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
Nathan Guse a2f6e494f3 Merge remote-tracking branch 'remotes/brunoais/ticket/11171' into develop 
# By Bruno Ais
# Via Bruno Ais
* remotes/brunoais/ticket/11171:
  [ticket/11171] Moved the DB schema changes to its place
  [ticket/11171] Cleanup of leftovers
  [ticket/11171] Adapted the code in report.php
  [ticket/11171] Use the options stored to decide how to show it
  [ticket/11171] DB changes for the update
  [ticket/11171] DB additions for these changes

Conflicts:
	phpBB/install/schemas/firebird_schema.sql
	phpBB/install/schemas/mssql_schema.sql
	phpBB/install/schemas/mysql_40_schema.sql
	phpBB/install/schemas/mysql_41_schema.sql
	phpBB/install/schemas/oracle_schema.sql
	phpBB/install/schemas/postgres_schema.sql
	phpBB/install/schemas/sqlite_schema.sql
2013-01-14 12:16:59 -06:00
..
adm [ticket/10949] Converted missing code to new JS coding guidelines 2013-01-04 22:46:12 +01:00
assets/javascript [ticket/11313] Use correct object el instead of eel in alt_text callback 2013-01-08 23:35:39 +01:00
cache [ticket/9520] Removed per directory web.config files. 2010-05-03 19:31:40 +02:00
config [ticket/11305] Define hook finder as a service on the container. 2013-01-02 01:36:50 -05:00
develop [ticket/11171] DB additions for these changes 2012-12-05 16:39:29 +00:00
docs Merge remote-tracking branch 'p/ticket/11248' into develop 2012-12-22 23:25:54 +01:00
download [ticket/11306] Introduce phpbb_create_default_container 2013-01-02 06:41:35 +01:00
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 remote-tracking branch 'remotes/brunoais/ticket/11171' into develop 2013-01-14 12:16:59 -06:00
install Merge remote-tracking branch 'remotes/brunoais/ticket/11171' into develop 2013-01-14 12:16:59 -06:00
language Merge PR #1130 branch 'EXreaction/ticket/11259' into develop 2012-12-29 13:45:40 -05:00
store [ticket/9520] Removed per directory web.config files. 2010-05-03 19:31:40 +02:00
styles Merge PR #1178 branch 'marc1706/ticket/10949' into develop 2013-01-08 16:36:35 -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/11305] Define hook finder as a service on the container. 2013-01-02 01:36:50 -05:00
composer.json [ticket/11238] Set goutte version to 0.1.0. 2012-12-02 23:44:49 -05:00
composer.lock [ticket/11238] Set goutte version to 0.1.0. 2012-12-02 23:44:49 -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/11077] Remove code from old global announcements system 2012-11-11 13:04:14 +01:00
index.php [feature/controller] Implement a front controller 2012-11-16 16:25:09 -05:00
mcp.php [feature/php-events] Readd comment from d06adb06e9 2012-08-11 11:49:48 +02:00
memberlist.php [ticket/11259] Make phpbb_admin_path available everywhere 2012-12-09 17:01:08 -06:00
posting.php Merge branch 'develop-olympus' into develop 2012-12-20 14:28:01 +01:00
report.php [ticket/11171] Adapted the code in report.php 2012-12-07 08:53:11 +00:00
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 [ticket/11243] Show download all link on all pages of topic with attachments 2012-12-11 11:42:34 -05:00
web.config [feature/controller] Remove URL rewriting by default 2012-11-16 17:06:02 -05:00