aboutsummaryrefslogtreecommitdiffstats
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] Delete template_compile_test.phpNathaniel Guse2013-06-241-31/+0
| | | | | | No longer necessary PHPBB3-11598
* [feature/twig] Delete renderer_eval_test.phpNathaniel Guse2013-06-241-31/+0
| | | | | | No longer necessary PHPBB3-11598
* [feature/twig] Delete invalid constructs template testNathaniel Guse2013-06-243-89/+0
| | | | | | | | Invalid tags is no longer a valid test (invalid tags are ignored) Twig contains tests for loading files, so we should not need to test this PHPBB3-11598
* [feature/twig] Working on fixing testsNathan Guse2013-06-245-63/+72
| | | | PHPBB3-11598
* Merge branch 'develop' of github.com:phpbb/phpbb3 into feature/twigNathan Guse2013-06-2437-306/+1406
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # 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 developJoas Schilling2013-06-201-10/+43
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | Conflicts: tests/test_framework/phpbb_functional_test_case.php
| | * | | | Merge remote-tracking branch 'bantu/ticket/11604' into develop-olympusJoas Schilling2013-06-201-10/+43
| | |\ \ \ \
| | | * | | | [ticket/11604] Skip installer step where config.php is created.Andreas Fischer2013-06-191-20/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11604
| | | * | | | [ticket/11604] Fix case where config.php is not generated by phpBB.Andreas Fischer2013-06-181-1/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11604
| | | * | | | [ticket/11604] Use variables for config.php filesnames.Andreas Fischer2013-06-181-6/+10
| | | | |/ / | | | |/| | | | | | | | | | | | | | PHPBB3-11604
| * | | | | 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
generated by cgit v1.2.1 (git 2.21.0) at 2025-11-12 11:27:04 +0000