Nathaniel Guse bea1ce92a1 Merge branch 'develop-olympus' into develop ...

# By Oliver Schramm
# Via Nathaniel Guse (1) and Oliver Schramm (1)
* develop-olympus:
  [ticket/11062] If user's language is english there is no further work needed
  [ticket/11062] Load new strings from user's language file if provided

2013-07-25 13:34:10 -05:00

..

adm

[ticket/11713] Do not remove module if it couldn't be deleted

2013-07-18 22:41:23 +02:00

assets/javascript

Merge remote-tracking branch 'remotes/cyberalien/feature/editor-code-tabs' into develop

2013-06-06 14:07:27 -05:00

cache

…

config

Merge pull request #1513 from nickvergessen/ticket/11582

2013-07-22 11:28:55 -07:00

develop

Merge remote-tracking branch 'phpbb/develop' into feature/softdelete-1-permission

2013-07-11 11:41:48 +02:00

docs

Merge branch 'develop-olympus' into develop

2013-07-13 19:30:57 +02:00

download

[ticket/11725] Use new paths for phpbb_class_loader in file.php

2013-07-22 12:47:32 +02:00

files

…

images

…

includes

Merge remote-tracking branch 'asperous/ticket/11731' into develop

2013-07-23 00:07:38 +02:00

install

Merge branch 'develop-olympus' into develop

2013-07-25 13:34:10 -05:00

language

Merge branch 'develop-olympus' into develop

2013-07-25 14:08:06 +02:00

phpbb

[ticket/11667] Use @inheritdoc

2013-07-23 11:16:23 -05:00

store

…

styles

[ticket/11741] Fix empty brackets and remove bullet

2013-07-24 17:22:10 +02:00

.htaccess

…

app.php

…

common.php

[ticket/11698] Moving all autoloadable files to phpbb/

2013-07-14 01:32:34 -04:00

composer.json

Merge branch 'develop-olympus' into develop

2013-07-13 10:28:02 -05:00

composer.lock

Merge branch 'develop-olympus' into develop

2013-07-13 10:28:02 -05:00

cron.php

…

faq.php

…

feed.php

[ticket/11481] Move prepended slash from calls into function

2013-06-06 20:35:38 +02:00

index.php

…

mcp.php

[ticket/9657] Use the service instead of the static class

2013-07-11 14:24:07 +02:00

memberlist.php

Merge remote-tracking branch 'brunoais/ticket/11656' into develop

2013-07-24 22:14:52 +02:00

posting.php

[ticket/9657] Use the service instead of the static class

2013-07-11 14:24:07 +02:00

report.php

[ticket/11722] Remove reference assignment for $captcha in report.php

2013-07-22 03:30:27 +02:00

search.php

[ticket/11717] Use topic_posts_approved instead of topic_replies

2013-07-20 21:21:36 +02:00

ucp.php

[ticket/11685] Remove logout confirmation page

2013-07-13 12:27:00 -04:00

viewforum.php

[ticket/11702] Fix forum_posts left over for link-click counts in viewforum.php

2013-07-14 10:49:23 -04:00

viewonline.php

…

viewtopic.php

Merge remote-tracking branch 'phpbb/develop' into ticket/9657

2013-07-13 09:36:24 -04:00

web.config

…