makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-07 20:08:53 +00:00
Code Issues Projects Releases Packages Wiki Activity
phpbb/phpBB
History
Nils Adermann 0ef95a7009 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/11112] Do not change opensource.org link to https
  [ticket/11112] Use https for user-visible links to phpbb.com

Conflicts:
	phpBB/language/en/install.php
	phpBB/language/en/ucp.php
2013-07-13 13:16:58 -04:00
..
adm Merge remote-tracking branch 'remotes/Hardolaf/ticket/11626' into develop 2013-07-12 14:59:43 -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 [ticket/9520] Removed per directory web.config files. 2010-05-03 19:31:40 +02:00
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 13:16:58 -04:00
download Merge branch 'ticket/10820' into ticket/10820-develop 2013-06-13 22:12:39 +05:30
files [ticket/9520] Removed per directory web.config files. 2010-05-03 19:31:40 +02:00
images [ticket/9520] Removed per directory web.config files. 2010-05-03 19:31:40 +02:00
includes Merge branch 'develop-olympus' into develop 2013-07-13 13:16:58 -04:00
install Merge remote-tracking branch 'phpbb/develop' into ticket/9657 2013-07-13 09:36:24 -04:00
language Merge branch 'develop-olympus' into develop 2013-07-13 13:16:58 -04:00
store [ticket/9520] Removed per directory web.config files. 2010-05-03 19:31:40 +02:00
styles Merge remote-tracking branch 'phpbb/develop' into ticket/9657 2013-07-13 09:36:24 -04:00
.htaccess [feature/controller] Remove url rewriting until we use pathinfo in controllers 2012-11-18 13:32:54 -05:00
app.php [feature/controller] Check for proper status codes from controllers 2012-11-19 12:37:20 -05:00
common.php [ticket/11335] Replace "$phpEx" with $phpEx 2013-04-24 20:39:24 -05: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/10679] Use module_auth to limit access to the module 2012-12-06 16:33:12 +01: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