Joas Schilling 55aa5c8296 Merge branch 'develop-ascraeus' into develop ...

* develop-ascraeus:
  [ticket/12543] Only take over ENTER and ESC keys when alert box is active.

2014-05-24 14:30:28 +02:00

..

adm

[ticket/12547] Rename jquery.js to jquery.min.js in assets directory

2014-05-15 01:18:26 +03:00

assets

Merge pull request #2458 from prototech/ticket/12543

2014-05-24 14:28:38 +02: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

Merge branch 'develop-ascraeus' into develop

2014-05-24 14:20:51 +02:00

install

[ticket/12547] Rename jquery.js to jquery.min.js in assets directory

2014-05-15 01:18:26 +03:00

language

Merge remote-tracking branch 'n-aleha/ticket/12525' into develop-ascraeus

2014-05-16 20:04:34 -07:00

phpbb

[ticket/12586] Limit depth to 2, we require vendor/extension/ext.php

2014-05-22 23:43:35 +02:00

store

…

styles

Merge pull request #2444 from VSEphpbb/ticket/12531

2014-05-24 14:03:16 +02:00

.htaccess

Merge branch 'develop-olympus' into develop-ascraeus

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

app.php

…

common.php

[ticket/12576] Remove cron from common.php

2014-05-22 12:45:03 +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

[ticket/12576] Retrieve the cron_manager in cron.php if needed

2014-05-22 13:47:37 +02:00

faq.php

…

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 #2468 from nickvergessen/ticket/12555

2014-05-23 03:06:42 +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/12555] Add canonical URL for viewforum

2014-05-16 11:34:04 +02:00

viewonline.php

[feature/sqlite3] Add support for SQLite 3

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

viewtopic.php

[ticket/12555] Add canonical URL for viewtopic

2014-05-16 11:38:37 +02:00

web.config

…