Commit Graph

427 Commits

Author SHA1 Message Date
virvar 9ad014a509 Rename group-settings to screen 2016-05-17 14:26:45 +03:00
Roman Volosovskyi 4752643ed7 more cleanup in handlers/subs 2016-05-17 13:32:20 +03:00
virvar 69b0dbdb8d Fix group chat 2016-05-17 13:26:20 +03:00
virvar 1059c47826 Group settings handler/sub 2016-05-16 19:38:35 +03:00
virvar 977b010a07 Merge develop to group-chat-settings 2016-05-16 19:24:17 +03:00
Jarrad 44074bd054 Merge pull request #68 from status-im/structure
Structure
2016-05-16 15:05:34 +02:00
Roman Volosovskyi c2b4a1ec33 fix giant 'type' 2016-05-16 16:04:07 +03:00
Roman Volosovskyi 5f0862e3b7 discoveries toolbar 2016-05-16 15:50:06 +03:00
Roman Volosovskyi 739ca7cb1b empty sections 2016-05-16 15:38:27 +03:00
virvar 1fe23fe57c 'Clear history', 'Leave chat' handlers 2016-05-16 15:36:52 +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
virvar 14e69f9369 Chat color 2016-05-16 13:47:34 +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
virvar bf6c419c5d Chat name edit form. Fix styles. 2016-05-13 18:03:45 +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
virvar 6b54767b98 Group settings refactoring 2016-05-13 15:15:40 +03:00
Roman Volosovskyi 748abd40e4 discoveries 2016-05-13 14:58:58 +03:00
virvar b2737d42f7 Add/remove group chat members 2016-05-13 14:17:03 +03:00
Adrian Tiberius 897ee3dcd6 fixed discovery tag navigation 2016-05-12 23:46:17 +03:00
Adrian Tiberius 1fd3f86e23 added tabs component 2016-05-12 22:47:32 +03:00
virvar 5283256804 Group settings to new structure 2016-05-12 16:31:27 +03:00
virvar 344f64b9f2 Group settings members 2016-05-12 15:32:40 +03:00
virvar 240569434c Group settings styles 2016-05-12 14:15:09 +03:00
virvar 14be588ca2 Read/save group chat settings 2016-05-12 13:26:13 +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