virvar
|
bb79c16e37
|
Default user icon in contacts view
Former-commit-id: 5c3009ca031bb370d3a0ba55efd427ae95c46e4c
|
2016-06-17 13:13:27 +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 |
|
Adrian Tiberius
|
a424ba1447
|
qr-scanner screen title, code cleaning, style fixes
Former-commit-id: fbd66a840fc7f43b212f16f7cf3ae619267ce429
|
2016-06-03 15:47:52 +03:00 |
|
Roman Volosovskyi
|
13d689bb4a
|
println
Former-commit-id: 72b9afce9985c73a1c98a13cdbd7615da775cd4a
|
2016-06-02 17:40:58 +03:00 |
|
Roman Volosovskyi
|
1d3a91c0ee
|
updated qr flow
Former-commit-id: db46a3a3cb4de5ef843759751661d9f41d8f26ad
|
2016-06-02 17:39:26 +03:00 |
|
Roman Volosovskyi
|
2b4f410fd7
|
fix contacts loading
Former-commit-id: 9ae6e752d894170d65e8d8da813c5386796a3fe8
|
2016-06-02 14:23:28 +03:00 |
|
Adrian Tiberius
|
a156c8f865
|
make qr-scanner callable multiple times from different screens
Former-commit-id: 6eeefb2efbd460376eb00b9714422e1c23724402
|
2016-06-02 13:43:26 +03:00 |
|
Roman Volosovskyi
|
ce80c8a330
|
fix exception at fetching of the contacts
Former-commit-id: 084f067ae82eca5576f2fc84450c961b3b75cc2b
|
2016-06-01 19:42:38 +03:00 |
|
Adrian Tiberius
|
d094cd286c
|
implemented #119 and #120
Former-commit-id: c81276e3b70616511a6f1f98f452dc50b08fe975
|
2016-06-01 11:41:50 +03:00 |
|
Roman Volosovskyi
|
3ea8b2cb82
|
first unit test
Former-commit-id: 1766b1af1295f6773f580a3a6d3a1afba3dbff0a
|
2016-05-30 08:58:38 +03:00 |
|
Adrian Tiberius
|
67e784598a
|
changed translation style
Former-commit-id: 182600b2d7089b36f9b7451ba49a74ac80dab515
|
2016-05-25 18:57:06 +03:00 |
|
Adrian Tiberius
|
7d47ab2d62
|
added i18n translations
Former-commit-id: b15c156a40957c27f0c4feea3ea7ceedf0407090
|
2016-05-25 04:27:03 +03:00 |
|
Adrian Tiberius
|
6ab889152c
|
merge develop
Former-commit-id: 98f22d9a13d55ae1baf7c655107a09e279024d80
|
2016-05-24 12:01:26 +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
|
56c1248a6d
|
fixes #88
Former-commit-id: b1bc93b782b0750be75ffdc7728736f4e0a87252
|
2016-05-23 15:13:52 +03:00 |
|
Adrian Tiberius
|
2e49994c86
|
small code clean
Former-commit-id: 45c35733be4f1c4c09d7d563f84d62020729287a
|
2016-05-23 13:13:06 +03:00 |
|
Adrian Tiberius
|
563e0d69c7
|
fix last element scroll
Former-commit-id: ff0307d4ce1c9e2b03640ec08f6623ba18e79e66
|
2016-05-22 23:36:43 +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 |
|
Jarrad
|
b5763bb8ad
|
syng to status
Former-commit-id: 6a5250247ca0de762169548c2ff109486b709f13
|
2016-05-19 18:31:56 +02:00 |
|