forums/phpBB/includes/mcp/mcp_forum.php, branch master The forums.mageia.org Website [ticket/14972] replace all occurrences of sizeof() with the count() 2018-01-01T12:56:04+00:00 rxu rxu@mail.ru 2017-06-27T17:58:03+00:00 f8fbe3793680af1dae2db2829cfc84068831c52f PHPBB3-14972 
PHPBB3-14972
Merge branch '3.1.x' into 3.2.x 2017-01-04T20:50:25+00:00 Marc Alexander admin@m-a-styles.de 2017-01-04T20:50:25+00:00 cfa2bc534b403fee05ac7e5188ba346313feb45f 






[ticket/14549] Correcting $redirect var to avoid the bug
2016-12-29T10:11:19+00:00

hubaishan
saeed@hubaishan.com

2016-12-29T10:11:19+00:00

40bc4ac484223f78902e7275085a53ebc5e05dba

by this correct $redirect will go to clean mcp page after merge

PHPBB3-14549





by this correct $redirect will go to clean mcp page after merge

PHPBB3-14549







Merge branch '3.1.x' into 3.2.x
2016-11-12T12:54:59+00:00

Marc Alexander
admin@m-a-styles.de

2016-11-12T12:54:59+00:00

78db28286ea1f3f647e4fdefa495727792ba6f1f












Merge pull request #4472 from dsinn/ticket/14804
2016-11-12T12:53:24+00:00

Marc Alexander
admin@m-a-styles.de

2016-11-12T12:53:24+00:00

577d669ba73c0ff10bfe663079bbd13416092917

[ticket/14804] Add core event to MCP after merging topics





[ticket/14804] Add core event to MCP after merging topics







Merge branch '3.1.x' into 3.2.x
2016-11-06T14:47:49+00:00

Tristan Darricau
github@nicofuma.fr

2016-11-06T14:47:49+00:00

50f5efba9cee542d6660b403c52c8a82dc9bbedf

* 3.1.x:
  [ticket/14795] Use maximum topic views instead of adding up views in merge





* 3.1.x:
  [ticket/14795] Use maximum topic views instead of adding up views in merge







[ticket/14795] Use maximum topic views instead of adding up views in merge
2016-10-16T08:55:00+00:00

Marc Alexander
admin@m-a-styles.de

2016-10-16T08:55:00+00:00

fce30d1d91d7e1e4a2c2989640d5c5176e7fada0

Merging topics should not result in topic views being added up but rather in
the highest topic view showing up for the merged topic.

PHPBB3-14795





Merging topics should not result in topic views being added up but rather in
the highest topic view showing up for the merged topic.

PHPBB3-14795







[ticket/14804] Merge remote-tracking branch 'upstream/3.1.x' into ticket/14804
2016-10-03T14:24:30+00:00

Daniel Sinn
daniel.p.sinn@gmail.com

2016-10-03T14:24:30+00:00

59b52d6312cd10631532f6d1dcdabef141081fdc

PHPBB3-14804





PHPBB3-14804







Merge branch '3.1.x' into 3.2.x
2016-10-01T15:58:07+00:00

Marc Alexander
admin@m-a-styles.de

2016-10-01T15:58:07+00:00

328a7afcc3307f4c53bceb3ce733c832b503aafb












[ticket/14804] Fix undefined $topic_data after trying to port 3.2 changes to 3.1
2016-09-30T20:34:11+00:00

Daniel Sinn
daniel.p.sinn@gmail.com

2016-09-30T20:34:11+00:00

32d569c59464a80eb8c78a98b1953de0aa1008d8

PHPBB3-14804





PHPBB3-14804