Joas Schilling 76d7d38dea Merge branch 'develop-olympus' into develop ...

* develop-olympus:
  [ticket/11766] Hide edit, quote and delete buttons if topic is locked

Conflicts:
	phpBB/viewtopic.php

2014-03-19 20:37:52 +01:00

..

adm

[ticket/12284] Improve readability of extension manager details

2014-03-17 12:10:18 -07:00

assets

Merge pull request #2037 from prototech/ticket/12080

2014-02-20 20:59:14 -06:00

bin

[ticket/11998] Make phpbbcli executable and add shebang

2013-11-12 00:12:34 +01:00

cache

…

config

Merge remote-tracking branch 'EXreaction/ticket/9871-2' into develop

2014-03-14 14:04:30 +01:00

develop

[ticket/12262] Do not use inline assignments

2014-03-15 15:14:00 +01:00

docs

[ticket/12279] Add memberlist_view.html template event to add custom info

2014-03-17 21:01:16 +08:00

download

[ticket/12171] Send correct status 403 when forbidden and 404 when not found

2014-02-10 12:56:45 +01:00

files

…

images

…

includes

Merge remote-tracking branch 'prototech/ticket/12160' into develop

2014-03-18 11:00:43 +01:00

install

Merge remote-tracking branch 'prototech/ticket/12160' into develop

2014-03-18 11:00:43 +01:00

language

[ticket/12269] Delete folder mods in language

2014-03-17 14:26:08 +05:30

phpbb

[ticket/9040] Count HTML entities as single in custom profile fields

2014-03-17 17:35:30 +05:30

store

…

styles

[ticket/12279] Add memberlist_view.html template event to add custom info

2014-03-17 21:01:16 +08:00

.htaccess

…

app.php

…

common.php

…

composer.json

[ticket/11998] Add symfony/console as dependency.

2013-11-03 01:52:40 +01:00

composer.lock

[ticket/11998] Add symfony/console as dependency.

2013-11-03 01:52:40 +01:00

cron.php

…

faq.php

…

feed.php

[ticket/11271] Make path conversion more precise

2013-12-27 03:31:28 +05:30

index.php

Adding 'forgot password' link to index page

2014-01-22 12:42:33 +05:30

mcp.php

[ticket/12278] Add mcp.php core event to allow to modify modules display option

2014-03-17 23:28:51 +08:00

memberlist.php

[ticket/12236] Move AOL Instant Messanger field to custom profile field

2014-03-05 22:13:22 +01:00

posting.php

Merge pull request #1939 from prototech/ticket/12078

2014-02-20 21:04:52 -06:00

report.php

…

search.php

[ticket/8041] Merge item name into "Return to" string for better translations

2014-03-12 01:05:05 +01:00

ucp.php

…

viewforum.php

[ticket/8041] Wrap forum name, topic title and pm folder name with quotes

2014-03-12 18:47:02 +01:00

viewonline.php

[ticket/12139] Spaces $ show_guests viewonline.php

2014-02-20 17:02:50 -06:00

viewtopic.php

Merge branch 'develop-olympus' into develop

2014-03-19 20:37:52 +01:00

web.config

…