aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Expand)AuthorAgeFilesLines
* [ticket/12373] Add to and from forum_id to LOG_MOVE log entriesJoas Schilling2014-04-081-4/+13
* Merge remote-tracking branch 'paybas/ticket/12369' into develop-ascraeusJoas Schilling2014-04-086-6/+6
|\
| * [ticket/12369] White-space cleanupPayBas2014-04-071-1/+1
| * [ticket/12369] Removed template vars initial statePayBas2014-04-072-2/+0
| * [ticket/12369] Added ACP varsPayBas2014-04-073-2/+3
| * [ticket/12369] Add template var {BODY_CLASS} to HTML bodyPayBas2014-04-075-5/+6
* | Merge remote-tracking branch 'vsephpbb/ticket/12083' into develop-ascraeusJoas Schilling2014-04-081-2/+3
|\ \
| * | [ticket/12083] Fix Select All in CODE bbcode with only one charMatt Friedman2014-04-051-2/+3
* | | Merge remote-tracking branch 'nickvergessen/ticket/12349' into develop-ascraeusDhruv2014-04-0884-84/+84
|\ \ \
| * | | [ticket/12349] Update license header in several new filesJoas Schilling2014-04-0384-84/+84
* | | | Merge remote-tracking branch 'Marc/ticket/12362' into develop-ascraeusJoas Schilling2014-04-071-0/+36
|\ \ \ \
| * | | | [ticket/12362] Throw exception in schema generator on unresolvable dependencyMarc Alexander2014-04-061-0/+36
| | |/ / | |/| |
* | | | Merge remote-tracking branch 'paybas/ticket/12364' into develop-ascraeusJoas Schilling2014-04-076-4/+12
|\ \ \ \
| * | | | [ticket/12364] Add template identifier var to all missing pagesPayBas2014-04-066-4/+12
* | | | | Merge remote-tracking branch 'Elsensee/ticket/12360' into develop-ascraeusJoas Schilling2014-04-071-1/+0
|\ \ \ \ \
| * | | | | [ticket/12360] Fix duplicated creation of session when logging out the userOliver Schramm2014-04-061-1/+0
| | |_|_|/ | |/| | |
* | | | | [ticket/12361] Replace the Google logo.Maƫl Soucaze2014-04-071-2/+2
* | | | | [ticket/12358] Correctly check and change the redirect url for ajax requestsJoas Schilling2014-04-071-3/+3
|/ / / /
* | | | Merge remote-tracking branch 'Marc/ticket/12150' into develop-ascraeusJoas Schilling2014-04-0610-0/+308
|\ \ \ \ | |/ / / |/| | |
| * | | [ticket/12150] Use correct license URL in prune shadow migrations fileMarc Alexander2014-04-051-1/+1
| * | | [ticket/12150] Remove 'after' for columns from migrations fileMarc Alexander2014-04-032-24/+20
| * | | [ticket/12150] Update schema files for prune shadow topicsMarc Alexander2014-03-301-0/+20
| * | | Merge branch 'develop-ascraeus' of https://github.com/phpbb/phpbb into ticket...Marc Alexander2014-03-301-0/+5
| |\ \ \
| * | | | [ticket/12150] Use log service instead of add_log() functionMarc Alexander2014-03-292-2/+6
| * | | | [ticket/12150] Use shorter column names for prune settingsMarc Alexander2014-03-296-32/+33
| * | | | [ticket/12150] Add missing space to query for shadow topicsMarc Alexander2014-03-291-1/+1
| * | | | [ticket/12150] Add missing prune settings variables in acp_forumsMarc Alexander2014-03-293-3/+9
| * | | | [ticket/12150] Add file and caller for pruning shadow topicsMarc Alexander2014-03-295-0/+218
| * | | | [ticket/12150] Add prune columns to schema files and migration fileMarc Alexander2014-03-291-0/+1
| * | | | [ticket/12150] Add options to acpMarc Alexander2014-03-294-0/+62
* | | | | Merge branch 'develop-olympus' into develop-ascraeusAndreas Fischer2014-04-061-3/+3
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | [ticket/12359] Remove inline width styling on UCP birthday fieldsMatt Friedman2014-04-051-3/+3
| * | | | Merge remote-tracking branch 'Marc/ticket/10851' into develop-olympusJoas Schilling2014-04-051-0/+4
| |\ \ \ \
* | \ \ \ \ Merge remote-tracking branch 'Marc/ticket/10851-ascraeus' into develop-ascraeusJoas Schilling2014-04-051-0/+4
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'ticket/10851' into ticket/10851-ascraeusMarc Alexander2014-04-041-0/+4
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | [ticket/10851] Set disallowed content to empty array if checking is disabledMarc Alexander2014-04-031-0/+4
* | | | | | | Merge remote-tracking branch 'Elsensee/ticket/7707' into develop-ascraeusJoas Schilling2014-04-058-28/+12
|\ \ \ \ \ \ \
| * | | | | | | [ticket/7707] Fix undefined variable: perm_fromOliver Schramm2014-04-041-1/+3
| * | | | | | | [ticket/7707] Add comma to last entry of arraysOliver Schramm2014-04-012-4/+4
| * | | | | | | [ticket/7707] Remove unnecessary variablesOliver Schramm2014-03-291-3/+0
| * | | | | | | [ticket/7707] Add get_username_string() once moreOliver Schramm2014-03-291-1/+1
| * | | | | | | [ticket/7707] Remove unnecessary variablesOliver Schramm2014-03-262-12/+1
| * | | | | | | [ticket/7707] Add get_username_string() where possibleOliver Schramm2014-03-167-23/+19
* | | | | | | | Merge remote-tracking branch 'paybas/ticket/12338' into develop-ascraeusJoas Schilling2014-04-043-0/+12
|\ \ \ \ \ \ \ \
| * | | | | | | | [ticket/12338] Add Template Event overall_footer_page_body_afterPayBas2014-04-043-0/+12
* | | | | | | | | Merge remote-tracking branch 'paybas/ticket/12333' into develop-ascraeusJoas Schilling2014-04-043-0/+12
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | [ticket/12333] Change event namePayBas2014-04-013-10/+10
| * | | | | | | | | [ticket/12333] Add Template Event overall_header_body_afterPayBas2014-03-313-0/+12
| |/ / / / / / / /
* | | | | | | | | Merge remote-tracking branch 'paybas/ticket/12327' into develop-ascraeusJoas Schilling2014-04-043-12/+26
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | [ticket/12327] Ajax fixPayBas2014-04-041-1/+10