aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [3.1.x] Update development version to 3.1.5-devJoas Schilling2015-04-103-3/+3
* Merge branch 'prep-release-3.1.4' into 3.1.xJoas Schilling2015-04-108-9/+155
|\
| * [prep-release-3.1.4] Add changelog for 3.1.4-RC1Joas Schilling2015-04-091-1/+116
| * [prep-release-3.1.4] Add migration for 3.1.4-RC1Joas Schilling2015-04-091-0/+31
| * Update version to 3.1.4-RC1Joas Schilling2015-04-096-8/+8
|/
* Merge pull request #3525 from marc1706/ticket/13749Oliver Schramm2015-04-061-1/+1
|\
| * [ticket/13749] Add missing slash to base uri in helper route testsMarc Alexander2015-04-061-1/+1
|/
* Merge pull request #3392 from marc1706/ticket/13493Joas Schilling2015-04-063-1/+55
|\
| * [ticket/13493] Append page name to base url if it doesn't contain itMarc Alexander2015-02-113-1/+55
* | Merge pull request #3492 from RMcGirr83/ticket/13710Joas Schilling2015-04-063-1/+30
|\ \
| * | [ticket/13710] Allow template events near smilies displayRMcGirr832015-03-193-1/+30
* | | Merge pull request #3488 from Crizz0/ticket/13701Joas Schilling2015-04-062-0/+16
|\ \ \
| * | | [ticket/13701] Adds two new events to posting_pm_layout.htmlCrizzo2015-03-132-0/+16
* | | | Merge pull request #3517 from Wolfsblvt/ticket/13739Joas Schilling2015-04-063-1/+12
|\ \ \ \
| * | | | [ticket/13739] Add template core event posting_poll_body_options_afterWolfsblvt2015-04-031-1/+1
| * | | | [ticket/13739] Add template core event posting_poll_body_options_afterWolfsblvt2015-04-031-1/+2
| * | | | [ticket/13739] Add template core event posting_poll_body_options_afterWolfsblvt2015-04-033-0/+10
* | | | | Merge pull request #3523 from Nicofuma/ticket/13747Joas Schilling2015-04-061-0/+9
|\ \ \ \ \
| * | | | | [ticket/13747] Add assertions to test_validate_path_linuxTristan Darricau2015-04-061-0/+9
|/ / / / /
* | | | | Merge pull request #3458 from nickvergessen/ticket/8494Tristan Darricau2015-04-061-6/+4
|\ \ \ \ \
| * | | | | [ticket/8494] Ignore errors from the database schema preparationJoas Schilling2015-03-011-6/+4
* | | | | | Merge pull request #3437 from marc1706/ticket/12368Joas Schilling2015-04-061-1/+23
|\ \ \ \ \ \
| * | | | | | [ticket/12368] Fix comment in docblockMarc Alexander2015-03-261-1/+1
| * | | | | | [ticket/12368] Correctly check if avatars migration is installedMarc Alexander2015-02-241-1/+23
* | | | | | | Merge pull request #3409 from Senky/ticket/11424Joas Schilling2015-04-061-0/+25
|\ \ \ \ \ \ \
| * | | | | | | [ticket/11424] Add space between control flow keywords and parenthesisJakub Senko2015-02-191-2/+2
| * | | | | | | [ticket/11424] Handle race condition properly for Quick-Mod ToolsJakub Senko2015-02-161-0/+25
* | | | | | | | Merge pull request #3402 from brunoais/ticket/13621Joas Schilling2015-04-061-3/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | [ticket/13621] Prepend $where_sql and postpend closing parentheses on returnbrunoais2015-02-151-3/+3
* | | | | | | | | Merge pull request #3333 from marc1706/ticket/13522Joas Schilling2015-04-062-31/+125
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | [ticket/13522] Fix QA tests for request_var() useMarc Alexander2015-02-211-1/+4
| * | | | | | | | | [ticket/13522] Add captcha to test file class nameMarc Alexander2015-02-211-1/+1
| * | | | | | | | | [ticket/13522] Remove unneeded variables and correctly output input on errorMarc Alexander2015-02-211-9/+5
| * | | | | | | | | [ticket/13522] Add tests for acp_get_question_input and set/get nameMarc Alexander2015-02-211-1/+46
| * | | | | | | | | [ticket/13522] Add test file for Q&A captchaMarc Alexander2015-02-211-0/+46
| * | | | | | | | | [ticket/13522] Use acp_get_question_input() for retrieving input dataMarc Alexander2015-02-211-12/+9
| * | | | | | | | | [ticket/13522] Trim array elements before processing furtherMarc Alexander2015-02-211-3/+2
| * | | | | | | | | [ticket/13522] Remove unused variables and unexpected returnsMarc Alexander2015-01-241-10/+9
| * | | | | | | | | [ticket/13522] Remove empty answers from possible answers in Q&AMarc Alexander2015-01-241-2/+11
* | | | | | | | | | Merge pull request #3284 from Elsensee/ticket/13469Joas Schilling2015-04-062-25/+117
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | [ticket/13469] Extract test to new methodOliver Schramm2015-04-021-5/+29
| * | | | | | | | | | [ticket/13469] Add testsOliver Schramm2015-03-221-21/+86
| * | | | | | | | | | [ticket/13469] Fall back to soft_delete if no permissions for deleteOliver Schramm2015-01-111-3/+6
* | | | | | | | | | | Merge pull request #3520 from rxu/ticket/13743Tristan Darricau2015-04-051-0/+13
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | [ticket/13743] Add $phpbb_root_path and $phpEx definitions in message_parser.phprxu2015-04-051-0/+13
|/ / / / / / / / / / /
* | | | | | | | | | | Merge pull request #3518 from marc1706/ticket/13703Marc Alexander2015-04-041-1/+3
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | [ticket/13703] Use correct avatar path for PHPBB_USE_BOARD_URL_PATHKevin Roy2015-04-031-1/+3
* | | | | | | | | | | | Merge pull request #3519 from marc1706/ticket/13742Marc Alexander2015-04-041-1/+3
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | [ticket/13742] Use correct avatar path for local avatarKevin Roy2015-04-031-1/+3
|/ / / / / / / / / / /
* | | | | | | | | | | Merge pull request #3515 from cyberalien/ticket/13741Joas Schilling2015-04-034-20/+2
|\ \ \ \ \ \ \ \ \ \ \