aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'develop-olympus' into developAndreas Fischer2013-06-201-2/+2
|\ | | | | | | | | | | * develop-olympus: [ticket/11603] Fix out dated comment [ticket/11603] Fix usage note
| * Merge remote-tracking branch 'nickvergessen/ticket/11603' into develop-olympusAndreas Fischer2013-06-201-2/+2
| |\ | | | | | | | | | | | | | | | * nickvergessen/ticket/11603: [ticket/11603] Fix out dated comment [ticket/11603] Fix usage note
| | * [ticket/11603] Fix out dated commentJoas Schilling2013-06-201-1/+1
| | | | | | | | | | | | PHPBB3-11603
| | * [ticket/11603] Fix usage noteJoas Schilling2013-06-201-1/+1
| | | | | | | | | | | | PHPBB3-11603
* | | Merge branch 'develop-olympus' into developAndreas Fischer2013-06-202-28/+83
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/11603] Throw RuntimeExceptions instead of using exit() [ticket/11603] Avoid using cURL [ticket/11603] Split api_request into two functions (query only vs. full url) [ticket/11603] Fix spacing and add some comments [ticket/11603] Fix github API calls [ticket/11603] Rename network to forks and fix handling [ticket/11603] Fix github api url and use curl with valid user agent
| * | Merge remote-tracking branch 'nickvergessen/ticket/11603' into develop-olympusAndreas Fischer2013-06-202-28/+83
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | * nickvergessen/ticket/11603: [ticket/11603] Throw RuntimeExceptions instead of using exit() [ticket/11603] Avoid using cURL [ticket/11603] Split api_request into two functions (query only vs. full url) [ticket/11603] Fix spacing and add some comments [ticket/11603] Fix github API calls [ticket/11603] Rename network to forks and fix handling [ticket/11603] Fix github api url and use curl with valid user agent
| | * [ticket/11603] Throw RuntimeExceptions instead of using exit()Joas Schilling2013-06-192-2/+2
| | | | | | | | | | | | PHPBB3-11603
| | * [ticket/11603] Avoid using cURLJoas Schilling2013-06-192-19/+19
| | | | | | | | | | | | PHPBB3-11603
| | * [ticket/11603] Split api_request into two functions (query only vs. full url)Joas Schilling2013-06-131-10/+8
| | | | | | | | | | | | PHPBB3-11603
| | * [ticket/11603] Fix spacing and add some commentsJoas Schilling2013-06-131-2/+5
| | | | | | | | | | | | PHPBB3-11603
| | * [ticket/11603] Fix github API callsJoas Schilling2013-06-132-14/+57
| | | | | | | | | | | | | | | | | | | | | | | | - Some URLs changed - Response is a plain array now - Added error messages when API limit is reached PHPBB3-11603
| | * [ticket/11603] Rename network to forks and fix handlingJoas Schilling2013-06-131-14/+14
| | | | | | | | | | | | PHPBB3-11603
| | * [ticket/11603] Fix github api url and use curl with valid user agentJoas Schilling2013-06-132-2/+13
| | | | | | | | | | | | PHPBB3-11603
* | | Merge branch 'develop-olympus' into developAndreas Fischer2013-06-201-0/+4
|\ \ \ | |/ / | | | | | | | | | * develop-olympus: [ticket/11094] Add textbox for jabber while memberlist search
| * | Merge remote-tracking branch 'dhruvgoel92/ticket/11094' into develop-olympusAndreas Fischer2013-06-201-0/+4
| |\ \ | | | | | | | | | | | | | | | | * dhruvgoel92/ticket/11094: [ticket/11094] Add textbox for jabber while memberlist search
| | * | [ticket/11094] Add textbox for jabber while memberlist searchDhruv2013-06-151-0/+4
| | |/ | | | | | | | | | PHPBB3-11094
* | | Merge remote-tracking branch 'nickvergessen/ticket/11561' into developDhruv2013-06-181-0/+8
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | # By Joas Schilling # Via Joas Schilling * nickvergessen/ticket/11561: [ticket/11561] Specify used tables in notification fixture, so they are emptied
| * | | [ticket/11561] Specify used tables in notification fixture, so they are emptiedJoas Schilling2013-06-181-0/+8
| | | | | | | | | | | | | | | | PHPBB3-11561
* | | | Merge branch 'develop-olympus' into developJoas Schilling2013-06-130-0/+0
|\ \ \ \ | | |/ / | |/| | | | | | * develop-olympus:
| * | | Merge remote-tracking branch 'remotes/dhruvgoel92/ticket/10820' into ↵Joas Schilling2013-06-131-9/+30
| |\ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop-olympus * remotes/dhruvgoel92/ticket/10820: [ticket/10820] fix if condition to check for IE [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
* | | | Merge remote-tracking branch 'remotes/dhruvgoel92/ticket/10820-develop' into ↵Joas Schilling2013-06-133-7/+158
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop * remotes/dhruvgoel92/ticket/10820-develop: (34 commits) [ticket/10820] fix if condition to check for IE [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 [ticket/10820] Fix function docblock [ticket/10820] Add test cases More test cases to check against different versions [ticket/10820] Rename function [ticket/10820] Fix copyright [ticket/10820] Change function call in tests ...
| * \ \ \ 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