Andreas Fischer
7d8e80241c
Merge remote-tracking branch 'EXreaction/ticket/11718' into develop
...
* EXreaction/ticket/11718:
[ticket/11718] Quick test for fixes in ELSEIF
[ticket/11718] Twig lexer only correcting statements in IF, not ELSEIF
Conflicts:
tests/template/template_test.php
2013-07-23 04:24:05 +02:00
Andreas Fischer
017d809e74
Merge remote-tracking branch 'nickvergessen/ticket/11733' into develop
...
* nickvergessen/ticket/11733:
[ticket/11733] Fix "Illegal offset type" Warning caused by overall feed
[ticket/11733] Add browse test for feed.php
2013-07-23 01:17:13 +02:00
Joas Schilling
10ba1e73da
[ticket/11733] Fix "Illegal offset type" Warning caused by overall feed
...
PHPBB3-11733
2013-07-23 00:59:51 +02:00
Andreas Fischer
c2d919f12d
Merge remote-tracking branch 'asperous/ticket/11731' into develop
...
* asperous/ticket/11731:
[ticket/11731] Remove static calls to captcha garbage collector
2013-07-23 00:07:38 +02:00
Andy Chase
80f81dd0d2
[ticket/11731] Remove static calls to captcha garbage collector
...
PHPBB3-11731
2013-07-22 15:04:30 -07:00
Joas Schilling
aa77367267
[ticket/11728] Replace topic_approved with topic_visibility
...
PHPBB3-11728
2013-07-22 22:54:55 +02:00
Nathan Guse
127ee62edd
Merge pull request #1589 from marc1706/ticket/11717
...
[ticket/11717] Use topic_posts_approved instead of topic_replies
2013-07-22 12:20:17 -07:00
Nathan Guse
b71038486e
Merge pull request #1513 from nickvergessen/ticket/11582
...
Ticket/11582 Split permission logic from translations
2013-07-22 11:28:55 -07:00
Marc Alexander
603dc1f786
[ticket/11717] Use topic_posts_approved instead of topic_replies
...
Due to the move to soft-delete, the topic_replies column no longer exists
in the topics table. Instead, the column topic_posts_approved should be used.
PHPBB3-11717
2013-07-20 21:21:36 +02:00
Nathaniel Guse
375976eb38
[ticket/11707] Twig DEFINE not working as expected
...
PHPBB3-11707
2013-07-19 14:12:28 -05:00
Nathaniel Guse
b92f660ed3
[ticket/11718] Twig lexer only correcting statements in IF, not ELSEIF
...
PHPBB3-11718
2013-07-19 13:08:41 -05:00
Marc Alexander
a0e5f83311
[ticket/11706] Use @ to suppress errors for getimagesize in remote avatar
...
PHPBB3-11706
2013-07-14 15:13:09 -04:00
Joas Schilling
e4a5ce307d
[ticket/11582] Test the event and and fix it.
...
PHPBB3-11582
2013-07-14 12:55:03 -04:00
Joas Schilling
9c72bbe284
[ticket/11582] Move file to new directory
...
PHPBB3-11582
2013-07-14 12:04:04 -04:00
Andreas Fischer
58a9e975f8
Merge remote-tracking branch 'galaxyAbstractor/ticket/11697' into develop
...
* galaxyAbstractor/ticket/11697:
[ticket/11697] author_search() used incorrect parameter
2013-07-14 17:41:31 +02:00
Joas Schilling
f302cbe175
[ticket/11696] Move file to new directory
...
PHPBB3-11696
2013-07-14 10:16:15 -04:00
Joas Schilling
057d860d07
[ticket/11696] Rename db_tools.php so it can be autoloaded
...
PHPBB3-11696
2013-07-14 10:10:05 -04:00
Nils Adermann
7030578bbe
[ticket/11698] Moving all autoloadable files to phpbb/
...
PHPBB3-11698
2013-07-14 01:32:34 -04:00
