phpbb/phpBB
Joas Schilling c49e7387d6 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/12037] Fix hard-coded text in acp_inactive.html.

Conflicts:
	phpBB/adm/style/acp_inactive.html
2013-11-26 11:33:17 +01:00
..
adm Merge branch 'develop-olympus' into develop 2013-11-26 11:33:17 +01:00
assets Merge pull request #1856 from prototech/ticket/12001 2013-11-21 13:56:03 -08:00
bin [ticket/11998] Make phpbbcli executable and add shebang 2013-11-12 00:12:34 +01:00
cache [ticket/11700] Add back accidently deleted file in cache dir 2013-09-17 16:18:04 +02:00
config [ticket/12008] Update the run time value for the prune notifications cron task 2013-11-14 01:05:58 -08:00
develop [ticket/11998] Turn develop/extensions.php into console commands. 2013-11-05 21:40:42 +01:00
docs Merge pull request #1878 from blitze/ticket/12024 2013-11-21 13:26:24 -08:00
download [ticket/11986] Fix undefined index: poster_id in file.php. 2013-10-29 06:02:04 -07:00
files
images
includes Merge pull request #1854 from Pico88/ticket/12005 2013-11-21 14:01:23 -08:00
install [prep-release-3.1.0-a2] Update version to 3.1.0-a3-dev in install and constant 2013-11-19 01:37:31 +01:00
language Merge branch 'develop-olympus' into develop 2013-11-26 11:33:17 +01:00
phpbb Merge pull request #1854 from Pico88/ticket/12005 2013-11-21 14:01:23 -08:00
store
styles [ticket/12028] Replace L_COLON with literal colon 2013-11-21 23:20:16 +01:00
.htaccess [ticket/11215] Remove unnecessary comment 2013-09-02 15:34:14 -07:00
app.php [ticket/11852] Split filesystem and path_helper into 2 classes 2013-09-26 15:34:44 +02:00
common.php [ticket/11850] Need symfony request and filesystem setup globally for session 2013-09-30 18:44:02 -05:00
composer.json [ticket/11998] Add symfony/console as dependency. 2013-11-03 01:52:40 +01:00
composer.lock [ticket/11998] Add symfony/console as dependency. 2013-11-03 01:52:40 +01:00
cron.php [ticket/11189] Replace DEBUG_EXTRA with DEBUG 2012-11-10 10:45:02 -06:00
faq.php [ticket/9916] Updating header license and removing Version $Id$ 2011-12-31 13:32:52 +00:00
feed.php [ticket/11481] Move prepended slash from calls into function 2013-06-06 20:35:38 +02:00
index.php [ticket/11103] Instantiate $phpbb_notifications as needed 2012-12-13 19:19:40 -06:00
mcp.php [ticket/11700] Move all recent code to namespaces 2013-09-16 00:25:27 +02:00
memberlist.php Merge pull request #1654 from rechosen/ticket/11786 2013-10-03 20:22:41 -07:00
posting.php [task/code-sniffer] Replace spaces with tabs. 2013-10-30 13:37:29 +01:00
report.php [ticket/11763] Add missing variable when reporting a PM to avoid SQL Error 2013-08-03 17:30:28 +02:00
search.php Merge remote-tracking branch 'github-phpbb/develop' into ticket/11700 2013-09-16 01:24:05 +02:00
ucp.php Merge remote-tracking branch 'github-phpbb/develop' into ticket/11700 2013-09-16 01:24:05 +02:00
viewforum.php Merge remote-tracking branch 'github-phpbb/develop' into ticket/11700 2013-09-16 01:24:05 +02:00
viewonline.php [ticket/12015] Add some parameters to viewonline events 2013-11-13 23:44:57 +01:00
viewtopic.php [ticket/12015] Fix variable name and event version 2013-11-21 23:42:40 +01:00
web.config [feature/controller] Remove URL rewriting by default 2012-11-16 17:06:02 -05:00