Roman Volosovskyi
|
b763d5d9c9
|
commands button
Former-commit-id: e728c155a1
|
2016-06-30 11:48:56 +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 |
|
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 |
|
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
|
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 |