Andreas Fischer f9c0a6b96e Merge pull request #2526 from Nicofuma/ticket/12639 ... [ticket/12639] Delete entry in admin-log leads to mysql-error * Nicofuma/ticket/12639: [ticket/12639] Add a space in the code generated by generate_sql_keyword() [ticket/12639] Handle $conditions['keywords'] outside of the loop [ticket/12639] Don't make a copy of $marked when deleting logs in acp_logs [ticket/12639] Send a correct IN entry when deleting marked logs [ticket/12639] Use assertSame [ticket/12639] Remove old commented tests [ticket/12639] Order the results correctly in the test [ticket/12639] Fix tests on postgres [ticket/12639] Update tests to use a dataProvider [ticket/12639] Add a test case with an empty keywords list [ticket/12639] Delete entry in admin-log leads to mysql-error		2014-06-04 23:59:20 +02:00
..
adm	[ticket/12641] Use jQuery's trim() method. IE8 does not support the native one	2014-05-31 10:56:08 -07:00
assets	[ticket/12155] Make the buttons bigger on touch devices.	2014-05-27 07:17:47 -07:00
bin	[ticket/12594] Remove @package tags and update file headers	2014-05-27 20:51:13 +02:00
cache	[ticket/11700] Add back accidently deleted file in cache dir	2013-09-17 16:18:04 +02:00
config	Merge pull request #2447 from n-aleha/ticket/11467	2014-05-30 23:01:19 +02:00
develop	[ticket/12594] Update file header in non-php files	2014-05-30 15:31:15 +02:00
docs	[develop-ascraeus] Correct capitalisation of NeoThermic.	2014-05-31 00:25:28 +02:00
download	[ticket/12594] Remove @package tags and update file headers	2014-05-27 20:51:13 +02:00
ext	[ticket/11163] Add ext/index.htm	2014-05-15 14:11:11 +02:00
files
images
includes	Merge pull request #2526 from Nicofuma/ticket/12639	2014-06-04 23:59:20 +02:00
install	[prep-release-3.1.0-b4] Update phpBB Version for b5 development	2014-05-30 17:52:38 +02:00
language	Merge pull request #2357 from Nicofuma/ticket/11942	2014-05-30 23:04:02 +02:00
phpbb	Merge pull request #2526 from Nicofuma/ticket/12639	2014-06-04 23:59:20 +02:00
store
styles	Merge remote-tracking branch 'prototech/ticket/12640' into develop-ascraeus	2014-06-04 23:25:48 +02:00
.htaccess	Merge branch 'develop-olympus' into develop-ascraeus	2014-05-03 00:37:28 +02:00
app.php	[ticket/12594] Remove @package tags and update file headers	2014-05-27 20:51:13 +02:00
common.php	[ticket/12594] Remove @package tags and update file headers	2014-05-27 20:51:13 +02:00
composer.json	Merge branch 'task/sami' into task/sami-ascraeus	2014-05-16 18:13:45 +02:00
composer.lock	Merge branch 'task/sami' into task/sami-ascraeus	2014-05-16 18:13:45 +02:00
cron.php	Merge pull request #2523 from bantu/ticket/12597	2014-05-30 22:52:01 +02:00
faq.php	[ticket/12594] Remove @package tags and update file headers	2014-05-27 20:51:13 +02:00
feed.php	[ticket/12594] Remove @package tags and update file headers	2014-05-27 20:51:13 +02:00
index.php	[ticket/12594] Remove @package tags and update file headers	2014-05-27 20:51:13 +02:00
mcp.php	[ticket/12594] Remove @package tags and update file headers	2014-05-27 20:51:13 +02:00
memberlist.php	[ticket/12594] Remove @package tags and update file headers	2014-05-27 20:51:13 +02:00
posting.php	[ticket/12640] Preserve the active tab when previewing in posting page.	2014-05-31 10:12:24 -07:00
report.php	[ticket/12594] Remove @package tags and update file headers	2014-05-27 20:51:13 +02:00
search.php	[ticket/12594] Remove @package tags and update file headers	2014-05-27 20:51:13 +02:00
ucp.php	[ticket/12594] Remove @package tags and update file headers	2014-05-27 20:51:13 +02:00
viewforum.php	[ticket/12594] Remove @package tags and update file headers	2014-05-27 20:51:13 +02:00
viewonline.php	[ticket/12594] Remove @package tags and update file headers	2014-05-27 20:51:13 +02:00
viewtopic.php	[ticket/12566] "Private messages" should be "Send pivate message"	2014-06-02 13:36:49 +02:00
web.config	[feature/controller] Remove URL rewriting by default	2012-11-16 17:06:02 -05:00