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 |
|
Jarrad
|
ef205d2d78
|
Merge pull request #92 from status-im/group-chat
Group chat
Former-commit-id: 7fb60472d527281de344566d0a4ad5e0334fca51
|
2016-05-23 15:28:49 +02:00 |
|
Adrian Tiberius
|
56c1248a6d
|
fixes #88
Former-commit-id: b1bc93b782b0750be75ffdc7728736f4e0a87252
|
2016-05-23 15:13:52 +03:00 |
|
virvar
|
5142ffc4c3
|
Fix new chat icon
Former-commit-id: fc5bb416af26496701f4132ef055d463b63ee9d6
|
2016-05-23 13:50:46 +03:00 |
|
Jarrad
|
7c5c20ff70
|
Merge pull request #75 from status-im/feature/tabs
Feature/tabs
Former-commit-id: e9af469ebb19ffa9ad3095de65b58fc1dbab14b6
|
2016-05-23 12:25:01 +02:00 |
|
Adrian Tiberius
|
2e49994c86
|
small code clean
Former-commit-id: 45c35733be4f1c4c09d7d563f84d62020729287a
|
2016-05-23 13:13:06 +03:00 |
|
Adrian Tiberius
|
563e0d69c7
|
fix last element scroll
Former-commit-id: ff0307d4ce1c9e2b03640ec08f6623ba18e79e66
|
2016-05-22 23:36:43 +03:00 |
|
Roman Volosovskyi
|
2b70ed56f4
|
fix typo in ns
Former-commit-id: 547ececac372fafe71a643b72d04dae008187ad7
|
2016-05-22 18:17:22 +03:00 |
|
Roman Volosovskyi
|
322622ae52
|
rename main-tabs.cljs
Former-commit-id: ebe61c9d9514a2baf31f49291b95f12ce60356e0
|
2016-05-22 10:22:22 +03:00 |
|
Roman Volosovskyi
|
c6de5075fe
|
remove println
Former-commit-id: 86f80dc52560402abe0956abae83ee4092f35dc7
|
2016-05-21 16:34:06 +03:00 |
|
Roman Volosovskyi
|
ec1439943d
|
fix loading of chat's messages
Former-commit-id: 8bda73920150ec96d177635479a718db122157ca
|
2016-05-21 16:32:04 +03:00 |
|
Roman Volosovskyi
|
7d2371afec
|
Merge branch 'develop' into group-chat
Conflicts:
src/status_im/android/core.cljs
src/status_im/chat/handlers.cljs
src/status_im/group_settings/handlers.cljs
src/status_im/group_settings/screen.cljs
src/status_im/group_settings/styles/chat_name_edit.cljs
src/status_im/group_settings/subs.cljs
src/status_im/group_settings/views/chat_name_edit.cljs
src/status_im/handlers.cljs
src/status_im/navigation.cljs
src/status_im/participants/views/contact.cljs
src/status_im/participants/views/create.cljs
src/status_im/participants/views/remove.cljs
src/syng_im/subs.cljs
Former-commit-id: 277905124dc9fe2bd4ea6362dd1365dca567ae38
|
2016-05-21 16:07:37 +03:00 |
|
Roman Volosovskyi
|
c086162f68
|
leave group/ clear history/ add-remove participants
Former-commit-id: 01d1ccdab893664cfdf0005b877771c53b107aa7
|
2016-05-21 15:23:24 +03:00 |
|
Adrian Tiberius
|
c7a9f13733
|
merged develop
Former-commit-id: 4a35a06b8c3dee363e8a237cc245e488b9c165c8
|
2016-05-20 22:12:08 +03:00 |
|
Roman Volosovskyi
|
97b4ba8653
|
add/remove participants
Former-commit-id: cd45d3420e74a49312468eb0c7822487492c257f
|
2016-05-20 19:58:07 +03:00 |
|
Roman Volosovskyi
|
227f22eb48
|
chat name/load messages on [:navigate-to :chat id]/ other
Former-commit-id: ae1918a2aed109400cda0e376fec6d37cdb5d79f
|
2016-05-20 19:12:04 +03:00 |
|
Jarrad
|
51c800c798
|
Merge pull request #84 from status-im/icon
an icon why not?
Former-commit-id: c22afec74a11a1979ea5b61ab2874ee290dfd02b
|
2016-05-20 15:47:01 +02:00 |
|
|
|
5e25330d58
|
an icon why not?
Former-commit-id: 4732498ba26fd4c13cddcba6c7af784910477536
|
2016-05-20 15:45:35 +02:00 |
|
virvar
|
585baa9d71
|
Truncate chat name
Former-commit-id: c3496957ff93f07bcfaf16d3cf78c866b4c7fe05
|
2016-05-20 16:36:00 +03:00 |
|
virvar
|
615cc4d73a
|
Chat members names menu item
Former-commit-id: 34f5ab31a1da6f553810fff7f2b5793bb85208b1
|
2016-05-20 16:18:12 +03:00 |
|
