631 Commits

Author SHA1 Message Date
P
7ea65bdadf
Merge branch 'develop' into currency-filter-or-fix-eth 2018-02-16 16:20:38 +01:00
Vitaliy Vlasov
f7547242d4
Merge branch 'develop' into revert-266-revert-260-revert-251-revert-240-fix/metamask-address-not-updated-#187 2018-02-16 16:49:58 +02:00
Oliver Martell
3c845c39f7 [Fix #291] Fix command to run migrations
Fixes #291
Status: Finished

Summary

This fixes the code in main to run migrations. The issue was that the original
code was using `:jdbc-database-url` vs `:database-url`. It now works for both
migrations and rollbacks. I've also simplified the components started by mount
as we only need to start env and not the db.
2018-02-16 14:43:05 +00:00
Vitaliy Vlasov
187b748c58
Merge branch 'develop' into 193-hide-myself 2018-02-16 16:00:53 +02:00
Venkata Chandrasekhar Nainala
0e35273f1c Aligned the squared brackets with its parent 2018-02-16 14:50:51 +01:00
Venkata Chandrasekhar Nainala
207ffca77b Sticky footer changes 2018-02-16 14:50:51 +01:00
Venkata Chandrasekhar Nainala
3c140a4171 Avoid excessing padding on top
Moving footer out of the vertical segment creates excessive padding on top. This reduces the padding/gap.
2018-02-16 14:50:51 +01:00
Venkata Chandrasekhar Nainala
c41f1c5e78 Moving footer out of the vertical segment
Avoid the bottom padding from the vertical segment - Semantic UI (Sticks the footer to the base)
2018-02-16 14:50:51 +01:00
Ivan Grishaev
a8cdaa427f
Merge branch 'develop' into 193-hide-myself 2018-02-16 15:04:51 +03:00
Rob Culliton
9f1febc0f3 remove moment.js dependency
and replace with goog.date.relative
2018-02-16 13:01:21 +01:00
Ivan Grishaev
38ecb91710 Merge branch 'develop' of https://github.com/status-im/open-bounty into 193-hide-myself 2018-02-16 14:56:30 +03:00
Vitaliy Vlasov
a25bfe419e
Revert "Revert "[FIX #187] Fix address dropdown in My Payment Details"" 2018-02-16 13:06:35 +02:00
pablodip
066b79c590 fix filter currency eth 2018-02-16 07:14:16 +01:00
Vitaliy Vlasov
a7803d5acc
Merge branch 'develop' into fix/metamask-address-not-updated-#187 2018-02-15 11:03:47 +02:00
P
a253045787
Merge branch 'develop' into filter-boxes-vertical-alignment 2018-02-15 08:41:21 +01:00
pablodip
26ac02caf5 fix vertical height in filter boxes 2018-02-14 08:19:25 +01:00
pablodip
9297de5660 some details 2018-02-14 08:05:01 +01:00
pablodip
7587b21154 fix cs 2018-02-13 16:27:56 +01:00
pablodip
957de197b7 currency-filter-or 2018-02-13 16:26:17 +01:00
Ivan Grishaev
9732b7c948 193 h3 added 2018-02-12 18:17:45 +03:00
Ivan Grishaev
092713a541 193 merge artifacts 2018-02-12 18:13:55 +03:00
Ivan Grishaev
34c16456ea Merge branch 'develop' of https://github.com/status-im/open-bounty into 193-hide-myself 2018-02-12 18:12:01 +03:00
Ivan Grishaev
4717a1a590 193 review fixes 2018-02-12 18:07:41 +03:00
Vitaliy Vlasov
c3798e98d9
Merge branch 'develop' into fix/metamask-address-not-updated-#187 2018-02-12 15:37:05 +02:00
Vitaliy Vlasov
caca11a37b
Revert "Revert "Revert "[FIX #187] Fix address dropdown in My Payment Details""" 2018-02-09 15:57:19 +02:00
Vitaliy Vlasov
5e8cb562b7 Remove trailing conflict marker 2018-02-09 15:39:08 +02:00
Vitaliy Vlasov
186d989006 Merge branch 'develop' into fix/metamask-address-not-updated-#187 2018-02-09 15:36:02 +02:00
Ivan Grishaev
c2d6094dad Merge branch 'develop' of https://github.com/status-im/open-bounty into 193-hide-myself 2018-02-09 16:20:13 +03:00
P
8dd2a4f2ef
Merge pull request #261 from pablodip/add-cider-dependency-temporatily
Remove Cider
2018-02-08 20:39:15 +01:00
Vitaliy Vlasov
8b0622480d Add :user-profile-loaded? event/sub 2018-02-08 18:08:44 +02:00
P
abaf5b3b31
Merge pull request #256 from pablodip/sort-and-filter-fixes-3
Sort and filter fixes 3
2018-02-08 16:30:50 +01:00
pablodip
177b0b22c7 remove cider in dependencies and code 2018-02-08 13:50:28 +01:00
Ivan Grishaev
21c869af49 193 blank line removed 2018-02-08 15:33:24 +03:00
Ivan Grishaev
c66691ca23 193 review fixes 2018-02-08 15:27:46 +03:00
Ivan Grishaev
596e6c9439 Merge branch 'develop' of https://github.com/status-im/open-bounty into 193-hide-myself 2018-02-08 12:54:18 +03:00
Vitaliy Vlasov
27d189f1bc
Revert "Revert "[FIX #187] Fix address dropdown in My Payment Details"" 2018-02-08 11:31:46 +02:00
pablodip
439c237336 disable filters and sorting in windows for now 2018-02-07 21:22:38 +01:00
pablodip
65a357dcd9 add top border in the first item in bounties, and adjust above info 2018-02-07 21:06:58 +01:00
pablodip
22a7939363 move sorting to align it with items count 2018-02-07 21:02:40 +01:00
pablodip
37aefc2d1a make right column narrower 2018-02-07 20:46:57 +01:00
pablodip
92dd80e7be fix z-index for events in safari 2018-02-07 20:40:39 +01:00
P
fb46b66979
Merge pull request #254 from pablodip/sort-and-filter-fixes-2
Sorting and filtering fixes 2
2018-02-07 15:20:26 +01:00
pablodip
1a4aec81d7 fix some visual issues in filters 2018-02-07 12:23:44 +01:00
Ivan Grishaev
a61885d5be 193 get rid of passing user-id 2018-02-07 11:33:48 +03:00
Ivan Grishaev
a0073b295e Merge branch 'develop' of https://github.com/status-im/open-bounty into 193-hide-myself 2018-02-06 20:13:15 +03:00
Ivan Grishaev
fb95fe6697 193 print removed 2018-02-06 20:01:19 +03:00
Ivan Grishaev
2b7dff9648 193 UI updated 2018-02-06 19:58:39 +03:00
Ivan Grishaev
8937816a8c 193 query field updated 2018-02-06 19:58:26 +03:00
Vitaliy Vlasov
560cd6a964 [FIX #154] Increase padding for open-claims-label 2018-02-06 16:45:15 +02:00
Vitaliy Vlasov
2ca563ab1a
Revert "[FIX #187] Fix address dropdown in My Payment Details" 2018-02-06 16:31:46 +02:00