Tristan Darricau d465e7e438 Merge branch 'develop-ascraeus' into develop ...

* develop-ascraeus:
  [ticket/12976] Correctly use plurals for attachment count in UCP navigation

Conflicts:
	phpBB/styles/subsilver2/template/ucp_attachments.html

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

..

adm

…

assets

[ticket/12856] Remove images from assets/plupload/img/

2014-08-13 23:20:43 +02:00

bin

…

cache

…

config

Merge branch 'develop-ascraeus' into develop

2014-08-16 09:50:51 +02:00

develop

…

docs

Merge branch 'develop-ascraeus' into develop

2014-09-05 21:07:02 +02:00

download

[ticket/13046] Call phpbb_load_extensions_autoloaders() in $download/file.php

2014-09-07 01:41:21 +02:00

ext

…

files

…

images

…

includes

Merge branch 'develop-ascraeus' into develop

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

install

Merge branch 'develop-ascraeus' into develop

2014-08-21 00:44:27 +02:00

language

[ticket/12976] Correctly use plurals for attachment count in UCP navigation

2014-09-09 21:31:34 +02:00

phpbb

Merge branch 'develop-ascraeus' into develop

2014-09-07 12:50:55 +02:00

store

…

styles/prosilver

Merge branch 'develop-ascraeus' into develop

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

.htaccess

…

app.php

…

common.php

…

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

…

faq.php

…

feed.php

…

index.php

…

mcp.php

…

memberlist.php

…

posting.php

[ticket/11854] Rename captchas.factory service to captcha.factory

2014-08-11 01:16:22 +02: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/12986] Fix detection of common words in search

2014-08-17 00:35:12 +08:00

ucp.php

…

viewforum.php

Merge pull request #2931 from rxu/ticket/13050

2014-09-08 21:23:46 +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

…