phpbb/phpBB
Andreas Fischer 1a1fb4a915 Merge branch 'develop-olympus' into develop-ascraeus
* develop-olympus:
  [ticket/12120] Remove imkingdavid from active authors

Conflicts:
	phpBB/docs/AUTHORS
2014-07-11 12:03:02 +02:00
..
adm [ticket/12810] Use correct template vars for shadow pruning settings 2014-07-06 18:03:09 +02:00
assets [ticket/12013] Prevent the dropdown scrollbar from overlapping the content. 2014-07-04 00:56:27 -07:00
bin [ticket/12775] Fix container_builder 2014-07-07 01:02:36 +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 #2671 from Nicofuma/ticket/12775 2014-07-11 11:49:51 +02:00
develop [ticket/12446] Unnecessary db connect inphpbb_bootstrap_enabled_exts 2014-06-26 21:09:19 +02:00
docs Merge branch 'develop-olympus' into develop-ascraeus 2014-07-11 12:03:02 +02:00
download [ticket/12775] Fix container_builder 2014-07-07 01:02:36 +02:00
ext [ticket/11163] Add ext/index.htm 2014-05-15 14:11:11 +02:00
files
images
includes Merge pull request #2701 from Nicofuma/ticket/12818 2014-07-11 11:53:38 +02:00
install [ticket/12775] Set dbal.conn.driver as synthetic during installation 2014-07-07 01:10:24 +02:00
language Merge pull request #2656 from nickvergessen/ticket/12197 2014-07-07 19:00:33 +02:00
phpbb Merge pull request #2671 from Nicofuma/ticket/12775 2014-07-11 11:49:51 +02:00
store
styles Merge remote-tracking branch 'paybas/ticket/12804' into develop-ascraeus 2014-07-08 15:59:23 +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/12775] Update doc blocks 2014-07-07 01:02:37 +02:00
composer.json [ticket/12788] Force 2.3.* on symfony dependencies 2014-07-03 20:50:06 +05:30
composer.lock [ticket/12788] Force 2.3.* on symfony dependencies 2014-07-03 20:50:06 +05:30
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/12612] Prefix get_*_data() with phpbb_ and delete unused global 2014-06-23 22:58:41 +02:00
memberlist.php [ticket/12804] Disable jabber from memberlist sort options 2014-07-08 00:42:01 +02:00
posting.php [ticket/12612] Prefix upload_popup() with phpbb_ 2014-06-23 22:49:00 +02:00
report.php [ticket/12594] Remove @package tags and update file headers 2014-05-27 20:51:13 +02:00
search.php [ticket/12446] Unnecessary db connect inphpbb_bootstrap_enabled_exts 2014-06-26 21:09:19 +02: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/12594] Remove @package tags and update file headers 2014-05-27 20:51:13 +02:00
viewonline.php Merge remote-tracking branch 'github-nicofuma/ticket/12446' into develop-ascraeus 2014-07-04 21:08:20 +02:00
viewtopic.php [ticket/12013] Fix functional tests and sniffer issue. 2014-07-04 01:22:32 -07:00
web.config [feature/controller] Remove URL rewriting by default 2012-11-16 17:06:02 -05:00