makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-10 13:28:55 +00:00
Code Issues Projects Releases Packages Wiki Activity
phpbb/phpBB
History
Nathaniel Guse 193670d7a9 Merge branch 'develop-olympus' into develop 
# By Andreas Fischer
# Via Andreas Fischer (1) and Nathaniel Guse (1)
* develop-olympus:
  [ticket/11662] Typos: occured -> occurred

Conflicts:
	tests/template/template_test.php
2013-07-12 10:37:52 -05:00
..
adm Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/twig 2013-07-01 12:03:24 -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 [feature/twig] Remove style dependency for controller helper 2013-07-05 12:11:59 -05:00
develop [ticket/11413] Undo editing the user_notifications table 2013-04-29 21:22:07 -05:00
docs Merge branch 'develop-olympus' into develop 2013-06-21 17:12:58 +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-olympus' into develop 2013-07-12 10:37:52 -05:00
install Merge remote-tracking branch 'remotes/nickv/ticket/8319' into develop-olympus 2013-07-11 10:09:53 -05:00
language Merge branch 'develop-olympus' into develop 2013-07-12 10:37:52 -05:00
store
styles [ticket/11388] INCLUDECSS 2013-07-11 15:31:55 -05: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 [feature/twig] Change composer to load Twig 1.13.* 2013-06-24 13:40:05 -05:00
composer.lock [feature/twig] Change composer to load Twig 1.13.* 2013-06-24 13:40:05 -05:00
cron.php [ticket/11189] Replace DEBUG_EXTRA with DEBUG 2012-11-10 10:45:02 -06:00
faq.php
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/9975] Moved a few E_USER_ERROR errors to /language 2013-04-23 09:55:36 -07:00
memberlist.php [ticket/11454] Use set_addresses in other applicable areas 2013-04-24 15:34:12 -05:00
posting.php Merge branch 'develop-olympus' into develop 2013-05-06 22:11:33 +02:00
report.php Merge branch 'ticket/11566' into ticket/11566-develop 2013-07-01 23:25:29 +05:30
search.php [ticket/11023] Fix additional whitespaces that were added by PHPBB3-10968 2012-10-17 23:34:37 +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/10954] Change behavior of marking topics/forums 2012-12-14 15:46:45 +01:00
viewonline.php [ticket/11259] adm_relative_path -> phpbb_adm_relative_path 2012-12-09 19:29:51 -06:00
viewtopic.php Merge branch 'develop-olympus' into develop 2013-07-11 13:15:26 -05:00
web.config [feature/controller] Remove URL rewriting by default 2012-11-16 17:06:02 -05:00