aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/11700] Correct service definitions with namespacesNils Adermann2013-09-161-4/+4
| | | | PHPBB3-11700
* [ticket/11700] Load avatar explanations correctly from namespacesNils Adermann2013-09-161-1/+1
| | | | PHPBB3-11700
* [ticket/11700] Correctly generate lang key from avatar driver classNils Adermann2013-09-161-1/+1
| | | | PHPBB3-11700
* [ticket/11700] Fix leftover backslashes in commentsNils Adermann2013-09-1613-18/+18
| | | | PHPBB3-11700
* [ticket/11700] And some last comments with backslashesNils Adermann2013-09-1611-30/+30
| | | | PHPBB3-11700
* [ticket/11700] Fix a few more commentsNils Adermann2013-09-1614-20/+20
| | | | PHPBB3-11700
* [ticket/11700] The word "them" in a comment is not a classNils Adermann2013-09-161-1/+1
| | | | PHPBB3-11700
* [ticket/11700] Actually "one" in comments is not a classNils Adermann2013-09-163-5/+5
| | | | PHPBB3-11700
* [ticket/11700] Fix authentication acp after develop mergeNils Adermann2013-09-166-28/+36
| | | | PHPBB3-11700
* [ticket/11700] Fix installation after develop mergeNils Adermann2013-09-167-14/+22
| | | | PHPBB3-11700
* [ticket/11700] Fix tests after merging new develop codeNils Adermann2013-09-1613-61/+68
| | | | PHPBB3-11700
* Merge remote-tracking branch 'github-phpbb/develop' into ticket/11700Nils Adermann2013-09-16250-5706/+7833
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * github-phpbb/develop: (586 commits) [ticket/11735] Display disabled checkbox in subsilver for read notifications [ticket/11735] Display disabled checkbox when notification is already read [ticket/11844] update acp/authentication language var [ticket/11795] Remove PM popup [ticket/11795] Remove outdated comment from forum_fn.js [ticket/11795] Move find user JS to forum_fn [ticket/11795] Replace TWIG with phpBB syntax in ACP [ticket/11795] Move MSN scripts to forum_fn.js [ticket/11795] Use phpBB template syntax instead of TWIG [ticket/11795] Move PM popup JS to forum_fn.js [ticket/11795] Get rid of pagination JS variables [ticket/11795] Get rid of onload_functions [ticket/11795] Use data-reset-on-edit attr to reset elements [ticket/11795] Redo form elements auto-focus [ticket/11811] Remove outline on :focus [ticket/11836] Fix subsilver fatal error [ticket/11837] Replace escaped single quote with utf-8 single quote [ticket/11836] Fix fatal error on unsupported provider for auth link [ticket/11837] Translate UCP_AUTH_LINK_NOT_SUPPORTED [ticket/11809] Ensure code.js is first script included after jQuery ... Conflicts: phpBB/config/services.yml phpBB/develop/create_schema_files.php phpBB/develop/mysql_upgrader.php phpBB/download/file.php phpBB/includes/bbcode.php phpBB/includes/functions_container.php phpBB/install/database_update.php phpBB/install/index.php phpBB/phpbb/controller/helper.php phpBB/phpbb/controller/resolver.php phpBB/phpbb/request/request_interface.php phpBB/phpbb/session.php phpBB/phpbb/style/extension_path_provider.php phpBB/phpbb/style/path_provider.php phpBB/phpbb/style/path_provider_interface.php phpBB/phpbb/style/resource_locator.php phpBB/phpbb/style/style.php phpBB/phpbb/template/locator.php phpBB/phpbb/template/template.php phpBB/phpbb/template/twig/node/includeasset.php phpBB/phpbb/template/twig/node/includecss.php phpBB/phpbb/template/twig/node/includejs.php phpBB/phpbb/template/twig/twig.php tests/controller/helper_url_test.php tests/di/create_container_test.php tests/extension/style_path_provider_test.php tests/notification/notification_test.php tests/session/continue_test.php tests/session/creation_test.php tests/template/template_events_test.php tests/template/template_test_case.php tests/template/template_test_case_with_tree.php tests/test_framework/phpbb_functional_test_case.php
| * [ticket/11735] Display disabled checkbox in subsilver for read notificationsDhruv2013-09-161-1/+1
| | | | | | | | PHPBB3-11735
| * [ticket/11735] Display disabled checkbox when notification is already readDhruv2013-09-151-1/+1
| | | | | | | | PHPBB3-11735
| * Merge remote-tracking branch 'Prosk8er/ticket/11844' into developDhruv2013-09-151-1/+1
| |\ | | | | | | | | | | | | | | | | | | # By Prosk8er # Via Prosk8er * Prosk8er/ticket/11844: [ticket/11844] update acp/authentication language var
| | * [ticket/11844] update acp/authentication language varProsk8er2013-09-141-1/+1
| | | | | | | | | | | | | | | | | | the language var ACP_AUTH_SETTINGS_EXPLAIN in language/en/acp/board.php PHPBB3-11844
| * | [ticket/11795] Remove PM popupVjacheslav Trushkin2013-09-143-14/+1
| | | | | | | | | | | | PHPBB3-11795
| * | [ticket/11795] Remove outdated comment from forum_fn.jsVjacheslav Trushkin2013-09-141-2/+0
| | | | | | | | | | | | | | | | | | This comment is no longer relevant because function was rewritten PHPBB3-11795
| * | [ticket/11795] Move find user JS to forum_fnVjacheslav Trushkin2013-09-143-42/+48
| | | | | | | | | | | | | | | | | | Move JavaScript from user search results to forum_fn.js PHPBB3-11795
| * | [ticket/11795] Replace TWIG with phpBB syntax in ACPVjacheslav Trushkin2013-09-142-2/+2
| | | | | | | | | | | | PHPBB3-11795
| * | [ticket/11795] Move MSN scripts to forum_fn.jsVjacheslav Trushkin2013-09-142-71/+59
| | | | | | | | | | | | | | | | | | | | | Move MSN scripts to forum_fn.js Rewrite MSN scripts to remove duplicate code PHPBB3-11795
| * | [ticket/11795] Use phpBB template syntax instead of TWIGVjacheslav Trushkin2013-09-143-6/+4
| | | | | | | | | | | | PHPBB3-11795
| * | [ticket/11795] Move PM popup JS to forum_fn.jsVjacheslav Trushkin2013-09-144-14/+12
| | | | | | | | | | | | | | | | | | | | | Move PM popup JavaScript from overall_header to forum_fn.js Use TWIG to escape PM popup URL PHPBB3-11795
| * | [ticket/11795] Get rid of pagination JS variablesVjacheslav Trushkin2013-09-148-23/+24
| | | | | | | | | | | | | | | | | | | | | Move pagination variables to data attributes Replace A_BASE_URL with BASE_URL and use TWIG to escape it PHPBB3-11795
| * | [ticket/11795] Get rid of onload_functionsVjacheslav Trushkin2013-09-142-42/+0
| | | | | | | | | | | | | | | | | | | | | Get rid of onload_functions and onunload_functions Scripts should use $(document).ready() instead PHPBB-11795
| * | [ticket/11795] Use data-reset-on-edit attr to reset elementsVjacheslav Trushkin2013-09-143-30/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use data-reset-on-edit attribute to reset other inputs when editing input with data. Do not unbind event (old code unbound it after one use for no reason) PHPBB3-11795
| * | [ticket/11795] Redo form elements auto-focusVjacheslav Trushkin2013-09-143-25/+12
| |/ | | | | | | | | | | | | Use data-focus attribute for forms to focus elements when document is loaded instead of adding JavaScript PHPBB3-11795
| * Merge pull request #1710 from Hardolaf/ticket/11837Nathan Guse2013-09-131-0/+1
| |\ | | | | | | [ticket/11837] Translate UCP_AUTH_LINK_NOT_SUPPORTED
| | * [ticket/11837] Replace escaped single quote with utf-8 single quoteJoseph Warner2013-09-131-1/+1
| | | | | | | | | | | | PHPBB3-11837
| | * [ticket/11837] Translate UCP_AUTH_LINK_NOT_SUPPORTEDJoseph Warner2013-09-131-0/+1
| | | | | | | | | | | | PHPBB3-11837
| * | Merge branch 'ticket/11811' into ticket/develop-2/11811Vjacheslav Trushkin2013-09-143-0/+23
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/11811: [ticket/11811] Remove outline on :focus Conflicts: phpBB/adm/style/admin.css phpBB/styles/prosilver/theme/forms.css
| | * | [ticket/11811] Remove outline on :focusVjacheslav Trushkin2013-09-133-0/+23
| | | | | | | | | | | | | | | | PHPBB3-11811
| * | | Merge remote-tracking branch 'remotes/upstream/develop-olympus' into developNathan Guse2013-09-132-140/+279
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/develop-olympus: [ticket/11831] getAttribute was replaced with attr [ticket/11831] Update fabpot/goutte to 1.0.* Conflicts: phpBB/composer.lock
| | * | Merge pull request #1701 from EXreaction/ticket/11831David King2013-09-122-154/+298
| | |\ \ | | | | | | | | | | Update fabpot/goutte
| | | * | [ticket/11831] Update fabpot/goutte to 1.0.*Nathan2013-09-062-154/+298
| | | | | | | | | | | | | | | | | | | | PHPBB3-11831
| * | | | [ticket/11836] Fix subsilver fatal errorJoseph Warner2013-09-131-1/+3
| | | | | | | | | | | | | | | | | | | | PHPBB3-11836
| * | | | [ticket/11836] Fix fatal error on unsupported provider for auth linkJoseph Warner2013-09-131-1/+3
| | |_|/ | |/| | | | | | | | | | PHPBB3-11836
| * | | Merge pull request #1675 from marc1706/ticket/11809Nathan Guse2013-09-132-2/+2
| |\ \ \ | | | | | | | | | | [ticket/11809] Ensure code.js is first script included after jQuery
| | * | | [ticket/11809] Ensure code.js is first script included after jQueryMarc Alexander2013-09-132-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The file core.js sets up most of the AJAX and jQuery related framework for phpBB. Due to this, it needs to be included before any other javascript file in order to ensure that subsequent files can use the phpBB variables and functions. Currently, it is however loaded with INCLUDEJS in overall_footer which causes it to be loaded after every other javascript file except for the style specific ajax.js. This causes every javascript file that is included before core.js and is using the phpBB AJAX functions or variables to break. PHPBB3-11809
| * | | | Merge remote-tracking branch 'imkingdavid/ticket/11824' into developJoas Schilling2013-09-136-13/+89
| |\ \ \ \
| | * | | | [ticket/11824] Fix comment wordingDavid King2013-09-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11824
| | * | | | [ticket/11824] Revert changes in functions.phpDavid King2013-09-121-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These will be added in another PR PHPBB3-11824
| | * | | | [ticket/11824] Update language string for board settingsDavid King2013-09-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11824
| | * | | | [ticket/11824] Revert changes to functions_content.phpDavid King2013-09-121-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These will be fixed in another PR PHPBB3-11824
| | * | | | [ticket/11824] Correct a commentDavid King2013-09-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11824
| | * | | | [ticket/11824] Change copyright year in migration fileDavid King2013-09-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11824
| | * | | | [ticket/11824] Remove unused globalsDavid King2013-09-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11824
| | * | | | [ticket/11824] Fix smiliesDavid King2013-09-061-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11824
| | * | | | [ticket/11824] Fix logicDavid King2013-09-062-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11824
| | * | | | [ticket/11824] Add option for mod_rewriteDavid King2013-09-037-16/+92
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11824