Merge from master

Frug · Jan 13, 2014 · d1656f6 · d1656f6
2 parents 0582844 + 7dc16c0
commit d1656f6
Show file tree

Hide file tree

Showing 2 changed files with 158 additions and 118 deletions.
diff --git a/chat/changelog.txt b/chat/changelog.txt
@@ -819,12 +819,12 @@ Bugfixes:
 - Fixed a typo in the localization section of config.php (all versions)
 
 
-Version 0.8.7 (?.?.2013)
+Version 0.8.7 (1.10.2014)
 -------------------------------
 Notice: 
 - Minimum php version is now 5 (was 4).
 - phpbb2 branch discontinued.
-- License has changed from GNU Affero to a Modified MIT License
+- License has changed from GNU Affero to a Modified MIT License. See file included in download.
 
 New features:
 - Added normal Dutch localization (moved existing nl to nl-be) - thanks to Patrick Donker.
@@ -842,3 +842,5 @@ Bugfixes:
 - Fixed a case where the default channel could be blocked from the limitChannelList config option.
 - Fix potential conflict between php and mysql timezones by using mysql's FROM_UNIXTIME(). - thanks to ManOnDaMoon.
 - Normalized sound volumes a bit.
+- Fixed mybb integration database connection. Connection details should be pulled automatically now.
+- Fidex mybb integration guest logins to accept guests that don't enter a username (assign numbers like other versions).