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 |
|
Adrian Tiberius
|
5a1c2c9bb3
|
added Geth react-native module
Former-commit-id: abaab3b26bbbee5251ea0cfb974464cfb0e0704f
|
2016-06-27 18:35:25 +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
|
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 |
|
Roman Volosovskyi
|
6beda2ace2
|
orientation
Former-commit-id: f7b583270707f4fcfc599f9010c3dcba58c1decc
|
2016-06-21 12:03:39 +03:00 |
|
Jarrad
|
65d93b5e2a
|
Merge pull request #135 from status-im/feature/service
Feature/service
Former-commit-id: 7459b632511b454a3ded8278d51d0756871df94d
|
2016-06-17 13:59:25 +02:00 |
|
|
|
83d3183aa6
|
update react-native-randombytes
Former-commit-id: 5b15f4607980de2eebe7e72d74ff0d14a2996775
|
2016-06-16 15:30:24 +02: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 |
|
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
|
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 |
|
|
|
4b43096ba8
|
System.loadLibrary voodoo magic
Former-commit-id: 97ff59f95bcdd80a57833263c5a8191223683be6
|
2016-06-08 15:29:48 +02: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 |
|
Adrian Tiberius
|
c7a9f13733
|
merged develop
Former-commit-id: 4a35a06b8c3dee363e8a237cc245e488b9c165c8
|
2016-05-20 22:12:08 +03:00 |
|
Roman Volosovskyi
|
227f22eb48
|
chat name/load messages on [:navigate-to :chat id]/ other
Former-commit-id: ae1918a2aed109400cda0e376fec6d37cdb5d79f
|
2016-05-20 19:12:04 +03:00 |
|
|
|
5e25330d58
|
an icon why not?
Former-commit-id: 4732498ba26fd4c13cddcba6c7af784910477536
|
2016-05-20 15:45:35 +02:00 |
|
virvar
|
844ff739af
|
Merge 'develop' into 'real-data'
Former-commit-id: ff5898b0a12f3702bf303bd20b42340ef61c6e68
|
2016-05-20 14:20:48 +03:00 |
|
Adrian Tiberius
|
6e53d72acb
|
add gradient
Former-commit-id: 799808965dac2236d21cd07e6a32e664f17e6711
|
2016-05-19 20:05:04 +03:00 |
|
Jarrad
|
5aa61b1de4
|
Syng to Status
Former-commit-id: 134c040c3e28667f01d4e218a9a8a4ab0b4c57cf
|
2016-05-19 18:32:38 +02:00 |
|
Jarrad
|
b5763bb8ad
|
syng to status
Former-commit-id: 6a5250247ca0de762169548c2ff109486b709f13
|
2016-05-19 18:31:56 +02:00 |
|
Adrian Tiberius
|
aba7d4fae0
|
fix padding
Former-commit-id: 0556e299d6fea7bb50c106a65cbe4b1f75df19a7
|
2016-05-19 18:41:25 +03:00 |
|
virvar
|
d1ef5e7e32
|
Setup sms-listener
Former-commit-id: 1f5dad71e81ec910b3370374544864e554fd6cf1
|
2016-05-18 17:40:26 +03:00 |
|
virvar
|
8919410735
|
Chat color
Former-commit-id: 14e69f9369148f334e77072d8e9a2431bd53bdfa
|
2016-05-16 13:47:34 +03:00 |
|
Adrian Tiberius
|
2b0bf554e4
|
added tabs component
Former-commit-id: 1fd3f86e235db34dde4ed04bc5535027d4a4cdfc
|
2016-05-12 22:47:32 +03:00 |
|
virvar
|
a3effe4f3d
|
Merge branch 'develop' into my-profile
Former-commit-id: 13205348ed8fa0180e94dde2b82aafb0022ecfbd
|
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: 3d8adf840ef4606d38a0419280256a8ddd57a10d
|
2016-05-11 14:42:12 +02:00 |
|
virvar
|
5a63f527d3
|
Add my profile view
Former-commit-id: 3dfc4619244a0e54901d82f74b54232ee729373e
|
2016-05-11 13:05:33 +03:00 |
|
Adrian Tiberius
|
30b9298478
|
replace avatar placeholder in discovery and remove unused image resources
Former-commit-id: 5fe774faeefecac20a1f67591071914c06fe16f3
|
2016-05-10 17:39:52 +03:00 |
|
virvar
|
bdc9b6e5e0
|
Merge with 'develop'
Former-commit-id: 6f2acb0f65ea8b587e3447c98f0bda1f54cbcd6d
|
2016-05-10 16:39:09 +03:00 |
|
virvar
|
d285fcd6e0
|
Suggestions style. Add close commands button.
Former-commit-id: 6f5dade40fa03ee6557d8ae3e396843bbe08fee4
|
2016-05-10 16:16:07 +03:00 |
|
virvar
|
59e6126572
|
Show suggestions as hint for phone number format
Former-commit-id: 6eeaab5c2803eafb04e74b2a9df1872db94a7735
|
2016-05-09 15:29:08 +03:00 |
|
virvar
|
088d20ebf0
|
Fix profile styles
Former-commit-id: 7ddd90e2dca147ea6f48f9508f964e482f489c0a
|
2016-05-06 14:25:29 +03:00 |
|
Adrian Tiberius
|
b4243aa2cc
|
merged develop branch
Former-commit-id: 2c9174af631e30598f80f5005a4be717d5b8d9e1
|
2016-05-05 16:33:48 +03:00 |
|
virvar
|
968def8a3f
|
Menu items icons. Hide actions menu on click outside.
Former-commit-id: ac115087035cc2ef7efbc9146708c5989ade4c50
|
2016-05-03 16:39:08 +03:00 |
|
virvar
|
df120998cf
|
Merge branch 'design' into icons_resolution
Former-commit-id: 7ee1625b31dd98602a3f4e05744051c40dd3660e
|
2016-04-25 20:33:40 +03:00 |
|
virvar
|
99f5f9caef
|
Fix #25 Low resolution icons
Former-commit-id: 81751b294b480b4a9d9e57e771a6e101c8b772fb
|
2016-04-25 20:32:43 +03:00 |
|
Roman Volosovskyi
|
5cc01ad2d9
|
fix #28 adjustPan
Former-commit-id: 2100e08a49aa108d2218cc8e7a9ab2dd62901fea
|
2016-04-25 15:55:42 +03:00 |
|
Roman Volosovskyi
|
ee165f0694
|
fix #28
Former-commit-id: a6555242ff9267f0f8d78a63a1823d5b6072fa71
|
2016-04-25 13:41:25 +03:00 |
|
