Nils Adermann e2046444a1 Merge branch 'develop-olympus' into develop ...

* develop-olympus:
  [ticket/11361] Make sure that array passed to strtr() has the proper format.

Conflicts:
	phpBB/includes/session.php

2013-02-24 17:58:27 +01:00

..

adm

[feature/migrations] Catch and display errors from the migrator

2013-02-09 21:09:29 -06: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

…

config

[feature/migrations] Inject Migrator instead of using the container to fetch

2013-02-09 20:01:40 -06:00

develop

Merge remote-tracking branch 'EXreaction/feature/migrations' into develop

2013-02-06 12:25:13 -05:00

docs

Merge branch 'develop-olympus' into develop

2013-02-24 17:37:38 +01:00

download

[ticket/11306] Introduce phpbb_create_default_container

2013-01-02 06:41:35 +01:00

files

…

images

…

includes

Merge branch 'develop-olympus' into develop

2013-02-24 17:58:27 +01:00

install

[ticket/11298] Fix typo in language key; EXTENSIONS -> EXTENSION

2013-02-23 14:20:56 -05:00

language

Merge branch 'develop-olympus' into develop

2013-02-24 17:42:14 +01:00

store

…

styles

[ticket/11201] Revert WLM dropping because it is still used in China.

2013-02-04 01:31:43 +01: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/11201] Revert WLM dropping because it is still used in China.

2013-02-04 01:31:43 +01: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/11201] Revert WLM dropping because it is still used in China.

2013-02-04 01:31:43 +01:00

web.config

[feature/controller] Remove URL rewriting by default

2012-11-16 17:06:02 -05:00