aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/11700] Add back accidently deleted file in cache dirNils Adermann2013-09-171-0/+10
| | | | PHPBB3-11700
* [ticket/11700] Correctly load extensions with nonprefixed namespacesNils Adermann2013-09-1729-72/+111
| | | | PHPBB3-11700
* [ticket/11700] Correctly convert old acm type to namespaced class nameNils Adermann2013-09-161-1/+1
| | | | PHPBB3-11700
* [ticket/11700] Use underscores in avatar driver template file namesNils Adermann2013-09-161-1/+1
| | | | PHPBB3-11700
* [ticket/11700] namespacify phpbb_permissions classNils Adermann2013-09-161-13/+15
| | | | PHPBB3-11700
* [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] Check for ALLOW_REMOTE_UPLOAD in acp output as expectedNils Adermann2013-09-162-2/+2
| | | | PHPBB3-11700
* [ticket/11700] And some last comments with backslashesNils Adermann2013-09-1611-30/+30
| | | | PHPBB3-11700
* [ticket/11700] Fix another case of non-namespaced classnamesNils Adermann2013-09-161-1/+1
| | | | PHPBB3-11700
* [ticket/11700] Fix a few more commentsNils Adermann2013-09-1614-20/+20
| | | | PHPBB3-11700
* [ticket/11700] The driver is namespaced now, so properly replace itNils Adermann2013-09-161-1/+1
| | | | PHPBB3-11700
* [ticket/11700] Default db driver for tests must not lead with \Nils Adermann2013-09-161-1/+1
| | | | PHPBB3-11700
* [ticket/11700] travis has hardcoded driver class names without namespacesNils Adermann2013-09-163-3/+3
| | | | 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] Oh dear modules. Abort! Retreat!Nils Adermann2013-09-161-0/+2
| | | | 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-1620-91/+98
| | | | PHPBB3-11700
* Merge remote-tracking branch 'github-phpbb/develop' into ticket/11700Nils Adermann2013-09-16330-6358/+10278
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| * Merge remote-tracking branch 'dhruv/ticket/11735' into developJoas Schilling2013-09-151-1/+1
| |\ | | | | | | | | | | | | * dhruv/ticket/11735: [ticket/11735] Display disabled checkbox in subsilver for read notifications
| | * [ticket/11735] Display disabled checkbox in subsilver for read notificationsDhruv2013-09-161-1/+1
| | | | | | | | | | | | PHPBB3-11735
| * | Merge remote-tracking branch 'dhruv/ticket/11735' into developJoas Schilling2013-09-151-1/+1
| |\ \ | | |/ | | | | | | | | | * dhruv/ticket/11735: [ticket/11735] Display disabled checkbox when notification is already read
| | * [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
| * | Merge pull request #1666 from cyberalien/ticket/11795Nathan Guse2013-09-1415-251/+149
| |\ \ | | |/ | |/| Move JS from html files to forum_fn.js
| | * [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 'develop-olympus' into developNathan Guse2013-09-130-0/+0
| |\ \ | | | | | | | | | | | | * develop-olympus:
| | * \ Merge remote-tracking branch 'remotes/cyberalien/ticket/11811' into ↵Nathan Guse2013-09-133-0/+23
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop-olympus * remotes/cyberalien/ticket/11811: [ticket/11811] Remove outline on :focus
| * | \ \ Merge remote-tracking branch 'remotes/cyberalien/ticket/develop-2/11811' ↵Nathan Guse2013-09-133-0/+23
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into develop * remotes/cyberalien/ticket/develop-2/11811: [ticket/11811] Remove outline on :focus
| | * \ \ \ 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-133-141/+280
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/develop-olympus: [ticket/11831] getAttribute was replaced with attr [ticket/11831] Update fabpot/goutte to 1.0.* Conflicts: phpBB/composer.lock