aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'ticket/10820' into ticket/10820-developDhruv2013-06-141-1/+1
|\ | | | | | | | | | | | | | | * ticket/10820: [ticket/10820] fix if condition to check for IE Conflicts: phpBB/download/file.php
| * [ticket/10820] fix if condition to check for IEDhruv2013-06-141-1/+1
| | | | | | | | PHPBB3-10820
* | Merge branch 'ticket/10820' into ticket/10820-developDhruv2013-06-132-2/+2
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Dhruv (13) and riadhchtara (1) * ticket/10820: [ticket/10820] Add additional check for IE in condition [ticket/10820] Fix function docblock [ticket/10820] Inject IE version in function [ticket/10820] fix regex Extract IE version from user agent string and then compare it with 7 [ticket/10820] remove unnecessary parentheses [ticket/10820] fix docblock [ticket/10820] add param and return to function [ticket/10820] simplify regex and escape dot [ticket/10820] Use singular return [ticket/10820] remove unnecessary condition checks [ticket/10820] add function docblock [ticket/10820] fix IE check function [ticket/10820] proper usage of global and local variable browser [ticket/10820] Image downloader recognize new version of ie When a user download image attachement using ie8, the file is displayed. However, when he uses ie version greater than 8, the image is download. A changes are made to phpbb/download/file.php to solve the problem. We check now if the ie version is greater or equal to 8 and not only equal to 8 Conflicts: phpBB/download/file.php
| * [ticket/10820] Add additional check for IE in conditionDhruv2013-06-131-2/+2
| | | | | | | | PHPBB3-10820
| * [ticket/10820] Fix function docblockDhruv2013-06-121-1/+1
| | | | | | | | PHPBB3-10820
| * [ticket/10820] Inject IE version in functionDhruv2013-06-121-8/+9
| | | | | | | | PHPBB3-10820
| * [ticket/10820] fix regexDhruv2013-06-121-1/+9
| | | | | | | | | | | | Extract IE version from user agent string and then compare it with 7 PHPBB3-10820
| * [ticket/10820] remove unnecessary parenthesesDhruv2013-06-121-1/+1
| | | | | | | | PHPBB3-10820
| * [ticket/10820] fix docblockDhruv2013-06-121-1/+1
| | | | | | | | PHPBB3-10820
| * [ticket/10820] add param and return to functionDhruv2013-06-121-3/+6
| | | | | | | | | | | | | | Add param and return in function docblock. Rename function parameter to $user_agent. PHPBB3-10820
| * [ticket/10820] simplify regex and escape dotDhruv2013-06-121-1/+1
| | | | | | | | PHPBB3-10820
| * [ticket/10820] Use singular returnDhruv2013-06-121-1/+1
| | | | | | | | PHPBB3-10820
| * [ticket/10820] remove unnecessary condition checksDhruv2013-06-121-2/+2
| | | | | | | | PHPBB3-10820
| * [ticket/10820] add function docblockDhruv2013-06-121-0/+4
| | | | | | | | PHPBB3-10820
| * [ticket/10820] fix IE check functionDhruv2013-06-121-8/+8
| | | | | | | | | | | | Add phpbb_ prefix to function name and return boolean value. PHPBB3-10820
| * [ticket/10820] proper usage of global and local variable browserDhruv2013-06-121-2/+2
| | | | | | | | PHPBB3-10820
| * [ticket/10820] Image downloader recognize new version of ieriadhchtara2013-06-121-9/+14
| | | | | | | | | | | | | | | | | | | | When a user download image attachement using ie8, the file is displayed. However, when he uses ie version greater than 8, the image is download. A changes are made to phpbb/download/file.php to solve the problem. We check now if the ie version is greater or equal to 8 and not only equal to 8 PHPBB3-10820
* | Merge branch 'develop' into ticket/10820-developDhruv2013-06-1316-32/+927
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Marc Alexander (10) and Joas Schilling (2) # Via Andreas Fischer (3) and Joas Schilling (1) * develop: [ticket/11605] Remove unused copied_files property [ticket/11605] Use empty_dir to better delete files and dirs of extensions [ticket/11579] Add method for validating emails for valid MX and mark as slow [ticket/11579] Do not extend validate_data_helper [ticket/11579] Add missing commas to validate_username_test [ticket/11579] Rework calls to validate_data_helper [ticket/11579] Move simple tests into seperate files [ticket/11579] Use test case helper class and use assert prefix for method [ticket/11579] Move tests into seperate files depending on needed fixture [ticket/11579] Remove unnecessary globals from validate_password() [ticket/11579] Add remaining unit tests for validate_data functions [ticket/11579] Add basic set of unit tests for validate_data()
| * \ Merge branch 'develop-olympus' into developAndreas Fischer2013-06-1115-1/+919
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/11579] Add method for validating emails for valid MX and mark as slow [ticket/11579] Do not extend validate_data_helper [ticket/11579] Add missing commas to validate_username_test [ticket/11579] Rework calls to validate_data_helper [ticket/11579] Move simple tests into seperate files [ticket/11579] Use test case helper class and use assert prefix for method [ticket/11579] Move tests into seperate files depending on needed fixture [ticket/11579] Remove unnecessary globals from validate_password() [ticket/11579] Add remaining unit tests for validate_data functions [ticket/11579] Add basic set of unit tests for validate_data() Conflicts: tests/mock/cache.php
| | * Merge remote-tracking branch 'marc1706/ticket/11579' into develop-olympusAndreas Fischer2013-06-1115-1/+919
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * marc1706/ticket/11579: [ticket/11579] Add method for validating emails for valid MX and mark as slow [ticket/11579] Do not extend validate_data_helper [ticket/11579] Add missing commas to validate_username_test [ticket/11579] Rework calls to validate_data_helper [ticket/11579] Move simple tests into seperate files [ticket/11579] Use test case helper class and use assert prefix for method [ticket/11579] Move tests into seperate files depending on needed fixture [ticket/11579] Remove unnecessary globals from validate_password() [ticket/11579] Add remaining unit tests for validate_data functions [ticket/11579] Add basic set of unit tests for validate_data()
| | | * [ticket/11579] Add method for validating emails for valid MX and mark as slowMarc Alexander2013-06-051-3/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | A method for setting up the prerequisities also has been added in order to reduce the amount of necessary code. PHPBB3-11579
| | | * [ticket/11579] Do not extend validate_data_helperMarc Alexander2013-06-051-1/+1
| | | | | | | | | | | | | | | | PHPBB3-11579
| | | * [ticket/11579] Add missing commas to validate_username_testMarc Alexander2013-06-031-6/+6
| | | | | | | | | | | | | | | | PHPBB3-11579
| | | * [ticket/11579] Rework calls to validate_data_helperMarc Alexander2013-06-0310-232/+344
| | | | | | | | | | | | | | | | PHPBB3-11579
| | | * [ticket/11579] Move simple tests into seperate filesMarc Alexander2013-06-037-251/+366
| | | | | | | | | | | | | | | | PHPBB3-11579
| | | * [ticket/11579] Use test case helper class and use assert prefix for methodMarc Alexander2013-06-035-95/+100
| | | | | | | | | | | | | | | | PHPBB3-11579
| | | * [ticket/11579] Move tests into seperate files depending on needed fixtureMarc Alexander2013-05-308-499/+594
| | | | | | | | | | | | | | | | PHPBB3-11579
| | | * [ticket/11579] Remove unnecessary globals from validate_password()Marc Alexander2013-05-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | The globals $db and $user are not used in that function. PHPBB3-11579
| | | * [ticket/11579] Add remaining unit tests for validate_data functionsMarc Alexander2013-05-304-62/+375
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This now includes tests for usernames, passwords, emails, and jabber addresses. A few small changes had to be applied to phpbb_mock_cache and phpbb_mock_user in order to incorporate needed methods. PHPBB3-11579
| | | * [ticket/11579] Add basic set of unit tests for validate_data()Marc Alexander2013-05-291-0/+252
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This currently includes tests for the string, num, date, match, and language iso validation functions. PHPBB3-11579
| * | | Merge remote-tracking branch 'nickvergessen/ticket/11605' into developAndreas Fischer2013-06-111-31/+8
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | * nickvergessen/ticket/11605: [ticket/11605] Remove unused copied_files property [ticket/11605] Use empty_dir to better delete files and dirs of extensions
| | * | | [ticket/11605] Remove unused copied_files propertyJoas Schilling2013-06-111-8/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-11605
| | * | | [ticket/11605] Use empty_dir to better delete files and dirs of extensionsJoas Schilling2013-06-111-23/+6
| | | | | | | | | | | | | | | | | | | | PHPBB3-11605
* | | | | Merge branch 'develop' into ticket/10820-developDhruv2013-06-13260-2934/+9028
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Joas Schilling (146) and others # Via Andreas Fischer (50) and others * develop: (356 commits) [ticket/11599] Copy the forums into a static array for later reuse [ticket/11602] Do not call localize_errors() if avatars are disabled [ticket/11601] Add protected method for database sync and call it [ticket/11601] Split post_setup_synchronisation logic from xml parsing [ticket/11550] Specify a valid path so it's clearer that it must be a path [ticket/11550] Move comments to correct function [ticket/11550] We use a different fixture set for extension_acp_test.php [ticket/11550] Fixtures should only be directories not files [ticket/11550] Use new functionality from the test case helpers [ticket/11550] Move functionality for copying/restoring to test case helpers [ticket/11550] Fix copying the fixtures in extension_permission_lang_test.php [ticket/11543] Add more users so #hidden <> #normal [ticket/11590] Close database connections when tearDown() is called [ticket/develop/11543] Use plurals in develop [ticket/11543] Use correct IP addresses and inject time for correct values [ticket/11543] Add unit tests for obtain_users_online_string() [ticket/11543] Add unit tests for obtain_users_online() with empty forum [ticket/11543] Add unit tests for obtain_users_online() [ticket/11543] Add unit tests for obtain_guest_count() [ticket/11481] Move prepended slash from calls into function ...
| * | | | Merge remote-tracking branch 'nickvergessen/ticket/11599' into developAndreas Fischer2013-06-111-17/+42
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | * nickvergessen/ticket/11599: [ticket/11599] Copy the forums into a static array for later reuse
| | * | | [ticket/11599] Copy the forums into a static array for later reuseJoas Schilling2013-06-111-17/+42
| |/ / / | | | | | | | | | | | | PHPBB3-11599
| * | | Merge remote-tracking branch 'marc1706/ticket/11602' into developAndreas Fischer2013-06-112-2/+2
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * marc1706/ticket/11602: [ticket/11602] Do not call localize_errors() if avatars are disabled
| | * | | [ticket/11602] Do not call localize_errors() if avatars are disabledMarc Alexander2013-06-112-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The avatar manager's method localize_errors() shouldn't be called if avatars are disabled in the config. PHPBB3-11602
| * | | | Merge branch 'develop-olympus' into developAndreas Fischer2013-06-112-3/+39
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | * develop-olympus: [ticket/11601] Add protected method for database sync and call it [ticket/11601] Split post_setup_synchronisation logic from xml parsing
| | * | | Merge remote-tracking branch 'nickvergessen/ticket/11601' into develop-olympusAndreas Fischer2013-06-112-3/+39
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * nickvergessen/ticket/11601: [ticket/11601] Add protected method for database sync and call it [ticket/11601] Split post_setup_synchronisation logic from xml parsing
| | | * | | [ticket/11601] Add protected method for database sync and call itJoas Schilling2013-06-111-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11601
| | | * | | [ticket/11601] Split post_setup_synchronisation logic from xml parsingJoas Schilling2013-06-111-3/+24
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11601
| * | | | | Merge remote-tracking branch 'nickvergessen/ticket/11550' into developAndreas Fischer2013-06-116-194/+88
| |\ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * nickvergessen/ticket/11550: [ticket/11550] Specify a valid path so it's clearer that it must be a path [ticket/11550] Move comments to correct function [ticket/11550] We use a different fixture set for extension_acp_test.php [ticket/11550] Fixtures should only be directories not files [ticket/11550] Use new functionality from the test case helpers [ticket/11550] Move functionality for copying/restoring to test case helpers [ticket/11550] Fix copying the fixtures in extension_permission_lang_test.php
| | * | | | [ticket/11550] Specify a valid path so it's clearer that it must be a pathJoas Schilling2013-06-112-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11550
| | * | | | [ticket/11550] Move comments to correct functionJoas Schilling2013-06-116-40/+8
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11550
| | * | | | [ticket/11550] We use a different fixture set for extension_acp_test.phpJoas Schilling2013-06-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11550
| | * | | | [ticket/11550] Fixtures should only be directories not filesJoas Schilling2013-06-081-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11550
| | * | | | [ticket/11550] Use new functionality from the test case helpersJoas Schilling2013-06-086-159/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of duplicating the extension copy code, it is now in the helpers. So we remove the code from existing tests. PHPBB3-11550
| | * | | | [ticket/11550] Move functionality for copying/restoring to test case helpersJoas Schilling2013-06-081-0/+44
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11550
| | * | | | [ticket/11550] Fix copying the fixtures in extension_permission_lang_test.phpJoas Schilling2013-06-081-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11550