aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/config
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/11852] Split filesystem and path_helper into 2 classesJoas Schilling2013-09-261-6/+10
| | | | PHPBB3-11852
* [ticket/11700] Get functional tests running after develop mergeNils Adermann2013-09-171-1/+1
| | | | PHPBB3-11700
* Merge remote-tracking branch 'github-phpbb/develop' into ticket/11700Nils Adermann2013-09-171-3/+11
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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] Fix INCLUDE(JS/CSS)Nathan Guse2013-09-131-3/+3
| | | | | | | | PHPBB3-11832
| * [ticket/11832] Create phpbb_symfony_request to handle initiating symfony_requestNathan Guse2013-09-131-0/+6
| | | | | | | | | | | | | | | | | | | | | | 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-131-0/+36
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # 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-121-1/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-122-0/+44
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # 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] Inject dependencies for phpbb_get_web_root_path (also moving)Nathan Guse2013-09-091-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-171-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-11700
* | | | | [ticket/11700] Correct service definitions with namespacesNils Adermann2013-09-161-4/+4
| | | | | | | | | | | | | | | | | | | | PHPBB3-11700
* | | | | [ticket/11700] Fix authentication acp after develop mergeNils Adermann2013-09-161-5/+5
| | | | | | | | | | | | | | | | | | | | PHPBB3-11700
* | | | | [ticket/11700] Fix installation after develop mergeNils Adermann2013-09-161-2/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-11700
* | | | | Merge remote-tracking branch 'github-phpbb/develop' into ticket/11700Nils Adermann2013-09-164-25/+91
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-131-1/+1
| |\ \ \ \ \ | | | |_|/ / | | |/| | / | | |_|_|/ | |/| | |
| | * | | [ticket/11824] Add option for mod_rewriteDavid King2013-09-031-1/+1
| | |/ / | | | | | | | | | | | | PHPBB3-11824
| * | | Merge pull request #1620 from EXreaction/ticket/11745David King2013-09-121-0/+18
| |\ \ \ | | | | | | | | | | Group join approved notification
| | * | | [ticket/11745] Group request approved notificationNathan Guse2013-07-271-0/+18
| | | | | | | | | | | | | | | | | | | | PHPBB3-11745
| * | | | Merge pull request #1617 from EXreaction/ticket/11744David King2013-09-121-0/+18
| |\ \ \ \ | | |/ / / | | | | / | | |_|/ | |/| | [ticket/11744] Group join request notification
| | * | [ticket/11744] Group join request notificationNathan Guse2013-07-261-0/+18
| | | | | | | | | | | | | | | | PHPBB3-11744
| * | | [feature/oauth] Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ↵Joseph Warner2013-09-061-25/+11
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature/oauth Conflicts: phpBB/composer.json phpBB/composer.lock phpBB/develop/create_schema_files.php phpBB/includes/ucp/ucp_register.php PHPBB3-11673
| | * | [ticket/11215] Make controller helper url() method use correct formatDavid King2013-09-021-0/+1
| | | | | | | | | | | | | | | | PHPBB3-11215
| | * | [ticket/11628] Remove phpbb_style (move methods to phpbb_template)Nathaniel Guse2013-07-241-10/+1
| | | | | | | | | | | | | | | | PHPBB3-11628
| | * | [ticket/11628] Remove style path providerNathaniel Guse2013-07-241-11/+0
| | | | | | | | | | | | | | | | | | | | | | | | No longer used since Twig was implemented. PHPBB3-11628
| | * | [ticket/11628] Remove style resource locatorNathaniel Guse2013-07-241-4/+0
| | |/ | | | | | | | | | | | | | | | No longer used since Twig was implemented. PHPBB3-11628
| | * Merge pull request #1513 from nickvergessen/ticket/11582Nathan Guse2013-07-221-0/+6
| | |\ | | | | | | | | Ticket/11582 Split permission logic from translations
| | | * [ticket/11582] Add event in constructor and add docsJoas Schilling2013-07-141-0/+1
| | | | | | | | | | | | | | | | PHPBB3-11582
| | | * [ticket/11582] Add new service for permissionsJoas Schilling2013-07-141-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | Replace calls to the language-array type with a call to get_types() PHPBB3-11582
| | * | [ticket/10931] Add phpbb_php_ini as a service.Andreas Fischer2013-07-161-0/+3
| | |/ | | | | | | | | | PHPBB3-10931
| * | [feature/oauth] Fix redirectsJoseph Warner2013-08-241-0/+2
| | | | | | | | | | | | PHPBB3-11673
| * | [feature/oauth] Pass users_table as parameter to OAuth in constructJoseph Warner2013-08-021-0/+1
| | | | | | | | | | | | PHPBB3-11673
| * | [feature/oauth] Fix more errors related to sql changesJoseph Warner2013-07-231-1/+1
| | | | | | | | | | | | PHPBB3-11673
| * | [feature/oauth] Finalize schema changesJoseph Warner2013-07-231-2/+2
| | | | | | | | | | | | PHPBB3-11673
| * | [feature/oauth] Fix errors in OAuthJoseph Warner2013-07-231-0/+2
| | | | | | | | | | | | PHPBB3-11673
| * | [feature/oauth] Update service files + check for existing linksJoseph Warner2013-07-182-2/+4
| | | | | | | | | | | | PHPBB3-11673
| * | [feature/oauth] Finish clean up of removed providersJoseph Warner2013-07-181-86/+2
| | | | | | | | | | | | PHPBB3-11673
| * | [feature/oauth] Bitly authentication method, no user_id associationJoseph Warner2013-07-181-0/+1
| | | | | | | | | | | | PHPBB3-11673
| * | [feature/oauth] Fix typoJoseph Warner2013-07-141-17/+17
| | | | | | | | | | | | PHPBB3-11673
| * | [feature/oauth] Update auth provider oauth to take in service providersJoseph Warner2013-07-141-0/+1
| | | | | | | | | | | | PHPBB3-11673
| * | [feature/oauth] Add constructor arguments to services fileJoseph Warner2013-07-141-17/+51
| | | | | | | | | | | | PHPBB3-11673
| * | [feature/oauth] Add OAuth services to service fileJoseph Warner2013-07-141-0/+74
| | | | | | | | | | | | PHPBB3-11673
| * | [feature/oauth] Pass table in constructorJoseph Warner2013-07-142-0/+2
| | | | | | | | | | | | PHPBB3-11673
| * | [feature/oauth] Use DB for OAuth token storageJoseph Warner2013-07-141-1/+0
| | | | | | | | | | | | PHPBB3-11673
| * | [feature/oauth] Continue work on OAuth loginJoseph Warner2013-07-141-0/+1
| | | | | | | | | | | | PHPBB3-11673
| * | [feature/oauth] OAuth as a symfony serviceJoseph Warner2013-07-141-0/+9
| |/ | | | | | | PHPBB3-11673
* | [ticket/11700] Move all recent code to namespacesNils Adermann2013-09-167-87/+87
|/ | | | PHPBB3-11700
* [ticket/11696] Rename db_tools.php so it can be autoloadedJoas Schilling2013-07-141-1/+0
| | | | PHPBB3-11696
* Merge remote-tracking branch 'phpbb/develop' into ticket/9657Joas Schilling2013-07-131-3/+3
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * phpbb/develop: (216 commits) [ticket/11626] Remove last reference to template in ldap [ticket/11626] Remove LDAP dependency on template [develop-olympus] Increment version number to 3.0.13-dev. [develop-olympus] Add changelog for 3.0.12 release. [develop-olympus] Bump version numbers for 3.0.12-RC1 release. [develop-olympus] Bumping version numbers to final for 3.0.12 releases. [ticket/11669] Fix PHP bug #55124 (recursive mkdir on /./) [ticket/11668] Run lint test at the end of the test suite [ticket/11548] Fix test errors in groups test on develop [ticket/11548] Check upload avatar URL the same way as in phpBB 3.0 [ticket/11548] Fix incorrect usage of array_map on acp groups page [ticket/11665] Fix test class name [ticket/11664] Stop creating php.html file in root path in tests [ticket/11665] Can't change file names already sent to set_filenames [ticket/11662] Typos: occured -> occurred [ticket/11662] Typos: occured -> occurred [ticket/11660] Fix bugs from bugs in #11651 (missing vars, db->sql_connect) [feature/auth-refactor] Add parent::setUp() in setUp() [feature/auth-refactor] Changes [feature/auth-refactor] DataProvider for acp_board test ...
| * [feature/twig] Remove style dependency for controller helperNathan Guse2013-07-051-1/+0
| | | | | | | | | | | | If a controller wants to use set_style, it can just use phpbb_style PHPBB3-11598
| * Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/twigNathaniel Guse2013-07-042-0/+38
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Joseph Warner (44) and others # Via Joas Schilling (4) and others * 'develop' of https://github.com/phpbb/phpbb3: (63 commits) [ticket/11617] Remove spaces and tabs from empty lines [ticket/11617] Missing U_ACTION in acp_captcha.php [feature/auth-refactor] Fix code style issue [feature/auth-refactor] Fix comment grammar [feature/auth-refactor] Fix the actual cause of test failures [feature/auth-refactor] A possible fix for the functional test failures [ticket/11566] Subsilver template error displayed after table headers [ticket/11566] Remove extra pair of brackets from conditional statement [ticket/11566] Check that guest doesn't have reporting permission by default [ticket/11566] Add captcha to report post template in subsilver [ticket/11566] Use the new constant CONFIRM_REPORT for captcha init [ticket/11566] Rename var to $visual_confirmation_response [ticket/11566] Revert forum permission changes [ticket/11566] Use language variable instead of hardcode [ticket/11566] add tests for reporting post [ticket/11566] add captcha reset and hidden fields [ticket/11566] display error instead of trigger_error [ticket/11566] add error in template [ticket/11566] add error functionality [ticket/11566] add interface for captcha ...
generated by cgit v1.2.1 (git 2.21.0) at 2025-03-26 23:57:34 +0000