makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-11 05:48:51 +00:00
Code Issues Projects Releases Packages Wiki Activity
phpbb/phpBB
History
Andreas Fischer b78ae290e8 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/13553] Add a method to the controller helper to display a message
  [prep-release-3.1.3] Add changelog for 3.1.3-RC1
  [prep-release-3.1.3] Prepare Changelog
  [prep-release-3.1.3] Add migration for 3.1.3-RC1
  [prep-release-3.1.3] Update version to 3.1.2-RC1

Conflicts:
	build/build.xml
	phpBB/includes/constants.php
	phpBB/install/schemas/schema_data.sql
	phpBB/styles/prosilver/style.cfg
	phpBB/styles/subsilver2/style.cfg
2015-01-30 13:14:33 +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/13450] Type-hint return value of $phpbb_container->get() 2015-01-12 20:19:07 +01:00
cache
config Merge pull request #3275 from nickvergessen/ticket/13487 2015-01-22 18:16:30 +01:00
develop [ticket/13468] Update calls to add_log() 2015-01-27 18:34:33 +01:00
docs Merge branch 'develop-ascraeus' into develop 2015-01-30 13:14:33 +01:00
download [ticket/13414] Set Content-Length header only if status is not 304 2015-01-28 15:50:48 +01:00
ext [ticket/11163] Add ext/index.htm 2014-05-15 14:11:11 +02:00
files
images
includes Merge branch 'prep-release-3.1.3' into develop-ascraeus 2015-01-30 13:10:38 +05:30
install Merge branch 'develop-ascraeus' into develop 2015-01-30 13:14:33 +01:00
language Merge pull request #3225 from prototech/ticket/13302 2014-12-27 14:12:23 +01:00
phpbb Merge branch 'develop-ascraeus' into develop 2015-01-30 13:14:33 +01:00
store
styles/prosilver [prep-release-3.1.3] Update version to 3.1.2-RC1 2015-01-26 19:42:06 +01: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/13450] Type-hint return value of $phpbb_container->get() 2015-01-12 20:19:07 +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/13450] Type-hint return value of $phpbb_container->get() 2015-01-12 20:19:07 +01:00
faq.php [ticket/12594] Remove @package tags and update file headers 2014-05-27 20:51:13 +02:00
feed.php [ticket/13450] Type-hint return value of $phpbb_container->get() 2015-01-12 20:19:07 +01:00
index.php [ticket/13450] Type-hint return value of $phpbb_container->get() 2015-01-12 20:19:07 +01:00
mcp.php [ticket/13142] Extra space before the comment block 2014-11-29 10:40:35 +00:00
memberlist.php [ticket/13450] Type-hint return value of $phpbb_container->get() 2015-01-12 20:19:07 +01:00
posting.php [ticket/13468] Update calls to add_log() 2015-01-27 18:34:33 +01:00
report.php [ticket/13450] Type-hint return value of $phpbb_container->get() 2015-01-12 20:19:07 +01:00
search.php [ticket/13450] Type-hint return value of $phpbb_container->get() 2015-01-12 20:19:07 +01:00
ucp.php [ticket/13468] Update calls to add_log() 2015-01-27 18:34:33 +01:00
viewforum.php [ticket/13450] Type-hint return value of $phpbb_container->get() 2015-01-12 20:19:07 +01:00
viewonline.php [ticket/13450] Type-hint return value of $phpbb_container->get() 2015-01-12 20:19:07 +01:00
viewtopic.php Merge pull request #3289 from MGaetan89/ticket/13450 2015-01-14 12:34:28 +01:00
web.config