aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #1746 from EXreaction/ticket/11882David King2013-10-032-1/+6
|\ | | | | [ticket/11882] Incorrect dependency in signature module auth migration
| * [ticket/11882] If dependency is incorrect/unfulfillable, throw an errorNathan2013-10-021-0/+5
| | | | | | | | PHPBB3-11882
| * [ticket/11882] Incorrect dependency in signature module auth migrationNathan2013-10-021-1/+1
| | | | | | | | PHPBB3-11882
* | Merge pull request #1726 from EXreaction/ticket/11850David King2013-10-031-5/+15
|\ \ | |/ |/| Fix $user->page on pages through the controller
| * Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11850Nathan Guse2013-09-30258-1321/+1895
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Nils Adermann (68) and others # Via Andreas Fischer (12) and others * 'develop' of github.com:phpbb/phpbb3: (102 commits) [ticket/11876] Replace MD5 with SHA256. [ticket/11876] Move checksum generation from build PHP files to phing build.xml [develop-olympus] Build against 3.0.12 instead of 3.0.12-RC3. Tag exists now. [prep-release-3.0.12] Update changelog for 3.0.12 release. [ticket/11873] Add unit test for large password input. [ticket/11873] Do not hash very large passwords in order to safe resources. [ticket/11862] Correct var names in user_delete() events due to prune-users [develop-olympus] Use 3.0.13-dev as build version. Use latest 3.0.12 RC tag. [prep-release-3.0.12] Bumping version number for 3.0.12 final. [ticket/11852] Add class file [ticket/11852] Move tests to folder with new class name [ticket/11852] Split filesystem and path_helper into 2 classes [ticket/11868] Add @depends to test [ticket/11868] Add functional test for registration [ticket/11868] Replace phpbb_request_interface references [ticket/11866] Only single backslash in .md files [ticket/11866] Remove outdated and broken develop script [ticket/11866] More namespaces [ticket/11866] Update some occurances of phpbb_db_ to new Namespace [ticket/11865] Convert old class name to namespaced version ... Conflicts: tests/security/extract_current_page_test.php tests/session/testable_facade.php
| * | [ticket/11850] page_name contains controller request rather than query stringNathan Guse2013-09-171-5/+6
| | | | | | | | | | | | | | | | | | Fixing tests PHPBB3-11850
| * | [ticket/11850] Fix $user->page on pages through the controllerNathan Guse2013-09-171-5/+14
| | | | | | | | | | | | PHPBB3-11850
* | | Merge remote-tracking branch 'nickvergessen/ticket/11691' into developDhruv2013-10-023-18/+62
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Joas Schilling # Via Joas Schilling * nickvergessen/ticket/11691: [ticket/11691] Fix conversion test [ticket/11691] Fix table names and arguments/docs [ticket/11691] Move purge code into new function [ticket/11691] Fix typo in comment [ticket/11691] Add order by to the query [ticket/11691] Fix some minor comments [ticket/11691] Fix some more problems with softdelete update [ticket/11691] Change detection of effectively_installed() [ticket/11691] Stagger user notification reconversion even more [ticket/11691] Stagger the convertion of soft delete updates
| * | | [ticket/11691] Fix table names and arguments/docsJoas Schilling2013-09-261-8/+8
| | | | | | | | | | | | | | | | PHPBB3-11691
| * | | [ticket/11691] Move purge code into new functionJoas Schilling2013-09-261-7/+7
| | | | | | | | | | | | | | | | PHPBB3-11691
| * | | [ticket/11691] Fix typo in commentJoas Schilling2013-09-261-1/+1
| | | | | | | | | | | | | | | | PHPBB3-11691
| * | | [ticket/11691] Add order by to the queryJoas Schilling2013-09-261-1/+2
| | | | | | | | | | | | | | | | PHPBB3-11691
| * | | [ticket/11691] Fix some minor commentsJoas Schilling2013-09-261-4/+3
| | | | | | | | | | | | | | | | PHPBB3-11691
| * | | [ticket/11691] Fix some more problems with softdelete updateJoas Schilling2013-09-261-4/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * wrong order of arguments on sql_query_limit * avoid "BIGINT UNSIGNED value is out of range" errors * increase limit for the loop PHPBB3-11691
| * | | [ticket/11691] Change detection of effectively_installed()Joas Schilling2013-09-261-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | When start is set for a migration, it is not yet effectively installed. So we just continue doing it... PHPBB3-11691
| * | | [ticket/11691] Stagger user notification reconversion even moreJoas Schilling2013-09-261-7/+24
| | | | | | | | | | | | | | | | PHPBB3-11691
| * | | [ticket/11691] Stagger the convertion of soft delete updatesJoas Schilling2013-09-261-3/+23
| | | | | | | | | | | | | | | | PHPBB3-11691
* | | | [ticket/11878] Missing leading \ in dependencies in soft_delete_mcp_modulesNathan Guse2013-10-021-2/+2
| |_|/ |/| | | | | | | | PHPBB3-11878
* | | [ticket/11852] Add class fileJoas Schilling2013-09-271-0/+175
| | | | | | | | | | | | PHPBB3-11852
* | | [ticket/11852] Split filesystem and path_helper into 2 classesJoas Schilling2013-09-265-173/+28
| | | | | | | | | | | | PHPBB3-11852
* | | 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