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

* develop-olympus:
  [ticket/11526] Update all dependencies / regenerate composer.lock.
  [ticket/11526] Increase composer minimum stability in olympus to stable.
  [ticket/11527] Upgrade composer.phar to 1.0.0-alpha7.

Conflicts:
	phpBB/composer.json
	phpBB/composer.lock

2013-05-09 18:12:54 +02:00

..

adm

[ticket/11442] Do not suggest an option on ajax confirm box

2013-05-08 00:07:13 +02:00

assets/javascript

Merge PR #1294 branch 'VSEphpbb/ticket/10155' into develop

2013-05-08 19:35:59 -04:00

cache

…

config

[ticket/11335] (avatars) Make php_ext 'php' not '.php'

2013-04-24 17:45:46 -05:00

develop

[ticket/10202] Upgrade TEXT to the bigger MTEXT.

2013-03-05 22:59:57 +01:00

docs

Merge branch 'develop-olympus' into develop

2013-05-06 22:11:33 +02:00

download

[ticket/11144] Add missing {FORUM_NAME} variable

2013-05-06 21:31:16 +02:00

files

…

images

…

includes

Merge PR #1294 branch 'VSEphpbb/ticket/10155' into develop

2013-05-08 19:35:59 -04:00

install

Merge PR #1294 branch 'VSEphpbb/ticket/10155' into develop

2013-05-08 19:35:59 -04:00

language

Merge PR #1209 branch 'dhruvgoel92/ticket/10325' into develop

2013-05-08 08:23:11 -04:00

store

…

styles

[ticket/11442] Do not suggest an option on ajax confirm box

2013-05-08 00:07:13 +02:00

.htaccess

…

app.php

…

common.php

[ticket/11335] Replace "$phpEx" with $phpEx

2013-04-24 20:39:24 -05:00

composer.json

[ticket/11526] Increase composer minimum stability in olympus to stable.

2013-05-09 02:48:31 +02:00

composer.lock

Merge branch 'develop-olympus' into develop

2013-05-09 18:12:54 +02:00

cron.php

…

faq.php

…

feed.php

…

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 'develop' of github.com:phpbb/phpbb3 into ticket/11103

2013-01-15 11:31:39 -06:00

search.php

…

ucp.php

…

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

…