Commit Graph

1003 Commits

Author SHA1 Message Date
Martin Klepsch b8393b39a5
fix relative time display for long-ago dates 2018-02-19 19:02:58 +01:00
Tetiana Churikova f3ae3e2dc1
Merge pull request #309 from status-im/bug/workflow-doc-formatting
Development workflow formatting
2018-02-19 16:17:22 +02:00
Martin Klepsch 66d62bf030
whitespace formatting 2018-02-19 15:16:00 +01:00
Tetiana Churikova a1e6af2048
Merge pull request #290 from status-im/doc/development_workflow
Doc to define development workflow
2018-02-19 16:12:49 +02:00
Tetiana Churikova 2f48fed480
Merge branch 'develop' into doc/development_workflow 2018-02-19 16:08:24 +02:00
Oliver Martell Núñez d0b61c7733
Merge branch 'develop' into bug/migrations-#291 2018-02-19 13:52:03 +00:00
Churikova Tetiana 30db40f54c Merge remote-tracking branch 'origin/doc/development_workflow' into doc/development_workflow 2018-02-19 14:28:45 +02:00
Churikova Tetiana a7ad1cf8fd Development workflow v1-updated 2018-02-19 14:28:16 +02:00
P a2c989df80
Merge pull request #298 from pablodip/currency-filter-or-fix-eth
Fix filter currency eth
2018-02-19 12:57:48 +01:00
P 7ea65bdadf
Merge branch 'develop' into currency-filter-or-fix-eth 2018-02-16 16:20:38 +01:00
Vitaliy Vlasov 3c55056376
Merge pull request #299 from status-im/revert-266-revert-260-revert-251-revert-240-fix/metamask-address-not-updated-#187
Revert "Revert "[FIX #187] Fix address dropdown in My Payment Details""
2018-02-16 17:02:10 +02: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 166c1252a7
Merge pull request #199 from igrishaev/193-hide-myself
193 Hide myself from the top hunters and activity lists
2018-02-16 16:00:59 +02: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
Ivan Borovkov c5067ec6c3
remove automatic deployment on build (#295) 2018-02-15 21:31:55 +04:00
Ivan Borovkov 56202d1d19
remove automatic deployment on build (#294) 2018-02-15 20:29:14 +04:00
Vitaliy Vlasov 162e53fdbc Add TOC to README, remove duplicate 'Running' section 2018-02-15 12:53:46 +01:00
Vitaliy Vlasov 714b869a72
Merge pull request #263 from status-im/fix/metamask-address-not-updated-#187
[FIX #187] Fix issue with "Select address" appearing after refresh
2018-02-15 11:04:23 +02:00
Vitaliy Vlasov a7803d5acc
Merge branch 'develop' into fix/metamask-address-not-updated-#187 2018-02-15 11:03:47 +02:00
Tetiana Churikova 74313c2215
Merge branch 'develop' into doc/development_workflow 2018-02-15 10:39:34 +02:00
Churikova Tetiana c106c675b1 Development workflow v1 2018-02-15 10:27:36 +02:00
P a52c738ca6
Merge pull request #283 from pablodip/filter-boxes-vertical-alignment
Fix vertical height in filter boxes
2018-02-15 08:41:34 +01:00
P a253045787
Merge branch 'develop' into filter-boxes-vertical-alignment 2018-02-15 08:41:21 +01:00
P 88016a2ad9
Merge pull request #279 from pablodip/currency-filter-or
Currency filter should use OR
2018-02-15 08:39:34 +01:00
P 0beced28d2
Merge branch 'develop' into currency-filter-or 2018-02-14 21:49:02 +01:00
P 5a4e6e3cff
Merge branch 'develop' into filter-boxes-vertical-alignment 2018-02-14 21:48:38 +01:00
Vitaliy Vlasov 0a50beb977 Add README with table of contents in doc dir 2018-02-14 17:28:44 +01:00
Vitaliy Vlasov 6f366e3dc6 Add wiki docs to the repo 2018-02-14 17:28:44 +01:00
Martin Klepsch dffb6104a2 provide homebrew instructions for solc and web3j 2018-02-14 15:19:34 +01:00
Martin Klepsch 3d3caa9b1a provide links to installation instructinos for solc and web3j 2018-02-14 15:19:34 +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
Martin Klepsch 64f5d3bb5a improve postgres setup instructions in readme 2018-02-13 15:22:23 +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