aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'develop-olympus' into developAndreas Fischer2013-05-191-9/+8
|\ | | | | | | | | | | | | | | * develop-olympus: [ticket/11537] Adjust error message on ucp group manage to fit rest of ucp Conflicts: phpBB/styles/prosilver/template/ucp_groups_manage.html
| * Merge remote-tracking branch 'marc1706/ticket/11537' into develop-olympusAndreas Fischer2013-05-191-9/+8
| |\ | | | | | | | | | | | | * marc1706/ticket/11537: [ticket/11537] Adjust error message on ucp group manage to fit rest of ucp
| | * [ticket/11537] Adjust error message on ucp group manage to fit rest of ucpMarc Alexander2013-05-141-9/+8
| | | | | | | | | | | | | | | | | | | | | The current look highly differed from the rest of the UCP. Additionally, this caused the error message to be hardly noticeable at all. PHPBB3-11537
* | | Merge remote-tracking branch 'cyberalien/ticket/11555' into developAndreas Fischer2013-05-191-1/+1
|\ \ \ | | | | | | | | | | | | | | | | * cyberalien/ticket/11555: [ticket/11555] Fix page comparison
| * | | [ticket/11555] Fix page comparisonVjacheslav Trushkin2013-05-191-1/+1
|/ / / | | | | | | | | | | | | | | | Strict comparison should not be used to compare string and number PHPBB3-11555
* | | Merge remote-tracking branch 'EXreaction/ticket/11415' into developDavid King2013-05-1810-112/+172
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * EXreaction/ticket/11415: [ticket/11415] Add test for find_from_extension() [ticket/11415] Send the extension base the finder rather than the manager [ticket/11415] Create function in finder find_from_extension [ticket/11415] Fix ext.manager constructor in tests [ticket/11415] Make migrator/ext.manager dependencies of the base ext class [ticket/11415] Remove migrator dependency from extension manager [ticket/11415] Move migrator to base extension class from ext.manager [ticket/11415] Move while loop from ext manager to acp_extensions.php
| * | | [ticket/11415] Add test for find_from_extension()Nathan Guse2013-05-141-0/+17
| | | | | | | | | | | | | | | | PHPBB3-11415
| * | | [ticket/11415] Send the extension base the finder rather than the managerNathan Guse2013-05-102-10/+9
| | | | | | | | | | | | | | | | PHPBB3-11415
| * | | [ticket/11415] Create function in finder find_from_extensionNathan Guse2013-05-102-13/+30
| | | | | | | | | | | | | | | | PHPBB3-11415
| * | | [ticket/11415] Fix ext.manager constructor in testsNathaniel Guse2013-05-033-3/+0
| | | | | | | | | | | | | | | | PHPBB3-11415
| * | | [ticket/11415] Make migrator/ext.manager dependencies of the base ext classNathaniel Guse2013-05-012-13/+23
| | | | | | | | | | | | | | | | PHPBB3-11415
| * | | [ticket/11415] Remove migrator dependency from extension managerNathaniel Guse2013-05-016-10/+18
| | | | | | | | | | | | | | | | PHPBB3-11415
| * | | [ticket/11415] Move migrator to base extension class from ext.managerNathaniel Guse2013-05-012-75/+86
| | | | | | | | | | | | | | | | PHPBB3-11415
| * | | [ticket/11415] Move while loop from ext manager to acp_extensions.phpNathaniel Guse2013-05-012-27/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Now enable_step works as it's supposed to (do one step at a time) and less refreshes are required for the user. PHPBB3-11415
* | | | Merge remote-tracking branch 'remotes/blitze/ticket/11458' into developNathaniel Guse2013-05-183-25/+140
|\ \ \ \
| * | | | [ticket/11458] Update functional testOpenShift guest2013-05-111-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Show that the phpbb permission lanuage file is being included PHPBB3-11458
| * | | | [ticket/11458] Use finder to get all permission language filesOpenShift guest2013-05-101-35/+12
| | | | | | | | | | | | | | | | | | | | PHPBB3-11458
| * | | | [ticket/11458] Use helper to create/move/delete directories/filesOpenShift guest2013-05-091-24/+27
| | | | | | | | | | | | | | | | | | | | PHPBB3-11458
| * | | | [ticket/11458] Fix functional test againOpenShift guest2013-04-141-20/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add 'u_foo' to phpbb_acl_options Make sure extension and fixtures are added before running test PHPBB3-11458
| * | | | [ticket/11458] Fix testOpenShift guest2013-04-131-1/+8
| | | | | | | | | | | | | | | | | | | | PHPBB-11458
| * | | | [ticket/11458] Add functional testOpenShift guest2013-04-132-0/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since there is no test method to include extension language files, a functional test seems more appropriate. We add a permission mask 'acl_u_foo' with translation found in extenion 'bar' and confirm that the permission language file 'permissions_foo.php' from 'bar' was added by asserting that 'Can view foo' exists when viewing user permissions in acp PHPBB3-11458
| * | | | [ticket/11458] We still auto add language files from the mods and acpOpenShift guest2013-04-131-4/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | folders in the language directory, so we revert some changes here PHPBB3-11458
| * | | | [ticket/11458] Search for permission language files in extensionsOpenShift guest2013-03-251-24/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extensions that add new permission masks only need to add a permission file in the language folder of the extension. The file must start with 'permissions_' eg 'permissions_blog.php'. The permission language file will be automatically included when viewing/setting permissions. PHPBB3-11458
* | | | | Merge remote-tracking branch 'bantu/ticket/11547-develop' into developAndreas Fischer2013-05-171-2/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * bantu/ticket/11547-develop: [ticket/11547] Add phpbb_db_driver_ prefix to DBMS names.
| * | | | | [ticket/11547] Add phpbb_db_driver_ prefix to DBMS names.Andreas Fischer2013-05-171-2/+2
|/ / / / / | | | | | | | | | | | | | | | PHPBB3-11547
* | | | | Merge branch 'develop-olympus' into developAndreas Fischer2013-05-173-7/+15
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/11542] Use Czech as example as it contains non-latin characters [ticket/11547] Set MySQL charset to UTF8 in database_test_connection_manager.
| * | | | Merge remote-tracking branch 'bantu/ticket/11547' into develop-olympusAndreas Fischer2013-05-171-0/+8
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * bantu/ticket/11547: [ticket/11547] Set MySQL charset to UTF8 in database_test_connection_manager.
| | * | | | [ticket/11547] Set MySQL charset to UTF8 in database_test_connection_manager.Andreas Fischer2013-05-171-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11547
| * | | | | Merge remote-tracking branch 'nickvergessen/ticket/11542-2' into develop-olympusAndreas Fischer2013-05-172-7/+7
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * nickvergessen/ticket/11542-2: [ticket/11542] Use Czech as example as it contains non-latin characters
| | * | | | | [ticket/11542] Use Czech as example as it contains non-latin charactersJoas Schilling2013-05-172-7/+7
| |/ / / / / | | | | | | | | | | | | | | | | | | PHPBB3-11542
* | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2013-05-170-0/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/11544] Add admin_login() method to 3.0 functional test case Conflicts: tests/test_framework/phpbb_functional_test_case.php
| * | | | | Merge remote-tracking branch 'marc1706/ticket/11544' into develop-olympusAndreas Fischer2013-05-171-0/+44
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | * marc1706/ticket/11544: [ticket/11544] Add admin_login() method to 3.0 functional test case
| | * | | | [ticket/11544] Add admin_login() method to 3.0 functional test caseMarc Alexander2013-05-141-0/+44
| | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | This method is needed in order to be able to properly test acp functions. PHPBB3-11544
* | | | | Merge branch 'develop-olympus' into developAndreas Fischer2013-05-172-0/+60
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/11542] Add non-existing default value for language select [ticket/11542] Add lang_english_name to fixture [ticket/11542] Add unit tests for language_select()
| * | | | Merge remote-tracking branch 'nickvergessen/ticket/11542' into develop-olympusAndreas Fischer2013-05-172-0/+60
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * nickvergessen/ticket/11542: [ticket/11542] Add non-existing default value for language select [ticket/11542] Add lang_english_name to fixture [ticket/11542] Add unit tests for language_select()
| | * | | | [ticket/11542] Add non-existing default value for language selectJoas Schilling2013-05-161-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11542
| | * | | | [ticket/11542] Add lang_english_name to fixtureJoas Schilling2013-05-151-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11542
| | * | | | [ticket/11542] Add unit tests for language_select()Joas Schilling2013-05-142-0/+56
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11542
* | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2013-05-161-2/+2
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/11536] Fixed incorrect removal of "install" in script_path
| * | | | | Merge remote-tracking branch 'galaxyAbstractor/ticket/11536' into ↵Andreas Fischer2013-05-161-2/+2
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop-olympus * galaxyAbstractor/ticket/11536: [ticket/11536] Fixed incorrect removal of "install" in script_path
| | * | | | | [ticket/11536] Fixed incorrect removal of "install" in script_pathVictor Nagy2013-05-151-2/+2
| | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Earlier the script would incorrectly remove the word "install" from the script_path when trying to remove the last folder in the path named "/install". This would lead to issues when the path you are installing phpBB contained "install". For example "/install_test/install" would become "/_test". This change gets the parent folder instead of replacing all "install". $name contains /install_test/install/index.php from start and running dirname() gives /install_test/install. Running dirname once more gives the parent folder of install, /install_test. PHPBB3-11536
* | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2013-05-162-5/+26
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/11545] Remove DIRECTORY_SEPARATOR dependency from is_absolute
| * | | | | Merge remote-tracking branch 'nickvergessen/ticket/11545' into develop-olympusAndreas Fischer2013-05-162-5/+26
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * nickvergessen/ticket/11545: [ticket/11545] Remove DIRECTORY_SEPARATOR dependency from is_absolute
| | * | | | | [ticket/11545] Remove DIRECTORY_SEPARATOR dependency from is_absoluteJoas Schilling2013-05-162-5/+26
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The given path is an absolute path in general, just not on our current system. PHPBB3-11545
* | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2013-05-152-0/+64
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/11541] Add unit tests for style_select()
| * | | | | Merge remote-tracking branch 'nickvergessen/ticket/11541' into develop-olympusAndreas Fischer2013-05-152-0/+64
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * nickvergessen/ticket/11541: [ticket/11541] Add unit tests for style_select()
| | * | | | | [ticket/11541] Add unit tests for style_select()Joas Schilling2013-05-142-0/+64
| | | |/ / / | | |/| | | | | | | | | | | | | | | PHPBB3-11541
* | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2013-05-152-1/+2
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/11546] Fix is_absolute() throws E_NOTICE for empty string
| * | | | | Merge remote-tracking branch 'nickvergessen/ticket/11546' into develop-olympusAndreas Fischer2013-05-152-1/+2
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * nickvergessen/ticket/11546: [ticket/11546] Fix is_absolute() throws E_NOTICE for empty string
| | * | | | | [ticket/11546] Fix is_absolute() throws E_NOTICE for empty stringJoas Schilling2013-05-152-1/+2
| |/ / / / / | | | | | | | | | | | | | | | | | | PHPBB3-11546
generated by cgit v1.2.1 (git 2.21.0) at 2025-11-12 17:06:26 +0000