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

* develop-olympus:
  [ticket/12061] Fix keyboard shortcut in firefox

Conflicts:
	phpBB/styles/prosilver/template/overall_footer.html

2013-12-09 01:23:29 +01:00

..

adm

Merge remote-tracking branch 'cyberalien/ticket/11979' into develop

2013-12-06 09:31:30 +01:00

assets

[ticket/11241] Add dropdown control button.

2013-12-06 00:44:48 -08:00

bin

[ticket/11998] Make phpbbcli executable and add shebang

2013-11-12 00:12:34 +01:00

cache

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

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

config

Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/11912

2013-11-23 00:54:56 +01:00

develop

[ticket/11998] Turn develop/extensions.php into console commands.

2013-11-05 21:40:42 +01:00

docs

[ticket/11241] Add border to dropdown menu options.

2013-12-06 00:56:31 -08:00

download

[ticket/11986] Fix undefined index: poster_id in file.php.

2013-10-29 06:02:04 -07:00

files

Copy 3.0.x branch to trunk

2009-10-04 18:14:59 +00:00

images

…

includes

Merge remote-tracking branch 'imkingdavid/ticket/12069' into develop

2013-12-08 21:43:06 +01:00

install

[prep-release-3.1.0-a2] Update version to 3.1.0-a3-dev in install and constant

2013-11-19 01:37:31 +01:00

language

[ticket/11241] Consolidate topic actions into "Topic tools" dropdown.

2013-12-06 00:56:24 -08:00

phpbb

[ticket/12058] Add missing apostrophe to avatar_types migration queries

2013-12-04 23:40:38 +01:00

store

Copy 3.0.x branch to trunk

2009-10-04 18:14:59 +00:00

styles

Merge branch 'develop-olympus' into develop

2013-12-09 01:23:29 +01:00

.htaccess

[ticket/11215] Remove unnecessary comment

2013-09-02 15:34:14 -07:00

app.php

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

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

common.php

[ticket/11850] Need symfony request and filesystem setup globally for session

2013-09-30 18:44:02 -05:00

composer.json

[ticket/11998] Add symfony/console as dependency.

2013-11-03 01:52:40 +01:00

composer.lock

[ticket/11998] Add symfony/console as dependency.

2013-11-03 01:52:40 +01:00

cron.php

…

faq.php

…

feed.php

…

index.php

…

mcp.php

[ticket/11700] Move all recent code to namespaces

2013-09-16 00:25:27 +02:00

memberlist.php

Merge pull request #1654 from rechosen/ticket/11786

2013-10-03 20:22:41 -07:00

posting.php

[ticket/11672] Replace sprintf() usage with $user->lang().

2013-11-19 07:32:49 -08:00

report.php

[ticket/11763] Add missing variable when reporting a PM to avoid SQL Error

2013-08-03 17:30:28 +02:00

search.php

Merge remote-tracking branch 'github-phpbb/develop' into ticket/11700

2013-09-16 01:24:05 +02:00

ucp.php

Merge remote-tracking branch 'github-phpbb/develop' into ticket/11700

2013-09-16 01:24:05 +02:00

viewforum.php

Merge remote-tracking branch 'github-phpbb/develop' into ticket/11700

2013-09-16 01:24:05 +02:00

viewonline.php

[ticket/12015] Add some parameters to viewonline events

2013-11-13 23:44:57 +01:00

viewtopic.php

[ticket/11241] Consolidate topic actions into "Topic tools" dropdown.

2013-12-06 00:56:24 -08:00

web.config

…