phpBB Ascraeus

• 

  Joas Schilling 28 Oct 2014 3a2ccd079e10e066d2c96bc9a1f193dcfb7cc5d5

  Merge branch 'prep-release-3.1.0' into develop-ascraeus
• 

  Joas Schilling 28 Oct 2014 197fed16bd0fed828dabc433dac6e99028231556 m

  [prep-release-3.1.0] Update changelog with final changes

  • phpBB/docs/CHANGELOG.html (version 197fed16bd0fed828dabc433dac6e99028231556)
• 

  Joas Schilling 28 Oct 2014 c57fbe9d0dcbc72b80e4bab63566c8e4bd0ca16c

  Merge branch 'prep-release-3.1.0' into develop-ascraeus
• 

  Joas Schilling 28 Oct 2014 12033bc4993cb5df68c284605152f41ed8448763 m

  Merge branch 'develop-olympus' into prep-release-3.1.0
  Conflicts:
          phpBB/phpbb/session.php
• 

  Joas Schilling 28 Oct 2014 71c19f6eb7dd26224445fec6b75c7b0e9bf21509 m

  Merge pull request #3091 from Nicofuma/ticket/13234-2
  Ticket/13234 2
• 

  Joas Schilling 28 Oct 2014 d2cd24e8750729110e06e42b507fd89cadb9e51e m

  Merge pull request #3090 from Nicofuma/ticket/13234
  Ticket/13234
• 

  nicofuma 28 Oct 2014 9036edd935bef6e141c4d8b276f4a0dca01e6371 m

  [ticket/13234] Merge branch 'ticket/13234' into ticket/13234-2
  * ticket/13234:
    [ticket/13234] Fix conditions and CS
  
  Conflicts:
          phpBB/phpbb/session.php
  
  PHPBB3-13234
• 

  nicofuma 28 Oct 2014 fcc320e3852215a11b863d0108e16e2be998d5cc m

  [ticket/13234] Fix conditions and CS
  PHPBB3-13234

  • phpBB/includes/session.php (version fcc320e3852215a11b863d0108e16e2be998d5cc)
• 

  Nils Adermann <naderman@naderman.de> 28 Oct 2014 087a5363bba7228f29d6075deb2a099cf9d25630 m

  [ticket/13234-2] Correctly verify that user_id is set in user data array
  PHPBB3-13234-2

  • phpBB/phpbb/session.php (version 087a5363bba7228f29d6075deb2a099cf9d25630)
• 

  Nils Adermann <naderman@naderman.de> 28 Oct 2014 3472b6c5bc44b3ca13b6bb3fadc7aef7d7b41f1e m

  [ticket/13234-2] Never allow autologin/remember me to modify the userid
  Ascraeus version of 64d97d0787a63b3c646f89237574ac566ed89c50 commit
  
  PHPBB3-13234

  • phpBB/phpbb/session.php (version 3472b6c5bc44b3ca13b6bb3fadc7aef7d7b41f1e)
• 

  Nils Adermann <naderman@naderman.de> 28 Oct 2014 e1277c26ca68990a0aba5098fb4ca813c25e87b7 m

  Merge branch 'ticket/13234' into ticket/13234-2
  * ticket/13234:
    [ticket/13234] Never allow autologin/remember me to modify the userid
• 

  Nils Adermann <naderman@naderman.de> 28 Oct 2014 64d97d0787a63b3c646f89237574ac566ed89c50 m

  [ticket/13234] Never allow autologin/remember me to modify the userid
  This prevents admin relogin with forced user id from overwriting
  remember me cookies
  
  PHPBB3-13234

  • phpBB/includes/session.php (version 64d97d0787a63b3c646f89237574ac566ed89c50)