aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Expand)AuthorAgeFilesLines
* [ticket/11824] Fix logicDavid King2013-09-061-1/+1
* [ticket/11824] Add option for mod_rewriteDavid King2013-09-032-3/+51
* Merge remote-tracking branch 'EXreaction/ticket/11791' into developDavid King2013-09-021-1/+1
|\
| * [ticket/11791] Load adm/ events from styles/adm/event/Nathan Guse2013-09-021-1/+1
* | [ticket/11215] Add commented-out URL rewrite capability to .htaccessDavid King2013-09-021-0/+8
* | Merge remote-tracking branch 'upstream/develop' into ticket/11215David King2013-09-021-0/+5
|\ \
| * \ Merge branch 'develop-olympus' into developAndreas Fischer2013-09-021-0/+5
| |\ \ | | |/ | |/|
| | * Merge branch 'prep-release-3.0.12' into develop-olympusAndreas Fischer2013-09-021-1/+4
| | |\
| | | * [ticket/11769] Allow '0' as usernameJoas Schilling2013-09-021-1/+1
| | | * [ticket/11769] Fix language issues in the doc blocksJoas Schilling2013-08-231-3/+3
| | | * [ticket/11769] Correctly supply the post author's username in posting.phpJoas Schilling2013-08-231-1/+4
* | | | [ticket/11215] Everything appears to be working...David King2013-08-311-19/+9
* | | | Merge branch 'develop' into ticket/11215David King2013-08-31275-49476/+131
|\ \ \ \ | |/ / /
| * | | Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11628Nathan Guse2013-08-2815-112/+70
| |\ \ \
| | * \ \ Merge branch 'develop-olympus' into developJoas Schilling2013-08-261-0/+2
| | |\ \ \ | | | |/ /
| | | * | [ticket/11799] Send anti abuse headers in "new password" emails.Andreas Fischer2013-08-231-0/+2
| | * | | Merge remote-tracking branch 'cyberalien/ticket/11754' into developAndreas Fischer2013-08-181-2/+0
| | |\ \ \
| | | * | | [ticket/11754] Remove styleswitcher leftoversVjacheslav Trushkin2013-07-301-2/+0
| | * | | | Merge branch 'develop-olympus' into developAndreas Fischer2013-08-151-2/+2
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | | * | | Merge branch 'prep-release-3.0.12' into develop-olympusAndreas Fischer2013-08-151-2/+2
| | | |\ \ \ | | | | | |/ | | | | |/|
| | | | * | [ticket/11775] Fix error when moving the last post to another topicJoas Schilling2013-08-081-2/+2
| | | | * | [prep-release-3.0.12] Bumping version number for 3.0.12-RC2.Andreas Fischer2013-08-011-1/+1
| | * | | | [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
| | |\ \ \ \ \ \ \