69 Commits

Author SHA1 Message Date
Roman Volosovskyi
f613dbd2dc add group chat/ messages in group chat
Former-commit-id: a5f153bb664838e50fb13fd80534e0a8e660fe4b
2016-05-19 18:03:15 +03:00
virvar
9f61a21a98 Update with new structure
Former-commit-id: 1512b6de9d67a519397a84639e8aff38f8028453
2016-05-17 16:57:45 +03:00
virvar
8d2532eb46 Merge develop into group-chat-settings
Former-commit-id: e93e7724e2d1113abefbbdb4c31693da49102e6e
2016-05-17 14:38:55 +03:00
Roman Volosovskyi
f7bb988954 more cleanup in handlers/subs
Former-commit-id: 4752643ed7279fd54418af4e790bf18bdef35f4b
2016-05-17 13:32:20 +03:00
virvar
2d32a5c507 Group settings handler/sub
Former-commit-id: 1059c47826df191e5fd6a6c39540d7df7c80e778
2016-05-16 19:38:35 +03:00
virvar
a0b0e1e8c6 Merge develop to group-chat-settings
Former-commit-id: 977b010a07d298fd7a33f127bc8f0214653d9fcb
2016-05-16 19:24:17 +03:00
virvar
435d11eb2a 'Clear history', 'Leave chat' handlers
Former-commit-id: 1fe23fe57c25275fbd0bfc51808da9a651e86855
2016-05-16 15:36:52 +03:00
virvar
8919410735 Chat color
Former-commit-id: 14e69f9369148f334e77072d8e9a2431bd53bdfa
2016-05-16 13:47:34 +03:00
Roman Volosovskyi
4d9b81edf5 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


Former-commit-id: 473604d859b75b5ec22ac70237c4f6967e03baee
2016-05-16 12:31:08 +03:00
Roman Volosovskyi
96821edf6b remove to-realm-datasource
Former-commit-id: f484b190fde34712150ef6c87b776f8acfd85b82
2016-05-13 18:56:52 +03:00
Roman Volosovskyi
ee5a169c8e move discoveries model
Former-commit-id: c27fddfe18a86a596887a2524b2b5b1656428f8c
2016-05-13 17:34:04 +03:00
virvar
8ab611f5c5 Group settings refactoring
Former-commit-id: 6b54767b98beea962db844df39caf74d63e8849e
2016-05-13 15:15:40 +03:00
Roman Volosovskyi
f9cee873d1 discoveries
Former-commit-id: 748abd40e48f3a0210ecb33c3e72c4591673ee0a
2016-05-13 14:58:58 +03:00
virvar
470191d9b3 Add/remove group chat members
Former-commit-id: b2737d42f7451d8a41f38ae1b37876951c838ef9
2016-05-13 14:17:03 +03:00
virvar
798aab0f72 Read/save group chat settings
Former-commit-id: 14be588ca234fefcfd7813dc2b9ef67584ae3339
2016-05-12 13:26:13 +03:00
Roman Volosovskyi
8fb71e46b7 contacts handlers
Former-commit-id: 73d3fdb3e6e54192520750988317412d407df66f
2016-05-12 12:56:47 +03:00
Roman Volosovskyi
a2467348e3 contacts styles
Former-commit-id: c5c71691c33d2c16b14bb49b3a44048bd52129a7
2016-05-11 16:06:37 +03:00
Roman Volosovskyi
fc6926cbfd chats-list & new-group views/styles
Former-commit-id: 0b3469cd649b822520317ac473ac1ccc7f154ae4
2016-05-11 14:47:40 +03:00
virvar
5a63f527d3 Add my profile view
Former-commit-id: 3dfc4619244a0e54901d82f74b54232ee729373e
2016-05-11 13:05:33 +03:00
Roman Volosovskyi
fb22a08b79 remove chat model
Former-commit-id: 544571e3a7c4ce4ab04df0ba2e30ffb65ce4e70d
2016-05-10 17:40:21 +03:00
virvar
bdc9b6e5e0 Merge with 'develop'
Former-commit-id: 6f2acb0f65ea8b587e3447c98f0bda1f54cbcd6d
2016-05-10 16:39:09 +03:00
Roman Volosovskyi
39772b41f7 more navigation handlers
Former-commit-id: 38161d9e10dffc1a5bb58f495457873fede418fc
2016-05-10 15:25:36 +03:00
Roman Volosovskyi
8a99e2a614 chat & navigation handlers/subs
Former-commit-id: f429a15be874f45a3c04cf220b19bea8aa5277b7
2016-05-10 13:58:37 +03:00
virvar
7ecce32a86 Start command input on button click
Former-commit-id: 6bbd5bf92d63eee78492f3085ceace7db56e1636
2016-05-10 13:12:49 +03:00
virvar
4a5623285a Set signed-up at init db
Former-commit-id: 8324cf4109e1d77d3ee574ef6351e9f4df252d9b
2016-05-10 12:31:48 +03:00
virvar
d0f7dc8539 Fix navigation. Change image to icon.
Former-commit-id: ee7de392749f9900202b9955156c300d96c1646b
2016-05-10 11:15:39 +03:00
virvar
386ba0051f Merge with 'develop'
Former-commit-id: ee4a4a6f6529ecb1344e523385a321cd885a38bc
2016-05-10 09:45:59 +03:00
virvar
9bd9847138 Fixes
Former-commit-id: 4e7bdd47429ef39682ae57480113734b6342d93a
2016-05-09 17:33:41 +03:00
virvar
653cbc133b Merge with develop
Former-commit-id: 03d719edaf25e6ff2bbea4b0a0f94cf31c0ede0c
2016-05-09 17:30:01 +03:00
Adrian Tiberius
4ff9e34121 merge develop
Former-commit-id: 96957039c3e2bda2075186817f4f345e51e3998e
2016-05-09 16:58:03 +03:00
Adrian Tiberius
fba1bffd08 merge develop
Former-commit-id: 5b6c077b667503284ab426ca613dafd99e9df5fa
2016-05-09 16:40:45 +03:00
Roman Volosovskyi
98321167fe chat message styles
Former-commit-id: 27302d902718f7ae28224c3c4b81b79f70a7ce09
2016-05-08 23:06:38 +03:00
Adrian Tiberius
5b8adc04ce moved handlers and subs to component folder
Former-commit-id: 2f11811d55f07d1fc63e3d1f147d3148ba0d591a
2016-05-07 18:04:19 +03:00
virvar
34bd8bebe7 Show contact profile from chat menu. Fix chat creation.
Former-commit-id: e4e9bcfc1afcf5a067a63431226c1b9252fa5869
2016-05-06 17:12:24 +03:00
Roman Volosovskyi
459893a95c same-author/direction
Former-commit-id: 357249a49b9e36d6eafb73e219410e6468155306
2016-05-06 16:11:45 +03:00
Roman Volosovskyi
b7ddf69d78 same-author/direction
Former-commit-id: 827a354c1e8f603b8c541353ed3452814997da22
2016-05-06 15:17:17 +03:00
Roman Volosovskyi
c8890a545c refactoring
Former-commit-id: 319bb656ec6848954fe9afb34a191cd4c04dfca7
2016-05-06 14:06:58 +03:00
virvar
ce53fec09c Add drawer
Former-commit-id: 55dc64f6e62163c22486368d8ada6932fabcd86a
2016-05-05 17:03:34 +03:00
Adrian Tiberius
b4243aa2cc merged develop branch
Former-commit-id: 2c9174af631e30598f80f5005a4be717d5b8d9e1
2016-05-05 16:33:48 +03:00
virvar
02f08e6b99 Merge with 'design'
Former-commit-id: f06cdee11bcb2dd78c3d67f8598d5fb1436a431d
2016-05-05 13:30:12 +03:00
virvar
968def8a3f Menu items icons. Hide actions menu on click outside.
Former-commit-id: ac115087035cc2ef7efbc9146708c5989ade4c50
2016-05-03 16:39:08 +03:00
virvar
b9a51912fd Store last chat msg id in chat entity
Former-commit-id: c81b0dfc8c5fab896bb5352115d81638ef89f071
2016-05-02 13:43:13 +03:00
michaelr
eb10272bdb improved system messages for edge cases
Former-commit-id: a555c57bcc1fa2e3632e202ef987b83adedd8b0a
2016-04-29 16:24:03 +03:00
michaelr
de14071c06 remove participants colors, re-join chat, update contacts instead of remove
Former-commit-id: 8f04104cc0327c834113b916ae4ebecdafb8a2d2
2016-04-29 02:06:15 +03:00
michaelr
ff8dc7a4f7 idempotent joined chat msg
Former-commit-id: dbfbd18eaf100ad9732799a2b432703953740b8b
2016-04-28 14:37:33 +03:00
Adrian Tiberius
bce474e857 merge master
Former-commit-id: a87ed22db8a6b62d9c5f096e4c31f7586edad362
2016-04-28 04:12:30 +03:00
Roman Volosovskyi
0a293ee74d lein-kibit suggestions
Former-commit-id: 529148c1014b64d546651d9e4bb67bd040884d86
2016-04-26 12:42:08 +03:00
Roman Volosovskyi
ef3668044b fix command as non-command
Former-commit-id: d1bc2196fa55024cea80c780b887b0dec5a18b3f
2016-04-25 11:27:30 +03:00
virvar
dd50fe0846 Merge
Former-commit-id: 4016767f17a0d2e219fcf0cc11913bebb659d556
2016-04-21 22:12:33 +03:00
virvar
4bf21fc42c Send staged commands
Former-commit-id: 3cde44c5cc345accf51e98f564b268af9bc55249
2016-04-21 15:33:53 +03:00