aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb
Commit message (Collapse)AuthorAgeFilesLines
* 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/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/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
| * | | [ticket/11700] Get the installer to run with namespacesNils Adermann2013-09-162-4/+11
| | | | | | | | | | | | | | | | PHPBB3-11700
| * | | [ticket/11700] Avoid \t in double quoted strings for template codeNils Adermann2013-09-161-1/+1
| | | | | | | | | | | | | | | | PHPBB3-11700
| * | | [ticket/11700] Correclty use namespaces in notificationsNils Adermann2013-09-161-13/+13
| | | | | | | | | | | | | | | | PHPBB3-11700
| * | | [ticket/11700] Fix number class names in 3.0.x migrationsNils Adermann2013-09-1637-109/+109
| | | | | | | | | | | | | | | | PHPBB3-11700
| * | | [ticket/11700] Namespaces and class names should not start with digitsNils Adermann2013-09-1656-40/+40
| | | | | | | | | | | | | | | | PHPBB3-11700
| * | | [ticket/11700] Move all recent code to namespacesNils Adermann2013-09-16243-1047/+1533
| | | | | | | | | | | | | | | | PHPBB3-11700
| * | | [ticket/11700] Use a new style constructor for the error collectorNils Adermann2013-07-141-1/+1
| | | | | | | | | | | | | | | | PHPBB3-11700
| * | | [ticket/11700] include and define are not valid class namesNils Adermann2013-07-145-8/+8
| | | | | | | | | | | | | | | | PHPBB3-11700
| * | | [ticket/11700] Implement namespace loading in the class loaderNils Adermann2013-07-141-31/+18
| | | | | | | | | | | | | | | | PHPBB3-11700
| * | | [ticket/11700] Modify all code to use the new interface namesNils Adermann2013-07-1430-113/+113
| | | | | | | | | | | | | | | | PHPBB3-11700
| * | | [ticket/11700] With namespaces interface will no longer be a valid classnameNils Adermann2013-07-1411-14/+14
| | | | | | | | | | | | | | | | PHPBB3-11700
* | | | [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
* | | [ticket/11832] get_url() from phpbb_template_asset should return web pathNathan Guse2013-09-152-4/+9
| | | | | | | | | | | | PHPBB3-11832