aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'github-nickvergessen/ticket/11352' into develop...Nils Adermann2014-04-102-0/+335
|\
| * [ticket/11352] Add functional tests for disapproving a post/topicJoas Schilling2014-04-071-0/+319
| * [ticket/11352] Redirect the user back to view*.php after disapprovingJoas Schilling2014-04-071-0/+16
* | Merge branch 'develop-olympus' into develop-ascraeusAndreas Fischer2014-04-101-1/+1
|\ \
| * \ Merge pull request #2279 from Elsensee/ticket/12381Andreas Fischer2014-04-101-1/+1
| |\ \
| | * | [ticket/12381] Fix broken error message when selecting invalid DB driverOliver Schramm2014-04-101-1/+1
| |/ /
* | | Merge branch 'develop-olympus' into develop-ascraeusJoas Schilling2014-04-102-3/+1
|\ \ \ | |/ /
| * | Merge remote-tracking branch 'bantu/ticket/12320' into develop-olympusJoas Schilling2014-04-102-3/+1
| |\ \
| | * | [ticket/12320] Install a nightly build of HHVM.Andreas Fischer2014-04-101-1/+1
| | * | [ticket/12320] No longer allow Travis CI HHVM environment to fail.Andreas Fischer2014-04-101-2/+0
| |/ /
* | | Merge remote-tracking branch 'vsephpbb/ticket/11098' into develop-ascraeusJoas Schilling2014-04-104-52/+49
|\ \ \
| * | | [ticket/11098] Fix error reporting on the autologin key pagesMatt Friedman2014-04-093-15/+6
| * | | [ticket/11098] Update subsilver2 to also include mark/unmark all buttonsMatt Friedman2014-04-091-5/+9
| * | | [ticket/11098] HTML Validity fix to Notifications in UCPMatt Friedman2014-04-091-5/+7
| * | | [ticket/11098] Add mark/unmark all options to remember me keysMatt Friedman2014-04-091-34/+34
* | | | Merge remote-tracking branch 'prototech/ticket/12375' into develop-ascraeusJoas Schilling2014-04-101-4/+1
|\ \ \ \
| * | | | [ticket/12375] Fix broken attachment deletion.Cesar G2014-04-081-4/+1
* | | | | Merge remote-tracking branch 'prototech/ticket/12356' into develop-ascraeusJoas Schilling2014-04-103-6/+10
|\ \ \ \ \
| * | | | | [ticket/12356] Assign vars preventing Plupload from loading in PM editor.Cesar G2014-04-093-6/+10
| |/ / / /
* | | | | Merge remote-tracking branch 'prototech/ticket/12379' into develop-ascraeusJoas Schilling2014-04-101-4/+0
|\ \ \ \ \
| * | | | | [ticket/12379] Remove duplicate labels in attachment uploader when responsive.Cesar G2014-04-091-4/+0
|/ / / / /
* | | | | Merge remote-tracking branch 'nickvergessen/ticket/8700' into develop-ascraeusCesar G2014-04-092-288/+4
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | [ticket/8700] Use L_COLON instead of adding ":" manuallyJoas Schilling2014-04-022-4/+4
| * | | | [ticket/8700] Remove unused language stringsJoas Schilling2014-04-021-284/+0
* | | | | Merge remote-tracking branch 'VSEphpbb/ticket/12365' into develop-ascraeusCesar G2014-04-091-2/+0
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | [ticket/12365] Do not crop image attachments at 350pxMatt Friedman2014-04-061-2/+0
* | | | | 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-0899-99/+99
|\ \ \ \ \
| * | | | | [ticket/12349] Fix Sniffer for @license tagJoas Schilling2014-04-031-1/+1
| * | | | | [ticket/12349] Update license header in several new filesJoas Schilling2014-04-0398-98/+98
* | | | | | Merge remote-tracking branch 'Marc/ticket/12362' into develop-ascraeusJoas Schilling2014-04-072-0/+85
|\ \ \ \ \ \
| * | | | | | [ticket/12362] Do not use database test case as it's not neededMarc Alexander2014-04-061-8/+2
| * | | | | | [ticket/12362] Add tests for schema generatorMarc Alexander2014-04-061-0/+55
| * | | | | | [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
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch 'ticket/mael/12361' into develop-ascraeusJoas Schilling2014-04-071-2/+2
|\ \ \ \ \ \ \
| * | | | | | | [ticket/12361] Replace the Google logo.Maƫl Soucaze2014-04-071-2/+2
|/ / / / / / /
* | | | | | | Merge remote-tracking branch 'github-nickvergessen/ticket/12358' into develop...Nils Adermann2014-04-071-3/+3
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | [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-0611-0/+515
|\ \ \ \ \ \
| * | | | | | [ticket/12150] Use correct license URL in prune shadow migrations fileMarc Alexander2014-04-051-1/+1