status-im
/
status-mobile
mirror of https://github.com/status-im/status-mobile.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity
308 Commits 589 Branches 76 Tags 1.5 GiB
Commit Graph

308 Commits

Author SHA1 Message Date
Roman Volosovskyi 739ca7cb1b empty sections 2016-05-16 15:38:27 +03:00
Roman Volosovskyi 1977d29b72 profiles/drawer structure 2016-05-16 14:38:07 +03:00
Roman Volosovskyi c833764e22 content-suggestions 2016-05-16 14:05:43 +03:00
Roman Volosovskyi ac4548f63b drawer 2016-05-16 13:40:43 +03:00
Roman Volosovskyi 473604d859 Merge branch 'develop' into structure 
Conflicts:
	src/syng_im/android/core.cljs
	src/syng_im/chat/screen.cljs
	src/syng_im/chat/styles/suggestions.cljs
	src/syng_im/chat/suggestions.cljs
	src/syng_im/chat/views/command.cljs
	src/syng_im/chat/views/phone.cljs
	src/syng_im/chat/views/suggestions.cljs
	src/syng_im/components/chat/input/money.cljs
	src/syng_im/components/chats/chats_list.cljs
	src/syng_im/components/contact_list/contact.cljs
	src/syng_im/components/contact_list/contact_list.cljs
	src/syng_im/components/discovery/discovery.cljs
	src/syng_im/components/toolbar.cljs
	src/syng_im/db.cljs
	src/syng_im/discovery/styles.cljs
	src/syng_im/handlers.cljs
	src/syng_im/models/chat.cljs
	src/syng_im/models/contacts.cljs
	src/syng_im/subs.cljs
 2016-05-16 12:31:08 +03:00
Roman Volosovskyi af0ed4c3a9 start chat with contact 2016-05-16 10:45:59 +03:00
Roman Volosovskyi 780b12049e defview suggestion 2016-05-14 12:39:01 +03:00
Roman Volosovskyi 85e05a451d replace to-datasource2 2016-05-13 19:03:14 +03:00
Roman Volosovskyi f484b190fd remove to-realm-datasource 2016-05-13 18:56:52 +03:00
Roman Volosovskyi c27fddfe18 move discoveries model 2016-05-13 17:34:04 +03:00
Roman Volosovskyi c62feb0159 some missed styles 2016-05-13 16:58:14 +03:00
Roman Volosovskyi 83e4c584cb tag screen 2016-05-13 16:52:42 +03:00
Roman Volosovskyi 74249dc717 discoveries order 2016-05-13 15:52:02 +03:00
Roman Volosovskyi 748abd40e4 discoveries 2016-05-13 14:58:58 +03:00
Roman Volosovskyi 73d3fdb3e6 contacts handlers 2016-05-12 12:56:47 +03:00
Jarrad 8c386f2175 Merge pull request #65 from status-im/my-profile 
My profile view
 2016-05-12 11:54:02 +02:00
Roman Volosovskyi c5c71691c3 contacts styles 2016-05-11 16:06:37 +03:00
virvar 13205348ed Merge branch 'develop' into my-profile 2016-05-11 15:49:05 +03:00
Jarrad 3d8adf840e Merge pull request #64 from status-im/commands-button 
Commands button. Phone number validation. Drawer and Profile views.
 2016-05-11 14:42:12 +02:00
Roman Volosovskyi bb0a6c848f chats-list screen styles 2016-05-11 14:58:03 +03:00
Roman Volosovskyi 0b3469cd64 chats-list & new-group views/styles 2016-05-11 14:47:40 +03:00
virvar 249ea85201 Profile menu item of chat view 2016-05-11 14:37:31 +03:00
virvar 0e2cd2f653 Chat view toolbar refactoring 2016-05-11 14:36:40 +03:00
virvar 3dfc461924 Add my profile view 2016-05-11 13:05:33 +03:00
virvar 3264bbfac9 Microrefactoring 2016-05-11 10:42:04 +03:00
virvar c89f2820aa Fix back navigation. Add 'discovery' drawer item. 2016-05-11 10:36:13 +03:00
Roman Volosovskyi eae67bd400 Merge branch 'develop' into structure 2016-05-10 19:07:58 +03:00
Roman Volosovskyi f1584b8342 contacts screen/views 2016-05-10 19:06:36 +03:00
Roman Volosovskyi 544571e3a7 remove chat model 2016-05-10 17:40:21 +03:00
Adrian Tiberius 5fe774faee replace avatar placeholder in discovery and remove unused image resources 2016-05-10 17:39:52 +03:00
virvar 6f2acb0f65 Merge with 'develop' 2016-05-10 16:39:09 +03:00
virvar 6f5dade40f Suggestions style. Add close commands button. 2016-05-10 16:16:07 +03:00
Roman Volosovskyi bc494dcacd Merge branch 'develop' into structure 2016-05-10 15:32:47 +03:00
Roman Volosovskyi 38161d9e10 more navigation handlers 2016-05-10 15:25:36 +03:00
Jarrad bda5ce32ab Merge pull request #58 from status-im/feature-discover 
Feature discover
 2016-05-10 13:21:58 +02:00
Roman Volosovskyi f429a15be8 chat & navigation handlers/subs 2016-05-10 13:58:37 +03:00
virvar 6bbd5bf92d Start command input on button click 2016-05-10 13:12:49 +03:00
virvar 8324cf4109 Set signed-up at init db 2016-05-10 12:31:48 +03:00
virvar ee7de39274 Fix navigation. Change image to icon. 2016-05-10 11:15:39 +03:00
virvar ee4a4a6f65 Merge with 'develop' 2016-05-10 09:45:59 +03:00
Adrian Tiberius d68e078130 refactored carousel component 2016-05-09 21:22:02 +03:00
Roman Volosovskyi 4b1b5a9449 chat inputs/suggestions/commands 2016-05-09 19:28:40 +03:00
Roman Volosovskyi 410a06c07c Merge branch 'develop' into structure 2016-05-09 18:46:50 +03:00
Roman Volosovskyi 4eac55e756 fix :navigation-stack sub 2016-05-09 18:41:42 +03:00
Roman Volosovskyi 4c4e27267a fix :chat-properties 2016-05-09 18:39:10 +03:00
Roman Volosovskyi 6932f1c103 chat's views & styles 2016-05-09 18:17:40 +03:00
virvar 4e7bdd4742 Fixes 2016-05-09 17:33:41 +03:00
virvar 03d719edaf Merge with develop 2016-05-09 17:30:01 +03:00
Adrian Tiberius 96957039c3 merge develop 2016-05-09 16:58:03 +03:00
Jarrad 9e49529d12 Merge pull request #62 from status-im/styles 
Chat & chat components styles
 2016-05-09 15:44:19 +02:00