Marc Alexander da9888d04f Merge branch 'develop-ascraeus' into develop ...

Conflicts:
	phpBB/styles/subsilver2/template/mcp_warn_post.html
	phpBB/styles/subsilver2/template/mcp_warn_user.html

2014-09-01 22:46:08 +02:00

..

adm

[ticket/12822] Remove "None" option from avatar select boxes

2014-08-07 17:28:21 +02:00

assets

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

2014-08-13 23:20:43 +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 branch 'develop-ascraeus' into develop

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

develop

[ticket/12958] Remove more references of subsilver2

2014-08-10 12:17:03 +02:00

docs

Merge branch 'develop-ascraeus' into develop

2014-09-01 22:46:08 +02:00

download

[ticket/12964] Correct use of undefined $row variable.

2014-08-10 15:54:56 +02:00

ext

…

files

…

images

…

includes

Merge branch 'develop-ascraeus' into develop

2014-08-30 22:56:26 +02:00

install

Merge branch 'develop-ascraeus' into develop

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

language

[ticket/13003] Add missing language keys

2014-08-21 19:37:03 +02:00

phpbb

Merge branch 'develop-ascraeus' into develop

2014-08-29 20:44:41 +05:30

store

…

styles/prosilver

Merge branch 'develop-ascraeus' into develop

2014-09-01 22:46:08 +02:00

.htaccess

…

app.php

…

common.php

[ticket/12775] Update doc blocks

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

composer.json

[ticket/11528] Revert Mink changes

2014-08-09 17:18:33 +02:00

composer.lock

[ticket/11528] Revert Mink changes

2014-08-09 17:18:33 +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

…

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/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

[ticket/12966] Sort by post_time and post_id where applicable

2014-08-23 16:36:39 +02:00

viewonline.php

[ticket/12837] Use else if instead of elseif

2014-07-16 11:19:28 +02:00

viewtopic.php

Merge pull request #2865 from marc1706/ticket/12966

2014-08-29 20:44:01 +05:30

web.config

…