Commit graph

60 commits

Author SHA1 Message Date
Nate Jensen
0f20bba406 Issue #444 fix peer to peer send, remove redundancy of ID classes, send session leader and data provider with invite
Change-Id: If381a0dab94e39da4e78e59e33e637f10a4057d7

Former-commit-id: 4aa478bd573ad7d9a801658c37a1d229d7bf5862
2012-04-10 18:15:36 -05:00
Brad Gonzales
ac35f8f2fb Issue #440 keep login window up when a username or password is incorrect.
Former-commit-id: dc4bf6dfbb2f0c58f9986b524ad49f18656cebc7
2012-04-10 17:20:38 -05:00
Roger Ferrel
69ea7c724e Issue #437 Added change status menu option.
Change-Id: Ie4b1d453aa3e75b77e360c26dcc838c13b7b6223

Former-commit-id: 82ae4e9433e71e9027566aed4595046ce0ef6dfa
2012-04-10 16:50:26 -05:00
Max Schenkelberg
6e0c5c3cdf Issue #239 Got zoom/pan events working for remote users
Former-commit-id: a817a720868fe887deca6ce6589014f0cd439c2d
2012-04-10 14:40:51 -05:00
Roger Ferrel
d2e2fd8da3 Issue #437 User status now properly displayed and updated in sessions.
Change-Id: I7b0e077cb87f97388fddff27b846ce856cb6a999

Former-commit-id: 8ee6d7cf1a8b7e0bd2fa0abfe016cb221c60f2b3
2012-04-10 11:11:26 -05:00
Nate Jensen
2e5272cff9 Issue #427 cleanup
Change-Id: I3ae5c84feead4bccf49007ddb16a9ed61fa49024

Former-commit-id: 93a7d3b6f52331034efe1e02fdd073959eee56ee
2012-04-10 10:35:03 -05:00
Brad Gonzales
a378fea5d1 Issue #440 Changed login icon to green.
Former-commit-id: 69549e0e64ff8d14892db9e908692c47aeb3043c
2012-04-10 10:01:11 -05:00
Roger Ferrel
b4c8d3a0d9 Issue #437 Presence status sent out when logged on to the server.
Change-Id: I44d0cfd8e37aeda4d0eadaf80b9c014494258164

Former-commit-id: 9391b95b6a26b34675370b3f7347fab4f08444e5
2012-04-09 16:00:25 -05:00
Matt Nash
9887678590 Issue #429 changing 'private' aspect
Former-commit-id: 4c475ace9b0803b40bc90eca71a800a1ca2da4b5
2012-04-09 15:21:07 -05:00
Roger Ferrel
c5399687bc Issue #437 Change to up date Presence in the Group View.
Change-Id: I59d4f4fcc14f59dc3017c118d3613f6f7040dca8

Former-commit-id: b64a623cda4ec00d555d8542da496286e0210dac
2012-04-09 15:16:19 -05:00
Matt Nash
42ce0e72f0 Issue #429 add resource data to ISerializableObject file to fix error
Former-commit-id: b8fc69fc6746566e83b19ed4dfa8611858332aac
2012-04-09 12:42:44 -05:00
Brad Gonzales
44a83e92ed Issue #440 added login icon. Changed Logon to Login.
Former-commit-id: d2b9c7981006dad91c5781fe0df96113530491df
2012-04-09 11:38:08 -05:00
James Korman
bb31e9e2ea Issue #437 - Add code to update and post roster presence changes.
Former-commit-id: 8c5406eb39e9bd8590817e5eda854e20866ebbae
2012-04-09 10:01:55 -05:00
Max Schenkelberg
cbe92bdf32 Issue #239 Fixed D2D context activation so as not to override important
keys when a unrelated view is active such as Product Browser or
Collaboration views.

Former-commit-id: c7badfd1c2a77d410cd3b841fef967c07c9e6434
2012-04-06 10:23:24 -05:00
Nate Jensen
c1543afc44 Issue #444 initial role transfer code and some cleanup
Change-Id: I45abf42df8da789532a4420259065fbb1f7ed04f

Former-commit-id: c7276b7fddee718fd47f1f1b3fb75d5b483e62fc
2012-04-05 17:49:12 -05:00
Matt Nash
d62a660e52 Issue #429 alert of new messages when in background
Former-commit-id: 8e8fbe73b41f6457c085ab11939fdbd1242d4383
2012-04-05 12:38:35 -05:00
Matt Nash
c53719be8a Issue #429 clear,undo,redo
Former-commit-id: 69fcd977767dec591f2132cc6b13f9e48a3180b0
2012-04-05 11:49:57 -05:00
Matt Nash
f200e37a36 Issue #429 telestrator allows all users to draw
Former-commit-id: ed59b0803da528f391db3c71aac1184581cc353d
2012-04-05 10:27:10 -05:00
Roger Ferrel
afc79a14f3 Issue #439 added filter to prevent illegal characters in the session name. Also made changes to throw exceptions when creation fails.
Change-Id: Ieb5fcbb433f8165d8cd711224dc095fe96e5162c

Former-commit-id: 898e1a503af21abef70afc734924332e7de249ee
2012-04-05 08:09:15 -05:00
Nate Jensen
b084156a30 Issue #427 fixed subject
Change-Id: Ieb5499e16b2c30169fe49eb06d73b8e3ede6ce70

Former-commit-id: 8908b81e0e47cfe112ad132a82f2b2cb1a0dd55e
2012-04-04 17:06:00 -05:00
Bradley Gonzales
6fc14461ee Issue #440 more descriptive login failure message
Former-commit-id: 909362d88423e3c5a39c73b5e5da2d2168f5ed91
2012-04-04 16:26:58 -05:00
Nate Jensen
260c7c10eb Issue #427 instantiate collaboration resource
Change-Id: I5aa7ec5d7dfb3f2373730eb40dd9ea3178112d20

Former-commit-id: 5cd5a85bf836ade2da3b43b2797c2a65d61be461
2012-04-04 14:05:12 -05:00
Matt Nash
3c2fcc59d0 Issue #429 working telestration collaboration capabilities
Former-commit-id: f1c9552a757e7d194e31ed9786cb358c53e631b7
2012-04-04 11:23:34 -05:00
Roger Ferrel
a39475e04d Issue #244 Fix bug in handleInvitationEvent
Change-Id: Ic47628203707a8238b1d3c0982d177641bba53a9

Former-commit-id: 12e29dfb9e3a77e44b7b946f138c84e082e0990a
2012-04-03 17:28:27 -05:00
Roger Ferrel
78502719e9 Issue #244 Change user status now send Presence update to the server.
Change-Id: Id0a455633693db251d03a85343f526905a9c4364

Former-commit-id: fd8a0cad3ded983308f1f0d983a9f9a42ade7f2b
2012-04-03 16:20:07 -05:00
Roger Ferrel
7d7ee81855 Issue #244 Peer to Peer chat implemented. Change Passwor implemtned.
Change-Id: I4949d5ff82a1046d344cd63e32842b2d67717681

Former-commit-id: dde6ebb7a4ce4cdee62b1d4e31d33694c331309e
2012-04-03 13:28:40 -05:00
James Korman
b89a89def3 Issue #232 - Corrected problem using participant identifiers
Former-commit-id: 5b102692838b42ffab97186742338494df78b978
2012-04-03 12:45:00 -05:00
Matt Nash
5cb40430a7 #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: be35f7e75bbeb89fe160e24d9ff691f62753c96b
2012-04-03 12:23:11 -05:00
Nate Jensen
223eb82fe0 Issue #427 open editor when joining session
Change-Id: I6094a7a909584acb8b10236119ec3eb5dd965e59

Former-commit-id: f1c0549a84b0aa0d4829ca1bc584165ca98dbbb6
2012-04-03 08:44:58 -05:00
Roger Ferrel
146a421ccb Issue #244 Invite form Creat Session dialog implementd. Change code to use ParticipantRole enum.
Change-Id: If1c7268bded530312d9c132edacef00cd1dcdfd2

Former-commit-id: 89978ed4bcf7c3b65c6038c6403874ba812f835b
2012-04-02 12:13:26 -05:00
Roger Ferrel
442500aeae Issue #244 Active Sessions node only displays rooms the user is in.
Change-Id: I2a0ba28e4519102fe26498eb578e83c4a92163a4

Former-commit-id: 17c8ca27316951cb97c48c8172d669cc65bbd6cd
2012-03-30 15:06:35 -05:00
James Korman
436b967ff1 Issue #232 - Modified invitation methods
Former-commit-id: 1c9381e1ba1a8b01084717db7ff3e94b26eb0b89
2012-03-30 11:27:09 -05:00
Roger Ferrel
22fff3a4b8 Issue #244 Send and accept invites now works.
Change-Id: I8d2c5e04f0d7dab6eb81a7321130533e5cfd6148

Former-commit-id: 6929e4f068cc397d253b3fabd712e093c4c16dbe
2012-03-30 10:45:26 -05:00
Roger Ferrel
9bd5aa57b6 Issue #244 Gett color coding on messages
Change-Id: Ibe54e07c26336899198093b0a104f8796ebc0d47

Former-commit-id: 3fa0c543f02ccb556b5d1898e359f1e2b6e63819
2012-03-29 16:52:11 -05:00
Steve Harris
bf55bc0d86 Issue #244 Roster groups now display and improved presents.
Change-Id: I7965201692cab4472ce85d2525e39cf3823ab16f

Former-commit-id: 7f4e485aae341b11beb4a55c895a86cd6ff13635
2012-03-29 14:36:53 -05:00
Matt Nash
89d401550a Issue #429 fix proxied handler error, added toolbar for drawing tool
Former-commit-id: 5728e687e79a54da8313b444a48db18c6671e79e
2012-03-29 12:24:27 -05:00
Nate Jensen
d2d3a245b3 Issue #427 Right click on editor tab support
Change-Id: Ia9240a01c145c81bbf98268d4df5fd2242ca7987

Former-commit-id: 7597db5bbc0642072143e4c7ea0291108154eb40
2012-03-29 10:44:08 -05:00
Nate Jensen
cf880ddd0d Merge "Issue #429 telestrator merging" into 11-Collaboration
Former-commit-id: eda16f8aa5a9aa88a8e947070d8e9df32c36c114
2012-03-28 15:10:34 -05:00
Matt Nash
d55dab5c34 Issue #429 telestrator merging
Change-Id: I18f8f283db617d0865b274dcf6003a24e2cf2028

Former-commit-id: b1a679a2e37bdd7a887fffe82a3d735cdb60f7f9
2012-03-28 15:09:18 -05:00
Nate Jensen
5fdc253d77 Issue #427 initial input event code
Change-Id: I37dc96ed8dbef37d8e3f7a8ae39fc6fcad59f4aa

Former-commit-id: 6297c04332bb349d8351b07e2ffd1c24c046ccd7
2012-03-28 14:34:25 -05:00
Roger Ferrel
5d95a69f39 Issue #244 Clean up and Link editor to chat now works.
Change-Id: I23b12fa44b8908b6a0c5ce79ca79ad73ff26df9d

Former-commit-id: 51e85606ad7d7462ce84bb14bd4df0c792997a59
2012-03-28 11:23:51 -05:00
Nate Jensen
89d7f5ec7e Issue #427 small improvements
Change-Id: I9a28888dceb268ab62f60bc9686b0130da01ca0e

Former-commit-id: 3a268a54417ee7ed6fcef6549b9c47b86fadfc82
2012-03-27 09:42:39 -05:00
Roger Ferrel
a270259553 Issue #244 Tied CollaboratonEditor to the view.
Change-Id: I67b9b2f9f1a71f1f131584cdb138c54788cac165

Former-commit-id: fd9eb8cbf048ce03bce27c4d1249596f5649d2a7
2012-03-26 17:30:51 -05:00
Roger Ferrel
b180f9b45e Issue #244 Localization of login data and removal of messanger and participant listeners.
Change-Id: I247199030152575c82b8320fa0cbdeddb62fa662

Former-commit-id: 4e4a705b98070d2e671133e6acc29dc72617505a
2012-03-26 17:30:50 -05:00
Nate Jensen
f6226a89d9 Issue #427 event controllers use ISharedDisplaySession
Change-Id: Ia0e41dcb7f0b49956a4a3c88a037894b972435c9

Former-commit-id: bf6cf477825be1d19081965ca9e958ebf423c0af
2012-03-26 16:37:44 -05:00
Nate Jensen
7c6e0a41f7 Issue #427 fix xml serialization
Change-Id: I795fe5a47fc2ed678a431795a6242382b3ef6654

Former-commit-id: eb39d19f3940ba57e1322a786d0dd535289b2a1e
2012-03-26 15:47:34 -05:00
Nate Jensen
4d7a53c583 Issue #427 initial role based event handling
Change-Id: I73d4df3f09c7cfa60025142ec5a4dccdad4423bb

Former-commit-id: b752ced02d726771a6e11a9982967a892d2e55f3
2012-03-26 13:05:01 -05:00
James Korman
e408ed1a28 Issue #232 : Large refactor - Add command interfaces
Former-commit-id: e82a81cb465b07710b8b2cd6c99e87f97311d316
2012-03-26 10:17:17 -05:00
Roger Ferrel
04b5a92838 Issue #244 Added participant even handler for SessionView and put in code to get groups(rosters).
Change-Id: I4a7501859f2681b290ad0babf4dab9cbca80e102

Former-commit-id: a264abfff059a9c5942ef1db91a6390fad12a110
2012-03-22 16:57:30 -05:00
Nate Jensen
615962f5dd Issue #427 Share maps and editor
Change-Id: I6bd3148ec199c348ffd85d08322fdb8befa4096c

Former-commit-id: 7a58d8a17be53fc504cafe32d19de2f52121eeff
2012-03-22 09:39:59 -05:00