phpbb/phpBB
Marc Alexander d30b5207b8 Merge branch '3.1.x'
Conflicts:
	phpBB/styles/subsilver2/template/attachment.html
2015-08-22 08:11:15 +02:00
..
adm Merge branch '3.1.x' 2015-08-17 09:39:16 +02:00
assets Merge branch '3.1.x' 2015-08-05 13:41:59 +02:00
bin [ticket/13740] Use language service in console application 2015-07-24 18:05:10 +02:00
cache
config Merge branch '3.1.x' 2015-08-08 22:23:03 +02:00
develop [ticket/8708] Add f_announce_global permission 2015-07-19 21:26:47 +02:00
docs Merge branch '3.1.x' 2015-08-22 08:11:15 +02:00
download [ticket/13770] Wither interface for container_builder 2015-05-14 23:04:03 +02:00
ext [ticket/11163] Add ext/index.htm 2014-05-15 14:11:11 +02:00
files
images
includes Merge branch '3.1.x' 2015-08-09 10:31:43 +02:00
install Merge pull request #3698 from s9e/ticket/13935 2015-08-05 12:59:55 +02:00
install_new [ticket/14052] Translate installer commands 2015-07-27 11:40:12 +02:00
language Merge remote-tracking branch 'Nicofuma/ticket/12692' 2015-08-07 10:07:45 +02:00
phpbb Merge branch '3.1.x' 2015-08-20 15:48:18 +02:00
store
styles/prosilver Merge branch '3.1.x' 2015-08-22 08:11:15 +02:00
.htaccess Merge branch 'develop-olympus' into develop-ascraeus 2014-05-03 00:37:28 +02:00
app.php [ticket/13450] Type-hint return value of $phpbb_container->get() 2015-01-12 20:19:07 +01:00
common.php [ticket/13740] Restore original install folder 2015-07-08 01:28:10 +02:00
composer.json Merge branch '3.1.x' 2015-05-30 10:58:40 +02:00
composer.lock [ticket/14096] Update Symfony 2015-08-12 14:48:06 +02:00
cron.php [ticket/13455] Update calls to request_var() 2015-02-03 20:50:40 +01:00
faq.php [ticket/13844] FAQ in new controller format 2015-05-16 22:09:05 +02:00
feed.php [ticket/13455] Update calls to request_var() 2015-02-03 20:50:40 +01:00
index.php [ticket/11444] Moving the in-board notifications to a method class 2015-07-13 22:41:13 +02:00
mcp.php [ticket/8708] Apply permission 'f_announce_global' 2015-07-19 21:26:47 +02:00
memberlist.php [ticket/13455] Remove request_var() references from comments 2015-02-03 20:56:48 +01:00
posting.php Merge pull request #3781 from Elsensee/ticket/8708-2 2015-07-22 11:30:50 +02:00
report.php [ticket/13654] Moving reporting into controller 2015-04-16 11:29:11 +02:00
search.php Merge branch '3.1.x' 2015-07-23 10:20:10 +02:00
ucp.php [ticket/13455] Update calls to request_var() 2015-02-03 20:50:40 +01:00
viewforum.php Merge branch '3.1.x' 2015-03-06 13:45:12 +01:00
viewonline.php [ticket/13844] FAQ in new controller format 2015-05-16 22:09:05 +02:00
viewtopic.php [ticket/8708] Apply permission 'f_announce_global' 2015-07-19 21:26:47 +02:00
web.config [ticket/13271] Fix URL Rewriting on IIS7 2015-03-23 18:23:12 +01:00