Dhruv 74815d5951 Merge branch 'develop-ascraeus' into develop ...

# By Marc Alexander
# Via Dhruv Goel (1) and Marc Alexander (1)
* develop-ascraeus:
  [ticket/11331] Inform user that double dots will be stripped from avatar paths

2014-06-09 04:39:28 +05:30

..

adm

[ticket/12666] Use "None" for images in root of gallery avatar path

2014-06-05 23:28:00 +02:00

assets

[ticket/12541] Activate attachments tab when files are dropped into textarea

2014-06-02 12:42:45 +02:00

bin

[ticket/12655] Run the shell when --shell is used

2014-06-04 14:46:40 +02:00

cache

…

config

[ticket/12602] Add files to print the cron list and test files.

2014-06-02 12:17:37 +02:00

develop

[ticket/12594] Update file header in non-php files

2014-05-30 15:31:15 +02:00

docs

[develop-ascraeus] Correct capitalisation of NeoThermic.

2014-05-31 00:25:28 +02:00

download

[ticket/12594] Remove @package tags and update file headers

2014-05-27 20:51:13 +02:00

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-06-08 22:18:34 +02:00

install

[prep-release-3.1.0-b4] Update phpBB Version for b5 development

2014-05-30 17:52:38 +02:00

language

[ticket/11331] Inform user that double dots will be stripped from avatar paths

2014-06-07 16:28:03 +02:00

phpbb

Merge pull request #2543 from Nicofuma/ticket/12655

2014-06-06 19:49:29 +02:00

store

…

styles

[ticket/12666] Use "None" for images in root of gallery avatar path

2014-06-05 23:28:00 +02:00

.htaccess

Merge branch 'develop-olympus' into develop-ascraeus

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

app.php

[ticket/12594] Remove @package tags and update file headers

2014-05-27 20:51:13 +02:00

common.php

[ticket/12594] Remove @package tags and update file headers

2014-05-27 20:51:13 +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

Merge pull request #2523 from bantu/ticket/12597

2014-05-30 22:52:01 +02:00

faq.php

[ticket/12594] Remove @package tags and update file headers

2014-05-27 20:51:13 +02:00

feed.php

[ticket/12594] Remove @package tags and update file headers

2014-05-27 20:51:13 +02:00

index.php

[ticket/12594] Remove @package tags and update file headers

2014-05-27 20:51:13 +02:00

mcp.php

[ticket/12594] Remove @package tags and update file headers

2014-05-27 20:51:13 +02:00

memberlist.php

[ticket/12594] Remove @package tags and update file headers

2014-05-27 20:51:13 +02:00

posting.php

[ticket/12640] Preserve the active tab when previewing in posting page.

2014-05-31 10:12:24 -07:00

report.php

[ticket/12594] Remove @package tags and update file headers

2014-05-27 20:51:13 +02:00

search.php

[ticket/12594] Remove @package tags and update file headers

2014-05-27 20:51:13 +02:00

ucp.php

[ticket/12594] Remove @package tags and update file headers

2014-05-27 20:51:13 +02:00

viewforum.php

[ticket/12594] Remove @package tags and update file headers

2014-05-27 20:51:13 +02:00

viewonline.php

[ticket/12594] Remove @package tags and update file headers

2014-05-27 20:51:13 +02:00

viewtopic.php

[ticket/12566] "Private messages" should be "Send pivate message"

2014-06-02 13:36:49 +02:00

web.config

…