Tristan Darricau 868179c295 Merge branch 'develop-olympus' into develop-ascraeus ...

* develop-olympus:
  [ticket/12120] Add nicofuma to the developers

Conflicts:
	phpBB/docs/AUTHORS

2014-07-02 22:55:00 +02:00

..

adm

[ticket/12779] Change order of file lists on automatic update

2014-06-29 22:13:33 +02:00

assets

Merge pull request #2514 from prototech/ticket/12553

2014-06-20 10:37:30 +02:00

bin

…

cache

…

config

Merge remote-tracking branch 'dragoon/ticket/12772' into develop-ascraeus

2014-06-27 15:17:51 +02:00

develop

[ticket/12763] Do not regenerate the *_schema.sql files

2014-06-23 21:39:34 +02:00

docs

Merge branch 'develop-olympus' into develop-ascraeus

2014-07-02 22:55:00 +02:00

download

…

ext

…

files

…

images

…

includes

[ticket/12674] Use user's colour in 'Last edited' line in sent PMs

2014-06-30 00:01:14 +02:00

install

Merge pull request #2493 from Nicofuma/ticket/12325

2014-06-27 14:01:31 +02:00

language

Merge pull request #2493 from Nicofuma/ticket/12325

2014-06-27 14:01:31 +02:00

phpbb

Merge pull request #2681 from Nicofuma/ticket/12790

2014-07-01 20:47:57 +02:00

store

…

styles

[ticket/12462] Do not use string "None" for different options

2014-06-25 22:14:33 +02:00

.htaccess

…

app.php

…

common.php

…

composer.json

[ticket/11528] Add behat/mink and mink-goutte-driver as dependency

2014-06-23 01:26:02 +05:30

composer.lock

[ticket/11528] Add behat/mink and mink-goutte-driver as dependency

2014-06-23 01:26:02 +05:30

cron.php

…

faq.php

…

feed.php

…

index.php

…

mcp.php

[ticket/12612] Prefix get_*_data() with phpbb_ and delete unused global

2014-06-23 22:58:41 +02:00

memberlist.php

[ticket/12759] Cache all lang_options in lang_helper instead

2014-06-27 17:48:37 +05:30

posting.php

[ticket/12612] Prefix upload_popup() with phpbb_

2014-06-23 22:49:00 +02:00

report.php

…

search.php

[ticket/12758] Add @changed to doc block

2014-06-22 10:23:41 +02:00

ucp.php

[ticket/12612] Move function from ucp.php to functions_user.php

2014-06-18 16:57:13 +02:00

viewforum.php

…

viewonline.php

…

viewtopic.php

[ticket/12759] Cache all lang_options in lang_helper instead

2014-06-27 17:48:37 +05:30

web.config

…