Merge remote-tracking branch 'origin' into mybb

Conflicts: chat/changelog.txt chat/index.php chat/lib/template/loggedOut.html chat/readme.html readme.md
Frug · Apr 17, 2016 · 907581d · 907581d
2 parents 8ef19f6 + cbccb35
commit 907581d
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/chat/changelog.txt b/chat/changelog.txt
@@ -845,7 +845,7 @@ Bugfixes:
 - 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).
 
-Version 0.8.8 (?.?.2014)
+Version 0.8.8 (17.04.2016)
 -------------------------------
 Notice:
 - Templates, especially loggedIn.html have changed a lot to add mobile support. Javascript in the templates files has also changed.

diff --git a/chat/index.php b/chat/index.php
@@ -9,7 +9,7 @@
  */
 
 // Suppress errors:
-error_reporting(E_ALL);
+error_reporting(0);
 
 // Path to the chat directory:
 define('AJAX_CHAT_PATH', dirname($_SERVER['SCRIPT_FILENAME']).'/');

diff --git a/readme.md b/readme.md
@@ -1,5 +1,5 @@
 AJAX Chat MyBB
-====================
+==============
 
 This is the MyBB integration version of Blueimp's AJAX Chat.