Adrian Tiberius
|
a479ae3e15
|
merge develop
Former-commit-id: 04440181b2d27c09c6a8af79b85ef6c6834ab741
|
2016-07-18 21:33:41 +03:00 |
|
Adrian Tiberius
|
68b6be2f31
|
fix account database separation
Former-commit-id: fac008b0875b81045b1dcdfa5077f18a35775bbe
|
2016-07-18 19:29:51 +03:00 |
|
Roman Volosovskyi
|
aa89c0f85d
|
fix protocol's initialization on js reloading
Former-commit-id: 55a5b96ad7de96708ed1e1bac09f61a87e1ecd6e
|
2016-07-07 11:08:22 +03:00 |
|
Adrian Tiberius
|
93023900f0
|
fixed failed login, disabled address field, added error message
Former-commit-id: 9d8bd7d740f2f25c3c2990add35ee7d0baddf89d
|
2016-07-06 23:47:57 +03:00 |
|
Roman Volosovskyi
|
34059e5c61
|
"seen" message
Former-commit-id: 155626f59a8b4956bf2b5cc46f0fd3ec396214c4
|
2016-07-06 11:55:21 +03:00 |
|
Adrian Tiberius
|
04f4945aaf
|
updated design for login input fields
Former-commit-id: af3f21629b64f4de4e4c4fca4543537d44ea99d4
|
2016-07-05 21:19:12 +03:00 |
|
Adrian Tiberius
|
11cabd8731
|
Merge remote-tracking branch 'origin/develop' into feature/#124
Former-commit-id: 15955ffb987ae2949a26bccc8ccd70e3d6437033
|
2016-07-05 18:23:34 +03:00 |
|
Jarrad
|
4ac074a71d
|
Merge pull request #146 from status-im/feature/#119
Feature/#119
Former-commit-id: db5c654686263068343ebe0f4aeb39b89dac868b
|
2016-07-05 14:38:04 +02:00 |
|
Roman Volosovskyi
|
69b35af007
|
upgrade statusgo
Former-commit-id: 0c77625155f5d619960756c418aaeaeb3c422ee2
|
2016-07-02 11:00:53 +03:00 |
|
Adrian Tiberius
|
5349ecfc7f
|
Merge remote-tracking branch 'origin/develop' into feature/#124
Former-commit-id: 49ec4ca1453e741dc09a584617ce390c11b44f71
|
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: df229035e72723fff5266a0a5cec5128ca424c85
|
2016-06-30 20:28:51 +03:00 |
|
Adrian Tiberius
|
d30664e9a9
|
merge develop
Former-commit-id: 3a3a39b71d7567e504edc4b47a70fe43c5be34fc
|
2016-06-30 20:10:41 +03:00 |
|
Roman Volosovskyi
|
f02beb6e5b
|
upgrade statusgo
Former-commit-id: e73e9ee7b6b38ddb5a8ac1fedbdab769327c2ca1
|
2016-06-30 19:59:25 +03:00 |
|
Adrian Tiberius
|
97b5014307
|
merge develop
Former-commit-id: 4fca2507da80bb91decb20d92acc4de7baa58b36
|
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: c878fba6f13f458d4918ea02cab19e03f9d0b3fe
|
2016-06-30 18:06:05 +03:00 |
|
Adrian Tiberius
|
232259c4ba
|
changed add account flow to use new binding system
Former-commit-id: ec9cfe8f8c32d73f04a3cb37a788b8f156f6b212
|
2016-06-30 13:37:36 +03:00 |
|
Roman Volosovskyi
|
b763d5d9c9
|
commands button
Former-commit-id: e728c155a12139daf977397fb0ea7a6de5339b57
|
2016-06-30 11:48:56 +03:00 |
|
Adrian Tiberius
|
5a1c2c9bb3
|
added Geth react-native module
Former-commit-id: abaab3b26bbbee5251ea0cfb974464cfb0e0704f
|
2016-06-27 18:35:25 +03:00 |
|
Roman Volosovskyi
|
4da9f24d55
|
Merge branch 'develop' into feature/#123
Former-commit-id: 65c76e3cb1390e63e7944a67c97234b32bbc8538
|
2016-06-27 16:02:42 +03:00 |
|
Adrian Tiberius
|
b044b3917e
|
added stub function for geth communication
Former-commit-id: a99778031b77525521d68018c6abe66b6d9ffea4
|
2016-06-24 13:40:18 +03:00 |
|
Roman Volosovskyi
|
157393bd7a
|
handle errors from jail
Former-commit-id: 40dd0063d20cb56ce9d34d05b9720a7d66410d00
|
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: dd3eb3c0eb13b1bc2e587e1164d0882b0fb4a480
|
2016-06-23 12:02:39 +03:00 |
|
Roman Volosovskyi
|
3c62b92248
|
move statusgo to artifactory
Former-commit-id: c1e5a64836df78eed48a9f51fc5e2c15990cb8bb
|
2016-06-22 12:56:43 +03:00 |
|
Adrian Tiberius
|
163e98afee
|
merged develop
Former-commit-id: 6bb48a42f943e2c4f3616eecc89c849ec341769c
|
2016-06-22 11:24:47 +03:00 |
|
Roman Volosovskyi
|
9357849916
|
Merge branch 'develop' into feature/#123
Former-commit-id: bd3eea73fd72f0393c4c7541bba5c77ea3884fa3
|
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: 8e2c207b2eca5c9dccfc9fce70e1ccaa4448d260
|
2016-06-21 19:17:30 +03:00 |
|
Roman Volosovskyi
|
f24e493ac4
|
Merge branch 'develop' into feature/#138
Former-commit-id: 4be203bcd38674ee56d6b8a824c4ad61d263d14d
|
2016-06-21 18:54:52 +03:00 |
|
Roman Volosovskyi
|
9ac1056d73
|
no contacts screen & some fixes
Former-commit-id: dc567356ca90eac2d99c73b4a0008c65ac748e39
|
2016-06-21 18:48:41 +03:00 |
|
Adrian Tiberius
|
a9d2ed2711
|
applied new design
Former-commit-id: 9f405ee18d9407198a6752040ccb9342f3d7be87
|
2016-06-21 17:15:46 +03:00 |
|
Roman Volosovskyi
|
6beda2ace2
|
orientation
Former-commit-id: f7b583270707f4fcfc599f9010c3dcba58c1decc
|
2016-06-21 12:03:39 +03:00 |
|
Adrian Tiberius
|
e71cd180a0
|
code cleaning
Former-commit-id: 3d68e6d48af0beb7ee386fb5a3b27c1113900531
|
2016-06-16 07:27:58 +03:00 |
|
Adrian Tiberius
|
95edf10691
|
Moved geth to service
Former-commit-id: 58a9c2935ceda13c737c11742446d0192668fc20
|
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: 474729f230346fc10d7d14474282f7f6458f0998
|
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: ab93b21a4c2d0ed573f1d588c537baec9e068e0a
|
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: 86dc0ad06ebcfeb618b529c49b3432b52b106219
|
2016-06-13 19:54:39 +03:00 |
|
Adrian Tiberius
|
7d67ab6525
|
added login and users screens
Former-commit-id: 0a5ce64fe25837166b9798953f3bed961fe634c3
|
2016-06-13 19:35:18 +03:00 |
|
Adrian Tiberius
|
23a17b2632
|
merged develop
Former-commit-id: 7f207a37600ca9f2a44b51c714cf8b4e47f5ec29
|
2016-06-10 03:21:48 +03:00 |
|
Adrian Tiberius
|
c00bc75346
|
updated new contact screen; some code cleaning
Former-commit-id: e0ce4217bb27ed4f9015833ad19eb3bb441fc79c
|
2016-06-10 03:03:40 +03:00 |
|
Roman Volosovskyi
|
2920984b0c
|
react-native-status dependency and other
Former-commit-id: 76e2887b17fdc7321998280fe28895fdc314f6ea
|
2016-06-09 12:49:02 +03:00 |
|
|
|
4b43096ba8
|
System.loadLibrary voodoo magic
Former-commit-id: 97ff59f95bcdd80a57833263c5a8191223683be6
|
2016-06-08 15:29:48 +02:00 |
|
Roman Volosovskyi
|
5f2d8e63c7
|
jail module
Former-commit-id: 32422310e81ee2190eeb11eb05738d4710dd1280
|
2016-06-08 15:15:23 +03:00 |
|
|
|
ce6ebde8b7
|
fix conflicts
Former-commit-id: 804683cd5235ac5053923ef5268706b6f722d490
|
2016-06-08 13:06:58 +02:00 |
|
|
|
6756d02335
|
warn user if root before starting geth
Former-commit-id: 1f0a4214b814da17d596f368c962c30152843327
|
2016-06-08 12:43:02 +02:00 |
|
Adrian Tiberius
|
d094cd286c
|
implemented #119 and #120
Former-commit-id: c81276e3b70616511a6f1f98f452dc50b08fe975
|
2016-06-01 11:41:50 +03:00 |
|
virvar
|
cf897d235a
|
Fix drag icon
Former-commit-id: 96ef6c34a8a4e33cf0c470075c4db4a23405e397
|
2016-05-31 14:39:38 +03:00 |
|
Adrian Tiberius
|
ecf8ea0f33
|
workaround for adding peer to geth
Former-commit-id: 32b10794d20d6ac149bb484d1d65dacff4cc84d7
|
2016-05-26 19:20:39 +03:00 |
|
virvar
|
16f7f791ac
|
Request-info view
Former-commit-id: 5333eadd67ae2e8d185bfdb0b48f359b3543a1d1
|
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: dcc607022f4e62e4c544495220c3130c5c30b026
|
2016-05-24 11:08:54 +03:00 |
|
Jarrad
|
ef205d2d78
|
Merge pull request #92 from status-im/group-chat
Group chat
Former-commit-id: 7fb60472d527281de344566d0a4ad5e0334fca51
|
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: 277905124dc9fe2bd4ea6362dd1365dca567ae38
|
2016-05-21 16:07:37 +03:00 |
|
