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

77 Commits

Author SHA1 Message Date
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
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
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
Jarrad 134c040c3e Syng to Status 2016-05-19 18:32:38 +02:00
Jarrad 6a5250247c syng to status 2016-05-19 18:31:56 +02:00
Adrian Tiberius 0556e299d6 fix padding 2016-05-19 18:41:25 +03:00
virvar 1f5dad71e8 Setup sms-listener 2016-05-18 17:40:26 +03:00
virvar 14e69f9369 Chat color 2016-05-16 13:47:34 +03:00
Adrian Tiberius 1fd3f86e23 added tabs component 2016-05-12 22:47:32 +03:00
virvar 13205348ed Merge branch 'develop' into my-profile 2016-05-11 15:49:05 +03:00
Jarrad 3d8adf840e Merge pull request #64 from status-im/commands-button 
Commands button. Phone number validation. Drawer and Profile views.
 2016-05-11 14:42:12 +02:00
virvar 3dfc461924 Add my profile view 2016-05-11 13:05:33 +03:00
Adrian Tiberius 5fe774faee replace avatar placeholder in discovery and remove unused image resources 2016-05-10 17:39:52 +03:00
virvar 6f2acb0f65 Merge with 'develop' 2016-05-10 16:39:09 +03:00
virvar 6f5dade40f Suggestions style. Add close commands button. 2016-05-10 16:16:07 +03:00
virvar 6eeaab5c28 Show suggestions as hint for phone number format 2016-05-09 15:29:08 +03:00
virvar 7ddd90e2dc Fix profile styles 2016-05-06 14:25:29 +03:00