aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [ticket/12459] Change language stringsTristan Darricau2014-05-053-7/+9
* [ticket/12459] Enable related testsNicofuma2014-05-041-22/+9
* [ticket/12459] Fix: Differentiating unapproved and deleted postsTristan Darricau2014-05-041-1/+2
* [ticket/12459] Fix: Soft deleted topics should appear in feedsTristan Darricau2014-05-045-15/+28
* [ticket/12459] Fix: the posts were always marked as unapprovedTristan Darricau2014-05-041-1/+1
* Merge branch 'develop-olympus' into develop-ascraeusJoas Schilling2014-05-037-25/+27
|\
| * Merge pull request #2396 from Nicofuma/ticket/12485Joas Schilling2014-05-038-17/+61
| |\
| | * [ticket/12485] Broken tests due to absolute excludeNicofuma2014-05-038-17/+61
| |/
* | Merge remote-tracking branch 'VSEphpbb/ticket/10521' into develop-ascraeusCesar G2014-05-021-1/+1
|\ \
| * | [ticket/10521] Fix broken tests using set_cookieMatt Friedman2014-05-021-1/+1
* | | Merge remote-tracking branch 'github-vse/ticket/10521' into develop-ascraeusNils Adermann2014-05-031-1/+1
|\ \ \ | |/ /
| * | [ticket/10521] Update docblock of set_cookie for new HttpOnly paramMatt Friedman2014-05-021-1/+1
* | | Merge remote-tracking branch 'github-bantu/ticket/12429-ascraeus' into develo...Nils Adermann2014-05-031-1/+0
|\ \ \
| * | | [ticket/12429] Can not insert into more columns than exist.Andreas Fischer2014-05-031-1/+0
* | | | Merge branch 'develop-olympus' into develop-ascraeusNils Adermann2014-05-031-9/+47
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge remote-tracking branch 'github-bantu/ticket/11860' into develop-olympusNils Adermann2014-05-031-9/+47
| |\ \ \
| | * | | [ticket/11860] htaccess: Support for Apache 2.4's "Require" syntax.Andreas Fischer2013-09-231-9/+47
| * | | | Merge remote-tracking branch 'github-bantu/ticket/12429' into develop-olympusNils Adermann2014-05-022-80/+376
| |\ \ \ \
* | \ \ \ \ Merge pull request #2391 from naderman/ticket/12382Joas Schilling2014-05-035-10/+15
|\ \ \ \ \ \
| * | | | | | [ticket/12382] Event loop nesting inclusion applies to regular includes tooNils Adermann2014-05-032-3/+2
| * | | | | | [ticket/12382] Allow nested loops in included files.Nils Adermann2014-05-033-7/+13
* | | | | | | Merge remote-tracking branch 'github-vse/ticket/10521' into develop-ascraeusNils Adermann2014-05-032-5/+14
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | / | | |_|_|_|/ | |/| | | |
| * | | | | [ticket/10521] Allow language switching by URL parameterMatt Friedman2014-05-022-5/+14
* | | | | | Merge pull request #2389 from prototech/ticket/12482Andreas Fischer2014-05-021-1/+1
|\ \ \ \ \ \
| * | | | | | [ticket/12482] Fixed undefined variable: data.Cesar G2014-05-021-1/+1
|/ / / / / /
* | | | | | Merge pull request #2385 from prototech/ticket/12478Joas Schilling2014-05-023-1/+20
|\ \ \ \ \ \
| * | | | | | [ticket/12478] Add contact field events to viewtopic_body.html.Cesar G2014-05-022-0/+18
| * | | | | | [ticket/12478] Re-add contact field events in ucp_pm_viewmessage.html.Cesar G2014-05-021-1/+2
* | | | | | | Merge pull request #2388 from nickvergessen/ticket/12480Andreas Fischer2014-05-023-3/+6
|\ \ \ \ \ \ \
| * | | | | | | [ticket/12480] Remove unused use statementsJoas Schilling2014-05-021-2/+0
| * | | | | | | [ticket/12480] Add subfolder/config/routing.yml which should not be foundJoas Schilling2014-05-022-0/+5
| * | | | | | | [ticket/12480] Only load config/routing.yml from extensions routeJoas Schilling2014-05-021-1/+1
| | |/ / / / / | |/| | | | |
* | | | | | | Merge pull request #2384 from prototech/ticket/12477Andreas Fischer2014-05-022-3/+3
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | [ticket/12477] Tab instead of spaces.Cesar G2014-05-021-1/+1
| * | | | | | [ticket/12477] Fix logic to prevent admin-deactivated users from getting PM's.Cesar G2014-05-022-2/+2
| |/ / / / /
* | | | | | Merge remote-tracking branch 'github-bantu/ticket/12429-ascraeus' into develo...Nils Adermann2014-05-022-89/+374
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Merge branch 'ticket/12429' into ticket/12429-developAndreas Fischer2014-05-022-89/+374
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | [ticket/12429] Update PHPUnit to 4.1, update DBUnit to 1.3.Andreas Fischer2014-05-022-80/+376
| | | |/ / | | |/| |
* | | | | Merge remote-tracking branch 'github-vse/ticket/12254' into develop-ascraeusNils Adermann2014-05-026-12/+31
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | [ticket/12254] Add subsilver2 support for cookie storage instead of SIDMatt Friedman2014-05-022-2/+2
| * | | | [ticket/12254] Use a cookie instead of SID to store language selectionMatt Friedman2014-05-024-10/+13
| * | | | [ticket/12254] No longer need to add change_lang to the URL paramsMatt Friedman2014-04-111-5/+4
| * | | | [ticket/12254] Use 'language' instead of 'set_lang' as the variable nameMatt Friedman2014-04-116-9/+9
| * | | | [ticket/12254] Persist set_lang after reg only if changed from defaultMatt Friedman2014-04-071-2/+2
| * | | | [ticket/12254] Add set_lang var changes to subsilver2 filesMatt Friedman2014-04-072-0/+2
| * | | | [ticket/12254] Use new set_lang var to avoid conflict with change_langMatt Friedman2014-04-074-6/+8
| * | | | [ticket/12254] Stop using deprecated request_var in user classMatt Friedman2014-04-071-3/+3
| * | | | [ticket/12254] Better language switching on registration pageMatt Friedman2014-04-062-3/+16
* | | | | [ticket/12475] Tabs, spaces, ...Nils Adermann2014-05-021-2/+2
* | | | | [ticket/12475] Load extension migrations on cli updater tooNils Adermann2014-05-021-1/+2
| |/ / / |/| | |