status-im
/
status-react
mirror of https://github.com/status-im/status-react.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity
623 Commits 588 Branches 76 Tags 780 MiB
Commit Graph

91 Commits

Author SHA1 Message Date
Roman Volosovskyi 55a5b96ad7 fix protocol's initialization on js reloading 2016-07-07 11:08:22 +03:00
Roman Volosovskyi 155626f59a "seen" message 2016-07-06 11:55:21 +03:00
Jarrad db5c654686 Merge pull request #146 from status-im/feature/#119 
Feature/#119
 2016-07-05 14:38:04 +02:00
Roman Volosovskyi 0c77625155 upgrade statusgo 2016-07-02 11:00:53 +03:00
Adrian Tiberius df229035e7 login to account after creating it to enable it in whisper 2016-06-30 20:28:51 +03:00
Adrian Tiberius 3a3a39b71d merge develop 2016-06-30 20:10:41 +03:00
Roman Volosovskyi e73e9ee7b6 upgrade statusgo 2016-06-30 19:59:25 +03:00
Adrian Tiberius 4fca2507da merge develop 2016-06-30 19:12:07 +03:00
Adrian Tiberius c878fba6f1 created new accounts realm object and fixed new create account flow 2016-06-30 18:06:05 +03:00
Adrian Tiberius ec9cfe8f8c changed add account flow to use new binding system 2016-06-30 13:37:36 +03:00
Roman Volosovskyi e728c155a1 commands button 2016-06-30 11:48:56 +03:00
Adrian Tiberius abaab3b26b added Geth react-native module 2016-06-27 18:35:25 +03:00
Roman Volosovskyi 65c76e3cb1 Merge branch 'develop' into feature/#123 2016-06-27 16:02:42 +03:00
Adrian Tiberius a99778031b added stub function for geth communication 2016-06-24 13:40:18 +03:00
Roman Volosovskyi 40dd0063d2 handle errors from jail 2016-06-23 19:07:31 +03:00
Roman Volosovskyi dd3eb3c0eb Merge branch 'develop' into feature/#123 
Conflicts:
	android/app/build.gradle
	android/settings.gradle
	package.json
	src/status_im/chat/handlers.cljs
	src/status_im/chat/subs.cljs
 2016-06-23 12:02:39 +03:00
Roman Volosovskyi c1e5a64836 move statusgo to artifactory 2016-06-22 12:56:43 +03:00
Adrian Tiberius 6bb48a42f9 merged develop 2016-06-22 11:24:47 +03:00
Roman Volosovskyi bd3eea73fd Merge branch 'develop' into feature/#123 2016-06-22 10:53:27 +03:00
Roman Volosovskyi 8e2c207b2e Merge branch 'develop' into chat-animation 
Conflicts:
	.re-natal
	src/status_im/android/core.cljs
	src/status_im/chat/views/message_input.cljs
	src/status_im/chat/views/plain_message.cljs
	src/status_im/db.cljs
 2016-06-21 19:17:30 +03:00
Roman Volosovskyi 4be203bcd3 Merge branch 'develop' into feature/#138 2016-06-21 18:54:52 +03:00
Roman Volosovskyi dc567356ca no contacts screen & some fixes 2016-06-21 18:48:41 +03:00
Adrian Tiberius 9f405ee18d applied new design 2016-06-21 17:15:46 +03:00
Roman Volosovskyi f7b5832707 orientation 2016-06-21 12:03:39 +03:00
Jarrad 7459b63251 Merge pull request #135 from status-im/feature/service 
Feature/service
 2016-06-17 13:59:25 +02:00
Jarrad 5b15f46079 update react-native-randombytes 2016-06-16 15:30:24 +02:00
Adrian Tiberius 3d68e6d48a code cleaning 2016-06-16 07:27:58 +03:00
Adrian Tiberius 58a9c2935c Moved geth to service 2016-06-16 07:23:11 +03:00
Roman Volosovskyi 474729f230 Merge branch 'develop' into feature/#123 
First attempt.
 Conflicts:
	.re-natal
	android/app/build.gradle
	android/settings.gradle
	src/status_im/chat/handlers.cljs
	src/status_im/chat/views/command.cljs
	src/status_im/chat/views/content_suggestions.cljs
	src/status_im/chat/views/message.cljs
	src/status_im/chat/views/plain_input.cljs
 2016-06-15 10:47:38 +03:00
Roman Volosovskyi ab93b21a4c parsing of commands.js, command's handler, suggestions handler in jail (commit contains .aar oops) 2016-06-14 14:19:56 +03:00
virvar 86dc0ad06e Merge remote-tracking branch 'origin/develop' into response-design 
# Conflicts:
#	src/status_im/db.cljs
 2016-06-13 19:54:39 +03:00
Adrian Tiberius 7f207a3760 merged develop 2016-06-10 03:21:48 +03:00
Adrian Tiberius e0ce4217bb updated new contact screen; some code cleaning 2016-06-10 03:03:40 +03:00
Roman Volosovskyi 76e2887b17 react-native-status dependency and other 2016-06-09 12:49:02 +03:00
Jarrad 97ff59f95b System.loadLibrary voodoo magic 2016-06-08 15:29:48 +02:00
Roman Volosovskyi 32422310e8 jail module 2016-06-08 15:15:23 +03:00
Jarrad 804683cd52 fix conflicts 2016-06-08 13:06:58 +02:00
Jarrad 1f0a4214b8 warn user if root before starting geth 2016-06-08 12:43:02 +02:00
Adrian Tiberius c81276e3b7 implemented #119 and #120 2016-06-01 11:41:50 +03:00
virvar 96ef6c34a8 Fix drag icon 2016-05-31 14:39:38 +03:00
Adrian Tiberius 32b10794d2 workaround for adding peer to geth 2016-05-26 19:20:39 +03:00
virvar 5333eadd67 Request-info view 2016-05-26 16:54:18 +03: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
Jarrad 7fb60472d5 Merge pull request #92 from status-im/group-chat 
Group chat
 2016-05-23 15:28:49 +02: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
Adrian Tiberius 4a35a06b8c merged develop 2016-05-20 22:12:08 +03:00
Roman Volosovskyi ae1918a2ae chat name/load messages on [:navigate-to :chat id]/ other 2016-05-20 19:12:04 +03:00
Jarrad 4732498ba2 an icon why not? 2016-05-20 15:45:35 +02:00
virvar ff5898b0a1 Merge 'develop' into 'real-data' 2016-05-20 14:20:48 +03:00
Adrian Tiberius 799808965d add gradient 2016-05-19 20:05:04 +03:00