Cesar G 49c875413c Merge remote-tracking branch 'PayBas/ticket/12541' into develop-ascraeus ...

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

Conflicts:
	phpBB/styles/prosilver/template/forum_fn.js

2014-06-04 23:07:02 -07:00

..

adm

[ticket/12641] Use jQuery's trim() method. IE8 does not support the native one

2014-05-31 10:56:08 -07:00

assets

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

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

bin

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

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

cache

…

config

Merge pull request #2447 from n-aleha/ticket/11467

2014-05-30 23:01:19 +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 pull request #2526 from Nicofuma/ticket/12639

2014-06-04 23:59:20 +02:00

install

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

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

language

Merge pull request #2357 from Nicofuma/ticket/11942

2014-05-30 23:04:02 +02:00

phpbb

Merge pull request #2539 from marc1706/ticket/12457

2014-06-05 02:26:48 +02:00

store

…

styles

Merge remote-tracking branch 'PayBas/ticket/12541' into develop-ascraeus

2014-06-04 23:07:02 -07:00

.htaccess

…

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

…