Andreas Fischer 9cea96ad4e Merge branch 'task/sami' into task/sami-ascraeus ...

* task/sami:
  [task/sami] Replace phpdoctor with sami.
  [task/sami] Add sami/sami as a composer development dependency.

Conflicts:
	phpBB/composer.json
	phpBB/composer.lock

2014-05-16 18:13:45 +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

…

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

…

ext

[ticket/11163] Add ext/index.htm

2014-05-15 14:11:11 +02:00

files

…

images

…

includes

[ticket/12433] Use a different message when nesting of quotes is not allowed

2014-05-15 14:03:27 +02:00

install

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

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

language

Merge pull request #2463 from nickvergessen/ticket/12433

2014-05-15 16:48:18 +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

…

common.php

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

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

composer.json

Merge branch 'task/sami' into task/sami-ascraeus

2014-05-16 18:13:45 +02:00

composer.lock

Merge branch 'task/sami' into task/sami-ascraeus

2014-05-16 18:13:45 +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

…