Commit Graph

829 Commits

Author SHA1 Message Date
Roman Volosovskyi bf6d4ef256 Merge branch 'develop' into appium-setup
Conflicts:
	src/status_im/i18n.cljs
2016-06-01 19:11:51 +03:00
virvar 547c73d130 Start response suggestions dragging 2016-06-01 16:36:43 +03:00
Adrian Tiberius a46f60c854 fix translation pluralization 2016-06-01 14:44:04 +03:00
Adrian Tiberius 13c506491f fix translation pluralization 2016-06-01 14:35:22 +03:00
Roman Volosovskyi 2bfd90cec4 remove println 2016-06-01 14:09:43 +03:00
virvar 572fc0e554 Input text and buttons animation 2016-06-01 14:09:25 +03:00
Adrian Tiberius 755e9bf2b3 fix qr code decoding and remove extra data 2016-06-01 14:01:58 +03:00
Adrian Tiberius c81276e3b7 implemented #119 and #120 2016-06-01 11:41:50 +03:00
virvar 5c83b09db6 Animation refactoring 2016-05-31 17:05:31 +03:00
virvar 96ef6c34a8 Fix drag icon 2016-05-31 14:39:38 +03:00
virvar 8892d13db4 Spring animation 2016-05-31 14:23:30 +03:00
virvar b9fcad3df5 Response suggestions animation 2016-05-30 16:50:23 +03:00
Roman Volosovskyi b914493283 fix ids for chats created after receiving from unknown id 2016-05-30 11:49:16 +03:00
Roman Volosovskyi f30248e7fe move js/React to cljsjs.react.cljs 2016-05-30 11:01:57 +03:00
Roman Volosovskyi c8d0f590c2 doc for appium-test 2016-05-30 10:22:29 +03:00
Roman Volosovskyi 1766b1af12 first unit test 2016-05-30 08:58:38 +03:00
Roman Volosovskyi 043d28c44d js/window 2016-05-30 08:58:38 +03:00
Roman Volosovskyi 7694ad9e87 clean js/window first attempt 2016-05-30 08:58:38 +03:00
virvar a495fa7961 Response suggestions 2016-05-27 16:27:17 +03:00
Adrian Tiberius 32b10794d2 workaround for adding peer to geth 2016-05-26 19:20:39 +03:00
Jarrad ab36ec7df7 Merge branch 'appium-setup' of github.com:status-im/status-react into appium-setup 2016-05-26 18:05:24 +02:00
Jarrad a2e14e4ff0 run appium with second param 2016-05-26 18:05:10 +02:00
Roman Volosovskyi 0e3c1d10ba implicitly wait 25s 2016-05-26 18:13:37 +03:00
Roman Volosovskyi 54ae25dc67 appium-test macro 2016-05-26 17:00:42 +03:00
virvar 5333eadd67 Request-info view 2016-05-26 16:54:18 +03:00
Roman Volosovskyi 63dd0d4a4a :accessibility-label 2016-05-26 16:46:14 +03:00
Roman Volosovskyi dc2839e086 first attempt 2016-05-26 15:31:11 +03:00
Jarrad b6b1bf494b Merge pull request #109 from status-im/feature/i18n
added i18n translations
2016-05-25 18:09:37 +02:00
Adrian Tiberius 182600b2d7 changed translation style 2016-05-25 18:57:06 +03:00
Adrian Tiberius 930d201764 removed unneeded translations 2016-05-25 14:59:19 +03:00
virvar 49b08e5118 Don't dismiss keyboard on command input appear 2016-05-25 14:50:52 +03:00
virvar 7745f1accb Merge remote-tracking branch 'origin/develop' into fix-input 2016-05-25 12:45:34 +03:00
virvar 4d70e318b3 Chat name validation 2016-05-25 12:44:00 +03:00
Roman Volosovskyi 6ff7c71e35 uncomment name view 2016-05-25 11:37:49 +03:00
Roman Volosovskyi 83c36caf3a update protocol dependency 2016-05-25 11:35:51 +03:00
virvar ea09dcb1a6 Merge remote-tracking branch 'origin/develop' into fix-input 2016-05-25 10:44:14 +03:00
Adrian Tiberius e2b8bcc424 fix interop 2016-05-25 04:55:44 +03:00
Adrian Tiberius b15c156a40 added i18n translations 2016-05-25 04:27:03 +03:00
Roman Volosovskyi aa751fc59c fix content-content issue 2016-05-24 17:21:12 +03:00
virvar 583f424e93 Single input 2016-05-24 16:36:27 +03:00
virvar 5a901e3b9a Start single input 2016-05-24 16:36:27 +03:00
virvar 00145a8c6f Fix suggestions tapping issue. Fix command input position. 2016-05-24 16:36:27 +03:00
Jarrad 9a8a5e0ddd Merge pull request #97 from status-im/utf8-hex
utf8 over whisper
2016-05-24 12:58:52 +02:00
Jarrad 01016390d8 Merge pull request #96 from status-im/bug/#88
fixes #88
2016-05-24 11:06:23 +02:00
Roman Volosovskyi 6b78d9eee2 utf8 over whisper 2016-05-24 12:05:47 +03:00
Adrian Tiberius 98f22d9a13 merge develop 2016-05-24 12:01:26 +03:00
Jarrad eb72ea776f Merge pull request #85 from status-im/real-data
Listen sms. Comment/replace placeholders.
2016-05-24 10:52:21 +02:00
virvar dcc607022f 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
2016-05-24 11:08:54 +03:00
Adrian Tiberius 979ce25f2a merge develop 2016-05-23 19:53:07 +03:00
Jarrad 7fb60472d5 Merge pull request #92 from status-im/group-chat
Group chat
2016-05-23 15:28:49 +02:00