Joas Schilling 592624379f Merge branch 'develop-ascraeus' into develop ...

* develop-ascraeus:
  [ticket/8610] Use css selector instead of xPath
  [ticket/8610] Add functional test when two topics are merged
  [ticket/8610] Throw an error when the dest topic isn't set
  [ticket/8610] Fix bookmarks when merging all the posts of a topic
  [ticket/8610] Merging topics does not handle bookmarks correctly

2014-06-09 22:57:33 +02:00

..

info

Merge branch 'develop-ascraeus' into develop

2014-05-28 18:19:20 +02:00

mcp_ban.php

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

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

mcp_forum.php

Merge pull request #2434 from Nicofuma/ticket/8610

2014-06-09 22:57:27 +02:00

mcp_front.php

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

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

mcp_logs.php

[ticket/12639] Send a correct IN entry when deleting marked logs

2014-06-02 23:15:25 +02:00

mcp_main.php

Merge pull request #2357 from Nicofuma/ticket/11942

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

mcp_notes.php

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

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

mcp_pm_reports.php

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

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

mcp_post.php

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

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

mcp_queue.php

[ticket/12675] Fix code sniffer complaints introduced by recent commits

2014-06-09 00:51:01 +02:00

mcp_reports.php

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

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

mcp_topic.php

Merge pull request #2434 from Nicofuma/ticket/8610

2014-06-09 22:57:27 +02:00

mcp_warn.php

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

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