aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Collapse)AuthorAgeFilesLines
* [feature/twig] Append assets_version to includejs tagNathaniel Guse2013-06-245-12/+49
| | | | | | Some fixes for main template parser PHPBB3-11598
* [feature/twig] Working on fixing testsNathan Guse2013-06-244-31/+69
| | | | PHPBB3-11598
* Merge branch 'develop' of github.com:phpbb/phpbb3 into feature/twigNathan Guse2013-06-249-32/+56
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Dhruv (35) and others # Via Andreas Fischer (15) and others * 'develop' of github.com:phpbb/phpbb3: (75 commits) [ticket/10776] update min php version 5.3.3 in readme [ticket/11503] similar implementation for mssql_native and odbc [ticket/11603] Fix out dated comment [ticket/11603] Fix usage note [ticket/11604] Skip installer step where config.php is created. [ticket/11603] Throw RuntimeExceptions instead of using exit() [ticket/11603] Avoid using cURL [ticket/11604] Fix case where config.php is not generated by phpBB. [ticket/11604] Use variables for config.php filesnames. [ticket/11561] Specify used tables in notification fixture, so they are emptied [ticket/11094] Add textbox for jabber while memberlist search [ticket/10820] fix if condition to check for IE [ticket/11603] Split api_request into two functions (query only vs. full url) [ticket/11603] Fix spacing and add some comments [ticket/10820] Add additional check for IE in condition [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/10820] Fix function docblock [ticket/10820] Inject IE version in function ...
| * Merge branch 'develop-olympus' into developJoas Schilling2013-06-211-16/+15
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10776] update min php version 5.3.3 in readme [ticket/10776] Fixed a couple language changes in docs/README.html. [ticket/10776] Fixed errors in docs/README.html. Conflicts: phpBB/docs/README.html
| | * Merge remote-tracking branch 'dhruvgoel92/ticket/10776' into develop-olympusJoas Schilling2013-06-211-15/+15
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | * dhruvgoel92/ticket/10776: [ticket/10776] update min php version 5.3.3 in readme [ticket/10776] Fixed a couple language changes in docs/README.html. [ticket/10776] Fixed errors in docs/README.html.
| | | * [ticket/10776] update min php version 5.3.3 in readmeDhruv2013-06-211-1/+1
| | | | | | | | | | | | | | | | PHPBB3-10776
| | | * Merge branch 'ticket/10776' of git://github.com/callumacrae/phpbb3 into ↵Dhruv2013-06-201-15/+15
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ticket/10776 # By Callum Macrae # Via Callum Macrae * 'ticket/10776' of git://github.com/callumacrae/phpbb3: [ticket/10776] Fixed a couple language changes in docs/README.html. [ticket/10776] Fixed errors in docs/README.html. Conflicts: phpBB/docs/README.html
| | | | * [ticket/10776] Fixed a couple language changes in docs/README.html.Callum Macrae2012-04-121-3/+3
| | | | | | | | | | | | | | | | | | | | PHPBB3-10776
| | | | * [ticket/10776] Fixed errors in docs/README.html.Callum Macrae2012-04-101-39/+38
| | | | | | | | | | | | | | | | | | | | PHPBB3-10776
| * | | | Merge remote-tracking branch 'dhruvgoel92/ticket/11503' into developJoas Schilling2013-06-212-6/+6
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * dhruvgoel92/ticket/11503: [ticket/11503] similar implementation for mssql_native and odbc
| | * | | | [ticket/11503] similar implementation for mssql_native and odbcDhruv2013-06-202-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mssql_native and mssql_odbc db drivers varied at some places where they should have been similar. PHPBB3-11503
| * | | | | 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 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-131-1/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # 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-111-1/+1
| | |\ \ \ | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-111-1/+1
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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] 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
| * | | | | Merge branch 'develop' into ticket/10820-developDhruv2013-06-13174-2575/+5351
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # 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 ...
| | * | | | [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 'ticket/10820' into ticket/10820-developDhruv2013-06-081-1/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/10820: [ticket/10820] Fix function docblock Conflicts: phpBB/download/file.php
| | * | | | | [ticket/10820] Fix function docblockDhruv2013-06-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10820
| * | | | | | Merge branch 'ticket/10820' into ticket/10820-developDhruv2013-06-052-8/+9
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/10820: [ticket/10820] Inject IE version in function Conflicts: phpBB/download/file.php
| | * | | | | [ticket/10820] Inject IE version in functionDhruv2013-06-051-8/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10820
| * | | | | | Merge branch 'ticket/10820' into ticket/10820-developDhruv2013-05-121-1/+9
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/10820: [ticket/10820] fix regex Extract IE version from user agent string and then compare it with 7 Conflicts: phpBB/download/file.php
| | * | | | | [ticket/10820] fix regexDhruv2013-05-121-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extract IE version from user agent string and then compare it with 7 PHPBB3-10820
| * | | | | | Merge remote-tracking branch 'dhruvgoel92/ticket/10820' into ↵Andreas Fischer2013-04-272-7/+19
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ticket/10820-develop * dhruvgoel92/ticket/10820: [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 Conflicts: phpBB/download/file.php
| | * | | | | [ticket/10820] remove unnecessary parenthesesDhruv2013-04-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10820
| | * | | | | [ticket/10820] fix docblockDhruv2013-04-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10820
| | * | | | | [ticket/10820] add param and return to functionDhruv2013-04-271-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add param and return in function docblock. Rename function parameter to $user_agent. PHPBB3-10820
| | * | | | | [ticket/10820] simplify regex and escape dotDhruv2013-04-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10820
| | * | | | | [ticket/10820] Use singular returnDhruv2013-04-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10820
| | * | | | | [ticket/10820] remove unnecessary condition checksDhruv2013-04-271-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10820
generated by cgit v1.2.1 (git 2.21.0) at 2025-11-12 11:27:13 +0000