Marc Alexander 42e78004fb Merge pull request #4643 from JoshyPHP/ticket/15008 ...

[ticket/15008] Disable emoji when smilies are disabled

2017-01-15 00:25:28 +01:00

..

adm

Merge branch '3.1.x' into 3.2.x

2017-01-14 14:59:04 +01:00

assets

[ticket/14961] Add cookie notice as enablable feature

2017-01-06 00:57:12 +01:00

bin

[ticket/12610] CS

2016-12-03 16:37:35 +01:00

cache

…

config

Merge branch 'ticket/14957' into ticket/14957-rhea

2017-01-03 21:41:36 +01:00

develop

…

docs

[ticket/14961] Updated CREDITS.txt for cookie consent and removed subsilver2

2017-01-06 12:06:39 +01:00

download

…

ext

[ticket/12610] Correctly handle empty cache

2016-12-03 16:37:36 +01:00

files

…

images

…

includes

[3.2.x] Update development version to 3.2.1-dev

2017-01-07 17:19:35 +01:00

install

[3.2.x] Update development version to 3.2.1-dev

2017-01-07 17:19:35 +01:00

language

[ticket/14961] Also translate "learn more" link

2017-01-06 01:04:14 +01:00

phpbb

Merge pull request #4643 from JoshyPHP/ticket/15008

2017-01-15 00:25:28 +01:00

store

…

styles

Merge branch '3.1.x' into 3.2.x

2017-01-14 14:59:04 +01:00

.htaccess

…

app.php

…

common.php

…

composer.json

[ticket/14947] Updates phpunit to 4.8

2016-12-30 21:58:38 +01:00

composer.lock

[ticket/14947] Updates phpunit to 4.8

2016-12-30 21:58:38 +01:00

cron.php

…

faq.php

…

feed.php

…

index.php

…

mcp.php

…

memberlist.php

…

posting.php

[ticket/14962] Introduces a new helper to check emptyness of bbcode texts

2017-01-06 21:40:31 +01:00

report.php

…

search.php

…

ucp.php

…

viewforum.php

Merge branch '3.1.x' into 3.2.x

2016-12-28 22:15:26 +01:00

viewonline.php

…

viewtopic.php

Merge branch '3.1.x' into 3.2.x

2016-12-11 19:51:56 +01:00

web.config

…