48 Commits

Author SHA1 Message Date
Jarrad
4ac074a71d Merge pull request #146 from status-im/feature/#119
Feature/#119

Former-commit-id: db5c654686263068343ebe0f4aeb39b89dac868b
2016-07-05 14:38:04 +02:00
Adrian Tiberius
2d6ab94329 changed error color
Former-commit-id: 42faf66c1d8b10c631054c2e432304a2929215e8
2016-06-30 23:09:33 +03:00
Roman Volosovskyi
b746bcef4f attempt to fix performance issues
Former-commit-id: 3a93e0890bfea4b167b934c26f2c5096ea73421a
2016-06-30 17:23:38 +03:00
Adrian Tiberius
220f0c14f8 fix typo
Former-commit-id: 31a8824d34e46a5eec2abfb61f1c6c44ee34b89b
2016-06-29 23:14:06 +03:00
Adrian Tiberius
15ddd891a1 fix validation visual feedback and disabled grey tick
Former-commit-id: e947bb0ea17394caa1facee04d43712882409845
2016-06-29 23:06:50 +03:00
Roman Volosovskyi
b505a3dc05 check identity length
Former-commit-id: fa2e2c2f28f95160b252f0e78e9de55dc7462fa7
2016-06-22 16:39:06 +03:00
Roman Volosovskyi
cbb56e499c check uniqueness
Former-commit-id: 4181541ae268cb5c427209ac51a90c3b16584088
2016-06-22 16:32:05 +03:00
Roman Volosovskyi
fe33e694b7 check uniqueness
Former-commit-id: bb4641fc939f74645e111daee6c4df262ed085d4
2016-06-22 16:29:25 +03:00
Adrian Tiberius
163e98afee merged develop
Former-commit-id: 6bb48a42f943e2c4f3616eecc89c849ec341769c
2016-06-22 11:24:47 +03:00
Adrian Tiberius
eb116cc65d try using clojure spec for validation
Former-commit-id: 42d8ea47dff1a9494522c764af8eb837512aacf1
2016-06-22 11:18:46 +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
e464079a84 Merge branch 'develop' into fix/single-drawer
Former-commit-id: e3e4de6f1203c0d9a4188a766a3cbd38de50df1c
2016-06-22 10:48:45 +03:00
Roman Volosovskyi
f24e493ac4 Merge branch 'develop' into feature/#138
Former-commit-id: 4be203bcd38674ee56d6b8a824c4ad61d263d14d
2016-06-21 18:54:52 +03:00
Roman Volosovskyi
9ac1056d73 no contacts screen & some fixes
Former-commit-id: dc567356ca90eac2d99c73b4a0008c65ac748e39
2016-06-21 18:48:41 +03:00
Adrian Tiberius
bfcc63fc05 added disabled state for create contact button
Former-commit-id: b5ea433420517a88bb8aba43d1eab928baf0070d
2016-06-21 17:39:05 +03:00
Adrian Tiberius
a9d2ed2711 applied new design
Former-commit-id: 9f405ee18d9407198a6752040ccb9342f3d7be87
2016-06-21 17:15:46 +03:00
Adrian Tiberius
0f0cd22cb2 cleanup
Former-commit-id: 5a409ed6bf803c75c128ab74ad78fdcb84113bab
2016-06-21 16:05:46 +03:00
Adrian Tiberius
9ecad449fe added identicons for default profile pictures
Former-commit-id: eab8dd5ca21b851da7fa508b978a0fb1ffa79647
2016-06-21 15:23:19 +03:00
virvar
c2ee61c1db Contact view refactoring
Former-commit-id: 93de4680de470003df22d6894f7bd5107d625608
2016-06-20 16:37:26 +03:00
virvar
e43ae9f3f5 Contact list toolbar color
Former-commit-id: dc1c32210647b198c27d9a792d3af3996e5790cb
2016-06-20 13:20:37 +03:00
virvar
c20e7a2424 Fix contacts sorting
Former-commit-id: c6205fdd651dba71f5c81dd142a9d6f868c2a166
2016-06-20 12:50:20 +03:00
virvar
3f2c598b2b Add shadows
Former-commit-id: 383602200e5714338091c48d87d7e48ef5290dc4
2016-06-20 12:21:57 +03:00
virvar
dc2895f2be Contacts tab view. Contacts group view.
Former-commit-id: e223fcbf9ed7ee1032d1d6568c980d38ed637eea
2016-06-17 18:38:47 +03:00
virvar
f737416893 Move drawer to tabs view
Former-commit-id: 86117b3de21857910eb550c430b1cf9aa037c2a5
2016-06-17 15:30:11 +03:00
virvar
4cdc81bc90 Contacts' letters
Former-commit-id: 9855d35d377fe874cf3618be3e9c74bcc2b28a2c
2016-06-17 14:41:56 +03:00
virvar
bb79c16e37 Default user icon in contacts view
Former-commit-id: 5c3009ca031bb370d3a0ba55efd427ae95c46e4c
2016-06-17 13:13:27 +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: 474729f230346fc10d7d14474282f7f6458f0998
2016-06-15 10:47:38 +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
Roman Volosovskyi
5689bf787e console commands/responses
Former-commit-id: 61b6599bd37d8a2d9e6214993ca4ff2fb5e3a8bc
2016-06-09 19:34:09 +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