Andreas Fischer 8b8c25194a Merge branch 'develop-olympus' into develop-ascraeus ...

* develop-olympus:
  [ticket/12540] Fix broken placeholders in language files

Conflicts:
	phpBB/language/en/common.php
	phpBB/language/en/posting.php
	phpBB/language/en/ucp.php

2014-05-15 13:41:54 +02:00

..

adm

[ticket/12534] Do not use errorbox for multi steps

2014-05-12 11:35:59 +02:00

assets

[ticket/12544] Update Plupload to 2.1.2.

2014-05-13 17:23:48 -07:00

bin

[ticket/12507] Move the 'require' statement

2014-05-06 17:58:31 +02:00

cache

[ticket/11700] Add back accidently deleted file in cache dir

2013-09-17 16:18:04 +02:00

config

Merge pull request #2438 from marc1706/ticket/12517

2014-05-11 18:11:44 +02:00

develop

[feature/sqlite3] Add support for SQLite 3

2014-05-02 15:45:20 +02:00

docs

[ticket/12523] Add template events search_results_topic_(before/after)

2014-05-11 15:57:21 +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

[ticket/12526] Fix undefined index: filesize when editing PM with attachments.

2014-05-11 02:36:48 -07:00

install

[ticket/12428] Use the database to store the original version number

2014-05-07 23:04:41 +02:00

language

Merge branch 'develop-olympus' into develop-ascraeus

2014-05-15 13:41:54 +02:00

phpbb

[ticket/12435] Update the comment

2014-05-14 02:32:12 +02:00

store

…

styles

Merge pull request #2420 from prototech/ticket/9388

2014-05-11 10:48:10 +02:00

.htaccess

Merge branch 'develop-olympus' into develop-ascraeus

2014-05-03 00:37:28 +02:00

app.php

[ticket/11852] Split filesystem and path_helper into 2 classes

2013-09-26 15:34:44 +02:00

common.php

[ticket/12473] Move compatibility globals out into its own file.

2014-05-02 19:01:26 +02:00

composer.json

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

2014-05-02 20:28:58 +02:00

composer.lock

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

2014-05-02 20:28:58 +02:00

cron.php

…

faq.php

[ticket/12364] Add template identifier var to all missing pages

2014-04-06 17:41:09 +02:00

feed.php

[ticket/12421] Rebase and enable tests

2014-05-06 14:54:22 +02:00

index.php

Merge remote-tracking branch 'github-nickvergessen/ticket/12273' into develop-ascraeus

2014-05-02 12:22:05 +02:00

mcp.php

Merge remote-tracking branch 'github-nickvergessen/ticket/12273' into develop-ascraeus

2014-05-02 12:22:05 +02:00

memberlist.php

Merge pull request #2294 from PayBas/ticket/12392

2014-05-04 16:31:46 +02:00

posting.php

[ticket/12518] Apply De Morgan to make the conditions easier to read

2014-05-11 22:52:09 +02:00

report.php

[ticket/12458] Apply Squiz.WhiteSpace.SuperfluousWhitespace.* to legacy code.

2014-04-29 17:51:21 +02:00

search.php

Merge pull request #2437 from rxu/ticket/12524

2014-05-11 10:42:46 +02:00

ucp.php

[ticket/12273] Update since version to 3.1.0-a* style

2014-04-25 12:15:44 +02:00

viewforum.php

[ticket/12431] Add has_poll icon to topiclists

2014-05-02 17:58:54 +02:00

viewonline.php

[feature/sqlite3] Add support for SQLite 3

2014-05-02 15:45:20 +02:00

viewtopic.php

[ticket/12518] Apply De Morgan to make the conditions easier to read

2014-05-11 22:52:09 +02:00

web.config

…