phpbb/phpBB
David King 9485eea098 Merge branch 'develop' into ticket/11215
* develop:
  [ticket/11694] Do not locate assets with root path
2013-07-14 00:34:49 -04:00
..
adm [ticket/11675] Fix template loop 2013-07-13 16:25:08 -05:00
assets/javascript Merge remote-tracking branch 'remotes/cyberalien/feature/editor-code-tabs' into develop 2013-06-06 14:07:27 -05:00
cache
config Merge remote-tracking branch 'phpbb/develop' into ticket/9657 2013-07-13 09:36:24 -04:00
develop Merge remote-tracking branch 'phpbb/develop' into feature/softdelete-1-permission 2013-07-11 11:41:48 +02:00
docs Merge branch 'develop-olympus' into develop 2013-07-13 19:30:57 +02:00
download [ticket/10820] fix if condition to check for IE 2013-06-14 00:29:06 +05:30
files
images
includes Merge branch 'develop' into ticket/11215 2013-07-14 00:34:49 -04:00
install [ticket/11687] Add assets_version to phpbb_config 2013-07-13 13:10:21 -04:00
language Merge branch 'develop-olympus' into develop 2013-07-13 13:16:58 -04:00
store
styles Merge pull request #1429 from cyberalien/ticket/11553 2013-07-13 14:20:23 -07:00
.htaccess [feature/controller] Remove url rewriting until we use pathinfo in controllers 2012-11-18 13:32:54 -05:00
app.php [ticket/11215] Correct paths when path info is used for controller access 2013-07-06 23:20:21 -04:00
common.php [ticket/11215] Correct paths when path info is used for controller access 2013-07-06 23:20:21 -04:00
composer.json Merge branch 'develop-olympus' into develop 2013-07-13 10:28:02 -05:00
composer.lock Merge branch 'develop-olympus' into develop 2013-07-13 10:28:02 -05: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/9657] Use the service instead of the static class 2013-07-11 14:24:07 +02:00
memberlist.php Merge remote-tracking branch 'phpbb/develop' into feature/softdelete-1-permission 2013-07-11 11:41:48 +02:00
posting.php [ticket/9657] Use the service instead of the static class 2013-07-11 14:24:07 +02:00
report.php Merge branch 'ticket/11566' into ticket/11566-develop 2013-07-01 23:25:29 +05:30
search.php [ticket/9657] Use the service instead of the static class 2013-07-11 14:24:07 +02:00
ucp.php [ticket/11685] Remove logout confirmation page 2013-07-13 12:27:00 -04:00
viewforum.php [ticket/9657] Remove last references to m_restore permission 2013-07-12 07:24:35 -04:00
viewonline.php [ticket/11259] adm_relative_path -> phpbb_adm_relative_path 2012-12-09 19:29:51 -06:00
viewtopic.php Merge remote-tracking branch 'phpbb/develop' into ticket/9657 2013-07-13 09:36:24 -04:00
web.config [feature/controller] Remove URL rewriting by default 2012-11-16 17:06:02 -05:00