phpBB Rhea

• 

  nicofuma 24 Sep 2016 b59e41d2891a6be89d0600625ab205e4d42adb13

  Merge branch '3.1.x' into 3.2.x
  * 3.1.x:
• 

  nicofuma 24 Sep 2016 fdd4f68aea8cc3639d880c8ec2ff439bf09f3b56

  Merge pull request #4455 from marc1706/ticket/14484-rhea
  [ticket/14484] Add possibility to use extensions in UI tests
  
  * marc1706/ticket/14484-rhea:
    [ticket/14484] Remove duplicate methods and no longer needed calls
    [ticket/14484] Remove invalid code caused by merge conflict
    [ticket/14484] Properly enable extensions in UI tests
    [ticket/14484] Move facebook/webdriver back to tests dir composer.json
    [ticket/14484] Move facebook webdriver to main composer.json
• 

  nicofuma 24 Sep 2016 cdd56c050512dc582314670b8784b2051fb86f99 m

  Merge pull request #4394 from marc1706/ticket/14484
  [ticket/14484] Add possibility to use extensions in UI tests
  
  * marc1706/ticket/14484:
    [ticket/14484] Properly enable extensions in UI tests
    [ticket/14484] Move facebook/webdriver back to tests dir composer.json
    [ticket/14484] Move facebook webdriver to main composer.json
• 

  Marc 24 Sep 2016 1fff45586288fd8bc2027e8dfe366bc4000df065

  Merge branch '3.1.x' into 3.2.x
• 

  Marc 24 Sep 2016 18f9c9f6e2a382eedc9c8e566b939e6515e1c44f m

  Merge pull request #3527 from Elsensee/ticket/13709
  [ticket/13709] Add fallback for email templates used by extensions
• 

  Marc 21 Sep 2016 2b22adbcacf469998b2490073c29a6188125f94d m

  [ticket/14484] Remove duplicate methods and no longer needed calls
  PHPBB3-14484

  • tests/test_framework/phpbb_ui_test_case.php (version 2b22adbcacf469998b2490073c29a6188125f94d)
• 

  Marc 18 Sep 2016 6242698a84dfc00bc5a09705eeed2db1a539996c m

  [ticket/14484] Remove invalid code caused by merge conflict
  PHPBB3-14484

  • tests/test_framework/phpbb_ui_test_case.php (version 6242698a84dfc00bc5a09705eeed2db1a539996c)
• 

  Marc 18 Sep 2016 229472cb071ba6c1cba448652ac0e4ddd8ea9be0 m

  Merge branch 'ticket/14484' into ticket/14484-rhea
• 

  Oliver Schramm <oliver.schramm97@gmail.com> 21 Aug 2016 eccb3d66025b4d10c40135b29ad36cc763a08571 m

  [ticket/13709] Add fallback for email templates used by extensions
  Also add a fallback to english for the core
  like we do it in $user->add_lang()
  
  PHPBB3-13709

  • phpBB/includes/functions_messenger.php (version eccb3d66025b4d10c40135b29ad36cc763a08571)
• 

  Marc 31 Jul 2016 d51c67440ef811082cb7e5ec9833d1511fceca54 m

  [ticket/14484] Properly enable extensions in UI tests
  PHPBB3-14484

  • tests/test_framework/phpbb_ui_test_case.php (version d51c67440ef811082cb7e5ec9833d1511fceca54)
• 

  Marc 31 Jul 2016 ef132e1531858fdf0189751fd2f5de13df688358 m

  [ticket/14484] Move facebook/webdriver back to tests dir composer.json
  This will make sure we don't try to install it to incompatible PHP 5.3.3.
  
  PHPBB3-14484

  • phpBB/composer.json (version ef132e1531858fdf0189751fd2f5de13df688358)
  • phpBB/composer.lock (version ef132e1531858fdf0189751fd2f5de13df688358)
  • tests/composer.json (version ef132e1531858fdf0189751fd2f5de13df688358)
  • tests/composer.lock (version ef132e1531858fdf0189751fd2f5de13df688358)
  • travis/install-phpbb-test-dependencies.sh (version ef132e1531858fdf0189751fd2f5de13df688358)
  • travis/setup-phpbb.sh (version ef132e1531858fdf0189751fd2f5de13df688358)
• 

  Marc 27 Jul 2016 29d2c6692205225546802d7f5425ef20258974c2 m

  [ticket/14484] Move facebook webdriver to main composer.json
  Also updated ui test case file to have same feature set as
  the 3.2.x version.
  
  PHPBB3-14484

  • phpBB/composer.json (version 29d2c6692205225546802d7f5425ef20258974c2)
  • phpBB/composer.lock (version 29d2c6692205225546802d7f5425ef20258974c2)
  • tests/composer.json (version 29d2c6692205225546802d7f5425ef20258974c2)
  • tests/composer.lock (version 29d2c6692205225546802d7f5425ef20258974c2)
  • tests/test_framework/phpbb_ui_test_case.php (version 29d2c6692205225546802d7f5425ef20258974c2)
  • travis/install-phpbb-test-dependencies.sh (version 29d2c6692205225546802d7f5425ef20258974c2)
  • travis/setup-phpbb.sh (version 29d2c6692205225546802d7f5425ef20258974c2)