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

113 Commits

Author SHA1 Message Date
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 0a5ce64fe2 added login and users screens 2016-06-13 19:35:18 +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
Adrian Tiberius 2c9174af63 merged develop branch 2016-05-05 16:33:48 +03:00
virvar ac11508703 Menu items icons. Hide actions menu on click outside. 2016-05-03 16:39:08 +03:00
virvar 7ee1625b31 Merge branch 'design' into icons_resolution 2016-04-25 20:33:40 +03:00
virvar 81751b294b Fix #25 Low resolution icons 2016-04-25 20:32:43 +03:00
Roman Volosovskyi 2100e08a49 fix #28 adjustPan 2016-04-25 15:55:42 +03:00
Roman Volosovskyi a6555242ff fix #28 2016-04-25 13:41:25 +03:00
Jarrad Hope bfaf45698c upgrade react-native and packages - but broken 2016-04-24 15:07:08 +07:00
Adrian Tiberius 71f6865204 fix android-geth dependency 2016-04-22 19:04:29 +03:00
Jarrad Hope 0bd8ff367f fix android-geth dependency 2016-04-22 23:03:56 +07:00
Adrian Tiberius f32fb04c1a added geolocation permission 2016-04-19 15:30:07 +03:00
michaelr 5a3b923b0c moved re-frame app to root folder 2016-04-04 19:21:10 +03:00
michaelr cc3f7ffdb1 depend on geth arr from maven repo instead of the git repo 2016-03-14 00:30:11 +02:00
virvar 1a7d089ddc Save whisper identities to db 2016-03-11 19:04:12 +03:00
Jarrad Hope 6d906a0306 fresh build of go-ethereum:develop with shh_createIdentity, shh_addIdentity JSON-RPC methods 2016-03-07 09:36:35 +01:00
Jarrad Hope 4c31f1225a upgrade renatal, react-native, web3 2016-03-06 23:09:55 +01:00
Jarrad Hope ea83bab74a removed quotes from geth instantiation 2016-03-06 22:34:10 +01:00
Adrian Tiberius 8bc66701b8 fixed geth bootnode url 2016-02-29 17:14:56 +02:00
michaelr d13ad30155 added shh API to list of APIs available over RPC 2016-02-28 18:59:05 +02:00
michaelr 3d37ea77cd fixed for java to compile 2016-02-28 13:00:51 +02:00
Adrian Tiberius 35b3013f3d fixed geth data folder path 2016-02-28 12:56:00 +02:00
virvar bf31fed4ea Add font 2016-02-24 16:05:21 +03:00
Jarrad Hope f4af8beb15 i18n android integration, TODO iOS 2016-02-23 23:15:51 +01:00
Jarrad Hope cade052129 add syng server as bootnode 2016-02-23 19:37:48 +01:00
Jarrad Hope ebd42db745 add Whisper flag and comments for Android quirks 2016-02-23 18:49:35 +01:00
Adrian Tiberius 103d83edd9 Fix for android 4.2 shared library loading 2016-02-23 19:36:28 +02:00
Adrian Tiberius ac7af91da0 Added geth library 2016-02-23 19:12:18 +02:00
virvar 7c6e7c644a Initial 2016-02-23 01:04:42 +03:00