status-im
/
status-react
mirror of https://github.com/status-im/status-react.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity
6,481 Commits 595 Branches 76 Tags 800 MiB
Commit Graph

379 Commits

Author SHA1 Message Date
Adrian Tiberius b044b3917e added stub function for geth communication 
Former-commit-id: a99778031b
 2016-06-24 13:40:18 +03:00
Roman Volosovskyi 157393bd7a handle errors from jail 
Former-commit-id: 40dd0063d2
 2016-06-23 19:07:31 +03:00
Roman Volosovskyi 5abe38445e 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


Former-commit-id: dd3eb3c0eb
 2016-06-23 12:02:39 +03:00
Roman Volosovskyi 3c62b92248 move statusgo to artifactory 
Former-commit-id: c1e5a64836
 2016-06-22 12:56:43 +03:00
Adrian Tiberius 163e98afee merged develop 
Former-commit-id: 6bb48a42f9
 2016-06-22 11:24:47 +03:00
Roman Volosovskyi 9357849916 Merge branch 'develop' into feature/#123 
Former-commit-id: bd3eea73fd
 2016-06-22 10:53:27 +03:00
Roman Volosovskyi 63034358b2 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


Former-commit-id: 8e2c207b2e
 2016-06-21 19:17:30 +03:00
Roman Volosovskyi f24e493ac4 Merge branch 'develop' into feature/#138 
Former-commit-id: 4be203bcd3
 2016-06-21 18:54:52 +03:00
Roman Volosovskyi 9ac1056d73 no contacts screen & some fixes 
Former-commit-id: dc567356ca
 2016-06-21 18:48:41 +03:00
Adrian Tiberius a9d2ed2711 applied new design 
Former-commit-id: 9f405ee18d
 2016-06-21 17:15:46 +03:00
Roman Volosovskyi 6beda2ace2 orientation 
Former-commit-id: f7b5832707
 2016-06-21 12:03:39 +03:00
Jarrad 65d93b5e2a Merge pull request #135 from status-im/feature/service 
Feature/service

Former-commit-id: 7459b63251
 2016-06-17 13:59:25 +02:00
Jarrad 83d3183aa6 update react-native-randombytes 
Former-commit-id: 5b15f46079
 2016-06-16 15:30:24 +02:00
Adrian Tiberius e71cd180a0 code cleaning 
Former-commit-id: 3d68e6d48a
 2016-06-16 07:27:58 +03:00
Adrian Tiberius 95edf10691 Moved geth to service 
Former-commit-id: 58a9c2935c
 2016-06-16 07:23:11 +03:00
Roman Volosovskyi f1005daeed 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


Former-commit-id: 474729f230
 2016-06-15 10:47:38 +03:00
Roman Volosovskyi 4301c813f4 parsing of commands.js, command's handler, suggestions handler in jail (commit contains .aar oops) 
Former-commit-id: ab93b21a4c
 2016-06-14 14:19:56 +03:00
virvar 5f8f390bd1 Merge remote-tracking branch 'origin/develop' into response-design 
# Conflicts:
#	src/status_im/db.cljs


Former-commit-id: 86dc0ad06e
 2016-06-13 19:54:39 +03:00
Adrian Tiberius 7d67ab6525 added login and users screens 
Former-commit-id: 0a5ce64fe2
 2016-06-13 19:35:18 +03:00
Adrian Tiberius 23a17b2632 merged develop 
Former-commit-id: 7f207a3760
 2016-06-10 03:21:48 +03:00
Adrian Tiberius c00bc75346 updated new contact screen; some code cleaning 
Former-commit-id: e0ce4217bb
 2016-06-10 03:03:40 +03:00
Roman Volosovskyi 2920984b0c react-native-status dependency and other 
Former-commit-id: 76e2887b17
 2016-06-09 12:49:02 +03:00
Jarrad 4b43096ba8 System.loadLibrary voodoo magic 
Former-commit-id: 97ff59f95b
 2016-06-08 15:29:48 +02:00
Roman Volosovskyi 5f2d8e63c7 jail module 
Former-commit-id: 32422310e8
 2016-06-08 15:15:23 +03:00
Jarrad ce6ebde8b7 fix conflicts 
Former-commit-id: 804683cd52
 2016-06-08 13:06:58 +02:00
Jarrad 6756d02335 warn user if root before starting geth 
Former-commit-id: 1f0a4214b8
 2016-06-08 12:43:02 +02:00
Adrian Tiberius d094cd286c implemented #119 and #120 
Former-commit-id: c81276e3b7
 2016-06-01 11:41:50 +03:00
virvar cf897d235a Fix drag icon 
Former-commit-id: 96ef6c34a8
 2016-05-31 14:39:38 +03:00
Adrian Tiberius ecf8ea0f33 workaround for adding peer to geth 
Former-commit-id: 32b10794d2
 2016-05-26 19:20:39 +03:00
virvar 16f7f791ac Request-info view 
Former-commit-id: 5333eadd67
 2016-05-26 16:54:18 +03:00
virvar 49a9ae3ba1 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


Former-commit-id: dcc607022f
 2016-05-24 11:08:54 +03:00
Jarrad ef205d2d78 Merge pull request #92 from status-im/group-chat 
Group chat

Former-commit-id: 7fb60472d5
 2016-05-23 15:28:49 +02:00
Roman Volosovskyi 7d2371afec 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


Former-commit-id: 277905124d
 2016-05-21 16:07:37 +03:00
Adrian Tiberius c7a9f13733 merged develop 
Former-commit-id: 4a35a06b8c
 2016-05-20 22:12:08 +03:00
Roman Volosovskyi 227f22eb48 chat name/load messages on [:navigate-to :chat id]/ other 
Former-commit-id: ae1918a2ae
 2016-05-20 19:12:04 +03:00
Jarrad 5e25330d58 an icon why not? 
Former-commit-id: 4732498ba2
 2016-05-20 15:45:35 +02:00
virvar 844ff739af Merge 'develop' into 'real-data' 
Former-commit-id: ff5898b0a1
 2016-05-20 14:20:48 +03:00
Adrian Tiberius 6e53d72acb add gradient 
Former-commit-id: 799808965d
 2016-05-19 20:05:04 +03:00
Jarrad 5aa61b1de4 Syng to Status 
Former-commit-id: 134c040c3e
 2016-05-19 18:32:38 +02:00
Jarrad b5763bb8ad syng to status 
Former-commit-id: 6a5250247c
 2016-05-19 18:31:56 +02:00
Adrian Tiberius aba7d4fae0 fix padding 
Former-commit-id: 0556e299d6
 2016-05-19 18:41:25 +03:00
virvar d1ef5e7e32 Setup sms-listener 
Former-commit-id: 1f5dad71e8
 2016-05-18 17:40:26 +03:00
virvar 8919410735 Chat color 
Former-commit-id: 14e69f9369
 2016-05-16 13:47:34 +03:00
Adrian Tiberius 2b0bf554e4 added tabs component 
Former-commit-id: 1fd3f86e23
 2016-05-12 22:47:32 +03:00
virvar a3effe4f3d Merge branch 'develop' into my-profile 
Former-commit-id: 13205348ed
 2016-05-11 15:49:05 +03:00
Jarrad e9029d1130 Merge pull request #64 from status-im/commands-button 
Commands button. Phone number validation. Drawer and Profile views.

Former-commit-id: 3d8adf840e
 2016-05-11 14:42:12 +02:00
virvar 5a63f527d3 Add my profile view 
Former-commit-id: 3dfc461924
 2016-05-11 13:05:33 +03:00
Adrian Tiberius 30b9298478 replace avatar placeholder in discovery and remove unused image resources 
Former-commit-id: 5fe774faee
 2016-05-10 17:39:52 +03:00
virvar bdc9b6e5e0 Merge with 'develop' 
Former-commit-id: 6f2acb0f65
 2016-05-10 16:39:09 +03:00
virvar d285fcd6e0 Suggestions style. Add close commands button. 
Former-commit-id: 6f5dade40f
 2016-05-10 16:16:07 +03:00
virvar 59e6126572 Show suggestions as hint for phone number format 
Former-commit-id: 6eeaab5c28
 2016-05-09 15:29:08 +03:00
virvar 088d20ebf0 Fix profile styles 
Former-commit-id: 7ddd90e2dc
 2016-05-06 14:25:29 +03:00
Adrian Tiberius b4243aa2cc merged develop branch 
Former-commit-id: 2c9174af63
 2016-05-05 16:33:48 +03:00
virvar 968def8a3f Menu items icons. Hide actions menu on click outside. 
Former-commit-id: ac11508703
 2016-05-03 16:39:08 +03:00
virvar df120998cf Merge branch 'design' into icons_resolution 
Former-commit-id: 7ee1625b31
 2016-04-25 20:33:40 +03:00
virvar 99f5f9caef Fix #25 Low resolution icons 
Former-commit-id: 81751b294b
 2016-04-25 20:32:43 +03:00
Roman Volosovskyi 5cc01ad2d9 fix #28 adjustPan 
Former-commit-id: 2100e08a49
 2016-04-25 15:55:42 +03:00
Roman Volosovskyi ee165f0694 fix #28 
Former-commit-id: a6555242ff
 2016-04-25 13:41:25 +03:00
Jarrad Hope 25a7f8bb32 upgrade react-native and packages - but broken 
Former-commit-id: bfaf45698c
 2016-04-24 15:07:08 +07:00
Adrian Tiberius 387a802789 fix android-geth dependency 
Former-commit-id: 71f6865204
 2016-04-22 19:04:29 +03:00
Jarrad Hope b522302ee8 fix android-geth dependency 
Former-commit-id: 0bd8ff367f
 2016-04-22 23:03:56 +07:00
Adrian Tiberius 8d349dc890 added geolocation permission 
Former-commit-id: f32fb04c1a
 2016-04-19 15:30:07 +03:00
michaelr d54d6555a4 moved re-frame app to root folder 
Former-commit-id: 5a3b923b0c
 2016-04-04 19:21:10 +03:00
michaelr 1441edc9e8 depend on geth arr from maven repo instead of the git repo 
Former-commit-id: cc3f7ffdb1
 2016-03-14 00:30:11 +02:00
virvar 3811efeb5e Save whisper identities to db 
Former-commit-id: 1a7d089ddc
 2016-03-11 19:04:12 +03:00
Jarrad Hope 7beec7dfe9 fresh build of go-ethereum:develop with shh_createIdentity, shh_addIdentity JSON-RPC methods 
Former-commit-id: 6d906a0306
 2016-03-07 09:36:35 +01:00
Jarrad Hope 5db6709dd0 upgrade renatal, react-native, web3 
Former-commit-id: 4c31f1225a
 2016-03-06 23:09:55 +01:00
Jarrad Hope 3304099be6 removed quotes from geth instantiation 
Former-commit-id: ea83bab74a
 2016-03-06 22:34:10 +01:00
Adrian Tiberius 6a2f1d6c10 fixed geth bootnode url 
Former-commit-id: 8bc66701b8
 2016-02-29 17:14:56 +02:00
michaelr 73b9fec6a2 added shh API to list of APIs available over RPC 
Former-commit-id: d13ad30155
 2016-02-28 18:59:05 +02:00
michaelr 8742e9a8b8 fixed for java to compile 
Former-commit-id: 3d37ea77cd
 2016-02-28 13:00:51 +02:00
Adrian Tiberius 9e46cf1bb9 fixed geth data folder path 
Former-commit-id: 35b3013f3d
 2016-02-28 12:56:00 +02:00
virvar 8766b15d36 Add font 
Former-commit-id: bf31fed4ea
 2016-02-24 16:05:21 +03:00
Jarrad Hope 65644b2d84 i18n android integration, TODO iOS 
Former-commit-id: f4af8beb15
 2016-02-23 23:15:51 +01:00
Jarrad Hope 286f50a634 add syng server as bootnode 
Former-commit-id: cade052129
 2016-02-23 19:37:48 +01:00
Jarrad Hope c003165d88 add Whisper flag and comments for Android quirks 
Former-commit-id: ebd42db745
 2016-02-23 18:49:35 +01:00
Adrian Tiberius da0a405100 Fix for android 4.2 shared library loading 
Former-commit-id: 103d83edd9
 2016-02-23 19:36:28 +02:00
Adrian Tiberius 1c6846d46f Added geth library 
Former-commit-id: ac7af91da0
 2016-02-23 19:12:18 +02:00
virvar 7c6e7c644a Initial 2016-02-23 01:04:42 +03:00