Nils Adermann
1c6b3fe073
Merge branch 'develop-ascraeus' into develop
...
* develop-ascraeus:
[ticket/12317] Cast string to int to refix DBMSes not using int for integers.
[ticket/12317] Fix notification tests for DBMSes returning integers as int.
[ticket/12317] Do not repeat SQL query in notification_submit_post_base.
[ticket/12314] Workaround HHVM SPL autoloader sometimes using leading backslash
2014-03-28 22:28:13 -04:00
Nils Adermann
b7909ba71b
Merge pull request #2192 from bantu/ticket/12314
...
[ticket/12314] Workaround HHVM SPL autoloader sometimes using leading ba...
2014-03-28 22:25:48 -04:00
Nils Adermann
6d0b7bba3f
Merge pull request #2194 from bantu/ticket/12317
...
[ticket/12317] Fix notification tests for DBMS drivers using int for integers ;-)
2014-03-28 22:24:57 -04:00
Joas Schilling
cff5c8ac38
Merge branch 'develop-ascraeus' into develop
...
* develop-ascraeus:
[ticket/11336] Adds 301 info to redirect
[ticket/11336] Adds redirect for old "leaders" mode
[ticket/11336] Changes language variabel LOGIN_EXPLAIN_LEADERS to _TEAM
[ticket/11336] Changes "leaders"-mode to "team"-mode and so in test-file
2014-03-28 23:32:20 +01:00
Joas Schilling
c7d18eaadd
Merge remote-tracking branch 'crizz0/ticket/11336' into develop-ascraeus
...
* crizz0/ticket/11336:
[ticket/11336] Adds 301 info to redirect
[ticket/11336] Adds redirect for old "leaders" mode
[ticket/11336] Changes language variabel LOGIN_EXPLAIN_LEADERS to _TEAM
[ticket/11336] Changes "leaders"-mode to "team"-mode and so in test-file
2014-03-28 23:32:05 +01:00
Andreas Fischer
ad2ed01623
[ticket/12317] Cast string to int to refix DBMSes not using int for integers.
...
PHPBB3-12317
2014-03-28 22:14:53 +01:00
Andreas Fischer
c489244895
[ticket/12317] Fix notification tests for DBMSes returning integers as int.
...
PHPBB3-12317
2014-03-28 22:14:53 +01:00
Andreas Fischer
043b6a207a
[ticket/12317] Do not repeat SQL query in notification_submit_post_base.
...
PHPBB3-12317
2014-03-28 22:14:53 +01:00
Andreas Fischer
bd0ba37207
[ticket/12314] Workaround HHVM SPL autoloader sometimes using leading backslash
...
PHPBB3-12314
2014-03-28 21:47:23 +01:00
Crizzo
28f17897b4
[ticket/11336] Adds 301 info to redirect
...
PHPBB3-11336
2014-03-28 19:36:12 +01:00
Crizzo
38d2efe829
[ticket/11336] Adds redirect for old "leaders" mode
...
PHPBB3-11336
2014-03-28 19:36:10 +01:00
Crizzo
c5eccedfb6
[ticket/11336] Changes language variabel LOGIN_EXPLAIN_LEADERS to _TEAM
...
PHPBB3-11336
2014-03-28 19:36:09 +01:00
Crizzo
76558fbce5
[ticket/11336] Changes "leaders"-mode to "team"-mode and so in test-file
...
PHPBB3-11336
2014-03-28 19:36:08 +01:00
Joas Schilling
e361896d07
Merge branch 'develop-ascraeus' into develop
...
* develop-ascraeus:
[ticket/12315] Fix invalid HTML in NO_SEARCH_INDEX in language/en/acp/common.php
2014-03-28 19:31:46 +01:00
Joas Schilling
e742d1ec26
Merge remote-tracking branch 'vsephpbb/ticket/12315' into develop-ascraeus
...
* vsephpbb/ticket/12315:
[ticket/12315] Fix invalid HTML in NO_SEARCH_INDEX in language/en/acp/common.php
2014-03-28 19:31:36 +01:00
Matt Friedman
e2c2692e9c
[ticket/12315] Fix invalid HTML in NO_SEARCH_INDEX in language/en/acp/common.php
...
PHPBB3-12315
2014-03-28 11:27:25 -07:00
Joas Schilling
c2214705a6
Merge branch 'develop-ascraeus' into develop
...
* develop-ascraeus:
[ticket/11666] Rewording POST_DELETED and
[ticket/11666] Removing MESSAGE_DELETED..
2014-03-28 17:43:13 +01:00
Joas Schilling
0be6582d7f
Merge branch 'ticket/suheb/11666' into develop-ascraeus
...
* ticket/suheb/11666:
[ticket/11666] Rewording POST_DELETED and
[ticket/11666] Removing MESSAGE_DELETED..
2014-03-28 17:42:34 +01:00
Suhaib Khan
96291d9e6e
[ticket/11666] Rewording POST_DELETED and
...
reverting removal of MESSAGE_DELETED.
PHPBB3-11666
2014-03-28 17:41:42 +01:00
Joas Schilling
f0c9240e8f
Merge branch 'develop-ascraeus' into develop
...
* develop-ascraeus:
[ticket/12311] Use British-English spelling of licence in lang file
[ticket/12311] Use valid composer schema - license - for extensions
2014-03-28 17:31:57 +01:00
Joas Schilling
ce6e3966cf
Merge remote-tracking branch 'vsephpbb/ticket/12311' into develop-ascraeus
...
* vsephpbb/ticket/12311:
[ticket/12311] Use British-English spelling of licence in lang file
[ticket/12311] Use valid composer schema - license - for extensions
2014-03-28 17:29:56 +01:00
Joas Schilling
a0f0ffc236
Merge branch 'develop-ascraeus' into develop
...
* develop-ascraeus:
[ticket/11230] Add missing last returns to dock block
[ticket/11230] Update cache driver dock blocks
[ticket/11230] Use inheritdoc in docblocks in cache drivers
2014-03-28 17:27:36 +01:00
Joas Schilling
968da05e51
Merge remote-tracking branch 'vsephpbb/ticket/11230' into develop-ascraeus
...
* vsephpbb/ticket/11230:
[ticket/11230] Add missing last returns to dock block
[ticket/11230] Update cache driver dock blocks
[ticket/11230] Use inheritdoc in docblocks in cache drivers
2014-03-28 17:27:14 +01:00
Matt Friedman
dab35589fe
[ticket/11230] Add missing last returns to dock block
...
PHPBB3-11230
2014-03-28 09:12:42 -07:00
Matt Friedman
368dd23d4b
[ticket/12311] Use British-English spelling of licence in lang file
...
PHPBB3-12311
2014-03-28 09:08:11 -07:00
Joas Schilling
95b0ee3724
Merge branch 'develop-ascraeus' into develop
...
* develop-ascraeus:
[ticket/11360] Updating default value of $display_online_list
[ticket/11360] Avoiding online list where not required
[ticket/11360] Change second parameter in page_header function
2014-03-28 17:07:50 +01:00
Joas Schilling
6af942740c
Merge remote-tracking branch 'geetakshi/ticket/11360' into develop-ascraeus
...
* geetakshi/ticket/11360:
[ticket/11360] Updating default value of $display_online_list
[ticket/11360] Avoiding online list where not required
[ticket/11360] Change second parameter in page_header function
2014-03-28 17:07:16 +01:00
Matt Friedman
ba9bc9c7dc
[ticket/12311] Use valid composer schema - license - for extensions
...
http://tracker.phpbb.com/browse/PHPBB3-12311
PHPBB3-12311
2014-03-27 23:27:30 -07:00
Joas Schilling
3bb843190f
Merge branch 'develop-ascraeus' into develop
...
* develop-ascraeus:
[ticket/12257] Use MyISAM in PHP 5.3 environment such that FULLTEXT tests run.
2014-03-27 14:33:20 +01:00
Joas Schilling
c256d7a88d
Merge branch 'develop-olympus' into develop-ascraeus
...
* develop-olympus:
2014-03-27 14:32:43 +01:00
Joas Schilling
252a8d4e9e
Merge remote-tracking branch 'bantu/ticket/12257-ascraeus' into develop-ascraeus
...
* bantu/ticket/12257-ascraeus:
[ticket/12257] Use MyISAM in PHP 5.3 environment such that FULLTEXT tests run.
2014-03-27 14:32:36 +01:00
Joas Schilling
40ed3f6776
Merge remote-tracking branch 'bantu/ticket/12257' into develop-olympus
...
* bantu/ticket/12257:
[ticket/12257] Use MyISAM in PHP 5.3 environment such that FULLTEXT tests run.
2014-03-27 14:31:23 +01:00
Nils Adermann
20422c174e
Merge branch 'develop-ascraeus' into develop
...
* develop-ascraeus:
[ticket/12310] Don't autocomplete SMTP user/pass on install
2014-03-26 23:36:18 -04:00
Nils Adermann
02c4d4ee7e
Merge branch 'develop-olympus' into develop-ascraeus
...
* develop-olympus:
[ticket/12310] Don't autocomplete SMTP user/pass on install
2014-03-26 23:35:57 -04:00
Nils Adermann
47ab801440
Merge remote-tracking branch 'marshalrusty/ticket/12310' into develop-olympus
...
* marshalrusty/ticket/12310:
[ticket/12310] Don't autocomplete SMTP user/pass on install
2014-03-26 23:35:48 -04:00
Yuriy Rusko
dc9ae231e5
[ticket/12310] Don't autocomplete SMTP user/pass on install
...
PHPBB3-12310
2014-03-26 23:16:39 -04:00
Andreas Fischer
1033a1fa12
Merge branch 'develop-ascraeus' into develop
...
* develop-ascraeus:
[ticket/12302] Added `--no-dev` to composer call in build.xml
[ticket/12302] Updated composer.phar to 1.0.0-alpha8
2014-03-25 17:34:19 +01:00
Andreas Fischer
5e688f9540
Merge branch 'develop-olympus' into develop-ascraeus
...
* develop-olympus:
[ticket/12302] Added `--no-dev` to composer call in build.xml
[ticket/12302] Updated composer.phar to 1.0.0-alpha8
2014-03-25 17:32:03 +01:00
Andreas Fischer
0b9752a594
Merge pull request #2183 from s9e/ticket/12302
...
Upgrade all composer.phar to 1.0.0-alpha8
* s9e/ticket/12302:
[ticket/12302] Added `--no-dev` to composer call in build.xml
[ticket/12302] Updated composer.phar to 1.0.0-alpha8
2014-03-25 17:27:15 +01:00
s9e
55e7459922
[ticket/12302] Added --no-dev to composer call in build.xml
...
PHPBB3-12302
2014-03-25 17:20:59 +01:00
s9e
53740111f6
[ticket/12302] Updated composer.phar to 1.0.0-alpha8
...
wget -N https://getcomposer.org/download/1.0.0-alpha8/composer.phar
PHPBB3-12302
2014-03-25 17:09:00 +01:00
Andreas Fischer
389bbe32d1
Merge pull request #2179 from bantu/ticket/12257
...
[ticket/12257] Use MyISAM in PHP 5.3 environment such that FULLTEXT test...
* bantu/ticket/12257:
[ticket/12257] Use MyISAM in PHP 5.3 environment such that FULLTEXT tests run.
Conflicts:
.travis.yml
2014-03-25 00:15:09 +01:00
Andreas Fischer
ca8fa03659
[ticket/12257] Use MyISAM in PHP 5.3 environment such that FULLTEXT tests run.
...
PHPBB3-12257
2014-03-24 21:42:06 +01:00
Joas Schilling
a0f8e79612
Merge branch 'develop-ascraeus' into develop
...
* develop-ascraeus:
[ticket/10174] Rename "Ban usernames" to "Ban users" in ACP
2014-03-24 20:58:56 +01:00
Joas Schilling
800c779403
Merge branch 'develop-olympus' into develop-ascraeus
...
* develop-olympus:
[ticket/10174] Rename "Ban usernames" to "Ban users" in ACP
2014-03-24 20:58:43 +01:00
Joas Schilling
574a9f4f2a
Merge remote-tracking branch 'schosser/ticket/10174' into develop-olympus
...
* schosser/ticket/10174:
[ticket/10174] Rename "Ban usernames" to "Ban users" in ACP
2014-03-24 20:58:11 +01:00
Joas Schilling
829f76c81d
Merge branch 'develop-ascraeus' into develop
...
* develop-ascraeus:
[ticket/12297] Delete user_from column on update
2014-03-24 20:46:33 +01:00
Joas Schilling
ce76a028c8
Merge remote-tracking branch 'Elsensee/ticket/12297' into develop-ascraeus
...
* Elsensee/ticket/12297:
[ticket/12297] Delete user_from column on update
2014-03-24 20:46:02 +01:00
geetakshi
76f7ef5c83
[ticket/11360] Updating default value of $display_online_list
...
PHPBB3-11360
2014-03-24 00:12:40 +05:30
Oliver Schramm
ccf400ef0f
[ticket/12297] Delete user_from column on update
...
PHPBB3-12297
2014-03-23 15:53:24 +01:00
