Adrian Tiberius
|
93023900f0
|
fixed failed login, disabled address field, added error message
Former-commit-id: 9d8bd7d740
|
2016-07-06 23:47:57 +03:00 |
|
Adrian Tiberius
|
04f4945aaf
|
updated design for login input fields
Former-commit-id: af3f21629b
|
2016-07-05 21:19:12 +03:00 |
|
Adrian Tiberius
|
11cabd8731
|
Merge remote-tracking branch 'origin/develop' into feature/#124
Former-commit-id: 15955ffb98
|
2016-07-05 18:23:34 +03:00 |
Jarrad
|
4ac074a71d
|
Merge pull request #146 from status-im/feature/#119
Feature/#119
Former-commit-id: db5c654686
|
2016-07-05 14:38:04 +02:00 |
Roman Volosovskyi
|
69b35af007
|
upgrade statusgo
Former-commit-id: 0c77625155
|
2016-07-02 11:00:53 +03:00 |
|
Adrian Tiberius
|
5349ecfc7f
|
Merge remote-tracking branch 'origin/develop' into feature/#124
Former-commit-id: 49ec4ca145
|
2016-06-30 23:55:55 +03:00 |
|
Adrian Tiberius
|
d2eb84be68
|
login to account after creating it to enable it in whisper
Former-commit-id: df229035e7
|
2016-06-30 20:28:51 +03:00 |
|
Adrian Tiberius
|
d30664e9a9
|
merge develop
Former-commit-id: 3a3a39b71d
|
2016-06-30 20:10:41 +03:00 |
|
Roman Volosovskyi
|
f02beb6e5b
|
upgrade statusgo
Former-commit-id: e73e9ee7b6
|
2016-06-30 19:59:25 +03:00 |
|
Adrian Tiberius
|
97b5014307
|
merge develop
Former-commit-id: 4fca2507da
|
2016-06-30 19:12:07 +03:00 |
|
Adrian Tiberius
|
ea7c5b1665
|
created new accounts realm object and fixed new create account flow
Former-commit-id: c878fba6f1
|
2016-06-30 18:06:05 +03:00 |
|
Adrian Tiberius
|
232259c4ba
|
changed add account flow to use new binding system
Former-commit-id: ec9cfe8f8c
|
2016-06-30 13:37:36 +03:00 |
|
Roman Volosovskyi
|
b763d5d9c9
|
commands button
Former-commit-id: e728c155a1
|
2016-06-30 11:48:56 +03:00 |
|
Adrian Tiberius
|
5a1c2c9bb3
|
added Geth react-native module
Former-commit-id: abaab3b26b
|
2016-06-27 18:35:25 +03:00 |
|
Roman Volosovskyi
|
4da9f24d55
|
Merge branch 'develop' into feature/#123
Former-commit-id: 65c76e3cb1
|
2016-06-27 16:02:42 +03:00 |
|
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 |