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 |
|
virvar
|
51287cd47a
|
Start response suggestions dragging
Former-commit-id: 547c73d130fc960cca6e17e91e1a1337eb7dd676
|
2016-06-01 16:36:43 +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 |
|
virvar
|
1b67a37877
|
Input text and buttons animation
Former-commit-id: 572fc0e554741f2cd1c3c81d3a112d0cb38ff1cd
|
2016-06-01 14:09:25 +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 |
|
virvar
|
516ad56a4e
|
Animation refactoring
Former-commit-id: 5c83b09db623bfb36add56ab70f27ee54ef914aa
|
2016-05-31 17:05:31 +03:00 |
|
virvar
|
cf897d235a
|
Fix drag icon
Former-commit-id: 96ef6c34a8a4e33cf0c470075c4db4a23405e397
|
2016-05-31 14:39:38 +03:00 |
|
virvar
|
81055c30bd
|
Spring animation
Former-commit-id: 8892d13db4ddd5a66c9daaea7e64d70d4e4e578e
|
2016-05-31 14:23:30 +03:00 |
|
virvar
|
0543b943f7
|
Response suggestions animation
Former-commit-id: b9fcad3df576bfea8592d0cbfa0419005c412266
|
2016-05-30 16:50:23 +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 |
|
virvar
|
9b114aa371
|
Response suggestions
Former-commit-id: a495fa79619bb67fde4ae34fd581521bee7a1683
|
2016-05-27 16:27:17 +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 |
|
virvar
|
16f7f791ac
|
Request-info view
Former-commit-id: 5333eadd67ae2e8d185bfdb0b48f359b3543a1d1
|
2016-05-26 16:54:18 +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 |
|
virvar
|
169d7ee51c
|
Don't dismiss keyboard on command input appear
Former-commit-id: 49b08e51181249addc5f50f0d0d866836f8e1944
|
2016-05-25 14:50:52 +03:00 |
|
virvar
|
1314cff149
|
Merge remote-tracking branch 'origin/develop' into fix-input
Former-commit-id: 7745f1accb9183a2e742739ca5f6cd72d61ec70a
|
2016-05-25 12:45:34 +03:00 |
|
virvar
|
a6b9ec3b9e
|
Chat name validation
Former-commit-id: 4d70e318b398d086d206e94c6b2258a51e354c74
|
2016-05-25 12:44:00 +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 |
|
virvar
|
a035991b3f
|
Merge remote-tracking branch 'origin/develop' into fix-input
Former-commit-id: ea09dcb1a66207b4811da0cbeefa53fd0c3e7c8f
|
2016-05-25 10:44:14 +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 |
|
virvar
|
950251a281
|
Single input
Former-commit-id: 583f424e93b2b15b1a5e6d014db73f61a103b88b
|
2016-05-24 16:36:27 +03:00 |
|
virvar
|
02e9365bdf
|
Start single input
Former-commit-id: 5a901e3b9a62ae00c0f82cf02b3d98f4ffb9d537
|
2016-05-24 16:36:27 +03:00 |
|
virvar
|
870d8d4026
|
Fix suggestions tapping issue. Fix command input position.
Former-commit-id: 00145a8c6f8e72c9e4e0816a23fa072dc0f1b852
|
2016-05-24 16:36:27 +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 |
|
Jarrad
|
bc1f9dcedd
|
Merge pull request #85 from status-im/real-data
Listen sms. Comment/replace placeholders.
Former-commit-id: eb72ea776f97d0cdd3e42097b03718aac264a9ef
|
2016-05-24 10:52:21 +02:00 |
|
virvar
|
49a9ae3ba1
|
Merge remote-tracking branch 'origin/develop' into real-data. Fix contacts synchronization.
# Conflicts:
# .re-natal
# android/app/build.gradle
# android/app/src/main/java/com/statusim/MainActivity.java
# android/settings.gradle
# src/status_im/chat/handlers.cljs
# src/status_im/chat/screen.cljs
# src/status_im/chats_list/views/chat_list_item.cljs
# src/status_im/db.cljs
# src/status_im/group_settings/screen.cljs
Former-commit-id: dcc607022f4e62e4c544495220c3130c5c30b026
|
2016-05-24 11:08:54 +03:00 |
|
Adrian Tiberius
|
9064021247
|
merge develop
Former-commit-id: 979ce25f2aa19ac957d863d800f42591d2ca38cf
|
2016-05-23 19:53:07 +03:00 |
|