aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb
Commit message (Expand)AuthorAgeFilesLines
* [ticket/13888] Fix sql_freeresult() error on author searchesCHItA2015-06-071-1/+1
* Merge pull request #22 from phpbb/ticket/sec-184Marc Alexander2015-06-071-2/+1
|\
| * [ticket/sec-184] Do not output LDAP password to HTMLJoas Schilling2015-06-041-2/+1
* | Merge pull request #3680 from marc1706/ticket/13917Tristan Darricau2015-06-061-2/+14
|\ \
| * | [ticket/13917] Do not pass non-string variables to hash_equals()Marc Alexander2015-06-041-2/+8
| * | [ticket/13917] Use hash_equals() if it's availableMarc Alexander2015-06-041-0/+6
| |/
* | Merge pull request #3502 from marc1706/ticket/13564Joas Schilling2015-06-043-5/+12
|\ \ | |/ |/|
| * [ticket/13564] Use user_id from link_data for unlinking account in oauthMarc Alexander2015-03-241-1/+4
| * [ticket/13564] Allow to specify user id for retrieving auth link dataMarc Alexander2015-03-243-4/+8
* | Merge pull request #3560 from Nicofuma/ticket/13790Nils Adermann2015-05-3016-17/+3
|\ \
| * | [ticket/13790] Update phpcsTristan Darricau2015-05-1916-17/+3
* | | Merge pull request #3633 from nickvergessen/ticket/13872Marc Alexander2015-05-282-3/+87
|\ \ \
| * | | [ticket/13872] Allow template events to have a changed versionJoas Schilling2015-05-282-3/+87
* | | | Merge pull request #3457 from brunoais/ticket/13661Joas Schilling2015-05-281-15/+70
|\ \ \ \ | |/ / / |/| | |
| * | | [ticket/13661] BUMP version to 3.1.5-devbrunoais2015-05-061-1/+1
| * | | [ticket/13661] Brackets in their own linebrunoais2015-03-021-1/+2
| * | | [ticket/13661] Re-Fixed $log_type -> $log_timebrunoais2015-03-011-1/+1
| * | | [ticket/13661] Wrong event @since versionbrunoais2015-03-011-1/+1
| * | | [ticket/13661] Removed superfluous whitespacebrunoais2015-03-011-1/+1
| * | | [ticket/13661] bugfix: The conditional is the log_time, not log_typebrunoais2015-03-011-3/+3
| * | | [ticket/13661] Fixed the "FROM" in the built query.brunoais2015-03-011-1/+4
| * | | [ticket/13661] Add event to allow editing the queries used to get the logsbrunoais2015-03-011-2/+45
| * | | [ticket/13661] Transform queries to get logs and log count into built queriesbrunoais2015-02-281-15/+23
* | | | Merge pull request #3624 from VSEphpbb/ticket/13861Marc Alexander2015-05-221-3/+3
|\ \ \ \
| * | | | [ticket/13861] Fix undefined variables in style update migrationMatt Friedman2015-05-211-3/+3
* | | | | 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
|\ \ \ \