phpbb/phpBB
Marc Alexander d3ca327f2c Merge branch '3.1.x'
Conflicts:
	phpBB/styles/prosilver/template/viewtopic_body.html
	phpBB/styles/subsilver2/template/viewtopic_body.html
2016-01-07 16:28:44 +01:00
..
adm [ticket/14380] Maintain consistent template var paths in 3.2 installer 2015-12-22 21:52:05 +01:00
assets [ticket/14310] Put progress percentage inside span and make more visible 2015-12-07 16:51:39 +01:00
bin Merge pull request #3857 from Nicofuma/ticket/14124 2015-10-07 14:47:23 +02:00
cache
config [ticket/14250] Change token_storage class to fit changed interface 2016-01-04 03:38:28 +01:00
develop [ticket/14358] Includes the composer autoloader in create_schema_files.php 2015-12-14 22:13:23 +01:00
docs Merge branch '3.1.x' 2016-01-07 16:28:44 +01:00
download Merge branch '3.1.x' 2015-10-11 20:27:47 +02:00
ext
files
images
includes Merge branch '3.1.x' 2016-01-06 13:31:15 +01:00
install [release-3.2.0-a2] Update version to 3.2.0-a3 2015-12-19 17:34:46 +01:00
language Merge branch '3.1.x' 2015-12-26 22:10:41 +01:00
phpbb Merge pull request #4000 from Elsensee/ticket/14250 2016-01-07 13:56:42 +01:00
store
styles Merge branch '3.1.x' 2016-01-07 16:28:44 +01:00
.htaccess
app.php [ticket/13450] Type-hint return value of $phpbb_container->get() 2015-01-12 20:19:07 +01:00
common.php [ticket/14177] Uses Symfony's Debug ErrorHandler in development environment 2015-12-11 21:05:53 +01:00
composer.json [ticket/14250] Added symfony/debug as requirement 2016-01-06 16:06:27 +01:00
composer.lock [ticket/14250] Added symfony/debug as requirement 2016-01-06 16:06:27 +01: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/13645] Move the feeds to controllers 2015-08-23 22:36:10 +02:00
index.php Merge branch '3.1.x' 2015-11-12 09:11:37 +01:00
mcp.php [ticket/8708] Apply permission 'f_announce_global' 2015-07-19 21:26:47 +02:00
memberlist.php Merge branch '3.1.x' 2015-11-26 14:45:36 +01:00
posting.php Merge branch '3.1.x' 2015-10-14 16:27:02 +02:00
report.php [ticket/13654] Moving reporting into controller 2015-04-16 11:29:11 +02:00
search.php [ticket/14234] Get rid of undefined variables 2015-10-12 21:56:09 +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-11-24 21:46:01 +01:00
viewonline.php Merge branch '3.1.x' 2015-10-12 09:20:13 +02:00
viewtopic.php Merge branch '3.1.x' 2015-11-26 14:27:57 +01:00
web.config [ticket/13271] Fix URL Rewriting on IIS7 2015-03-23 18:23:12 +01:00