Upgrade Sodium dependency to 0.1.0

Upgrade Sodium dependency to 0.1.0

--- client/project.clj
+++ client/project.clj
@@ -20,7 +20,7 @@
                  ;; Cookie support
                  [com.degel/re-frame-storage-fx "0.1.0-SNAPSHOT"]

-                 [com.degel/sodium "0.1.0-SNAPSHOT"]]
+                 [com.degel/sodium "0.1.0"]]

   :plugins [[lein-cljsbuild "1.1.4"]
             [lein-garden "0.2.8"]]
@@ -49,7 +49,7 @@
                    [figwheel-sidecar "0.5.11"]
                    [com.cemerick/piggieback "0.2.2"]]

-    :plugins      [[lein-figwheel "0.5.10"]
+    :plugins      [[lein-figwheel "0.5.11"]
                    [lein-doo "0.1.7"]]}}

   :cljsbuild


Display correct status for console messages

Signed-off-by: Andrey Shovkoplyas <b713972e59b8e606e23253c4a13e948139fea4d1@gmail.com>

--- src/status_im/chat/views/message/message.cljs
+++ src/status_im/chat/views/message/message.cljs
@@ -288,7 +288,7 @@

                               :else
                               (or delivery-status outgoing-status))]
-    (case outgoing-status
+    (case status
       :sending  [message-activity-indicator]
       :not-sent [message-not-sent-text chat-id message-id]
       (when last-outgoing?


Tappable request message (closes #283)

Tappable request message (closes #283)

Former-commit-id: 8026bdad0b520f2140f5c90bfae9e7b274867246

--- src/status_im/chat/views/request_message.cljs
+++ src/status_im/chat/views/request_message.cljs
@@ -70,19 +70,23 @@

 (defn message-content-command-request
   [{:keys [message-id content from incoming-group]}]
-  (let [commands-atom (subscribe [:get-responses])]
+  (let [commands-atom (subscribe [:get-responses])
+        answered? (subscribe [:is-request-answered? message-id])]
     (fn [{:keys [message-id content from incoming-group]}]
       (let [commands @commands-atom
             {:keys [command content]} (parse-command-request commands content)]
         [view st/comand-request-view
-         [view st/command-request-message-view
-          (when incoming-group
-            [text {:style st/command-request-from-text
-                   :font  :default}
-             from])
-          [text {:style st/style-message-text
-                 :font  :default}
-           content]]
+         [touchable-highlight
+          {:on-press            (when-not @answered?
+                                  #(set-chat-command message-id command))}
+          [view st/command-request-message-view
+           (when incoming-group
+             [text {:style st/command-request-from-text
+                    :font  :default}
+              from])
+           [text {:style st/style-message-text
+                  :font  :default}
+            content]]]
          [request-button message-id command]
          (when (:request-text command)
            [view st/command-request-text-view


Removed the source code sample

Removed the source code sample

--- template/index.html.clj
+++ template/index.html.clj
@@ -14,56 +14,11 @@
   " inspired static site generator in Clojure")

 ;; Sample posts
-(page-header "Sample posts")
+(page-header "Posts")
 (post-list)
 (prev-next-page-link)

 ;; Sample post tags
-(page-header "Sample tags")
+(page-header "Tags")
 (tag-list)

-;; Template source
-(page-header "Template source")
-[:p "you can highlight your code with "
- (link "google-code-prettify" "http://code.google.com/p/google-code-prettify/")]
-#-CLOJURE
-;; Define template options here
-; @layout  default
-; @title   home
-
-;; Your own function in template
-(defn page-header [[fs & rs]]
-  [:div {:class "page-header"}
-   [:h1 [:span fs] rs]])
-
-; Template is compiled with hiccup
-(header
-  (:title site)
-  (link "Jekyll" "https://github.com/mojombo/jekyll")
-  " inspired static site generator in Clojure")
-
-;; Sample posts
-(page-header "Sample posts")
-(post-list)
-
-;; Sample post tags
-(page-header "Sample tags")
-(tag-list)
-
-;; Template source
-(page-header "Template source")
-[:p "you can highlight your code with "
- (link "google-code-prettify" "http://code.google.com/p/google-code-prettify/")]
-#-CLJ
-CLJ
-
-;; Document
-(page-header "Document")
-; Markdown like format with "p" function
-(p "See " (link "http://liquidz.github.com/misaki/demo"))
-CLOJURE
-
-;; Document
-(page-header "Document")
-; Markdown like format with "p" function
-(p "See " (link "http://liquidz.github.com/misaki/"))


test fix ? :cherries:

test fix ? :cherries:

--- test/metabase/driver/postgres_test.clj
+++ test/metabase/driver/postgres_test.clj
@@ -37,9 +37,6 @@
 ;; ## no SSL -- this should *not* include the key :ssl (regardless of its value) since that will cause the PG driver to use SSL anyway
 (expect
     {:user "camsaul"
-     :host "localhost"
-     :port "5432"
-     :db "bird_sightings"
      :classname "org.postgresql.Driver"
      :subprotocol "postgresql"
      :subname "//localhost:5432/bird_sightings"
@@ -54,17 +51,14 @@
 (expect
     {:ssl true
      :make-pool? true
-     :db "bird_sightings"
      :sslmode "require"
      :classname "org.postgresql.Driver"
-     :port "5432"
      :subprotocol "postgresql"
-     :host "localhost"
      :user "camsaul"
      :sslfactory "org.postgresql.ssl.NonValidatingFactory"
      :subname "//localhost:5432/bird_sightings"}
   (connection-details->connection-spec {:ssl    true
                                         :host   "localhost"
-                                        :port   "5432"
+                                        :port   5432
                                         :dbname "bird_sightings"
                                         :user   "camsaul"}))


add support for min-width to replay args

--- src-cljs/frontend/controllers/navigation.cljs
+++ src-cljs/frontend/controllers/navigation.cljs
@@ -114,6 +114,13 @@
                                     db
                                     (db/reset-db! db initial-entities)))))))

+(defn play-replay? [args]
+  (and (get-in args [:query-params :replay])
+       (if-let [min-width (utils/inspect (some-> args :query-params :min-width js/parseInt))]
+         (> (.-width (goog.dom/getViewportSize))
+            min-width)
+         true)))
+
 (defmethod post-navigated-to! :document
   [history-imp navigation-point args previous-state current-state]
   (let [sente-state (:sente current-state)
@@ -121,7 +128,7 @@
     (when-let [prev-doc-id (:document/id previous-state)]
       (when (not= prev-doc-id doc-id)
         (sente/send-msg (:sente current-state) [:frontend/unsubscribe {:document-id prev-doc-id}])))
-    (if (get-in args [:query-params :replay])
+    (if (play-replay? args)
       (utils/apply-map replay/replay-and-subscribe
                        current-state
                        (-> {:sleep-ms 25


remove colored printing assert, for now

remove colored printing assert, for now

--- src/bolth.clj
+++ src/bolth.clj
@@ -457,7 +457,6 @@
   (assert (and (number? (:clear-screen-lines options 50)) (pos? (:clear-screen-lines options 50))) (str ":clear-screen-lines should be a positive number, but was: " (pr-str (:clear-screen-lines options 50))))
   (assert (and (number? (:flush-interval options 10)) (pos? (:flush-interval options 50))) (str ":flush-interval should be a positive number, but was: " (pr-str (:flush-interval options 50))))
   (assert (map? (:frame-options options *frame-options*)) (str ":frame-options should be a map, but was: " (pr-str (:frame-options options *frame-options*))))
-  (assert (#{true false} (:colored-printing options true)) (str ":colored-printing should be a boolean, but was: " (pr-str (:colored-printing options true))))
   (assert (#{:random :agony :gathered nil} (:priority options :agony)) (str ":priority should be one of :random, :agony, :gathered, or not set at all, but was: " (pr-str (:priority options :agony))))
   (assert (fn? (options->prioritizer options)) (str "prioritizer should a function, but was: " (pr-str (options->prioritizer options)))))


RR: merge fields to one query

RR: merge fields to one query

--- src/hatti/views/map.cljs
+++ src/hatti/views/map.cljs
@@ -1,6 +1,7 @@
 (ns hatti.views.map
   (:require-macros [cljs.core.async.macros :refer [go go-loop]])
   (:require [cljs.core.async :refer [<! chan put! timeout]]
+            [clojure.string :as string]
             [chimera.js-interop :refer [json->cljs]]
             [om.core :as om :include-macros true]
             [sablono.core :as html :refer-macros [html]]
@@ -34,17 +35,17 @@
                               (apply merge (map (fn [{:keys [label name]}]
                                                   {label name}) children)) %)
                              %)
-            field-key (keyword name)]
+            field-key (keyword name)
+            answers (for [d data]
+                      (let [label (-> d field-key first)
+                            answer (label->answer label)]
+                        (str "{\"" full-name \" ":\"" answer "\"}")))
+            query (str "{\"$or\":[" (string/join "," answers) "]}")
+            fields (str "[\"" _id \"  ", \"" full-name "\"]")
+            data (->> (<! (data-get nil {:query query :fields fields}))
+                      :body json->cljs (remove empty?))]
         (om/update! app-state [:map-page :data] [])
-        (doseq [d data]
-          (let [label (-> d field-key first)
-                answer (label->answer label)
-                query (str "{\"" full-name \" ":\"" answer "\"}")
-                fields  (str "[\"" _id \" "]")
-                ids (->> (<! (data-get nil {:query query :fields fields}))
-                         :body json->cljs (remove empty?))
-                data (map #(merge % {full-name answer}) ids)]
-            (om/transact! app-state [:map-page :data] #(concat % data)))))))
+        (om/transact! app-state [:map-page :data] #(concat % data)))))

 ;;;;; EVENT HANDLERS