aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '3.1.x'Marc Alexander2015-06-1610-11/+12
|\
| * Merge pull request #3653 from callumacrae/ticket/13882Marc Alexander2015-06-1610-11/+12
| |\
| | * [ticket/13882] Lazy load the notification avatars.Callum Macrae2015-05-2810-11/+12
* | | Merge branch '3.1.x'Joas Schilling2015-06-141-0/+31
|\ \ \ | |/ /
| * | Merge branch 'prep-release-3.1.5' into 3.1.xJoas Schilling2015-06-142-1/+32
| |\ \
| | * | [prep-release-3.1.5] Add migration for 3.1.5Joas Schilling2015-06-141-0/+31
| | * | [ticket/13942] Check if path to language file contains language pathMarc Alexander2015-06-131-1/+1
* | | | Merge branch '3.1.x'Andreas Fischer2015-06-131-2/+4
|\ \ \ \ | |/ / /
| * | | Merge pull request #3704 from Nicofuma/ticket/13941Andreas Fischer2015-06-131-2/+4
| |\ \ \
| | * | | [ticket/13941] Workaround to fix the bug on php 5.5 with sqlite3Tristan Darricau2015-06-131-2/+4
| * | | | Merge branch 'prep-release-3.1.5' into 3.1.xJoas Schilling2015-06-111-0/+31
| |\ \ \ \ | | |/ / / | |/| / / | | |/ /
| * | | Merge pull request #3694 from marc1706/ticket/13930Andreas Fischer2015-06-094-4/+4
| |\ \ \
* | \ \ \ Merge branch '3.1.x'Joas Schilling2015-06-111-0/+31
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | [prep-release-3.1.5] Add migration for 3.1.5-RC1Joas Schilling2015-06-091-0/+31
| |/ / /
* | | | Merge pull request #3696 from marc1706/ticket/13930-masterAndreas Fischer2015-06-094-4/+4
|\ \ \ \
| * | | | [ticket/13930] Add missing space to mssql_extractorMarc Alexander2015-06-081-1/+1
| * | | | Merge branch 'ticket/13930' into ticket/13930-masterMarc Alexander2015-06-083-3/+3
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | [ticket/13930] Add missing spaces to codeMarc Alexander2015-06-074-4/+4
* | | | | Merge branch '3.1.x'Joas Schilling2015-06-091-4/+18
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Merge pull request #3551 from rxu/ticket/13779Joas Schilling2015-06-091-4/+18
| |\ \ \ \
| | * | | | [ticket/13779] Set new auth options to the role only if matching the role typerxu2015-04-261-4/+18
* | | | | | Merge branch '3.1.x'Marc Alexander2015-06-091-0/+49
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge pull request #3486 from brunoais/ticket/13693Marc Alexander2015-06-091-0/+49
| |\ \ \ \ \
| | * | | | | [ticket/13693] BUMP version to 3.1.5-devbrunoais2015-05-061-1/+1
| | * | | | | [ticket/13693] Allow modifying the MySQL author search querybrunoais2015-03-121-0/+49
* | | | | | | Merge branch '3.1.x'Marc Alexander2015-06-091-0/+49
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge pull request #3485 from brunoais/ticket/13694Marc Alexander2015-06-091-0/+49
| |\ \ \ \ \ \
| | * | | | | | [ticket/13694] BUMP version to 3.1.5-devbrunoais2015-05-061-1/+1
| | * | | | | | [ticket/13694] Allow modifying the Postgres native author search querybrunoais2015-03-121-0/+49
| | |/ / / / /
* | | | | | | Merge branch '3.1.x'Marc Alexander2015-06-091-0/+43
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge pull request #3484 from brunoais/ticket/13691Marc Alexander2015-06-091-0/+43
| |\ \ \ \ \ \
| | * | | | | | [ticket/13691] BUMP version to 3.1.5-devbrunoais2015-05-061-1/+1
| | * | | | | | [ticket/13691] Allow changing query to search for posts by author in nativebrunoais2015-03-121-0/+43
| | |/ / / / /
* | | | | | | Merge branch '3.1.x'Marc Alexander2015-06-091-0/+62
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge pull request #3483 from brunoais/ticket/13686Marc Alexander2015-06-091-0/+62
| |\ \ \ \ \ \
| | * | | | | | [ticket/13686] BUMP version to 3.1.5-devbrunoais2015-05-061-1/+1
| | * | | | | | [ticket/13686] Allow modify query used for counting in fulltext_nativebrunoais2015-03-121-0/+62
| | |/ / / / /
* | | | | | | Merge branch '3.1.x'Marc Alexander2015-06-091-0/+49
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge pull request #3481 from brunoais/ticket/13689Marc Alexander2015-06-091-0/+49
| |\ \ \ \ \ \
| | * | | | | | [ticket/13689] BUMP version to 3.1.5-devbrunoais2015-05-061-1/+1
| | * | | | | | [ticket/13689] Allow modifying the query for postgres native fulltext searchbrunoais2015-03-121-0/+49
| | |/ / / / /
| | * | | | | [ticket/13685] Add phpbb_dispatcher to fulltext search constructorsbrunoais2015-03-124-4/+36
* | | | | | | Merge branch '3.1.x'Marc Alexander2015-06-094-4/+85
|\ \ \ \ \ \ \ | |/ / / / / / | | | | / / / | |_|_|/ / / |/| | | | |
| * | | | | Merge pull request #3479 from brunoais/ticket/13685Marc Alexander2015-06-094-4/+85
| |\ \ \ \ \
| | * | | | | [ticket/13685] phpBB, not PhpBBbrunoais2015-06-094-4/+4
| | * | | | | [ticket/13685] BUMP version to 3.1.5-devbrunoais2015-06-071-1/+1
| | * | | | | [ticket/13685] Allow modifying the query for mysql native fulltext searchbrunoais2015-06-071-0/+49
| | * | | | | [ticket/13685] Add phpbb_dispatcher to fulltext search constructorsbrunoais2015-06-074-4/+36
* | | | | | | Merge branch '3.1.x'Andreas Fischer2015-06-081-1/+1
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | [ticket/13888] Fix sql_freeresult() error on author searchesCHItA2015-06-071-1/+1
| | |_|_|/ / | |/| | | |