status-im
/
status-react
mirror of https://github.com/status-im/status-react.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity
755 Commits 602 Branches 77 Tags 802 MiB
Commit Graph

755 Commits

Author SHA1 Message Date
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
Adrian Tiberius b1bc93b782 fixes #88 2016-05-23 15:13:52 +03:00
virvar fc5bb416af Fix new chat icon 2016-05-23 13:50:46 +03:00
Jarrad e9af469ebb Merge pull request #75 from status-im/feature/tabs 
Feature/tabs
 2016-05-23 12:25:01 +02:00
Adrian Tiberius 45c35733be small code clean 2016-05-23 13:13:06 +03:00
Adrian Tiberius ff0307d4ce fix last element scroll 2016-05-22 23:36:43 +03:00
Roman Volosovskyi 547ececac3 fix typo in ns 2016-05-22 18:17:22 +03:00
Roman Volosovskyi ebe61c9d95 rename main-tabs.cljs 2016-05-22 10:22:22 +03:00
Roman Volosovskyi 86f80dc525 remove println 2016-05-21 16:34:06 +03:00
Roman Volosovskyi 8bda739201 fix loading of chat's messages 2016-05-21 16:32:04 +03:00
Roman Volosovskyi 277905124d 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
 2016-05-21 16:07:37 +03:00
Roman Volosovskyi 01d1ccdab8 leave group/ clear history/ add-remove participants 2016-05-21 15:23:24 +03:00
Adrian Tiberius 4a35a06b8c merged develop 2016-05-20 22:12:08 +03:00
Roman Volosovskyi cd45d3420e add/remove participants 2016-05-20 19:58:07 +03:00
Roman Volosovskyi ae1918a2ae chat name/load messages on [:navigate-to :chat id]/ other 2016-05-20 19:12:04 +03:00
Jarrad c22afec74a Merge pull request #84 from status-im/icon 
an icon why not?
 2016-05-20 15:47:01 +02:00
Jarrad 4732498ba2 an icon why not? 2016-05-20 15:45:35 +02:00
virvar c3496957ff Truncate chat name 2016-05-20 16:36:00 +03:00
virvar 34f5ab31a1 Chat members names menu item 2016-05-20 16:18:12 +03:00
virvar 3af6d2f369 Add TODO comments 2016-05-20 15:37:24 +03:00
virvar df2d2b02ca Fix group members count 2016-05-20 14:38:20 +03:00
virvar ff5898b0a1 Merge 'develop' into 'real-data' 2016-05-20 14:20:48 +03:00
virvar a782cf0726 Last message date 2016-05-20 12:41:55 +03:00
Roman Volosovskyi 368b9aef2b Merge pull request #80 from status-im/syng-rename 
Syng rename to Status
 2016-05-20 12:15:15 +03:00
Jarrad ae77cdd738 fix ios build 2016-05-20 11:04:20 +02:00