aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #2192 from bantu/ticket/12314Nils Adermann2014-03-281-1/+7
|\
| * [ticket/12314] Workaround HHVM SPL autoloader sometimes using leading backslashAndreas Fischer2014-03-281-1/+7
* | Merge pull request #2194 from bantu/ticket/12317Nils Adermann2014-03-288-14/+9
|\ \
| * | [ticket/12317] Cast string to int to refix DBMSes not using int for integers.Andreas Fischer2014-03-284-5/+5
| * | [ticket/12317] Fix notification tests for DBMSes returning integers as int.Andreas Fischer2014-03-283-3/+3
| * | [ticket/12317] Do not repeat SQL query in notification_submit_post_base.Andreas Fischer2014-03-281-6/+1
| |/
* | Merge remote-tracking branch 'crizz0/ticket/11336' into develop-ascraeusJoas Schilling2014-03-286-6/+13
|\ \ | |/ |/|
| * [ticket/11336] Adds 301 info to redirectCrizzo2014-03-281-1/+2
| * [ticket/11336] Adds redirect for old "leaders" modeCrizzo2014-03-281-0/+6
| * [ticket/11336] Changes language variabel LOGIN_EXPLAIN_LEADERS to _TEAMCrizzo2014-03-281-1/+1
| * [ticket/11336] Changes "leaders"-mode to "team"-mode and so in test-fileCrizzo2014-03-285-5/+5
* | Merge remote-tracking branch 'vsephpbb/ticket/12315' into develop-ascraeusJoas Schilling2014-03-281-1/+1
|\ \ | |/ |/|
| * [ticket/12315] Fix invalid HTML in NO_SEARCH_INDEX in language/en/acp/common.phpMatt Friedman2014-03-281-1/+1
|/
* Merge branch 'ticket/suheb/11666' into develop-ascraeusJoas Schilling2014-03-281-3/+3
|\
| * [ticket/11666] Rewording POST_DELETED andSuhaib Khan2014-03-281-3/+4
| * [ticket/11666] Removing MESSAGE_DELETED..Suhaib Khan2014-03-101-1/+0
* | Merge remote-tracking branch 'vsephpbb/ticket/12311' into develop-ascraeusJoas Schilling2014-03-2810-17/+17
|\ \
| * | [ticket/12311] Use British-English spelling of licence in lang fileMatt Friedman2014-03-281-1/+1
| * | [ticket/12311] Use valid composer schema - license - for extensionsMatt Friedman2014-03-2710-17/+17
* | | Merge remote-tracking branch 'vsephpbb/ticket/11230' into develop-ascraeusJoas Schilling2014-03-2810-73/+90
|\ \ \
| * | | [ticket/11230] Add missing last returns to dock blockMatt Friedman2014-03-281-0/+3
| * | | [ticket/11230] Update cache driver dock blocksMatt Friedman2014-03-223-0/+32
| * | | [ticket/11230] Use inheritdoc in docblocks in cache driversMatt Friedman2014-03-199-73/+55
* | | | Merge remote-tracking branch 'geetakshi/ticket/11360' into develop-ascraeusJoas Schilling2014-03-289-16/+16
|\ \ \ \ | |_|/ / |/| | |
| * | | [ticket/11360] Updating default value of $display_online_listgeetakshi2014-03-244-4/+4
| * | | [ticket/11360] Avoiding online list where not requiredgeetakshi2014-03-205-8/+8
| * | | [ticket/11360] Change second parameter in page_header functiongeetakshi2014-03-1910-17/+17
* | | | Merge branch 'develop-olympus' into develop-ascraeusJoas Schilling2014-03-270-0/+0
|\ \ \ \
| * \ \ \ Merge remote-tracking branch 'bantu/ticket/12257' into develop-olympusJoas Schilling2014-03-271-0/+1
| |\ \ \ \
* | \ \ \ \ Merge remote-tracking branch 'bantu/ticket/12257-ascraeus' into develop-ascraeusJoas Schilling2014-03-271-0/+1
|\ \ \ \ \ \
| * \ \ \ \ \ Merge pull request #2179 from bantu/ticket/12257Andreas Fischer2014-03-251-0/+1
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | [ticket/12257] Use MyISAM in PHP 5.3 environment such that FULLTEXT tests run.Andreas Fischer2014-03-241-0/+1
* | | | | | | Merge branch 'develop-olympus' into develop-ascraeusNils Adermann2014-03-262-3/+4
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | Merge remote-tracking branch 'marshalrusty/ticket/12310' into develop-olympusNils Adermann2014-03-262-3/+4
| |\ \ \ \ \ \
| | * | | | | | [ticket/12310] Don't autocomplete SMTP user/pass on installYuriy Rusko2014-03-262-3/+4
| |/ / / / / /
* | | | | | | Merge branch 'develop-olympus' into develop-ascraeusAndreas Fischer2014-03-252-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / | | / / / / / | |/ / / / / |/| | | | |
| * | | | | Merge pull request #2183 from s9e/ticket/12302Andreas Fischer2014-03-252-1/+1
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | [ticket/12302] Added `--no-dev` to composer call in build.xmls9e2014-03-251-1/+1
| | * | | | [ticket/12302] Updated composer.phar to 1.0.0-alpha8s9e2014-03-251-0/+0
| |/ / / /
* | | | | Merge branch 'develop-olympus' into develop-ascraeusJoas Schilling2014-03-242-3/+3
|\ \ \ \ \ | |/ / / /
| * | | | Merge remote-tracking branch 'schosser/ticket/10174' into develop-olympusJoas Schilling2014-03-242-3/+3
| |\ \ \ \
| | * | | | [ticket/10174] Rename "Ban usernames" to "Ban users" in ACPDaniel Schosser2014-03-232-3/+3
* | | | | | Merge remote-tracking branch 'Elsensee/ticket/12297' into develop-ascraeusJoas Schilling2014-03-241-0/+47
|\ \ \ \ \ \
| * | | | | | [ticket/12297] Delete user_from column on updateOliver Schramm2014-03-231-0/+47
|/ / / / / /
* | | | | | Merge remote-tracking branch 'VSEphpbb/ticket/12292' into develop-ascraeusCesar G2014-03-221-1/+1
|\ \ \ \ \ \
| * | | | | | [ticket/12292] Fix syntax error in admin.cssMatt Friedman2014-03-221-1/+1
* | | | | | | Merge remote-tracking branch 'nickvergessen/ticket/12268' into develop-ascraeusDhruv2014-03-232-5/+38
|\ \ \ \ \ \ \
| * | | | | | | [ticket/12268] Do not use substr but just compare the characterJoas Schilling2014-03-151-1/+2
| * | | | | | | [ticket/12268] Rename class file to recursive_dot_prefix_filter_iterator.phpJoas Schilling2014-03-141-0/+0
| * | | | | | | [ticket/12268] Move class out of extension namespace and rename itJoas Schilling2014-03-142-5/+5