Andreas Fischer 1b3109d650 Merge branch 'develop-olympus' into develop-ascraeus ...

* develop-olympus:
  [ticket/13086] String replaces 50 with 20

Conflicts:
	phpBB/language/en/acp/email.php

2014-09-24 21:24:29 +02:00

..

adm

Merge pull request #2844 from marc1706/ticket/12858

2014-09-24 13:47:59 +02:00

assets

Merge pull request #2844 from marc1706/ticket/12858

2014-09-24 13:47:59 +02:00

bin

[ticket/12663] Have cli.php language file at top level; unrelated to ACP.

2014-07-17 16:54:42 +02:00

cache

…

config

Merge pull request #2948 from Nicofuma/ticket/13061

2014-09-17 20:09:49 +02:00

develop

…

docs

[prep-release-3.1.0-RC4] Add changelog for 3.1.0-RC4

2014-09-19 19:09:46 +02:00

download

[ticket/13061] Replace the service event.subscriber_loader by a compiler pass

2014-09-13 14:34:18 +02:00

ext

…

files

…

images

…

includes

Merge pull request #2844 from marc1706/ticket/12858

2014-09-24 13:47:59 +02:00

install

Merge pull request #2963 from Senky/ticket/13045

2014-09-21 11:29:56 +05:30

language

Merge branch 'develop-olympus' into develop-ascraeus

2014-09-24 21:24:29 +02:00

phpbb

Merge pull request #2954 from rxu/ticket/13055

2014-09-24 12:25:57 +02:00

store

…

styles

[ticket/13087] Correctly link to user profile when contact field has no URL

2014-09-24 17:33:54 +02:00

.htaccess

…

app.php

…

common.php

[ticket/12775] Update doc blocks

2014-07-07 01:02:37 +02:00

composer.json

[ticket/13032] Also update symfony/css-selector and pin it down.

2014-09-03 21:47:41 +02:00

composer.lock

[ticket/13032] Also update symfony/css-selector and pin it down.

2014-09-03 21:47:41 +02:00

cron.php

[ticket/12898] Call garbage_collection() at the end of cron.php

2014-07-28 14:45:39 +02:00

faq.php

…

feed.php

[ticket/13045] Remove Pragma headers

2014-09-17 20:10:01 +02:00

index.php

…

mcp.php

…

memberlist.php

[ticket/12804] Disable jabber from memberlist sort options

2014-07-08 00:42:01 +02:00

posting.php

[ticket/13019] Always accept a reason for deleting a post/topic.

2014-09-14 10:38:56 -07:00

report.php

[ticket/12990] Use the full services name for the notification's types

2014-08-16 21:46:03 +02:00

search.php

[ticket/13066] Add search results core event to modify search title

2014-09-14 15:00:47 +08:00

ucp.php

…

viewforum.php

[ticket/13062] Fix name of "ORDER_BY" key in SQL array

2014-09-19 00:56:16 +02:00

viewonline.php

[ticket/13051] Fix core event name

2014-09-09 13:12:29 -07:00

viewtopic.php

[ticket/13050] Allow topic/forum subscription when email/jabber is off

2014-09-07 18:54:34 +08:00

web.config

…