Merge remote-tracking branch 'origin/development' into nightly

cryptoGlance · Jul 12, 2015 · 1d954d0 · 1d954d0
2 parents 0eb2758 + 84dacab
commit 1d954d0
Show file tree

Hide file tree

Showing 296 changed files with 2,239 additions and 2,204 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1,6 @@
+* text eol=lf
+* bat eol=lf
+* sh eol=lf
+# Denote all files that are truly binary and should not be modified.
+*.ttf binary
+*.eot binary
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,26 @@
 
-    [ v2.1.0.9 ]
+    [ v2.1.0.14 ]
+
+    FEATURES
+    ========
+    - Added highest temperature to Overview panel
+
+    SERVICE
+    =======
+    - Removed PoolPicker due to the service shutting down
+
+    HOTFIXES
+    ========
+    - Added CkPool changes (https://bitcointalk.org/index.php?topic=569924.msg11827496#msg11827496)
+
+    KNOWN ISSUES
+    ============
+    - Miner Failover may report incorrect active pool
+    - Wallets can take a long time to load
+
+---
+
+    [ v2.1.0.13 ]
 
     FEATURES
     ========
@@ -30,11 +51,6 @@
     - Fixed issue where JS would load for all features regardless if they are used
     - Fixed issue with some switch styling
 
-    KNOWN ISSUES
-    ============
-    - Miner Failover may report incorrect active pool
-    - Wallets can take a long time to load
-
 ---
 
     [ v2.1 ]
@@ -206,4 +222,8 @@
 
 ---
 
-/*end CHANGELOG.md*
+<<<<<<< HEAD
+/*end CHANGELOG.md*
+=======
+/*end CHANGELOG.md*
+>>>>>>> origin/development
diff --git a/LICENSE b/LICENSE
diff --git a/Michelf/Markdown.inc.php b/Michelf/Markdown.inc.php
diff --git a/Michelf/Markdown.php b/Michelf/Markdown.php
diff --git a/Michelf/MarkdownExtra.inc.php b/Michelf/MarkdownExtra.inc.php
diff --git a/Michelf/MarkdownExtra.php b/Michelf/MarkdownExtra.php
diff --git a/Michelf/MarkdownInterface.inc.php b/Michelf/MarkdownInterface.inc.php
diff --git a/Michelf/MarkdownInterface.php b/Michelf/MarkdownInterface.php
diff --git a/README.md b/README.md
diff --git a/ajax.php b/ajax.php
diff --git a/changelog.php b/changelog.php
diff --git a/css/animate.min.css b/css/animate.min.css
diff --git a/css/bootstrap-modal-bs3patch.css b/css/bootstrap-modal-bs3patch.css
diff --git a/css/bootstrap-modal.css b/css/bootstrap-modal.css
diff --git a/css/bootstrap-switch.min.css b/css/bootstrap-switch.min.css
diff --git a/css/bootstrap.min.css b/css/bootstrap.min.css
diff --git a/css/cryptoglance-base.css b/css/cryptoglance-base.css
diff --git a/css/jquery.toastmessage.css b/css/jquery.toastmessage.css
diff --git a/css/slider.css b/css/slider.css