aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Expand)AuthorAgeFilesLines
* [ticket/11774] Fix constant to avoid PHP errorsOliver Schramm2013-08-081-1/+1
* Merge remote-tracking branch 'nickvergessen/ticket/11574' into developDhruv2013-08-081-7/+34
|\
| * Merge remote-tracking branch 'phpbb/develop' into ticket/11574Joas Schilling2013-07-3010-61/+56
| |\
| * | [ticket/11574] Fix more issues in the updaterIgor Wiedler2013-07-141-6/+6
| * | Merge remote-tracking branch 'upstream/develop' into ticket/11574Igor Wiedler2013-07-14256-48956/+1883
| |\ \
| * | | [ticket/11574] Add trailing slash for consistencyIgor Wiedler2013-07-141-1/+1
| * | | [ticket/11574] Fix various path issues in the updaterIgor Wiedler2013-07-141-1/+25
| * | | [ticket/11574] Make install language filename less crazyIgor Wiedler2013-07-131-10/+4
| * | | [ticket/11574] Use alternate DI config file for updaterIgor Wiedler2013-07-132-18/+12
| * | | [ticket/11574] Only fall back to install/update versions, when IN_INSTALL ;)Joas Schilling2013-07-132-4/+6
| * | | [ticket/11574] Find language files in update/new before throwing an errorJoas Schilling2013-07-131-0/+12
| * | | [ticket/11574] Try to load updated service.yml before the default oneJoas Schilling2013-07-131-2/+10
* | | | Merge remote-tracking branch 'brunoais/ticket11639' into developJoas Schilling2013-08-041-9/+4
|\ \ \ \
| * | | | [ticket/11639] Changing how censorship is handled.brunoais2013-08-031-4/+2
| * | | | [ticket/11639] Removed a non-needed unsetBruno Ais2013-07-241-2/+0
| * | | | [ticket/11639] Whitespace fixingBruno Ais2013-07-201-1/+1
| * | | | [ticket/11639] Whitespace fixingBruno Ais2013-07-151-2/+2
| * | | | [ticket/11639] Added an useful comment.Bruno Ais2013-07-151-1/+2
| * | | | [ticket/11639] generate_text_for_display on functions_posting.phpBruno Ais2013-07-151-8/+6
* | | | | Merge remote-tracking branch 'brunoais/ticket/11642' into developJoas Schilling2013-08-031-11/+2
|\ \ \ \ \
| * | | | | [ticket/11642] Use $parse_flagsBruno Ais2013-08-011-1/+2
| * | | | | [ticket/11642] Fixed typo in the variable name.Bruno Ais2013-07-201-1/+1
| * | | | | [ticket/11642] generate_text_for_display on mcp/mcp_post.phpBruno Ais2013-07-161-11/+1
| |/ / / /
* | | | | Merge remote-tracking branch 'brunoais/ticket/11643' into developJoas Schilling2013-08-031-11/+2
|\ \ \ \ \
| * | | | | [ticket/11643] Use $parse_flagsBruno Ais2013-08-011-1/+2
| * | | | | [ticket/11643] Fixed typo in the variable name.Bruno Ais2013-07-201-1/+1
| * | | | | [ticket/11643] generate_text_for_display on mcp/mcp_queue.phpBruno Ais2013-07-161-11/+1
| |/ / / /
* | | | | Merge remote-tracking branch 'brunoais/ticket/11641' into developJoas Schilling2013-08-031-10/+2
|\ \ \ \ \
| * | | | | [ticket/11641] Use $parse_flagsBruno Ais2013-08-011-1/+2
| * | | | | [ticket/11641] generate_text_for_display on mcp/mcp_pm_reports.phpBruno Ais2013-07-161-10/+1
| |/ / / /
* | | | | Merge branch 'develop-olympus' into developJoas Schilling2013-08-031-2/+2
|\ \ \ \ \
| * | | | | [ticket/11762] Use the === operator to distinguish "0" from ""s9e2013-08-031-2/+2
* | | | | | Merge remote-tracking branch 'brunoais/ticket/11653' into developJoas Schilling2013-08-011-7/+2
|\ \ \ \ \ \
| * | | | | | [ticket/11653] Use $parse_flagsBruno Ais2013-08-011-1/+2
| * | | | | | [ticket/11653] generate_text_for_display on mcp/mcp_topic.phpBruno Ais2013-07-161-7/+1
| | |/ / / / | |/| | | |
* | | | | | Merge remote-tracking branch 'brunoais/ticket/11655' into developJoas Schilling2013-08-011-26/+4
|\ \ \ \ \ \
| * | | | | | [ticket/11653] Use $parse_flagsBruno Ais2013-08-011-1/+2
| * | | | | | [ticket/11653] Missing ";"Bruno Ais2013-08-011-1/+1
| * | | | | | [ticket/11655] Use $parse_flagsBruno Ais2013-08-011-1/+2
| * | | | | | [ticket/11655] wrong var names for the uid and for the bitfieldBruno Ais2013-07-201-1/+1
| * | | | | | [ticket/11655] generate_text_for_display on ucp_pm_viewmessage.phpBruno Ais2013-07-191-26/+2
| |/ / / / /
* | | | | | Merge branch 'develop-olympus' into developJoas Schilling2013-07-311-0/+3
|\ \ \ \ \ \ | | |/ / / / | |/| | | / | |_|_|_|/ |/| | | |
| * | | | [ticket/10037] Apply attached patch with a few changesOliver Schramm2013-07-251-0/+3
* | | | | Merge pull request #1625 from brunoais/ticket/11640Joas Schilling2013-07-291-1/+1
|\ \ \ \ \
| * | | | | [ticket/11640] removed the space that I wonder what it was doing there.Bruno Ais2013-07-291-1/+1
* | | | | | Merge pull request #1597 from marc1706/ticket/11723Nathan Guse2013-07-291-3/+3
|\ \ \ \ \ \
| * | | | | | [ticket/11723] Correctly redirect user to agreement page and let him leaveMarc Alexander2013-07-221-3/+3
* | | | | | | Merge pull request #1576 from brunoais/ticket/11640Nathan Guse2013-07-291-8/+5
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | [ticket/11640] removed the unsetBruno Ais2013-07-221-1/+0
| * | | | | | [ticket/11640] generate_text_for_display on functions_privmsgs.phpBruno Ais2013-07-161-8/+6
| | |_|/ / / | |/| | | |