Roman Volosovskyi
|
9357849916
|
Merge branch 'develop' into feature/#123
Former-commit-id: bd3eea73fd
|
2016-06-22 10:53:27 +03:00 |
Adrian Tiberius
|
0f0cd22cb2
|
cleanup
Former-commit-id: 5a409ed6bf
|
2016-06-21 16:05:46 +03:00 |
Adrian Tiberius
|
9ecad449fe
|
added identicons for default profile pictures
Former-commit-id: eab8dd5ca2
|
2016-06-21 15:23:19 +03:00 |
virvar
|
c2f81f99c0
|
Uncomment randomBytes
Former-commit-id: 9d0cd3359c
|
2016-06-17 10:03:14 +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 |
virvar
|
478976f01d
|
Merge remote-tracking branch 'origin/develop' into message-animation
# Conflicts:
# src/status_im/components/styles.cljs
Former-commit-id: bf4f8521ec
|
2016-06-13 20:04:39 +03:00 |
Adrian Tiberius
|
23a17b2632
|
merged develop
Former-commit-id: 7f207a3760
|
2016-06-10 03:21:48 +03:00 |
Roman Volosovskyi
|
34f1e2fa17
|
fetch commands.js init
Former-commit-id: 0f4581476d
|
2016-06-08 15:14:35 +03:00 |
virvar
|
f57711aec1
|
Message appear animation
Former-commit-id: 446e6ade50
|
2016-06-08 14:39:37 +03:00 |
Roman Volosovskyi
|
13d689bb4a
|
println
Former-commit-id: 72b9afce99
|
2016-06-02 17:40:58 +03:00 |
Roman Volosovskyi
|
1d3a91c0ee
|
updated qr flow
Former-commit-id: db46a3a3cb
|
2016-06-02 17:39:26 +03:00 |
Roman Volosovskyi
|
04760cc549
|
Merge branch 'develop' into appium-setup
Conflicts:
src/status_im/i18n.cljs
Former-commit-id: bf6d4ef256
|
2016-06-01 19:11:51 +03:00 |
Roman Volosovskyi
|
7fbbf8b4aa
|
remove println
Former-commit-id: 2bfd90cec4
|
2016-06-01 14:09:43 +03:00 |
Adrian Tiberius
|
4870fef74b
|
fix qr code decoding and remove extra data
Former-commit-id: 755e9bf2b3
|
2016-06-01 14:01:58 +03:00 |
Adrian Tiberius
|
d094cd286c
|
implemented #119 and #120
Former-commit-id: c81276e3b7
|
2016-06-01 11:41:50 +03:00 |
Roman Volosovskyi
|
3ea8b2cb82
|
first unit test
Former-commit-id: 1766b1af12
|
2016-05-30 08:58:38 +03:00 |
Roman Volosovskyi
|
17c1c76003
|
clean js/window first attempt
Former-commit-id: 7694ad9e87
|
2016-05-30 08:58:38 +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 |
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 |
virvar
|
585baa9d71
|
Truncate chat name
Former-commit-id: c3496957ff
|
2016-05-20 16:36:00 +03:00 |
virvar
|
844ff739af
|
Merge 'develop' into 'real-data'
Former-commit-id: ff5898b0a1
|
2016-05-20 14:20:48 +03:00 |
Jarrad
|
b5763bb8ad
|
syng to status
Former-commit-id: 6a5250247c
|
2016-05-19 18:31:56 +02:00 |