Adrian Tiberius
|
7d67ab6525
|
added login and users screens
Former-commit-id: 0a5ce64fe25837166b9798953f3bed961fe634c3
|
2016-06-13 19:35:18 +03:00 |
|
Jarrad
|
2d1275a663
|
Merge pull request #129 from status-im/issue/#120
Issue/#120
Former-commit-id: 08790ddd0d111fc50e2dfc03102370dbe78162f5
|
2016-06-13 18:06:29 +02:00 |
|
Adrian Tiberius
|
23a17b2632
|
merged develop
Former-commit-id: 7f207a37600ca9f2a44b51c714cf8b4e47f5ec29
|
2016-06-10 03:21:48 +03:00 |
|
Adrian Tiberius
|
c00bc75346
|
updated new contact screen; some code cleaning
Former-commit-id: e0ce4217bb27ed4f9015833ad19eb3bb441fc79c
|
2016-06-10 03:03:40 +03:00 |
|
Roman Volosovskyi
|
7ff6f97290
|
Merge pull request #127 from status-im/root-warning
warn user if root before starting geth
Former-commit-id: 9630f4370fb2721f2d869fa20e87d70b6c1ae456
|
2016-06-08 16:47:15 +03:00 |
|
|
|
4b43096ba8
|
System.loadLibrary voodoo magic
Former-commit-id: 97ff59f95bcdd80a57833263c5a8191223683be6
|
2016-06-08 15:29:48 +02:00 |
|
|
|
ce6ebde8b7
|
fix conflicts
Former-commit-id: 804683cd5235ac5053923ef5268706b6f722d490
|
2016-06-08 13:06:58 +02:00 |
|
|
|
6756d02335
|
warn user if root before starting geth
Former-commit-id: 1f0a4214b814da17d596f368c962c30152843327
|
2016-06-08 12:43:02 +02:00 |
|
Jarrad
|
fb5d4f15f1
|
Merge pull request #118 from status-im/bug/#115
workaround for adding peer to geth
Former-commit-id: 44c98d68c1e7941102e4df5dc79514dfc59afcc3
|
2016-06-06 12:57:09 +02:00 |
|
Adrian Tiberius
|
a424ba1447
|
qr-scanner screen title, code cleaning, style fixes
Former-commit-id: fbd66a840fc7f43b212f16f7cf3ae619267ce429
|
2016-06-03 15:47:52 +03:00 |
|
Roman Volosovskyi
|
13d689bb4a
|
println
Former-commit-id: 72b9afce9985c73a1c98a13cdbd7615da775cd4a
|
2016-06-02 17:40:58 +03:00 |
|
Roman Volosovskyi
|
1d3a91c0ee
|
updated qr flow
Former-commit-id: db46a3a3cb4de5ef843759751661d9f41d8f26ad
|
2016-06-02 17:39:26 +03:00 |
|
Roman Volosovskyi
|
18e6b80e18
|
fix typo
Former-commit-id: 485718d8719411456968560a56f58172a0d85299
|
2016-06-02 15:57:33 +03:00 |
|
Roman Volosovskyi
|
ea06b2da58
|
fix label function
Former-commit-id: 11edd55b5a5a8205195c02e52cd3fc20a606889a
|
2016-06-02 15:48:57 +03:00 |
|
Roman Volosovskyi
|
2b4f410fd7
|
fix contacts loading
Former-commit-id: 9ae6e752d894170d65e8d8da813c5386796a3fe8
|
2016-06-02 14:23:28 +03:00 |
|
Adrian Tiberius
|
a156c8f865
|
make qr-scanner callable multiple times from different screens
Former-commit-id: 6eeefb2efbd460376eb00b9714422e1c23724402
|
2016-06-02 13:43:26 +03:00 |
|
Jarrad
|
855dca08f5
|
Merge pull request #117 from status-im/appium-setup
Appium setup & unit tests
Former-commit-id: ba1d5d1c4ec0194d9c08f59669cef1913d1e7c5b
|
2016-06-02 11:52:39 +02:00 |
|
|
|
ed65ba0ba7
|
update run-osx for unit tests and iTerm new release
Former-commit-id: 058f470ea7fd00d50de7f6ef20642d5608b44831
|
2016-06-02 11:51:44 +02:00 |
|
Roman Volosovskyi
|
ce80c8a330
|
fix exception at fetching of the contacts
Former-commit-id: 084f067ae82eca5576f2fc84450c961b3b75cc2b
|
2016-06-01 19:42:38 +03:00 |
|
Roman Volosovskyi
|
04760cc549
|
Merge branch 'develop' into appium-setup
Conflicts:
src/status_im/i18n.cljs
Former-commit-id: bf6d4ef2569f3be04ec86548389ef4ad5b9c83a4
|
2016-06-01 19:11:51 +03:00 |
|
Adrian Tiberius
|
4d5c5755c6
|
fix translation pluralization
Former-commit-id: a46f60c854a6d17d982da3ffdc62ae186a8fa981
|
2016-06-01 14:44:04 +03:00 |
|
Adrian Tiberius
|
8250e8d225
|
fix translation pluralization
Former-commit-id: 13c506491fb4181ee8df9fcec8a0426fb2067f7f
|
2016-06-01 14:35:22 +03:00 |
|
Roman Volosovskyi
|
7fbbf8b4aa
|
remove println
Former-commit-id: 2bfd90cec410750bd31b9e487cc236192ac8b7ae
|
2016-06-01 14:09:43 +03:00 |
|
Adrian Tiberius
|
4870fef74b
|
fix qr code decoding and remove extra data
Former-commit-id: 755e9bf2b3afe92d0bf426cd47b7bbfa572f7c82
|
2016-06-01 14:01:58 +03:00 |
|
Adrian Tiberius
|
d094cd286c
|
implemented #119 and #120
Former-commit-id: c81276e3b70616511a6f1f98f452dc50b08fe975
|
2016-06-01 11:41:50 +03:00 |
|
Roman Volosovskyi
|
0f6e15a8d0
|
fix ids for chats created after receiving from unknown id
Former-commit-id: b914493283e4b03415ba576533ff02f68c4ada81
|
2016-05-30 11:49:16 +03:00 |
|
Roman Volosovskyi
|
c4d3436bfc
|
move js/React to cljsjs.react.cljs
Former-commit-id: f30248e7fea10649bebf2b412ecef12f4920e663
|
2016-05-30 11:01:57 +03:00 |
|
Roman Volosovskyi
|
eedf38895d
|
doc for appium-test
Former-commit-id: c8d0f590c21797dfed5f7deb74e022c65b3d2a2c
|
2016-05-30 10:22:29 +03:00 |
|
Roman Volosovskyi
|
3ea8b2cb82
|
first unit test
Former-commit-id: 1766b1af1295f6773f580a3a6d3a1afba3dbff0a
|
2016-05-30 08:58:38 +03:00 |
|
Roman Volosovskyi
|
59cf02194b
|
js/window
Former-commit-id: 043d28c44d8c62496627e39fd0cb21d4a70fb27e
|
2016-05-30 08:58:38 +03:00 |
|
Roman Volosovskyi
|
17c1c76003
|
clean js/window first attempt
Former-commit-id: 7694ad9e873d80824a07798de66b96b0f6a96dbb
|
2016-05-30 08:58:38 +03:00 |
|
Adrian Tiberius
|
ecf8ea0f33
|
workaround for adding peer to geth
Former-commit-id: 32b10794d20d6ac149bb484d1d65dacff4cc84d7
|
2016-05-26 19:20:39 +03:00 |
|
|
|
983a007280
|
Merge branch 'appium-setup' of github.com:status-im/status-react into appium-setup
Former-commit-id: ab36ec7df7f7b555fb79d00cedbe7575b462c0cf
|
2016-05-26 18:05:24 +02:00 |
|
|
|
ee2087ce77
|
run appium with second param
Former-commit-id: a2e14e4ff09b49cce3d170341e8623cdcd4c46d9
|
2016-05-26 18:05:10 +02:00 |
|
Roman Volosovskyi
|
e8256f34e9
|
implicitly wait 25s
Former-commit-id: 0e3c1d10ba0ef3205efb800ce5d98f71f4266274
|
2016-05-26 18:13:37 +03:00 |
|
Roman Volosovskyi
|
23b646c213
|
appium-test macro
Former-commit-id: 54ae25dc67ec9ca2d75e87f8b62637c4c8592c43
|
2016-05-26 17:00:42 +03:00 |
|
Roman Volosovskyi
|
6823acd171
|
:accessibility-label
Former-commit-id: 63dd0d4a4a63c1d71bcafe6b7e56ecc00fd3c9aa
|
2016-05-26 16:46:14 +03:00 |
|
Roman Volosovskyi
|
c10abb17bb
|
first attempt
Former-commit-id: dc2839e0861cd17ae5b40d28f08c27dc6f658c8c
|
2016-05-26 15:31:11 +03:00 |
|
Jarrad
|
9888eaab18
|
Merge pull request #109 from status-im/feature/i18n
added i18n translations
Former-commit-id: b6b1bf494b2e0b00be1f44b2f001e1686a82e614
|
2016-05-25 18:09:37 +02:00 |
|
Adrian Tiberius
|
67e784598a
|
changed translation style
Former-commit-id: 182600b2d7089b36f9b7451ba49a74ac80dab515
|
2016-05-25 18:57:06 +03:00 |
|
Adrian Tiberius
|
c64b157666
|
removed unneeded translations
Former-commit-id: 930d201764c042aced8178499102dc937ad5b249
|
2016-05-25 14:59:19 +03:00 |
|
Roman Volosovskyi
|
ded52dca90
|
uncomment name view
Former-commit-id: 6ff7c71e35be89d4314106c37cd3792b882d4d09
|
2016-05-25 11:37:49 +03:00 |
|
Roman Volosovskyi
|
0cd0a638a1
|
update protocol dependency
Former-commit-id: 83c36caf3a3f83d3f7787b14defa10cfc456ed22
|
2016-05-25 11:35:51 +03:00 |
|
Adrian Tiberius
|
67c8a63e26
|
fix interop
Former-commit-id: e2b8bcc42436f584060a874b67e06adf6dc7957c
|
2016-05-25 04:55:44 +03:00 |
|
Adrian Tiberius
|
7d47ab2d62
|
added i18n translations
Former-commit-id: b15c156a40957c27f0c4feea3ea7ceedf0407090
|
2016-05-25 04:27:03 +03:00 |
|
Roman Volosovskyi
|
88aa653d79
|
fix content-content issue
Former-commit-id: aa751fc59c8bb0742c2a5845da7db6547bf9da91
|
2016-05-24 17:21:12 +03:00 |
|
Jarrad
|
91bdb515a7
|
Merge pull request #97 from status-im/utf8-hex
utf8 over whisper
Former-commit-id: 9a8a5e0ddd9952932408e8550a4112bb9cb2d6ea
|
2016-05-24 12:58:52 +02:00 |
|
Jarrad
|
0031c9d077
|
Merge pull request #96 from status-im/bug/#88
fixes #88
Former-commit-id: 01016390d84cca26608571effd16f4d4491e5304
|
2016-05-24 11:06:23 +02:00 |
|
Roman Volosovskyi
|
4bef3a0428
|
utf8 over whisper
Former-commit-id: 6b78d9eee2aa9d0c75e910b046beaab2638d5a51
|
2016-05-24 12:05:47 +03:00 |
|
Adrian Tiberius
|
6ab889152c
|
merge develop
Former-commit-id: 98f22d9a13d55ae1baf7c655107a09e279024d80
|
2016-05-24 12:01:26 +03:00 |
|
