Commit graph

19 commits

Author SHA1 Message Date
Matt Nash
4ff28dd769 Issue #429 color final fixes
Former-commit-id: 03174d8f66 [formerly 9bc3f0c75d] [formerly 506d3e8989 [formerly 51b937b9be5c9f1a1e17317e241cd93337e9fd0c]]
Former-commit-id: 506d3e8989
Former-commit-id: 76e8b2e192
2012-04-25 14:22:12 -05:00
Matt Nash
5fa80650b3 Issue #429 colors matching between telestrator and chat room across clients
Former-commit-id: abbe0c3d6b [formerly d84865ced9] [formerly 09fc05162c [formerly 46a327c929a09c21270f7b6de543e8d742476003]]
Former-commit-id: 09fc05162c
Former-commit-id: 563e76c313
2012-04-25 07:39:05 -05:00
Matt Nash
75a76124f8 Issue #429 colors for collaboration session
Former-commit-id: 190a951b26 [formerly 63dccd6b85] [formerly bc1e35f4b4 [formerly 86a4ba1b10b58f266cfd46a257145717140a3778]]
Former-commit-id: bc1e35f4b4
Former-commit-id: d79ae59e19
2012-04-24 16:39:28 -05:00
Matt Nash
b84be3fe98 Issue #429 color fixes
Former-commit-id: 878e798141 [formerly 7116eb79cd] [formerly 1b9c4320fc [formerly 819a0b037d49993e56dc77207809dbf3903ea6ec]]
Former-commit-id: 1b9c4320fc
Former-commit-id: 15478a9e21
2012-04-20 15:30:58 -05:00
Matt Nash
b71d725791 Issue #429 change name of editor sharing
Former-commit-id: dfba9a1d0d [formerly 9b7a839cdd] [formerly ac3b674bf3 [formerly 199c8c6af547dc66e8cb068e2617a96f3b68d515]]
Former-commit-id: ac3b674bf3
Former-commit-id: 87a5511a7c
2012-04-16 15:40:37 -05:00
Nate Jensen
c6f42b4a70 Issue #427 attempt to fix collaboration build
Change-Id: I30297eebe969601b5a803ccd58e9e69f5ac0e515

Former-commit-id: a876c29a8f [formerly 6b84101223] [formerly a823db85be [formerly d011c6f975cae23d5f6dc47ff8faa03f973f28e8]]
Former-commit-id: a823db85be
Former-commit-id: c278bcd9fe
2012-04-16 12:58:56 -05:00
Nate Jensen
58fec0767d Issue #427 fix drawing icons
Change-Id: Ib7b04baf7f8ab528070c455c1e3e081be56124e0

Former-commit-id: 25b8851589 [formerly 446052111f] [formerly 1d3666a10e [formerly 50f3e0babfb5c38b814be13802bb61f04e73e56f]]
Former-commit-id: 1d3666a10e
Former-commit-id: 6c381ceb01
2012-04-16 12:54:29 -05:00
Matt Nash
d1ef8025be Issue #429 fix null pointers and make erase first pass possible
Former-commit-id: bdec7aff90 [formerly 82c11c4224] [formerly b133b57c6d [formerly 67a87efe19292a279d42a0104d902afc59e3dd84]]
Former-commit-id: b133b57c6d
Former-commit-id: ed75909d5b
2012-04-13 10:46:53 -05:00
Matt Nash
49a6d10c18 Issue #429 telestrator fixes and view changes
Former-commit-id: 244e02a318 [formerly 19e37ff05a] [formerly c6c0483cee [formerly 51969dfc82d750571115d179911333cec55f677f]]
Former-commit-id: c6c0483cee
Former-commit-id: 1c2df7d912
2012-04-13 09:50:48 -05:00
Matt Nash
721621f785 Issue #429 fix error as well as add checks
Former-commit-id: 9eb69d57f9 [formerly cf24a2cee9] [formerly a6c6695e5b [formerly 317bf0f2ebdc76ee55f2db9eb81b80731f504847]]
Former-commit-id: a6c6695e5b
Former-commit-id: 0f604dd351
2012-04-12 09:45:37 -05:00
Matt Nash
8a04973191 Issue #429 drawing additions, code cleanup, toolbar fixes
Former-commit-id: df7ddc0fa2 [formerly 8e83184569] [formerly b707408a0a [formerly fa78aa2f7f4738770b37beb6b02fe5adbb074fae]]
Former-commit-id: b707408a0a
Former-commit-id: c6d7a5a69b
2012-04-11 16:45:28 -05:00
Matt Nash
80da3ac38f Issue #429 add resource data to ISerializableObject file to fix error
Former-commit-id: 2a7698e284 [formerly 42ce0e72f0] [formerly b340718346 [formerly b8fc69fc6746566e83b19ed4dfa8611858332aac]]
Former-commit-id: b340718346
Former-commit-id: 22aec07dfd
2012-04-09 12:42:44 -05:00
Matt Nash
f985ddaa7e Issue #429 telestrator allows all users to draw
Former-commit-id: 916b8428e4 [formerly f200e37a36] [formerly 09c022bda8 [formerly ed59b0803da528f391db3c71aac1184581cc353d]]
Former-commit-id: 09c022bda8
Former-commit-id: fd1b123912
2012-04-05 10:27:10 -05:00
Matt Nash
a7544fadf9 Issue #429 working telestration collaboration capabilities
Former-commit-id: 86e2f1a7ad [formerly 3c2fcc59d0] [formerly c27a3cf672 [formerly f1c9552a757e7d194e31ed9786cb358c53e631b7]]
Former-commit-id: c27a3cf672
Former-commit-id: 28df06150e
2012-04-04 11:23:34 -05:00
Matt Nash
f11fcc7d8e #429 fix issue where dialog prevents collaboration view from opening, add collaboration drawing layer, use event bus for message handling, prep work for
Former-commit-id: 217d707198 [formerly 5cb40430a7] [formerly 8e16194370 [formerly be35f7e75bbeb89fe160e24d9ff691f62753c96b]]
Former-commit-id: 8e16194370
Former-commit-id: ce79d3bec3
2012-04-03 12:23:11 -05:00
Matt Nash
5e3bebc033 Issue #429 fix minor issues with toolbar and updated eraser code
Former-commit-id: 25a539a1c8 [formerly 27e850d203] [formerly 236ae6f26c [formerly f6f3bcc2596735c8371256f4274c9b9e21445f1a]]
Former-commit-id: 236ae6f26c
Former-commit-id: 0a97f20f3a
2012-03-30 16:35:02 -05:00
Matt Nash
3a890f0c68 Issue #429 added wrong cursor code
Former-commit-id: c1ee2d1718 [formerly 4e003f8723] [formerly 3d81840532 [formerly 88143adba6d493b49f87da30773bdd205a6e7948]]
Former-commit-id: 3d81840532
Former-commit-id: acf376e126
2012-03-29 13:46:21 -05:00
Matt Nash
fdde739063 Issue #429 fix proxied handler error, added toolbar for drawing tool
Former-commit-id: 057ffedb23 [formerly 89d401550a] [formerly 9beef61917 [formerly 5728e687e79a54da8313b444a48db18c6671e79e]]
Former-commit-id: 9beef61917
Former-commit-id: 18291c4101
2012-03-29 12:24:27 -05:00
Matt Nash
4871565ff0 Issue #429 telestrator merging
Change-Id: I18f8f283db617d0865b274dcf6003a24e2cf2028

Former-commit-id: b86ee8584f [formerly d55dab5c34] [formerly 39670f6755 [formerly b1a679a2e37bdd7a887fffe82a3d735cdb60f7f9]]
Former-commit-id: 39670f6755
Former-commit-id: aeb022880c
2012-03-28 15:09:18 -05:00