Adrian Tiberius
|
68b6be2f31
|
fix account database separation
Former-commit-id: fac008b0875b81045b1dcdfa5077f18a35775bbe
|
2016-07-18 19:29:51 +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
|
9357849916
|
Merge branch 'develop' into feature/#123
Former-commit-id: bd3eea73fd72f0393c4c7541bba5c77ea3884fa3
|
2016-06-22 10:53:27 +03:00 |
|
Roman Volosovskyi
|
6beda2ace2
|
orientation
Former-commit-id: f7b583270707f4fcfc599f9010c3dcba58c1decc
|
2016-06-21 12:03:39 +03:00 |
|
|
|
83d3183aa6
|
update react-native-randombytes
Former-commit-id: 5b15f4607980de2eebe7e72d74ff0d14a2996775
|
2016-06-16 15:30:24 +02: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
|
2920984b0c
|
react-native-status dependency and other
Former-commit-id: 76e2887b17fdc7321998280fe28895fdc314f6ea
|
2016-06-09 12:49:02 +03:00 |
|
Adrian Tiberius
|
d094cd286c
|
implemented #119 and #120
Former-commit-id: c81276e3b70616511a6f1f98f452dc50b08fe975
|
2016-06-01 11:41:50 +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 |
|
Adrian Tiberius
|
c7a9f13733
|
merged develop
Former-commit-id: 4a35a06b8c3dee363e8a237cc245e488b9c165c8
|
2016-05-20 22:12:08 +03: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 |
|
virvar
|
d1ef5e7e32
|
Setup sms-listener
Former-commit-id: 1f5dad71e81ec910b3370374544864e554fd6cf1
|
2016-05-18 17:40:26 +03:00 |
|
michaelr
|
d54d6555a4
|
moved re-frame app to root folder
Former-commit-id: 5a3b923b0c32e5e900b89e984393822ce6a15abc
|
2016-04-04 19:21:10 +03:00 |
|
virvar
|
3811efeb5e
|
Save whisper identities to db
Former-commit-id: 1a7d089ddc31719a5a527acc30479c6cd4a54458
|
2016-03-11 19:04:12 +03:00 |
|
Jarrad Hope
|
65644b2d84
|
i18n android integration, TODO iOS
Former-commit-id: f4af8beb158f4b36618004f5f9b61e2759265192
|
2016-02-23 23:15:51 +01:00 |
|
virvar
|
7c6e7c644a
|
Initial
|
2016-02-23 01:04:42 +03:00 |
|
