aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'develop-ascraeus' into developJoas Schilling2014-08-071-0/+2
|\
| * Merge pull request #2811 from bantu/ticket/12918Joas Schilling2014-08-071-0/+2
| |\
| | * [ticket/12918] Load class fileupload in fileupload_remote_test.php.Andreas Fischer2014-08-071-0/+2
* | | Merge branch 'develop-ascraeus' into developMarc Alexander2014-08-071-0/+12
|\ \ \ | |/ /
| * | Merge pull request #2763 from brunoais/ticket/12877Marc Alexander2014-08-071-0/+12
| |\ \
| | * | [ticket/12877] core.mcp_mcp_front_reports_listing_query_beforebrunoais2014-07-231-0/+12
* | | | Merge branch 'develop-ascraeus' into developAndreas Fischer2014-08-073-3/+3
|\ \ \ \ | |/ / /
| * | | Merge branch 'develop-olympus' into develop-ascraeusAndreas Fischer2014-08-070-0/+0
| |\ \ \
| | * \ \ Merge pull request #2808 from nickvergessen/ticket/12917Andreas Fischer2014-08-071-3/+3
| | |\ \ \
| * | \ \ \ Merge pull request #2809 from nickvergessen/ticket/12917-ascAndreas Fischer2014-08-073-3/+3
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | Merge branch 'ticket/12917' into ticket/12917-ascJoas Schilling2014-08-073-3/+3
| | |\ \ \ \ | |/ / / / / | | | | _ / | | | | /
| | * | | [ticket/12917] Check commit message and image ICC profile on 5.3.3Joas Schilling2014-08-071-3/+3
| | |/ /
* | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-08-079-2/+96
|\ \ \ \ | |/ / /
| * | | Merge pull request #2729 from Nicofuma/ticket/12847Joas Schilling2014-08-079-2/+96
| |\ \ \
| | * | | [ticket/12847] Allow the extensions to say if they can be enabledTristan Darricau2014-07-139-2/+97
* | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-08-0754-74/+148
|\ \ \ \ \ | |/ / / /
| * | | | Merge pull request #2477 from n-aleha/ticket/12557ascraeusJoas Schilling2014-08-0754-74/+148
| |\ \ \ \
| | * | | | [ticket/12557] Fix load active module descriptionn-aleha2014-08-071-1/+1
| | * | | | [ticket/12557] Fix php file descriptionn-aleha2014-08-0720-26/+26
| | * | | | [ticket/12557] Fix post data description for notificationsn-aleha2014-08-078-8/+8
| | * | | | [ticket/12557] Fix pass by reference doc blocksn-aleha2014-08-072-9/+9
| | * | | | [ticket/12557] Fix doc block in extension base classn-aleha2014-08-061-0/+1
| | * | | | [ticket/12557] Fix doc block in mimetype guessern-aleha2014-08-031-1/+6
| | * | | | [ticket/12557] Fix var $preserve_cr descriptionn-aleha2014-08-031-1/+2
| | * | | | [ticket/12557] Fix doc block errors found by Samin-aleha2014-08-033-8/+9
| | * | | | [ticket/12557] Fix doc block errors found by Samin-aleha2014-08-035-11/+11
| | * | | | [ticket/12557] Fix doc block errors found by Samin-aleha2014-08-031-1/+1
| | * | | | [ticket/12557] Template fixesn-aleha2014-08-034-6/+7
| | * | | | [ticket/12557] Search, cron and profilefields fixesn-aleha2014-08-037-4/+26
| | * | | | [ticket/12557] Notification fixesn-aleha2014-08-0314-4/+19
| | * | | | [ticket/12557] Fix doc block errors found by Sami pt1n-aleha2014-08-038-19/+22
| | * | | | [ticket/12557] Fix doc block errors found by Samin-aleha2014-08-033-3/+4
| | * | | | [ticket/12557] Fix doc block errors found by Samin-aleha2014-08-036-17/+41
* | | | | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-08-071-1/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge pull request #2644 from Nicofuma/ticket/12051Joas Schilling2014-08-071-1/+1
| |\ \ \ \ \
| | * | | | | [ticket/12051] Optimise Composer Autoloader on BuildTristan Darricau2014-06-231-1/+1
* | | | | | | Merge pull request #2637 from Nicofuma/ticket/12387Joas Schilling2014-08-0713-149/+257
|\ \ \ \ \ \ \
| * | | | | | | [ticket/12387] Fix a call to sql_freeresult in full_text_nativeTristan Darricau2014-06-231-1/+1
| * | | | | | | [ticket/12387] Fix \phpbb\db\driver\mysqli::sql_freeresultTristan Darricau2014-06-221-1/+6
| * | | | | | | [ticket/12387] Use the hash as query_id for cachingTristan Darricau2014-06-222-10/+9
| * | | | | | | [ticket/12387] Remove unnecessary checksTristan Darricau2014-06-225-5/+5
| * | | | | | | [ticket/12387] mssql_query return true if a select query returns 0 rowTristan Darricau2014-06-221-2/+12
| * | | | | | | [ticket/12387] Cleanup *_free_result call and remove @ on that callTristan Darricau2014-06-2210-133/+227
* | | | | | | | Merge branch 'develop-ascraeus' into developNils Adermann2014-08-079-44/+134
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Merge remote-tracking branch 'github-marc1706/ticket/11148' into develop-ascr...Nils Adermann2014-08-079-44/+134
| |\ \ \ \ \ \ \
| | * | | | | | | [ticket/11148] Remove unneeded variable mimetype and use type octet-streamMarc Alexander2014-06-231-2/+1
| | * | | | | | | [ticket/11148] Change expected output with disallowed content in testMarc Alexander2014-06-231-2/+2
| | * | | | | | | [ticket/11148] Always use the output of the mimetype guesser in get_mimetypeMarc Alexander2014-06-231-6/+1
| | * | | | | | | [ticket/11148] Get rid of extra line in mimetype guesser setter doc blockMarc Alexander2014-06-231-2/+1
| | * | | | | | | [ticket/11148] Add missing parts to docblock of get_mimetype() methodMarc Alexander2014-06-231-0/+2