aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/passwordsMarc Alexander2013-09-27266-2666/+4840
|\ | | | | | | | | Conflicts: phpBB/develop/create_schema_files.php
| * Merge remote-tracking branch 'EXreaction/ticket/11816-2' into developJoas Schilling2013-09-261-4/+4
| |\ | | | | | | | | | | | | * EXreaction/ticket/11816-2: [ticket/11816] Fix multiple parenthesis as well before $VARs in templates
| | * [ticket/11816] Fix multiple parenthesis as well before $VARs in templatesNathan Guse2013-09-191-4/+4
| | | | | | | | | | | | PHPBB3-11816
| * | [ticket/11866] Update some occurances of phpbb_db_ to new NamespaceJoas Schilling2013-09-261-1/+1
| | | | | | | | | | | | PHPBB3-11866
| * | [ticket/11700] Undo migrations migration, as not an issue for new installsNils Adermann2013-09-251-55/+0
| | | | | | | | | | | | PHPBB3-11700
| * | [ticket/11700] Update migrations table for namespacesNils Adermann2013-09-251-0/+55
| | | | | | | | | | | | PHPBB3-11700
| * | [ticket/11700] Only replace phpbb_search in strings that matchNils Adermann2013-09-251-1/+1
| | | | | | | | | | | | PHPBB3-11700
| * | [ticket/11700] Use spaces, not tabsNils Adermann2013-09-251-2/+2
| | | | | | | | | | | | PHPBB3-11700
| * | [ticket/11700] Return class names with leading backslash in finderNils Adermann2013-09-251-1/+1
| | | | | | | | | | | | PHPBB3-11700
| * | [ticket/11700] Fix unresolvable condition in migrationJoas Schilling2013-09-251-1/+1
| | | | | | | | | | | | PHPBB3-11700
| * | [ticket/11700] Fix extension loading with namespacesNils Adermann2013-09-196-13/+20
| | | | | | | | | | | | | | | | | | | | | class loader now expects all classes to be prefixed with a backslash when resolving paths PHPBB3-11700
| * | [ticket/11700] Change search backend db entry to namespacesNils Adermann2013-09-191-0/+30
| | | | | | | | | | | | PHPBB3-11700
| * | [ticket/11700] Correctly load avatar templates for namespaced driversNils Adermann2013-09-192-2/+2
| | | | | | | | | | | | PHPBB3-11700
| * | [ticket/11700] Correctly handle avatar drivers with namespacesNils Adermann2013-09-191-3/+3
| | | | | | | | | | | | PHPBB3-11700
| * | [ticket/11700] Fix some more incorrectly changed commentsNils Adermann2013-09-1914-15/+15
| | | | | | | | | | | | PHPBB3-11700
| * | [ticket/11700] Replace some leftover phpbb_filesystem usesNils Adermann2013-09-171-2/+2
| | | | | | | | | | | | PHPBB3-11700
| * | [ticket/11700] Get functional tests running after develop mergeNils Adermann2013-09-172-2/+2
| | | | | | | | | | | | PHPBB3-11700
| * | [ticket/11700] Fix unit tests after develop mergeNils Adermann2013-09-173-14/+16
| | | | | | | | | | | | PHPBB3-11700
| * | Merge remote-tracking branch 'github-phpbb/develop' into ticket/11700Nils Adermann2013-09-176-15/+247
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * github-phpbb/develop: [ticket/11832] Correct paths in tests [ticket/11832] Correct ROOT_PATH variable [ticket/11832] get_url() from phpbb_template_asset should return web path [ticket/11832] Fix INCLUDE(JS/CSS) [ticket/11832] Fix constructions of phpbb_filesystem [ticket/11832] Fix smiley paths [ticket/11832] Create phpbb_symfony_request to handle initiating symfony_request [ticket/11832] Fix build_url and the S_LOGIN_ACTION [ticket/11832] Changing comments to say app.php rather than index.php [ticket/11832] We must instantiate the $phpbb_filesystem in common [ticket/11832] Fix the web path corrections [ticket/11832] More extensive testing [ticket/11832] Use dirname(__FILE__) [ticket/11832] Use $phpbb_filesystem instead of the container in append_sid Revert "[ticket/11832] Make $phpbb_container a global initiated by the framework" [ticket/11832] Make $phpbb_container a global initiated by the framework [ticket/11832] Fix log tests [ticket/11832] update_web_root_path helper and tests [ticket/11832] Inject dependencies for phpbb_get_web_root_path (also moving) Conflicts: phpBB/common.php phpBB/config/services.yml phpBB/includes/bbcode.php phpBB/includes/functions.php phpBB/includes/functions_messenger.php phpBB/install/index.php phpBB/phpbb/filesystem.php phpBB/phpbb/template/twig/environment.php phpBB/phpbb/template/twig/node/includeasset.php phpBB/phpbb/template/twig/twig.php tests/controller/helper_url_test.php tests/dbal/migrator_test.php tests/extension/manager_test.php tests/extension/metadata_manager_test.php tests/filesystem/clean_path_test.php tests/mock/extension_manager.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/11832] get_url() from phpbb_template_asset should return web pathNathan Guse2013-09-152-4/+9
| | | | | | | | | | | | PHPBB3-11832
| | * [ticket/11832] Fix INCLUDE(JS/CSS)Nathan Guse2013-09-134-15/+78
| | | | | | | | | | | | PHPBB3-11832
| | * Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11832Nathan Guse2013-09-131-1/+1
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | # By David King # Via David King (1) and Joas Schilling (1) * 'develop' of github.com:phpbb/phpbb3: [ticket/11824] Fix comment wording
| | * | [ticket/11832] Create phpbb_symfony_request to handle initiating symfony_requestNathan Guse2013-09-132-12/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now symfony_request is also a service (removed the function phpbb_create_symfony_request). Inject symfony request into filesystem Cleanup for the tests PHPBB3-11832
| | * | Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11832Nathan Guse2013-09-1311-28/+673
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Nathan Guse (22) and others # Via Nathan Guse (10) and others * 'develop' of github.com:phpbb/phpbb3: (39 commits) [ticket/11843] Added newlines and included numbers in the DEFINE vars test [ticket/11843] Add checking DEFINE variables with underscores to template_test [ticket/11843] The twig lexer fixes DEFINE variables with underscores again [ticket/11727] Fix indentation [ticket/11727] Fix indentation [ticket/11745] Correct language, coding guidelines [ticket/11828] Fix greedy operators in lexer [ticket/11833] Prevent Twig errors from invalid template loops using BEGINELSE [ticket/11833] Fix bad template loop [ticket/11816] !$DOESNT_EXIST test [ticket/9550] Add the core.viewtopic_post_rowset_data event to viewtopic.php [ticket/11829] Use report_closed to determine status in MCP report_details [ticket/11816] Test !$DEFINITION [ticket/11822] Use namespace lookup order for asset loading [ticket/11727] Template loader support for safe directories to load files from [ticket/11816] Fix define/loop checks in IF statements containing parenthesis [ticket/11373] Use inheritdoc [ticket/11637] generate_text_for_display on search.php [ticket/11744] Cast to int [ticket/11744] Inheritdoc ...
| | * \ \ Merge remote-tracking branch 'remotes/imkingdavid/ticket/11824' into ↵Nathan Guse2013-09-122-12/+35
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ticket/11832 * remotes/imkingdavid/ticket/11824: [ticket/11824] Revert changes in functions.php [ticket/11824] Reorganize test file [ticket/11824] Update language string for board settings [ticket/11824] Revert changes to functions_content.php [ticket/11824] Add tests for urls with mod_rewrite enabled [ticket/11824] Correct a comment [ticket/11824] Change copyright year in migration file [ticket/11824] Remove unused globals [ticket/11824] Fix smilies [ticket/11824] Fix logic [ticket/11824] Add option for mod_rewrite
| | * \ \ \ Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11832Nathan Guse2013-09-1214-0/+1679
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Joseph Warner (187) and others # Via Andreas Fischer (2) and others * 'develop' of github.com:phpbb/phpbb3: (189 commits) [ticket/11835] Fix ucp_auth_link adding in migration [prep-release-3.0.12] Remove changelog entry for ticket that was not resolved. [feature/oauth] Fix tabindex [feature/oauth] Fix bug on ucp_auth_link related to error display [feature/oauth] More small fixes [feature/oauth] More minor changes from review [feature/oauth] Fix small bug introduced by update in OAuth library [feature/oauth] Fix small issues on ucp pages [feature/oauth] Fix typo in OAuth logout method [feature/oauth] Make token storage service ignorant [feature/oauth] Update oauth::logout() to use clearAllTokens() [feature/oauth] Update storage implementation due to inteface change [feature/oauth] Update lusitanian/oauth to stable branch [feature/oauth] Update comment on oauth service exception [feature/oauth] Forgot to remove placeholder comment [feature/oauth] OAuth service exception [feature/oauth] A few more minor changes [feature/oauth] Changes due to code review [feature/oauth] Fix redirects [feature/oauth] Fix issues on ucp_login_link from review ...
| | * | | | | [ticket/11832] Changing comments to say app.php rather than index.phpNathan Guse2013-09-121-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11832
| | * | | | | [ticket/11832] Fix the web path correctionsNathan Guse2013-09-121-10/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add some real life examples to test PHPBB3-11832
| | * | | | | [ticket/11832] More extensive testingNathan Guse2013-09-101-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11832
| | * | | | | [ticket/11832] update_web_root_path helper and testsNathan Guse2013-09-091-7/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11832
| | * | | | | [ticket/11832] Inject dependencies for phpbb_get_web_root_path (also moving)Nathan Guse2013-09-091-0/+69
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Function moved from phpbb_get_web_root_path to filesystem::get_web_root_path PHPBB3-11832
| * | | | | | [ticket/11700] Correctly load extensions with nonprefixed namespacesNils Adermann2013-09-172-7/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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] 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-165-23/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11700
| * | | | | | [ticket/11700] Fix installation after develop mergeNils Adermann2013-09-165-9/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11700
| * | | | | | [ticket/11700] Fix tests after merging new develop codeNils Adermann2013-09-1612-52/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11700
| * | | | | | Merge remote-tracking branch 'github-phpbb/develop' into ticket/11700Nils Adermann2013-09-1689-1625/+3508
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 'imkingdavid/ticket/11824' into developJoas Schilling2013-09-132-12/+35
| | |\ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| | | * | | | [ticket/11824] Fix comment wordingDavid King2013-09-131-1/+1
| | | | |_|/ | | | |/| | | | | | | | | | | | | | PHPBB3-11824
| | | * | | [ticket/11824] Change copyright year in migration fileDavid King2013-09-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11824
| | | * | | [ticket/11824] Add option for mod_rewriteDavid King2013-09-032-12/+35
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11824
generated by cgit v1.2.1 (git 2.21.0) at 2025-03-21 07:39:46 +0000