Andreas Fischer 26ddd5a7fc Merge branch 'develop-ascraeus' into develop ...

* develop-ascraeus:
  [ticket/12656] Fix typo for "purged extension"
  [ticket/12656] Fix syntax in language file
  [ticket/12656] Fix typo
  [ticket/12656] Use utf8 ’ instead of escaping '
  [ticket/12656] Use lang keys for all CLI strings
  [ticket/12656] Use lang keys for CLI command descriptions

2014-07-28 14:45:34 +02:00

..

adm

[ticket/12814] Replace email type with text type

2014-07-15 19:36:35 +02:00

assets

Merge branch 'ticket/sumanai/12843' into develop-ascraeus

2014-07-27 19:51:38 +02:00

bin

[ticket/12663] Have cli.php language file at top level; unrelated to ACP.

2014-07-17 16:54:42 +02:00

cache

…

config

[ticket/12656] Pass user object into all console commands.

2014-07-17 20:37:24 +02:00

develop

[ticket/12446] Unnecessary db connect inphpbb_bootstrap_enabled_exts

2014-06-26 21:09:19 +02:00

docs

Merge remote-tracking branch 'paybas/ticket/12857' into develop-ascraeus

2014-07-24 11:00:43 +02:00

download

[ticket/12775] Fix container_builder

2014-07-07 01:02:36 +02:00

ext

…

files

…

images

…

includes

Merge branch 'develop-ascraeus' into develop

2014-07-27 19:45:12 +02:00

install

[prep-release-3.1.0-RC2] Update phpBB Version for RC3 development

2014-07-11 17:22:16 +02:00

language

Merge pull request #2772 from dhruvgoel92/ticket/12656

2014-07-28 14:45:33 +02:00

phpbb

Merge pull request #2772 from dhruvgoel92/ticket/12656

2014-07-28 14:45:33 +02:00

store

…

styles

Merge branch 'ticket/sumanai/12843' into develop-ascraeus

2014-07-27 19:51:38 +02:00

.htaccess

…

app.php

…

common.php

[ticket/12775] Update doc blocks

2014-07-07 01:02:37 +02:00

composer.json

[ticket/12788] Force 2.3.* on symfony dependencies

2014-07-03 20:50:06 +05:30

composer.lock

[ticket/12788] Force 2.3.* on symfony dependencies

2014-07-03 20:50:06 +05:30

cron.php

…

faq.php

…

feed.php

…

index.php

…

mcp.php

[ticket/12612] Prefix get_*_data() with phpbb_ and delete unused global

2014-06-23 22:58:41 +02:00

memberlist.php

[ticket/12804] Disable jabber from memberlist sort options

2014-07-08 00:42:01 +02:00

posting.php

[ticket/12612] Prefix upload_popup() with phpbb_

2014-06-23 22:49:00 +02:00

report.php

…

search.php

[ticket/12446] Unnecessary db connect inphpbb_bootstrap_enabled_exts

2014-06-26 21:09:19 +02:00

ucp.php

…

viewforum.php

[ticket/12881] Checks earlier if server-side topic marking is enabled

2014-07-25 00:22:46 +02:00

viewonline.php

[ticket/12837] Use else if instead of elseif

2014-07-16 11:19:28 +02:00

viewtopic.php

Merge pull request #2745 from nickvergessen/ticket/12861

2014-07-21 20:48:30 +02:00

web.config

…