Joas Schilling dbebe30c9a Merge branch 'develop-olympus' into develop ...

* develop-olympus:
  [ticket/12176] Reword comment about config entries.
  [ticket/12176] Add newest_user_colour to config array to ensure it exists
  [ticket/12176] Display correct message when trying to delete founder.
  [ticket/12176] Add functional test for founder deletion message.

Conflicts:
	tests/test_framework/phpbb_functional_test_case.php

2014-03-13 10:27:19 +01:00

..

adm

Merge remote-tracking branch 'VSEphpbb/ticket/12248' into develop

2014-03-06 23:50:07 +01:00

assets

Merge pull request #2037 from prototech/ticket/12080

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

bin

…

cache

…

config

Merge remote-tracking branch 'dhruvgoel92/ticket/11271-develop' into develop

2014-03-11 09:53:52 +01:00

develop

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

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

docs

[ticket/11938] use sql_attr_string instead of sql_attr_str2ordinal

2014-03-09 01:16:13 +05:30

download

…

files

…

images

…

includes

Merge branch 'develop-olympus' into develop

2014-03-13 10:27:19 +01:00

install

[ticket/12251] Enable displaying profile fields on memberlist, posts and pms

2014-03-06 12:02:11 +01:00

language

Merge branch 'develop-olympus' into develop

2014-03-13 10:27:19 +01:00

phpbb

Merge remote-tracking branch 'EXreaction/ticket/11716' into develop

2014-03-12 18:51:14 +01:00

store

…

styles

Merge pull request #2092 from nickvergessen/ticket/12090

2014-03-10 20:50:08 -05:00

.htaccess

…

app.php

…

common.php

…

composer.json

…

composer.lock

…

cron.php

…

faq.php

…

feed.php

…

index.php

…

mcp.php

[ticket/12213] Add MCP events for custom quick moderation options

2014-02-23 01:33:34 +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

Merge branch 'ticket/10945' into ticket/10945-develop

2014-03-08 21:44:30 +05:30

ucp.php

…

viewforum.php

…

viewonline.php

[ticket/12139] Spaces $ show_guests viewonline.php

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

viewtopic.php

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

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

web.config

…