]> git.mxchange.org Git - friendica-addons.git/log
friendica-addons.git
4 years agoMove PConfig::load() to DI::pConfig()->load()
nupplaPhil [Sat, 18 Jan 2020 14:59:01 +0000 (15:59 +0100)]
Move PConfig::load() to DI::pConfig()->load()

4 years agoMerge pull request #943 from MrPetovan/bug/fatal-errors
Tobias Diekershoff [Sun, 12 Jan 2020 14:40:26 +0000 (15:40 +0100)]
Merge pull request #943 from MrPetovan/bug/fatal-errors

[openstreetmap] Fix references to Cache

4 years ago[openstreetmap] Fix references to Cache
Hypolite Petovan [Sun, 12 Jan 2020 14:36:43 +0000 (09:36 -0500)]
[openstreetmap] Fix references to Cache

4 years agoMerge pull request #942 from MrPetovan/bug/8090-advancedcontentfilter-cache
Philipp [Fri, 10 Jan 2020 19:54:12 +0000 (20:54 +0100)]
Merge pull request #942 from MrPetovan/bug/8090-advancedcontentfilter-cache

[advancedcontentfilter] Enable rule caching

4 years ago[advancedcontentfilter] Enable rule caching
Benjamin Lorteau [Fri, 10 Jan 2020 19:05:27 +0000 (14:05 -0500)]
[advancedcontentfilter] Enable rule caching

- Fix broken reference to Friendica\Core\Cache

4 years agoMerge pull request #940 from nupplaphil/task/remove_get_server
Hypolite Petovan [Sun, 5 Jan 2020 01:10:57 +0000 (20:10 -0500)]
Merge pull request #940 from nupplaphil/task/remove_get_server

[testdrive] Remove get_server() in favor of Search::getGlobalDirectory()

4 years agoRemove get_server() in favor of Search::getGlobalDirectory()
nupplaPhil [Sat, 4 Jan 2020 23:04:04 +0000 (00:04 +0100)]
Remove get_server() in favor of Search::getGlobalDirectory()

4 years agoRemove get_server() in favor of Config::get()
nupplaPhil [Sat, 4 Jan 2020 22:59:19 +0000 (23:59 +0100)]
Remove get_server() in favor of Config::get()

4 years agoMerge pull request #939 from nupplaphil/task/remove_get_app
Michael Vogel [Sat, 4 Jan 2020 22:42:32 +0000 (23:42 +0100)]
Merge pull request #939 from nupplaphil/task/remove_get_app

[ifttt] Remove get_app() in favor of DI::app()

4 years agoRemove get_app() in favor of DI::app()
nupplaPhil [Sat, 4 Jan 2020 22:42:00 +0000 (23:42 +0100)]
Remove get_app() in favor of DI::app()

4 years agoMerge pull request #938 from tobiasd/20200103-advZHCN
Hypolite Petovan [Fri, 3 Jan 2020 13:21:23 +0000 (08:21 -0500)]
Merge pull request #938 from tobiasd/20200103-advZHCN

[advanced content filter] added ZH-CN translation THX  tomacat

4 years ago[advanced content filter] added ZH-CN translation THX tomacat
Tobias Diekershoff [Fri, 3 Jan 2020 06:15:34 +0000 (07:15 +0100)]
[advanced content filter] added ZH-CN translation THX  tomacat

4 years agoMerge pull request #937 from loma-one/patch-1
Hypolite Petovan [Thu, 2 Jan 2020 20:55:10 +0000 (15:55 -0500)]
Merge pull request #937 from loma-one/patch-1

Extending the Unicode Emoji based on the 'unicode_smiles addon'

4 years agoUpdate unicode_smilies.php
loma-one [Thu, 2 Jan 2020 20:49:14 +0000 (21:49 +0100)]
Update unicode_smilies.php

correction // subdivision-flag

4 years agoUpdate unicode_smilies.php
loma-one [Thu, 2 Jan 2020 15:14:22 +0000 (16:14 +0100)]
Update unicode_smilies.php

4 years agoUpdate unicode_smilies.php
loma-one [Thu, 2 Jan 2020 09:02:19 +0000 (10:02 +0100)]
Update unicode_smilies.php

4 years agoExtending the Unicode Emoji based on the 'unicode_smiles addon'
loma-one [Thu, 2 Jan 2020 08:53:13 +0000 (09:53 +0100)]
Extending the Unicode Emoji based on the 'unicode_smiles addon'

-Indentation of the file restored
-change :bowling
-:birthday cake' audited
-German translation removed
-Author list added

4 years agoUpdate unicode_smilies.php
loma-one [Wed, 1 Jan 2020 17:36:16 +0000 (18:36 +0100)]
Update unicode_smilies.php

4 years agoUpdate unicode_smilies.php
loma-one [Wed, 1 Jan 2020 17:10:47 +0000 (18:10 +0100)]
Update unicode_smilies.php

Extension of the UNICODE Emoji based on  http://www.unicode.org/emoji/charts/full-emoji-list.html

4 years agoMerge pull request #936 from MrPetovan/bug/notices
Michael Vogel [Tue, 31 Dec 2019 09:54:18 +0000 (10:54 +0100)]
Merge pull request #936 from MrPetovan/bug/notices

[various] Replace remaining $a->page by DI::page()

4 years ago[various] Replace remaining $a->page by DI::page()
Hypolite Petovan [Mon, 30 Dec 2019 20:53:43 +0000 (15:53 -0500)]
[various] Replace remaining $a->page by DI::page()

4 years agoMerge pull request #935 from nupplaphil/task/move_page
Hypolite Petovan [Mon, 30 Dec 2019 18:42:47 +0000 (13:42 -0500)]
Merge pull request #935 from nupplaphil/task/move_page

[various] Replace deprecated $a->page with DI::page()

4 years agoReplace deprecated $a->page with DI::page()
nupplaPhil [Mon, 30 Dec 2019 19:02:08 +0000 (20:02 +0100)]
Replace deprecated $a->page with DI::page()

4 years agoMerge pull request #934 from tobiasd/20191230-markdownPL
Michael Vogel [Mon, 30 Dec 2019 08:54:39 +0000 (09:54 +0100)]
Merge pull request #934 from tobiasd/20191230-markdownPL

[markdown] added PL translation THX waldis

4 years ago[markdown] added PL translation THX waldis
Tobias Diekershoff [Mon, 30 Dec 2019 06:58:26 +0000 (07:58 +0100)]
[markdown] added PL translation THX waldis

4 years agoMerge pull request #933 from MrPetovan/bug/fatal-errors
Hypolite Petovan [Mon, 30 Dec 2019 03:29:40 +0000 (22:29 -0500)]
Merge pull request #933 from MrPetovan/bug/fatal-errors

[various] Update missing references to DI

4 years agoMerge pull request #932 from annando/markdown-more-elements
Hypolite Petovan [Mon, 30 Dec 2019 02:57:47 +0000 (21:57 -0500)]
Merge pull request #932 from annando/markdown-more-elements

Markdown: Protecting some more BBCode elements

4 years agoUpdate obsolete Module\Login reference to Module\Security\Login
Hypolite Petovan [Mon, 30 Dec 2019 02:55:37 +0000 (21:55 -0500)]
Update obsolete Module\Login reference to Module\Security\Login

4 years agoUpdate obsolete App::getBaseUrl calls to DI::baseUrl
Hypolite Petovan [Mon, 30 Dec 2019 02:55:10 +0000 (21:55 -0500)]
Update obsolete App::getBaseUrl calls to DI::baseUrl

4 years agoMarkdown: Protecting some more BBCode elements
Michael [Mon, 30 Dec 2019 02:25:01 +0000 (02:25 +0000)]
Markdown: Protecting some more BBCode elements

4 years agoMerge pull request #931 from annando/fix-927
Hypolite Petovan [Mon, 30 Dec 2019 02:05:33 +0000 (21:05 -0500)]
Merge pull request #931 from annando/fix-927

Fix PR 927: Adds forgotten calls

4 years agoFix PR 927: Adds forgotten calls
Michael [Mon, 30 Dec 2019 01:20:55 +0000 (01:20 +0000)]
Fix PR 927: Adds forgotten calls

4 years agoMerge pull request #927 from nupplaphil/task/replace_getClass
Hypolite Petovan [Mon, 30 Dec 2019 00:55:44 +0000 (19:55 -0500)]
Merge pull request #927 from nupplaphil/task/replace_getClass

[various] CleanUp deprecated methods

4 years agoMerge pull request #930 from annando/markdown-encoding
Hypolite Petovan [Sun, 29 Dec 2019 22:37:22 +0000 (17:37 -0500)]
Merge pull request #930 from annando/markdown-encoding

Markdown: Protect some more elements from markdown parsing

4 years agoMarkdown: Protect some more elements from markdown parsing
Michael [Sun, 29 Dec 2019 21:01:38 +0000 (21:01 +0000)]
Markdown: Protect some more elements from markdown parsing

4 years agoMerge pull request #929 from tobiasd/20191229-markdownCS
Michael Vogel [Sun, 29 Dec 2019 18:36:43 +0000 (19:36 +0100)]
Merge pull request #929 from tobiasd/20191229-markdownCS

[markdown] added CS translation THX Aditoo

4 years ago[markdown] added CS translation THX Aditoo
Tobias Diekershoff [Sun, 29 Dec 2019 16:44:37 +0000 (17:44 +0100)]
[markdown] added CS translation THX Aditoo

4 years agoAdd DI::auth() call to windowsphonepush
nupplaPhil [Sat, 28 Dec 2019 14:18:18 +0000 (15:18 +0100)]
Add DI::auth() call to windowsphonepush

4 years agoRemove deprecated App::module - replace with DI::module()->getName()
nupplaPhil [Mon, 16 Dec 2019 00:35:25 +0000 (01:35 +0100)]
Remove deprecated App::module - replace with DI::module()->getName()

4 years agoRemove deprecated App::query_string - replace with DI::args()->getQueryString()
nupplaPhil [Mon, 16 Dec 2019 00:30:33 +0000 (01:30 +0100)]
Remove deprecated App::query_string - replace with DI::args()->getQueryString()

4 years agoRemove deprecated App::is_mobile/is_tablet - replace with DI::mode()->isMobile()...
nupplaPhil [Mon, 16 Dec 2019 00:12:07 +0000 (01:12 +0100)]
Remove deprecated App::is_mobile/is_tablet - replace with DI::mode()->isMobile()/isTablet()

4 years agoRemove deprecated App::registerStylesheet()/FooterScript() - replace with DI::page...
nupplaPhil [Mon, 16 Dec 2019 00:08:47 +0000 (01:08 +0100)]
Remove deprecated App::registerStylesheet()/FooterScript() - replace with DI::page()->registerStylesheet()/FooterScript()

4 years agoRemove deprecated App::getBaseURL() - process methods to DI::baseUrl()->get()
nupplaPhil [Mon, 16 Dec 2019 00:05:14 +0000 (01:05 +0100)]
Remove deprecated App::getBaseURL() - process methods to DI::baseUrl()->get()

4 years agoRemove deprecated App::getHostName() - process methods to DI::baseUrl()->getHostName()
nupplaPhil [Sun, 15 Dec 2019 23:47:24 +0000 (00:47 +0100)]
Remove deprecated App::getHostName() - process methods to DI::baseUrl()->getHostName()

4 years agoRefactor deprecated App::internalRedirect() to DI::baseUrl()->redirect()
nupplaPhil [Sun, 15 Dec 2019 23:28:30 +0000 (00:28 +0100)]
Refactor deprecated App::internalRedirect() to DI::baseUrl()->redirect()

4 years agoRefactor dynamic App::getProfiler() to static DI::profiler()
nupplaPhil [Sun, 15 Dec 2019 22:50:35 +0000 (23:50 +0100)]
Refactor dynamic App::getProfiler() to static DI::profiler()

4 years agoRefactor dynamic App::getLogger() to static DI::logger()
nupplaPhil [Sun, 15 Dec 2019 22:46:55 +0000 (23:46 +0100)]
Refactor dynamic App::getLogger() to static DI::logger()

4 years agoReplace BaseObject class with DI::* calls
nupplaPhil [Sun, 15 Dec 2019 22:28:00 +0000 (23:28 +0100)]
Replace BaseObject class with DI::* calls

4 years agoIntroduce new DI container
nupplaPhil [Sun, 15 Dec 2019 21:34:10 +0000 (22:34 +0100)]
Introduce new DI container
- Adding Friendica\DI class for getting dynamic classes
- Replacing BaseObject::getApp() with this class

4 years agoMerge pull request #925 from annando/markdown-escape
Hypolite Petovan [Fri, 27 Dec 2019 17:13:06 +0000 (12:13 -0500)]
Merge pull request #925 from annando/markdown-escape

Markdown: Escape some elements prior to sending them through Markdown

4 years agoMerge pull request #926 from tobiasd/20191227-markdownDE
Michael Vogel [Fri, 27 Dec 2019 09:26:10 +0000 (10:26 +0100)]
Merge pull request #926 from tobiasd/20191227-markdownDE

[markdown] added DE translation

4 years agobetter wording
Tobias Diekershoff [Fri, 27 Dec 2019 06:54:40 +0000 (07:54 +0100)]
better wording

4 years ago[markdown] added DE translation
Tobias Diekershoff [Fri, 27 Dec 2019 06:50:37 +0000 (07:50 +0100)]
[markdown] added DE translation

4 years agoStandards
Michael [Fri, 27 Dec 2019 06:09:09 +0000 (06:09 +0000)]
Standards

4 years agoMarkdown: Escape some elements prior to sending them through Markdown
Michael [Fri, 27 Dec 2019 01:35:15 +0000 (01:35 +0000)]
Markdown: Escape some elements prior to sending them through Markdown

4 years agoMerge pull request #924 from annando/markdown
Tobias Diekershoff [Thu, 26 Dec 2019 10:36:56 +0000 (11:36 +0100)]
Merge pull request #924 from annando/markdown

New Addon Markdown

4 years agoAdded messages
Michael [Thu, 26 Dec 2019 10:05:27 +0000 (10:05 +0000)]
Added messages

4 years agoNew Addon Markdown
Michael [Thu, 26 Dec 2019 08:14:04 +0000 (08:14 +0000)]
New Addon Markdown

4 years agoMerge pull request #923 from MrPetovan/bug/notices
Tobias Diekershoff [Wed, 25 Dec 2019 09:03:01 +0000 (10:03 +0100)]
Merge pull request #923 from MrPetovan/bug/notices

[tumblr] Fix notice when submitting user settings

4 years ago[tumblr] Fix notice when submitting user settings
Hypolite Petovan [Sat, 22 Jun 2019 12:00:09 +0000 (08:00 -0400)]
[tumblr] Fix notice when submitting user settings

- Addresses https://github.com/friendica/friendica/issues/8000#issuecomment-568784745

4 years agoMerge 2019.12 master into develop
Tobias Diekershoff [Mon, 23 Dec 2019 19:00:12 +0000 (20:00 +0100)]
Merge 2019.12 master into develop

4 years agoMerge pull request #922 from nupplaphil/bug/7989-advancedcontfilter
Hypolite Petovan [Mon, 23 Dec 2019 00:38:00 +0000 (19:38 -0500)]
Merge pull request #922 from nupplaphil/bug/7989-advancedcontfilter

[advancedcontentfilter] Fix Hook-call during install

4 years agoRestored Hook::register and added Hook::add
nupplaPhil [Mon, 23 Dec 2019 00:36:32 +0000 (01:36 +0100)]
Restored Hook::register and added Hook::add

4 years agoAdd more indention :-)
nupplaPhil [Sun, 22 Dec 2019 19:36:19 +0000 (20:36 +0100)]
Add more indention :-)

4 years agoFix dbstructure update hook for advancedcontentfilter
nupplaPhil [Sun, 22 Dec 2019 18:36:28 +0000 (19:36 +0100)]
Fix dbstructure update hook for advancedcontentfilter

4 years agoMerge pull request #917 from nupplaphil/task/reduce_app_deps
Hypolite Petovan [Sun, 22 Dec 2019 14:05:44 +0000 (09:05 -0500)]
Merge pull request #917 from nupplaphil/task/reduce_app_deps

[windowsphonepush] - Switch Authentication call

4 years agoMerge pull request #921 from tobiasd/20191222-et
Hypolite Petovan [Sun, 22 Dec 2019 14:02:56 +0000 (09:02 -0500)]
Merge pull request #921 from tobiasd/20191222-et

showmore: added ET translation THX Rain Hawk

4 years agoshowmore: added ET translation THX Rain Hawk
Tobias Diekershoff [Sun, 22 Dec 2019 06:03:17 +0000 (07:03 +0100)]
showmore: added ET translation THX Rain Hawk

4 years agoMerge pull request #909 from MrPetovan/task/4090-move-profile_photo-to-src
Michael Vogel [Wed, 18 Dec 2019 15:16:40 +0000 (16:16 +0100)]
Merge pull request #909 from MrPetovan/task/4090-move-profile_photo-to-src

Move Object\Image static methods to Util\Images

4 years agoMerge pull request #920 from tobiasd/20191216-lng
Hypolite Petovan [Mon, 16 Dec 2019 07:17:06 +0000 (02:17 -0500)]
Merge pull request #920 from tobiasd/20191216-lng

DE and ET translation updates

4 years agobuglink: DE translation updated THX Rene Wagner
Tobias Diekershoff [Mon, 16 Dec 2019 07:14:55 +0000 (08:14 +0100)]
buglink: DE translation updated THX Rene Wagner

4 years agosmileybutton: ET translation added THX Rain Hawk
Tobias Diekershoff [Mon, 16 Dec 2019 07:13:41 +0000 (08:13 +0100)]
smileybutton: ET translation added THX Rain Hawk

4 years agoMerge pull request #919 from MrPetovan/bug/tumblr-oauth
Michael Vogel [Wed, 11 Dec 2019 22:13:17 +0000 (23:13 +0100)]
Merge pull request #919 from MrPetovan/bug/tumblr-oauth

[various] Use correct object class for Oauth token

4 years ago[twitter] Use correct object class for Oauth token in library/tumblroauth
Benjamin Lorteau [Wed, 11 Dec 2019 19:46:03 +0000 (14:46 -0500)]
[twitter] Use correct object class for Oauth token in library/tumblroauth

- Addresses https://github.com/friendica/friendica/issues/7675#issuecomment-564562386

4 years ago[tumblr] Use correct object class for Oauth token in library/tumblroauth
Benjamin Lorteau [Wed, 11 Dec 2019 18:19:32 +0000 (13:19 -0500)]
[tumblr] Use correct object class for Oauth token in library/tumblroauth

- Addresses https://github.com/friendica/friendica/issues/7675#issuecomment-564648263

4 years ago[tumblr] Improve phpDoc in library/tumblroauth
Benjamin Lorteau [Wed, 11 Dec 2019 18:18:17 +0000 (13:18 -0500)]
[tumblr] Improve phpDoc in library/tumblroauth

4 years ago[tumblr] Fix formatting in library/tumblroauth
Benjamin Lorteau [Wed, 11 Dec 2019 18:04:36 +0000 (13:04 -0500)]
[tumblr] Fix formatting in library/tumblroauth

4 years agoMove Cookie to own class (with tests)
nupplaPhil [Sun, 8 Dec 2019 21:45:33 +0000 (22:45 +0100)]
Move Cookie to own class (with tests)
Move Authentication to App namespace

4 years agoMerge pull request #918 from annando/buffer-unsupported
Hypolite Petovan [Sat, 7 Dec 2019 22:04:22 +0000 (17:04 -0500)]
Merge pull request #918 from annando/buffer-unsupported

Issue 7916: Buffer is unsupported now

4 years agoIssue 7916: Buffer is unsupported now
Michael [Sat, 7 Dec 2019 21:56:43 +0000 (21:56 +0000)]
Issue 7916: Buffer is unsupported now

4 years agoRefactor "Authentication" class with four main methods:
nupplaPhil [Tue, 3 Dec 2019 21:29:36 +0000 (22:29 +0100)]
Refactor "Authentication" class with four main methods:
- withSession() - for auto authentication with Session/Cookie variables
- withOpenId() - for authentication with an OpenID account
- withPassword() - for authentication with Password
- setForUser() - for setting the user auth context of the current session

Refactor "Session" class - contains now "native" Session Management methods

4 years agoMerge pull request #916 from friendica/dependabot/composer/advancedcontentfilter...
Hypolite Petovan [Mon, 2 Dec 2019 19:23:37 +0000 (14:23 -0500)]
Merge pull request #916 from friendica/dependabot/composer/advancedcontentfilter/symfony/cache-3.4.36

Bump symfony/cache from 3.4.8 to 3.4.36 in /advancedcontentfilter

4 years agoBump symfony/cache from 3.4.8 to 3.4.36 in /advancedcontentfilter
dependabot[bot] [Mon, 2 Dec 2019 19:21:35 +0000 (19:21 +0000)]
Bump symfony/cache from 3.4.8 to 3.4.36 in /advancedcontentfilter

Bumps [symfony/cache](https://github.com/symfony/cache) from 3.4.8 to 3.4.36.
- [Release notes](https://github.com/symfony/cache/releases)
- [Changelog](https://github.com/symfony/cache/blob/master/CHANGELOG.md)
- [Commits](https://github.com/symfony/cache/compare/v3.4.8...v3.4.36)

Signed-off-by: dependabot[bot] <support@github.com>
4 years agoMerge pull request #915 from MrPetovan/bug/js_upload-public-visibility
Tobias Diekershoff [Mon, 2 Dec 2019 04:53:51 +0000 (05:53 +0100)]
Merge pull request #915 from MrPetovan/bug/js_upload-public-visibility

[js_upload] Restore public image upload

4 years ago[js_upload] Restore public image upload
Hypolite Petovan [Sun, 1 Dec 2019 21:33:19 +0000 (16:33 -0500)]
[js_upload] Restore public image upload

4 years agoMerge pull request #914 from MrPetovan/bug/7880-js_upload-rewrite-after-acl-change
Tobias Diekershoff [Sat, 30 Nov 2019 19:52:07 +0000 (20:52 +0100)]
Merge pull request #914 from MrPetovan/bug/7880-js_upload-rewrite-after-acl-change

[js_upload] Rewrite addon after ACL changes

4 years ago[js_upload] Rewrite addon after ACl changes
Hypolite Petovan [Sat, 30 Nov 2019 17:06:51 +0000 (12:06 -0500)]
[js_upload] Rewrite addon after ACl changes

- Move HTML to template
- Remove redundant uninstall method
- Enforce coding standards
- Add type-hinting

4 years agoMerge pull request #913 from annando/discourse
Hypolite Petovan [Thu, 28 Nov 2019 17:59:27 +0000 (12:59 -0500)]
Merge pull request #913 from annando/discourse

Discourse Addon

4 years agoImproved template
Michael [Thu, 28 Nov 2019 04:57:39 +0000 (04:57 +0000)]
Improved template

5 years agoSettings had been moved into a template
Michael [Wed, 27 Nov 2019 05:54:26 +0000 (05:54 +0000)]
Settings had been moved into a template

5 years agoSome fixes / subject cleaning
Michael [Tue, 26 Nov 2019 18:59:50 +0000 (18:59 +0000)]
Some fixes / subject cleaning

5 years agoTo-Do added, code fragment removed
Michael [Tue, 26 Nov 2019 07:21:49 +0000 (07:21 +0000)]
To-Do added, code fragment removed

5 years agoAdded logging value
Michael [Mon, 25 Nov 2019 23:09:18 +0000 (23:09 +0000)]
Added logging value

5 years agoSettings page added
Michael [Mon, 25 Nov 2019 22:58:01 +0000 (22:58 +0000)]
Settings page added

5 years agoREADME updated, code restructured
Michael [Mon, 25 Nov 2019 22:23:19 +0000 (22:23 +0000)]
README updated, code restructured

5 years agoDiscourse contacts are generated, URI and Parent-URI are regenerated
Michael [Mon, 25 Nov 2019 11:14:22 +0000 (11:14 +0000)]
Discourse contacts are generated, URI and Parent-URI are regenerated

5 years ago[avancedcontentfilter] Fix typo in exception name
Hypolite Petovan [Sun, 24 Nov 2019 19:20:57 +0000 (14:20 -0500)]
[avancedcontentfilter] Fix typo in exception name

5 years agoDiscourse addon created
Michael [Sat, 23 Nov 2019 23:43:59 +0000 (23:43 +0000)]
Discourse addon created

5 years agoMerge pull request #910 from tobiasd/20191106-lng
Hypolite Petovan [Thu, 7 Nov 2019 01:00:35 +0000 (20:00 -0500)]
Merge pull request #910 from tobiasd/20191106-lng

CA translation pack

5 years agoinfiniteprbabilitydrive addon updated CA translation THX Joan Bar
Tobias Diekershoff [Wed, 6 Nov 2019 08:41:19 +0000 (09:41 +0100)]
infiniteprbabilitydrive addon updated CA translation THX Joan Bar