Merge branch 'develop' into feature/messages_api

10 files changed, 32 insertions, 25 deletions

diff --git a/app/assets/stylesheets/leap.scss b/app/assets/stylesheets/leap.scss
index abfea05..02b6241 100644
--- a/app/assets/stylesheets/leap.scss
+++ b/app/assets/stylesheets/leap.scss
@@ -110,9 +110,9 @@ html.oldmac, html.oldwin, html.ios, html.fxos, html.other {
 
 [class^="big-icon-"],
 [class*=" big-icon-"] {
-  width: 32px;
-  height: 32px;
-  line-height: 32px;
+  width: 64px;
+  height: 64px;
+  line-height: 64px;
 }
 
 [class^="huge-icon-"],
@@ -122,14 +122,14 @@ html.oldmac, html.oldwin, html.ios, html.fxos, html.other {
   line-height: 128px;
 }
 
-
-.big-icon-arrow-down {
-  background-image: url(/leap-img/32/arrow-down.png)
+.big-icon-download {
+  height: 42px;
+  background: url(/leap-img/64/download.png) 50% 50%;
 }
 
 .huge-icon-mask {
   height: 64px;
-  background-image: url(/leap-img/128/mask.png)
+  background-image: url(/leap-img/128/mask.png);
 }
 
 //
diff --git a/config/defaults.yml b/config/defaults.yml
index 6e14623..cb18795 100644
--- a/config/defaults.yml
+++ b/config/defaults.yml
@@ -14,21 +14,18 @@ cert_options: &cert_options
   unlimited_cert_prefix: "UNLIMITED"
 
 downloads: &downloads
-  client_download_domain: https://downloads.leap.se
+  client_download_domain: https://dl.bitmask.net
   available_clients:
-    - linux32
-    - linux64
+    - linux
     - osx
     - windows
     - android
   download_paths:
-    android: /client/android/Bitmask-Android-latest.apk
-    linux:   /client/linux
-    linux32: /client/linux/Bitmask-linux32-latest.tar.bz2
-    linux64: /client/linux/Bitmask-linux64-latest.tar.bz2
-    osx:     /client/osx/Bitmask-OSX-latest.dmg
-    windows: /client/windows/Bitmask-win32-latest.zip
-    other:   /client
+    android: /android/
+    linux:   /linux/
+    osx:     /mac/
+    windows: /windows/
+    other:   /
 
 common: &common
   force_ssl: false
diff --git a/config/environments/development.rb b/config/environments/development.rb
index adde3ba..7b06c81 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -29,7 +29,7 @@ LeapWeb::Application.configure do
   # Expands the lines which load the assets
   config.assets.debug = true
 
-  #  hacky, but otherwise getting certificate error, and doesn't seem dangerous in development mode:
-  OpenSSL::SSL::VERIFY_PEER = OpenSSL::SSL::VERIFY_NONE
-
+  # super hacky, but otherwise getting certificate error, and doesn't seem dangerous in development mode:
+  OpenSSL::SSL.send(:remove_const, "VERIFY_PEER")
+  OpenSSL::SSL.const_set("VERIFY_PEER", OpenSSL::SSL::VERIFY_NONE)
 end
diff --git a/core/app/views/common/_download_for_os.html.haml b/core/app/views/common/_download_for_os.html.haml
index 4c096ce..3a11d10 100644
--- a/core/app/views/common/_download_for_os.html.haml
+++ b/core/app/views/common/_download_for_os.html.haml
@@ -3,10 +3,11 @@
   %span.link
     - btn_class = (os == "other") ? "disabled" : "btn-primary"
     = link_to client_download_url(os), :class => "btn btn-large #{btn_class}" do
-      .pull-left= huge_icon('mask')
-      = t(:download_client)
-      %br/
-      %small= I18n.t("os.#{os}")
+      = big_icon('download')
+      .pull-right
+        = t(:download_client)
+        %br/
+        %small= I18n.t("os.#{os}")
   %span.info
     %div= t(:client_info, :provider => content_tag(:b,APP_CONFIG[:domain])).html_safe
     %div
diff --git a/core/config/initializers/couchrest_model.rb b/core/config/initializers/couchrest_model.rb
new file mode 100644
index 0000000..ce4f41a
--- /dev/null
+++ b/core/config/initializers/couchrest_model.rb
@@ -0,0 +1,3 @@
+CouchRest::Model::Base.configure do |config|
+  config.auto_update_design_doc = false
+end
diff --git a/core/config/locales/en.yml b/core/config/locales/en.yml
index 4abf4e8..bb510d4 100644
--- a/core/config/locales/en.yml
+++ b/core/config/locales/en.yml
@@ -33,8 +33,9 @@ en:
   os:
     linux32: "Linux (32 bit)"
     linux64: "Linux (64 bit)"
+    linux: "GNU/Linux"
     windows: "Windows"
     android: "Android"
     osx: "Mac OS"
-    other: "(not available for your OS.)"
+    other: "(not available for your OS)"
 
diff --git a/public/leap-img/32/arrow-down.png b/public/leap-img/32/arrow-down.png
deleted file mode 100644
index 3b16e6d..0000000
--- a/public/leap-img/32/arrow-down.png
+++ /dev/null
diff --git a/public/leap-img/32/download.png b/public/leap-img/32/download.png
new file mode 100644
index 0000000..7dc2a68
--- /dev/null
+++ b/public/leap-img/32/download.png
diff --git a/public/leap-img/64/download.png b/public/leap-img/64/download.png
new file mode 100644
index 0000000..bac9a85
--- /dev/null
+++ b/public/leap-img/64/download.png
diff --git a/users/test/unit/user_test.rb b/users/test/unit/user_test.rb
index c797623..ffbb7d8 100644
--- a/users/test/unit/user_test.rb
+++ b/users/test/unit/user_test.rb
@@ -7,6 +7,11 @@ class UserTest < ActiveSupport::TestCase
     @user = FactoryGirl.build(:user)
   end
 
+  test "design docs in database are authorative" do
+    assert !User.design_doc.auto_update,
+      "Automatic update of design docs should be disabled"
+  end
+
   test "test set of attributes should be valid" do
     @user.valid?
     assert_equal Hash.new, @user.errors.messages