Adrian Tiberius
|
68b6be2f31
|
fix account database separation
Former-commit-id: fac008b087
|
2016-07-18 19:29:51 +03:00 |
|
Adrian Tiberius
|
d3b8840893
|
account database separation try
Former-commit-id: d19b595b9f
|
2016-07-18 15:42:48 +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
|
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 |
Jarrad
|
3488beeee0
|
Merge pull request #143 from status-im/feature/#131
Feature/#131
Former-commit-id: f800f2c6bd
|
2016-06-21 17:07:19 +02:00 |
|
Adrian Tiberius
|
9ecad449fe
|
added identicons for default profile pictures
Former-commit-id: eab8dd5ca2
|
2016-06-21 15:23:19 +03:00 |
 Jarrad
|
da49076648
|
set linear-gradient to last known working version
Former-commit-id: defc5a44b3
|
2016-06-21 13:46:46 +02:00 |
|
Roman Volosovskyi
|
6beda2ace2
|
orientation
Former-commit-id: f7b5832707
|
2016-06-21 12:03:39 +03:00 |
|
Jarrad
|
83d3183aa6
|
update react-native-randombytes
Former-commit-id: 5b15f46079
|
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: 474729f230
|
2016-06-15 10:47:38 +03:00 |
|
Roman Volosovskyi
|
2920984b0c
|
react-native-status dependency and other
Former-commit-id: 76e2887b17
|
2016-06-09 12:49:02 +03:00 |
|
Adrian Tiberius
|
d094cd286c
|
implemented #119 and #120
Former-commit-id: c81276e3b7
|
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: dcc607022f
|
2016-05-24 11:08:54 +03:00 |
|
Adrian Tiberius
|
c7a9f13733
|
merged develop
Former-commit-id: 4a35a06b8c
|
2016-05-20 22:12:08 +03: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 |
|
virvar
|
d1ef5e7e32
|
Setup sms-listener
Former-commit-id: 1f5dad71e8
|
2016-05-18 17:40:26 +03:00 |
|
Jarrad Hope
|
f2bd17aa3e
|
stuck on Waiting for Figwheel to load files.
Former-commit-id: f5e82c5752
|
2016-04-24 15:23:17 +07:00 |
|
Jarrad Hope
|
25a7f8bb32
|
upgrade react-native and packages - but broken
Former-commit-id: bfaf45698c
|
2016-04-24 15:07:08 +07:00 |
michaelr
|
d54d6555a4
|
moved re-frame app to root folder
Former-commit-id: 5a3b923b0c
|
2016-04-04 19:21:10 +03:00 |
|
michaelr
|
95817924d6
|
changed navigation method, send new message
Former-commit-id: 77cae2cc42
|
2016-03-23 12:46:41 +02:00 |
|
virvar
|
d2aabc81c9
|
Add loading spinner
Former-commit-id: b10b44988c
|
2016-03-17 23:48:52 +03:00 |
|
virvar
|
3811efeb5e
|
Save whisper identities to db
Former-commit-id: 1a7d089ddc
|
2016-03-11 19:04:12 +03:00 |
|
virvar
|
577cf4e93c
|
Setup cljsjs/web dependency
Former-commit-id: 8d7a57e6d4
|
2016-03-07 20:00:30 +03:00 |
|
Jarrad Hope
|
5db6709dd0
|
upgrade renatal, react-native, web3
Former-commit-id: 4c31f1225a
|
2016-03-06 23:09:55 +01:00 |
|
virvar
|
76fcd5c3f7
|
User phone number input view
Former-commit-id: 68ae5ce5a9
|
2016-03-04 00:20:37 +03:00 |
|
virvar
|
5cd48e241a
|
Messages scroll direction
Former-commit-id: 995738ba19
|
2016-02-26 12:22:25 +03:00 |
|
Jarrad Hope
|
3418f77fac
|
add i18n package for translations
Former-commit-id: d6bfdadd85
|
2016-02-23 23:01:59 +01:00 |
|
Jarrad Hope
|
dbd39babb0
|
added web3 to interface with ethereum rpc server
|
2016-02-23 16:44:14 +01:00 |
|
virvar
|
7c6e7c644a
|
Initial
|
2016-02-23 01:04:42 +03:00 |