aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #3601 from nickvergessen/ticket/13827Nicofuma2015-05-171-3/+23
|\
| * [ticket/13827] Use JsonResponse instead of our hacky json_response with exit()Joas Schilling2015-05-141-8/+11
| * [ticket/13827] Correctly return JSON instead of HTML when valled from AJAXJoas Schilling2015-05-091-3/+20
* | [ticket/13838] Fix coding styleNicofuma2015-05-146-9/+19
* | Merge pull request #3598 from VSEphpbb/ticket/13822Marc Alexander2015-05-081-1/+2
|\ \
| * | [ticket/13822] Correctly display softdelete and post detail permsMatt Friedman2015-05-071-1/+2
| |/
* | Merge pull request #3583 from nickvergessen/ticket/13807Nicofuma2015-05-062-10/+159
|\ \ | |/ |/|
| * [ticket/13807] Fix minor coding flawsJoas Schilling2015-05-021-2/+3
| * [ticket/13807] Add an option to generate a diff for the release highlightsJoas Schilling2015-05-022-5/+30
| * [ticket/13807] Allow filtering template eventsJoas Schilling2015-05-021-1/+27
| * [ticket/13807] Allow filtering events by phpBB versionJoas Schilling2015-05-021-4/+101
* | Merge branch 'prep-release-3.1.4' into 3.1.xJoas Schilling2015-05-031-0/+32
|\ \
| * | [prep-release-3.1.4] Add migrationJoas Schilling2015-05-031-0/+32
* | | Merge branch 'prep-release-3.1.4' into 3.1.xAndreas Fischer2015-05-031-0/+37
|\ \ \ | |/ / | | / | |/ |/|
| * Merge branch 'prep-release-3.0.14' into prep-release-3.1.4Andreas Fischer2015-05-031-0/+37
* | Merge branch 'prep-release-3.1.4' into 3.1.xJoas Schilling2015-04-291-0/+32
|\ \ | |/
| * [prep-release-3.1.4] Increase version number to 3.1.4-RC2Joas Schilling2015-04-291-0/+32
* | Merge branch 'prep-release-3.1.4' into 3.1.xAndreas Fischer2015-04-281-0/+37
|\ \ | |/
| * Merge branch 'prep-release-3.0.14' into prep-release-3.1.4Andreas Fischer2015-04-281-0/+37
* | [ticket/13772] Fix typo in phpbb\passwords\manager::__construct()brunoais2015-04-211-1/+1
* | [ticket/13756] Fix resize after upload with pluploadOliver Schramm2015-04-111-2/+2
|/
* [prep-release-3.1.4] Add migration for 3.1.4-RC1Joas Schilling2015-04-091-0/+31
* Merge pull request #3392 from marc1706/ticket/13493Joas Schilling2015-04-061-0/+6
|\
| * [ticket/13493] Append page name to base url if it doesn't contain itMarc Alexander2015-02-111-0/+6
* | 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 #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-061-31/+31
|\ \ \
| * | | [ticket/13522] Remove unneeded variables and correctly output input on errorMarc Alexander2015-02-211-9/+5
| * | | [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 #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
* | | | | [ticket/13742] Use correct avatar path for local avatarKevin Roy2015-04-031-1/+3
|/ / / /
* | | | [ticket/13550] Check that the Plupload temp directory is writable before movingCesar G2015-03-151-1/+1
* | | | [ticket/13674] Missing space after "if"brunoais2015-03-071-1/+1
* | | | [ticket/13674] Change MySQL native total search results calculationbrunoais2015-03-061-11/+8
* | | | Merge pull request #3453 from RMcGirr83/ticket/13477Marc Alexander2015-03-051-0/+14
|\ \ \ \
| * | | | [ticket/13477] rename function and fix doc blocksRMcGirr832015-03-041-7/+7
| * | | | [ticket/13477] Update file cache driver for filenamesRMcGirr832015-03-031-0/+14
| | |_|/ | |/| |
* | | | Merge pull request #3444 from naderman/ticket/13617-ascraeusJoas Schilling2015-02-271-1/+5
|\ \ \ \
| * | | | [ticket/13617] Document magic number for forum_idNils Adermann2015-02-251-0/+1
| * | | | [ticket/13617] Use request->variable instead of request_varNils Adermann2015-02-251-1/+1
| * | | | Merge branch 'ticket/13617' into ticket/13617-ascraeusNils Adermann2015-02-251-1/+4
| |/ / /
* | | | Merge pull request #3384 from brunoais/ticket/13592Marc Alexander2015-02-271-2/+33
|\ \ \ \ | |/ / / |/| | |
| * | | [ticket/13592] The name didn't make proper sensebrunoais2015-02-111-2/+2