phpBB Master

• 

  Marc 06 Jan 2017 663bdda53c57f15c94fabb2f99aedbff24fa002b

  Merge branch '3.2.x'
• 

  Marc 06 Jan 2017 44f130808fc8ce9d125094d5294355d2b014014a m

  Merge pull request #4618 from marc1706/ticket/14961
  [ticket/14961] Add cookie notice as enablable feature
• 

  Marc 06 Jan 2017 f8d5b3c41759d72bccdac4664ce3eb7819660bfd

  Merge branch '3.2.x'
• 

  Marc 06 Jan 2017 e096137537d1526ae914c73c66619cd1821c2f7a m

  Merge pull request #4620 from marc1706/ticket/14772
  [ticket/14772] Use float to prevent pagination overwriting topic time
• 

  Marc 06 Jan 2017 c0fb367d0ae1221898812ecaf5ffddc345f58e58

  Merge branch '3.2.x'
• 

  Marc 06 Jan 2017 7074876f3298df301bad89c1a55c4265aad4c710 m

  Merge pull request #4619 from Nicofuma/ticket/14962
  [ticket/14962] Introduces a new helper to check emptyness of bbcode texts
• 

  Marc 06 Jan 2017 538f03efb058c84daf3e677a3137be8900678f2b m

  [ticket/14962] Fix functional test for editing post
  PHPBB3-14962

  • tests/functional/posting_test.php (version 538f03efb058c84daf3e677a3137be8900678f2b)
• 

  Marc 06 Jan 2017 ba82dfa49ec585c9f9498c5a7f2d8ea8038e7143 m

  [ticket/14772] Add rtl definition for .topic-poster and small margin
  PHPBB3-14772

  • phpBB/styles/prosilver/theme/bidi.css (version ba82dfa49ec585c9f9498c5a7f2d8ea8038e7143)
  • phpBB/styles/prosilver/theme/common.css (version ba82dfa49ec585c9f9498c5a7f2d8ea8038e7143)
• 

  Marc 06 Jan 2017 89f0e4d54f5306a88260525e27204fae858a3fc5 m

  [ticket/14772] Use float to prevent pagination overwriting topic time
  PHPBB3-14772

  • phpBB/styles/prosilver/template/viewforum_body.html (version 89f0e4d54f5306a88260525e27204fae858a3fc5)
  • phpBB/styles/prosilver/theme/common.css (version 89f0e4d54f5306a88260525e27204fae858a3fc5)
• 

  nicofuma 06 Jan 2017 f82299b8e445cccfc8bad8cbe6505f3fb50d0f8f m

  [ticket/14962] Introduces a new helper to check emptyness of bbcode texts
  PHPBB3-14962

  • phpBB/phpbb/textformatter/s9e/utils.php (version f82299b8e445cccfc8bad8cbe6505f3fb50d0f8f)
  • phpBB/phpbb/textformatter/utils_interface.php (version f82299b8e445cccfc8bad8cbe6505f3fb50d0f8f)
  • phpBB/posting.php (version f82299b8e445cccfc8bad8cbe6505f3fb50d0f8f)
  • tests/functional/posting_test.php (version f82299b8e445cccfc8bad8cbe6505f3fb50d0f8f)
• 

  Marc 06 Jan 2017 743d3af3c52f21a47795b76598b0136ad261839a m

  [ticket/14961] Updated CREDITS.txt for cookie consent and removed subsilver2
  PHPBB3-14961

  • phpBB/docs/CREDITS.txt (version 743d3af3c52f21a47795b76598b0136ad261839a)
• 

  Marc 06 Jan 2017 af4f477a1b23775f94c347b668e8d1a095818cd6 m

  [ticket/14961] Also translate "learn more" link
  PHPBB3-14961

  • phpBB/language/en/common.php (version af4f477a1b23775f94c347b668e8d1a095818cd6)
  • phpBB/styles/prosilver/template/overall_footer.html (version af4f477a1b23775f94c347b668e8d1a095818cd6)
• 

  Marc 05 Jan 2017 e0eeea800cb51217e4511c3bcfcba6406d89f314 m

  [ticket/14961] Add cookie notice as enablable feature
  Uses Insites cookieconsent v3.0.3:
  https://cookieconsent.insites.com
  
  PHPBB3-14961

  • phpBB/assets/cookieconsent/cookieconsent.min.css (version e0eeea800cb51217e4511c3bcfcba6406d89f314)
  • phpBB/assets/cookieconsent/cookieconsent.min.js (version e0eeea800cb51217e4511c3bcfcba6406d89f314)
  • phpBB/includes/acp/acp_board.php (version e0eeea800cb51217e4511c3bcfcba6406d89f314)
  • phpBB/includes/functions.php (version e0eeea800cb51217e4511c3bcfcba6406d89f314)
  • phpBB/language/en/acp/board.php (version e0eeea800cb51217e4511c3bcfcba6406d89f314)
  • phpBB/language/en/common.php (version e0eeea800cb51217e4511c3bcfcba6406d89f314)
  • phpBB/phpbb/db/migration/data/v320/cookie_notice.php (version e0eeea800cb51217e4511c3bcfcba6406d89f314)
  • phpBB/styles/prosilver/template/overall_footer.html (version e0eeea800cb51217e4511c3bcfcba6406d89f314)
  • phpBB/styles/prosilver/template/overall_header.html (version e0eeea800cb51217e4511c3bcfcba6406d89f314)