aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'develop-ascraeus' into developJoas Schilling2014-10-021-4/+42
|\
| * Merge pull request #2947 from rxu/ticket/13059Joas Schilling2014-10-021-4/+42
| |\ | | | | | | | | | [ticket/13059] Add core event to generate_page_link()
| | * [ticket/13059] Add core event to generate_page_link()rxu2014-10-011-4/+42
| | | | | | | | | | | | | | | | | | | | | | | | Add core event to generate_page_link() to allow overriding/modifying pagination URLs. Event request: http://area51.phpbb.com/phpBB/viewtopic.php?f=111&t=45905 PHPBB3-13059
* | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-10-011-14/+2
|\ \ \ | |/ /
| * | [ticket/11224] Revert "Merge pull request #2460 from Nicofuma/ticket/11224"Joas Schilling2014-10-011-14/+2
| | | | | | | | | | | | | | | | | | | | | This reverts commit d26436944173d1fa28a1abd96bca861381246860, reversing changes made to 75fcfb1c1d68f1632e7beae3f59699ddff8e5292. PHPBB3-11224
* | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-10-011-0/+51
|\ \ \ | |/ /
| * | Merge pull request #3013 from VSEphpbb/ticket/13121Joas Schilling2014-10-011-0/+51
| |\ \ | | | | | | | | | | | | [ticket/13121] Remove cache mode from style management module
| | * | [ticket/13121] Fix migration fileMatt Friedman2014-10-011-3/+3
| | | | | | | | | | | | | | | | PHPBB3-13121
| | * | [ticket/13121] Remove cache mode from style management moduleMatt Friedman2014-10-011-0/+51
| | | | | | | | | | | | | | | | | | | | | | | | https://tracker.phpbb.com/browse/PHPBB3-13121 PHPBB3-13121
* | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-10-011-2/+14
|\ \ \ \ | |/ / /
| * | | Merge pull request #2460 from Nicofuma/ticket/11224Joas Schilling2014-10-011-2/+14
| | | | | | | | | | | | | | | | [ticket/11224] SQL cache destroy does not destroy queries to tables joined
* | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-10-011-2/+2
|\ \ \ \ | |/ / /
| * | | Merge pull request #2545 from ptitlazy/ticket/12657Joas Schilling2014-10-011-2/+2
| |\ \ \ | | | | | | | | | | | | | | | [ticket/12657] Add a test file for base case of command cache:purge
| | * | | [ticket/12657] Add a test file for base caseLEZY Thomas2014-09-191-2/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-12657
* | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-10-011-2/+5
|\ \ \ \ \ | |/ / / /
| * | | | Merge pull request #2888 from Nicofuma/ticket/12993Joas Schilling2014-10-011-2/+5
| |\ \ \ \ | | |_|/ / | |/| | | | | | | | [ticket/12993] Improve get_user_ranks
| | * | | [ticket/12993] Return an array instead of reference passingTristan Darricau2014-08-191-1/+4
| | | | | | | | | | | | | | | | | | | | PHPBB3-12993
| | * | | [ticket/12993] Fix includes of functions_displayTristan Darricau2014-08-191-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-12993
| | * | | [ticket/12993] Rename to phpbb_get_user_rankTristan Darricau2014-08-181-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-12993
| | * | | [ticket/12993] Fix user_loader and memberlistTristan Darricau2014-08-181-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-12993
* | | | | Merge branch 'develop-ascraeus' into developAndreas Fischer2014-09-301-1/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/13111] Dropdown options are already an array in the field data
| * | | | Merge pull request #3008 from nickvergessen/ticket/13111Andreas Fischer2014-09-301-1/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13111] Dropdown options are already an array in the field data * nickvergessen/ticket/13111: [ticket/13111] Dropdown options are already an array in the field data
| | * | | | [ticket/13111] Dropdown options are already an array in the field dataJoas Schilling2014-09-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13111
* | | | | | Merge branch 'develop-ascraeus' into developAndreas Fischer2014-09-301-1/+1
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/13118] Correctly use the provided datetime class
| * | | | | Merge pull request #3007 from nickvergessen/ticket/13118Andreas Fischer2014-09-301-1/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13118] Correctly use the provided datetime class * nickvergessen/ticket/13118: [ticket/13118] Correctly use the provided datetime class
| | * | | | | [ticket/13118] Correctly use the provided datetime classJoas Schilling2014-09-301-1/+1
| | |/ / / / | | | | | | | | | | | | | | | | | | PHPBB3-13118
* | | | | | Merge branch 'develop-ascraeus' into developNils Adermann2014-09-301-1/+1
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/13117] Correctly define auto increment columns as "NOT NULL" on mysql
| * | | | | Merge pull request #3003 from nickvergessen/ticket/13117Nils Adermann2014-09-301-1/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | [ticket/13117] Correctly define auto increment columns as "NOT NULL" on mysql
| | * | | | | [ticket/13117] Correctly define auto increment columns as "NOT NULL" on mysqlJoas Schilling2014-09-291-1/+1
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unintended change from 95ab4b3e931521ce3c56068478311f0c04f713cc PHPBB3-13117
* | | | | | Merge branch 'develop-ascraeus' into developNils Adermann2014-09-291-7/+10
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/13113] Updates the base url only when the front-end isn't app.php
| * | | | | [ticket/13113] Updates the base url only when the front-end isn't app.phpTristan Darricau2014-09-281-7/+10
| |/ / / / | | | | | | | | | | | | | | | PHPBB3-13113
* | | | | Merge branch 'develop-ascraeus' into developAndreas Fischer2014-09-251-18/+21
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/13105] Do not display future dates 2+ days ahead as "tomorrow" [ticket/13105] Add a test for relative dates
| * | | | Merge pull request #2995 from nickvergessen/ticket/13105Andreas Fischer2014-09-251-18/+21
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13105] Future relative dates are always displayed as "Tomorrow" * nickvergessen/ticket/13105: [ticket/13105] Do not display future dates 2+ days ahead as "tomorrow" [ticket/13105] Add a test for relative dates
| | * | | | [ticket/13105] Do not display future dates 2+ days ahead as "tomorrow"Joas Schilling2014-09-251-18/+21
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13105
* | | | | | Merge branch 'develop-ascraeus' into developAndreas Fischer2014-09-251-67/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/13106] Remove \phpbb\di\pass\kernel_pass.php
| * | | | | [ticket/13106] Remove \phpbb\di\pass\kernel_pass.phpJakub Senko2014-09-251-67/+0
| |/ / / / | | | | | | | | | | | | | | | PHPBB3-13106
* | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-09-242-2/+97
|\ \ \ \ \ | |/ / / /
| * | | | Merge pull request #2954 from rxu/ticket/13055Joas Schilling2014-09-242-2/+97
| |\ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/13055] Fix string profile fields validation to support unicode
| | * | | | [ticket/13055] Add string profile fields validation options to support unicoderxu2014-09-182-2/+97
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13055
* | | | | | Merge branch 'develop-ascraeus' into developAndreas Fischer2014-09-231-3/+4
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/13048] Only do not update the session page for ajax requests
| * | | | | Merge pull request #2985 from nickvergessen/ticket/13048Andreas Fischer2014-09-231-3/+4
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13048] Only do not update the session page for ajax requests * nickvergessen/ticket/13048: [ticket/13048] Only do not update the session page for ajax requests
| | * | | | | [ticket/13048] Only do not update the session page for ajax requestsJoas Schilling2014-09-231-3/+4
| | | |_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The session time still needs to be updated, so e.g. long upload times with PLupload stop the session from timing out. PHPBB3-13048
* | | | | | Merge branch 'develop-ascraeus' into developAndreas Fischer2014-09-231-3/+3
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/13070] Use old 'template' class for template class hook
| * | | | | [ticket/13070] Use old 'template' class for template class hookMarc Alexander2014-09-221-3/+3
| |/ / / / | | | | | | | | | | | | | | | PHPBB3-13070
* | | | | Merge branch 'develop-ascraeus' into developDhruv2014-09-211-1/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | # By n-aleha # Via Dhruv Goel (1) and n-aleha (1) * develop-ascraeus: [ticket/13085] Fix typo in oauth.php
| * | | | [ticket/13085] Fix typo in oauth.phpn-aleha2014-09-211-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-13085
* | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-09-201-0/+32
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-ascraeus: [prep-release-3.1.0-RC4] Update phpBB Version for RC4 development [prep-release-3.1.0-RC4] Add changelog for 3.1.0-RC4 [prep-release-3.1.0-RC4] Prepare Changelog [prep-release-3.1.0-RC4] Add migration for 3.1.0-RC4 [prep-release-3.1.0-RC4] Update version to 3.1.0-RC4 Conflicts: build/build.xml phpBB/includes/constants.php phpBB/install/schemas/schema_data.sql phpBB/styles/prosilver/style.cfg phpBB/styles/subsilver2/style.cfg
| * | | | [prep-release-3.1.0-RC4] Add migration for 3.1.0-RC4Joas Schilling2014-09-191-0/+32
| | | | |
* | | | | Merge branch 'ticket/13073' into ticket/13073-developMarc Alexander2014-09-191-2/+9
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | Conflicts: tests/controller/common_helper_route.php
| * | | | [ticket/13073] Add path regex to get_preg_expression() and add unit testsMarc Alexander2014-09-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We're now calling get_preg_expression() instead of hardcoding the regex into the helper route method. PHPBB3-13073
generated by cgit v1.2.1 (git 2.21.0) at 2025-11-12 11:44:31 +0000