phpbb/phpBB
Joas Schilling 22948127f8 Merge branch 'develop-ascraeus' into develop
Conflicts:
	phpBB/styles/subsilver2/template/index.htm
	phpBB/styles/subsilver2/template/overall_header.html
	phpBB/styles/subsilver2/template/simple_header.html
	phpBB/styles/subsilver2/template/ucp_pm_viewmessage_print.html
	phpBB/styles/subsilver2/template/viewtopic_print.html
	phpBB/styles/subsilver2/theme/images/index.htm
2014-12-27 13:35:23 +01:00
..
adm [ticket/13319] Add missing table tags 2014-11-24 20:48:15 +01:00
assets [ticket/13277] Force IE to not cache AJAX requests. 2014-11-18 00:41:57 -08:00
bin [ticket/12620] Add support of the environments for the ext routing files 2014-11-20 20:15:45 +01:00
cache [ticket/11700] Add back accidently deleted file in cache dir 2013-09-17 16:18:04 +02:00
config Merge pull request #3170 from Nicofuma/ticket/13266-develop 2014-12-27 13:31:16 +01:00
develop [ticket/13421] Move tools to subdirectory 2014-12-06 17:10:07 +01:00
docs Merge branch 'develop-ascraeus' into develop 2014-11-25 16:47:22 +01:00
download [ticket/12620] Fix download/file.php and app.php outside of the root_path 2014-11-20 20:58:35 +01:00
ext [ticket/11163] Add ext/index.htm 2014-05-15 14:11:11 +02:00
files
images
includes [ticket/13421] Move tools to subdirectory 2014-12-06 17:10:07 +01:00
install [ticket/13421] Move tools to subdirectory 2014-12-06 17:10:07 +01:00
language Merge pull request #3159 from Crizz0/ticket/13357 2014-12-27 13:29:04 +01:00
phpbb Merge pull request #3170 from Nicofuma/ticket/13266-develop 2014-12-27 13:31:16 +01:00
store
styles/prosilver Merge branch 'develop-ascraeus' into develop 2014-12-27 13:35:23 +01:00
.htaccess Merge branch 'develop-olympus' into develop-ascraeus 2014-05-03 00:37:28 +02:00
app.php [ticket/12620] Fix tests 2014-11-21 17:38:13 +01:00
common.php [ticket/12620] Adds a yaml config file 2014-11-20 20:59:48 +01:00
composer.json [ticket/13063] Adds Twig routing extension 2014-11-20 16:09:44 +01:00
composer.lock [ticket/13063] Adds Twig routing extension 2014-11-20 16:09:44 +01:00
cron.php [ticket/12898] Call garbage_collection() at the end of cron.php 2014-07-28 14:45:39 +02:00
faq.php [ticket/12594] Remove @package tags and update file headers 2014-05-27 20:51:13 +02:00
feed.php [ticket/13045] Remove Pragma headers 2014-09-17 20:10:01 +02:00
index.php [ticket/12885] New if for Index-page - board-index-text switch 2014-11-22 00:09:38 +01:00
mcp.php [ticket/12612] Prefix get_*_data() with phpbb_ and delete unused global 2014-06-23 22:58:41 +02:00
memberlist.php [ticket/13265] Don't show link to edit own profile to those without permission 2014-11-05 21:06:32 +01:00
posting.php Merge pull request #3127 from omniError/ticket/13323 2014-11-21 23:33:45 +01:00
report.php [ticket/12990] Use the full services name for the notification's types 2014-08-16 21:46:03 +02:00
search.php [ticket/13400] Information text if the server load id high at search 2014-12-06 13:42:16 +01:00
ucp.php [ticket/12612] Move function from ucp.php to functions_user.php 2014-06-18 16:57:13 +02:00
viewforum.php [ticket/13241] Fix pagination with global announcements 2014-10-29 13:42:42 +01:00
viewonline.php [ticket/13051] Fix core event name 2014-09-09 13:12:29 -07:00
viewtopic.php [ticket/13326] fix CS 2014-11-11 10:51:03 -06:00
web.config [feature/controller] Remove URL rewriting by default 2012-11-16 17:06:02 -05:00