Nils Adermann 5361a14c1e Merge branch 'develop-olympus' into develop ...

* develop-olympus:
  [ticket/10896] Move EMAIL_INVALID_EMAIL to common, replace EMAIL_INVALID
  [ticket/10896] Adds email validation to email settings in ACP

Conflicts:
	phpBB/adm/index.php
	phpBB/language/en/common.php
	phpBB/language/en/ucp.php

2013-02-24 17:42:14 +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:42:14 +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

…

app.php

…

common.php

[ticket/11305] Define hook finder as a service on the container.

2013-01-02 01:36:50 -05:00

composer.json

…

composer.lock

…

cron.php

…

faq.php

…

feed.php

…

index.php

…

mcp.php

…

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

…

search.php

…

ucp.php

…

viewforum.php

…

viewonline.php

…

viewtopic.php

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

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

web.config

…