aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | 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
* | | | | | | | Merge remote-tracking branch 'bantu/ticket/11540' into developAndreas Fischer2013-05-151-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * bantu/ticket/11540: [ticket/11540] Add phpbb_ prefix in is_absolute_test from olympus.
| * | | | | | | | [ticket/11540] Add phpbb_ prefix in is_absolute_test from olympus.Andreas Fischer2013-05-151-1/+1
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11540
* | | | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2013-05-151-0/+34
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | / / | |_|_|_|_|/ / |/| | | | | | * develop-olympus: [ticket/11540] Add unit tests for is_absolute()
| * | | | | | Merge remote-tracking branch 'nickvergessen/ticket/11540' into develop-olympusAndreas Fischer2013-05-151-0/+34
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | * nickvergessen/ticket/11540: [ticket/11540] Add unit tests for is_absolute()
| | * | | | | [ticket/11540] Add unit tests for is_absolute()Joas Schilling2013-05-141-0/+34
| | |/ / / / | | | | | | | | | | | | | | | | | | PHPBB3-11540
* | | | | | Merge remote-tracking branch 'remotes/cyberalien/ticket/11533' into developNathan Guse2013-05-124-158/+145
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Vjacheslav Trushkin # Via Vjacheslav Trushkin * remotes/cyberalien/ticket/11533: [ticket/11533] Update unit tests [ticket/11533] Fix colspan and unnecessary tables [ticket/11533] Change list to table for notification settings [ticket/11533] Columns counter for notification settings
| * | | | | | [ticket/11533] Update unit testsVjacheslav Trushkin2013-05-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update notification settings functional unit test for new layout PHPBB3-11533
| * | | | | | [ticket/11533] Fix colspan and unnecessary tablesVjacheslav Trushkin2013-05-111-123/+115
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix colspan and remove unnecessary tables in notification settings page in subsilver2. PHPBB3-11533
| * | | | | | [ticket/11533] Change list to table for notification settingsVjacheslav Trushkin2013-05-111-34/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11533
| * | | | | | [ticket/11533] Columns counter for notification settingsVjacheslav Trushkin2013-05-111-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add columns counter template variable. It counts number of notification types + column for name + column for checkbox PHPBB3-11533
* | | | | | | Merge remote-tracking branch 'remotes/Marc/ticket/11465' into developNathan Guse2013-05-1215-49/+369
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Marc Alexander (8) and Joas Schilling (3) # Via Marc Alexander * remotes/Marc/ticket/11465: [ticket/11465] Increase count of disabled extensions to 5 in functional test [ticket/11465] Add disabled ext to allow proper testing of get_module_infos() [ticket/11465] Add tests for optional arguments of get_module_infos() [ticket/11465] Add comments explaining the tests [ticket/11465] Check if class exists before including info file [ticket/11465] Correctly set the root path for the test [ticket/11465] The info file does not have _info suffix [ticket/11465] Add phpBB module to test [ticket/11465] Move require_once() in unit test to the top of the file [ticket/11465] Add unit tests for acp_modules::get_module_infos() [ticket/11465] Use extension finder when adding extensions' acp modules
| * | | | | | | [ticket/11465] Increase count of disabled extensions to 5 in functional testMarc Alexander2013-05-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The ACP function test checks the amount of disabled extensions. Due to the added disabled extension for the tests of the acp_modules method get_module_infos(), this needed to be increased from 4 to 5. PHPBB3-11465
| * | | | | | | Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/11465Marc Alexander2013-05-12185-1989/+6802
| |\ \ \ \ \ \ \
| * | | | | | | | [ticket/11465] Add disabled ext to allow proper testing of get_module_infos()Marc Alexander2013-05-125-2/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will now also enable us to test the $use_all_available parameter of get_module_infos(), which will not only return the module infos for enabled extensions but also those from disabled extensions. PHPBB3-11465
| * | | | | | | | [ticket/11465] Add tests for optional arguments of get_module_infos()Marc Alexander2013-05-121-0/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The possibilities of the first argument have already been covered previously. The second argument will be covered with an entry that should exist, an incorrect entry, and the default false entry that should use the previously set module class. Unfortunately, the third argument doesn't have an effect in the tests, as the mocked extension manager will not properly handle enabled/disabled extensions. PHPBB3-11465
| * | | | | | | | [ticket/11465] Add comments explaining the testsMarc Alexander2013-05-103-2/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11465
| * | | | | | | | [ticket/11465] Check if class exists before including info fileMarc Alexander2013-04-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11465
| * | | | | | | | [ticket/11465] Correctly set the root path for the testJoas Schilling2013-04-101-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11465
| * | | | | | | | [ticket/11465] The info file does not have _info suffixJoas Schilling2013-04-101-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11465
| * | | | | | | | [ticket/11465] Add phpBB module to testJoas Schilling2013-04-103-0/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11465
| * | | | | | | | [ticket/11465] Move require_once() in unit test to the top of the fileMarc Alexander2013-03-221-7/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11465
| * | | | | | | | [ticket/11465] Add unit tests for acp_modules::get_module_infos()Marc Alexander2013-03-227-0/+158
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The tests add 3 different modules. One acp module that should be found (acp/a_module), one acp module that should not be found (acp/fail_module), and one mcp module that should work again (mcp/a_module). The modules' info files had to be included as they were not auto-loaded for some reason. There are several test stages. First of, it is tested if the correct mcp and acp module is returned. Afterwards, the proper loading of specified modules is tested. One with an existing module and one with a not existing module. Finally, the test concludes with trying to get the module info of not existing ucp modules. Other classes like foobar would have also worked for that check but I decided to use the ucp type of class as that is the one type missing from the added test modules. PHPBB3-11465
| * | | | | | | | [ticket/11465] Use extension finder when adding extensions' acp modulesMarc Alexander2013-03-211-47/+25
| | |_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The method acp_modules::get_module_infos() needs to use the extension finder whenever it is looking for a module's info file. While transitioning to the new extension system, only the initial search for all module info files was changed to the new system. Due to this it is not possible to add an extension's acp/mcp/ucp module manually in the ACP. This patch will always use the extension finder for the acp module's info files and therefore properly find the needed file. Additionally, the code has been cleaned up a little bit. PHPBB3-11465
* | | | | | | | Merge branch 'develop-olympus' into developNils Adermann2013-05-122-2/+2
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | / / / / | | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/11105] Added spaces between ; and "url=" to adhere to w3c conventions. Conflicts: phpBB/includes/functions.php
| * | | | | | Merge pull request #1403 from bantu/ticket/11105Nils Adermann2013-05-122-2/+2
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | [ticket/11105] Add mandatory space to content part of meta http-equiv=re...
| | * | | | | [ticket/11105] Added spaces between ; and "url=" to adhere to w3c conventions.gamerchan2013-05-122-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There was no space between ; and the string "url=". But according to w3c, we should have atleast one space between them. So, added space characters accordingly. PHPBB3-11105
* | | | | | | Merge remote-tracking branch 'remotes/bantu/ticket/11452' into developNathaniel Guse2013-05-111-1/+1
|\ \ \ \ \ \ \
| * | | | | | | [ticket/11452] Now notification_method_email checks whether user has address.Andreas Fischer2013-03-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure the user has an email address set before offering email notifications. The address could be missing for whatever reason, e.g. external authentication. This is also consistent with XMPP/Jabber now. PHPBB3-11452
generated by cgit v1.2.1 (git 2.21.0) at 2025-11-13 01:26:52 +0000