Nate Jensen
477d1bb013
Issue #427 fixed subject
...
Change-Id: Ieb5499e16b2c30169fe49eb06d73b8e3ede6ce70
Former-commit-id: b084156a30
[formerly 8908b81e0e47cfe112ad132a82f2b2cb1a0dd55e]
Former-commit-id: 4999e547a1
2012-04-04 17:06:00 -05:00
Bradley Gonzales
c345b2614e
Issue #440 more descriptive login failure message
...
Former-commit-id: 6fc14461ee
[formerly 909362d88423e3c5a39c73b5e5da2d2168f5ed91]
Former-commit-id: 74ce6f2140
2012-04-04 16:26:58 -05:00
Nate Jensen
0f5b0f7e9e
Issue #427 instantiate collaboration resource
...
Change-Id: I5aa7ec5d7dfb3f2373730eb40dd9ea3178112d20
Former-commit-id: 260c7c10eb
[formerly 5cd5a85bf836ade2da3b43b2797c2a65d61be461]
Former-commit-id: f06338bcd4
2012-04-04 14:05:12 -05:00
James Korman
44b07395fb
Issue #437 - Corrected venue command message loopback
...
Former-commit-id: 23a2cd033a
[formerly c3ba8bd9416f18358f2a976ee2104e4e614321c3]
Former-commit-id: e663a9e5dc
2012-04-04 13:41:25 -05:00
Matt Nash
28df06150e
Issue #429 working telestration collaboration capabilities
...
Former-commit-id: 3c2fcc59d0
[formerly f1c9552a757e7d194e31ed9786cb358c53e631b7]
Former-commit-id: c27a3cf672
2012-04-04 11:23:34 -05:00
Roger Ferrel
5145bb9e7e
Issue #244 Fix bug in handleInvitationEvent
...
Change-Id: Ic47628203707a8238b1d3c0982d177641bba53a9
Former-commit-id: a39475e04d
[formerly 12e29dfb9e3a77e44b7b946f138c84e082e0990a]
Former-commit-id: 46ddf008b8
2012-04-03 17:28:27 -05:00
James Korman
f496523681
Issue #437 - Adding roster api message handling.
...
Former-commit-id: 4c7f2465fc
[formerly 8c7b4a55e6fa10e3e120e12334ba2d04d2d40a32]
Former-commit-id: afeea4d9d2
2012-04-03 16:57:27 -05:00
Roger Ferrel
7cf6e6166d
Issue #244 Change user status now send Presence update to the server.
...
Change-Id: Id0a455633693db251d03a85343f526905a9c4364
Former-commit-id: 78502719e9
[formerly fd8a0cad3ded983308f1f0d983a9f9a42ade7f2b]
Former-commit-id: 46addc13cf
2012-04-03 16:20:07 -05:00
Roger Ferrel
5b943096c5
Merge branch 'new_devel' into 11-Collaboration
...
Former-commit-id: b8df9f46e4
[formerly a441dcd259dbf3ecd77464d1bd0cbe1f4cdb1cb6]
Former-commit-id: 395ae5ae63
2012-04-03 15:29:53 -05:00
Max Schenkelberg
5d7e504e89
Issue #239 Start of remote target capabilities
...
Former-commit-id: 6c411ffb07
[formerly 30b76609cff9a737b8e4190bbfebb5a37a259fad]
Former-commit-id: d2d03e2c64
2012-04-03 15:11:20 -05:00
Roger Ferrel
813e91d1cc
Issue #244 Peer to Peer chat implemented. Change Passwor implemtned.
...
Change-Id: I4949d5ff82a1046d344cd63e32842b2d67717681
Former-commit-id: 7d7ee81855
[formerly dde6ebb7a4ce4cdee62b1d4e31d33694c331309e]
Former-commit-id: 9dd257f28a
2012-04-03 13:28:40 -05:00
Max Schenkelberg
bdc8c572a5
Merge branch '11-Collaboration' of ssh://lightning.omaha.us.ray.com:29418/thunder into 11-Collaboration
...
Former-commit-id: e78aad4bc5
[formerly 5bd4a3ccbcb84443eb342670c2a4ea6e083527b7]
Former-commit-id: 138114e3dc
2012-04-03 13:15:31 -05:00
James Korman
46a646f7f7
Issue #232 - Corrected problem using participant identifiers
...
Former-commit-id: b89a89def3
[formerly 5b102692838b42ffab97186742338494df78b978]
Former-commit-id: 96cd7bea11
2012-04-03 12:45:00 -05:00
Matt Nash
ce79d3bec3
#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: 5cb40430a7
[formerly be35f7e75bbeb89fe160e24d9ff691f62753c96b]
Former-commit-id: 8e16194370
2012-04-03 12:23:11 -05:00
Nate Jensen
6319166680
Issue #427 open editor when joining session
...
Change-Id: I6094a7a909584acb8b10236119ec3eb5dd965e59
Former-commit-id: 223eb82fe0
[formerly f1c0549a84b0aa0d4829ca1bc584165ca98dbbb6]
Former-commit-id: c29a5a75d9
2012-04-03 08:44:58 -05:00
Max Schenkelberg
e3477c90ae
Merge branch 'ss_sync (12.3.1)' into 11-Collaboration
...
Former-commit-id: 23d65caf2e
[formerly e8402b080c7d2a712f4f385293aa9b5d1a18484e]
Former-commit-id: 753de872e0
2012-04-02 16:15:21 -05:00
Roger Ferrel
bd37fffbeb
Issue #244 Invite form Creat Session dialog implementd. Change code to use ParticipantRole enum.
...
Change-Id: If1c7268bded530312d9c132edacef00cd1dcdfd2
Former-commit-id: 146a421ccb
[formerly 89978ed4bcf7c3b65c6038c6403874ba812f835b]
Former-commit-id: dbec72645a
2012-04-02 12:13:26 -05:00
Matt Nash
0a97f20f3a
Issue #429 fix minor issues with toolbar and updated eraser code
...
Former-commit-id: 27e850d203
[formerly f6f3bcc2596735c8371256f4274c9b9e21445f1a]
Former-commit-id: 236ae6f26c
2012-03-30 16:35:02 -05:00
Roger Ferrel
21b19df9db
Issue #244 Active Sessions node only displays rooms the user is in.
...
Change-Id: I2a0ba28e4519102fe26498eb578e83c4a92163a4
Former-commit-id: 442500aeae
[formerly 17c8ca27316951cb97c48c8172d669cc65bbd6cd]
Former-commit-id: 232df64e22
2012-03-30 15:06:35 -05:00
James Korman
48fb9fe7e4
Issue #232 - Modified invitation methods
...
Former-commit-id: 436b967ff1
[formerly 1c9381e1ba1a8b01084717db7ff3e94b26eb0b89]
Former-commit-id: 0b6a076129
2012-03-30 11:27:09 -05:00
Max Schenkelberg
993cac891e
Issue #358 Fixed merge errors when merging core_exp into ss_sync
...
Former-commit-id: 9b0d01f8b5
[formerly beb6a1d49fac8e3e7b2ba8cbc52a8980d06e9885]
Former-commit-id: 07cf5069ba
2012-03-30 10:51:31 -05:00
Roger Ferrel
1fd4aa5cf3
Issue #244 Send and accept invites now works.
...
Change-Id: I8d2c5e04f0d7dab6eb81a7321130533e5cfd6148
Former-commit-id: 22fff3a4b8
[formerly 6929e4f068cc397d253b3fabd712e093c4c16dbe]
Former-commit-id: 108ac66214
2012-03-30 10:45:26 -05:00
Steve Harris
6aa18f74f6
Merge branch 'core_exp' into ss_sync (Graphics Improvements for NPP/Collaboration)
...
Initial reconciliation of Graphics Improvements for NPP/Collaboration with 12.3.1 baseline
Conflicts:
cave/com.raytheon.uf.viz.derivparam/src/com/raytheon/uf/viz/derivparam/tree/DerivedLevelNode.java*
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/AbstractGLMesh.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/GLCanvasCache.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/GLFactoryAdapter.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/GLGeometryPainter.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/IGLTarget.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/AbstractGLImage.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/GLCMTextureData.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/GLColormappedImage.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/images/GLImage.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/GLTarget.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/GLWireframeShape2D.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/objects/GLVertexBufferObject.java
cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/util/GribDataCubeAdapter.java
cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/drawables/GeneralPointImageExtension.java
cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/drawables/IPointImageExtension.java
cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/rsc/PlotResource2.java*
cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/rsc/mosaic/ext/IRadarMosaicImageExtension.java
edexOsgi/com.raytheon.uf.common.time/src/com/raytheon/uf/common/time/msgs/GetServerTimeRequest.java
Former-commit-id: d3ad6095b7
[formerly 879a2e0a4a31999bf4d624ff59e77bbd68195458]
Former-commit-id: 5cdda77afb
2012-03-30 09:50:48 -05:00
Steve Harris
ce3b74c605
12.3.1-10 baseline
...
Former-commit-id: 4068f5295f
[formerly 7d62bca046401a670ef7bd917cbcbb073e061b60]
Former-commit-id: 22bd792cd9
2012-03-30 08:38:33 -05:00
Roger Ferrel
30fe4140ba
Issue #244 Gett color coding on messages
...
Change-Id: Ibe54e07c26336899198093b0a104f8796ebc0d47
Former-commit-id: 9bd5aa57b6
[formerly 3fa0c543f02ccb556b5d1898e359f1e2b6e63819]
Former-commit-id: d9ca310d94
2012-03-29 16:52:11 -05:00
Nate Jensen
40839a5c6e
Merge "Issue #232 - Added support for session creation from invitation" into 11-Collaboration
...
Former-commit-id: 7facfe9b7c
[formerly 459aa33b196c8c37897575636ae670505d959330]
Former-commit-id: 0338159662
2012-03-29 16:32:15 -05:00
James Korman
2eedb16808
Issue #232 - Added support for session creation from invitation
...
Former-commit-id: d048f0f324
[formerly 7d17d39b73ff66275ba247bd21e28b468ae87892]
Former-commit-id: 6381932f6e
2012-03-29 16:30:29 -05:00
Nate Jensen
14883dfa58
Issue #427 clean up
...
Change-Id: Id4bc3b27bfcbc324138a11998255a6f662f31255
Former-commit-id: d60fcaa4f3
[formerly 9eb405723f355343545b1f9d4fe3925d9d1a1f24]
Former-commit-id: a85aa4595f
2012-03-29 15:45:16 -05:00
Nate Jensen
25cf424a42
Merge "Issue #429 added wrong cursor code" into 11-Collaboration
...
Former-commit-id: b7fda1f852
[formerly d99655bcb8042378594ef31ad52305120808ca7e]
Former-commit-id: 9ce74d9430
2012-03-29 14:36:24 -05:00
Steve Harris
fbdf4d5c37
Issue #244 Roster groups now display and improved presents.
...
Change-Id: I7965201692cab4472ce85d2525e39cf3823ab16f
Former-commit-id: bf55bc0d86
[formerly 7f4e485aae341b11beb4a55c895a86cd6ff13635]
Former-commit-id: c27ee0903c
2012-03-29 14:36:53 -05:00
Matt Nash
acf376e126
Issue #429 added wrong cursor code
...
Former-commit-id: 4e003f8723
[formerly 88143adba6d493b49f87da30773bdd205a6e7948]
Former-commit-id: 3d81840532
2012-03-29 13:46:21 -05:00
Matt Nash
18291c4101
Issue #429 fix proxied handler error, added toolbar for drawing tool
...
Former-commit-id: 89d401550a
[formerly 5728e687e79a54da8313b444a48db18c6671e79e]
Former-commit-id: 9beef61917
2012-03-29 12:24:27 -05:00
Nate Jensen
6aae45687a
Issue #427 Right click on editor tab support
...
Change-Id: Ia9240a01c145c81bbf98268d4df5fd2242ca7987
Former-commit-id: d2d3a245b3
[formerly 7597db5bbc0642072143e4c7ea0291108154eb40]
Former-commit-id: aa000b4b06
2012-03-29 10:44:08 -05:00
James Korman
7f12149d98
Issue #232 - Added message routing/corrected roster creation
...
Former-commit-id: b45ea1e0a7
[formerly b7040976e3c8fd029a0d821511f977cfd4b4888e]
Former-commit-id: 6149d30b13
2012-03-29 10:16:15 -05:00
Steve Harris
6884520750
Merge branch 'sync_test' (VCModules) into ss_sync
...
Former-commit-id: 70357d90bc
[formerly e68338cecbe85a62835633e9aba0925344fb80f1]
Former-commit-id: a0abcf8120
2012-03-29 10:03:05 -05:00
Nate Jensen
ec0896c28d
Merge "Issue #429 telestrator merging" into 11-Collaboration
...
Former-commit-id: cf880ddd0d
[formerly eda16f8aa5a9aa88a8e947070d8e9df32c36c114]
Former-commit-id: 676746126c
2012-03-28 15:10:34 -05:00
Matt Nash
aeb022880c
Issue #429 telestrator merging
...
Change-Id: I18f8f283db617d0865b274dcf6003a24e2cf2028
Former-commit-id: d55dab5c34
[formerly b1a679a2e37bdd7a887fffe82a3d735cdb60f7f9]
Former-commit-id: 39670f6755
2012-03-28 15:09:18 -05:00
Nate Jensen
a5d38a0968
Issue #427 initial input event code
...
Change-Id: I37dc96ed8dbef37d8e3f7a8ae39fc6fcad59f4aa
Former-commit-id: 5fdc253d77
[formerly 6297c04332bb349d8351b07e2ffd1c24c046ccd7]
Former-commit-id: bbf96992ee
2012-03-28 14:34:25 -05:00
Max Schenkelberg
ac11dd0c18
Issue #358 Made wireframe shapes rely more on the grid geoemtry of the
...
descriptor than the actual descriptor as the descriptor is used purely
for convenience
Former-commit-id: 15a9245592
[formerly 265ccb3e22aa0122dbd74e83d0af202596c1941c]
Former-commit-id: f10f1a5319
2012-03-28 13:32:04 -05:00
Roger Ferrel
9712ba2751
Issue #244 Clean up and Link editor to chat now works.
...
Change-Id: I23b12fa44b8908b6a0c5ce79ca79ad73ff26df9d
Former-commit-id: 5d95a69f39
[formerly 51e85606ad7d7462ce84bb14bd4df0c792997a59]
Former-commit-id: dc2f3316e6
2012-03-28 11:23:51 -05:00
James Korman
0ff25a5258
Issue #232 - Added addition peer-to-peer events
...
Former-commit-id: e8b23e3687
[formerly 34994534b7e9b80b96e5ca038afef1977ba02383]
Former-commit-id: ae6eddcd68
2012-03-27 16:31:26 -05:00
Nate Jensen
a692caba1c
Issue #427 minor fixes
...
Change-Id: I9788992b2de751f75ab2cc5112f2cf0492c214ad
Former-commit-id: fa8b5b3400
[formerly 40e9906f41f0fa2ae4c87d3c2a2acb2406fd4e25]
Former-commit-id: 0f25c8ffa6
2012-03-27 09:56:46 -05:00
Nate Jensen
9602216cda
Issue #427 small improvements
...
Change-Id: I9a28888dceb268ab62f60bc9686b0130da01ca0e
Former-commit-id: 89d7f5ec7e
[formerly 3a268a54417ee7ed6fcef6549b9c47b86fadfc82]
Former-commit-id: 80500eec9c
2012-03-27 09:42:39 -05:00
Nate Jensen
43b58266c5
Merge "Issue #244 Tied CollaboratonEditor to the view." into 11-Collaboration
...
Former-commit-id: c6e046f11e
[formerly f5ace8ee9561bb02311414ac82b0bbe93a5ff3b6]
Former-commit-id: b2655debe8
2012-03-27 08:36:25 -05:00
Nate Jensen
f95cba545b
Merge "Issue #244 Localization of login data and removal of messanger and participant listeners." into 11-Collaboration
...
Former-commit-id: d40b15acc2
[formerly 9dc29b49a619cca5613e72858099029b4ffc724e]
Former-commit-id: d09c8a9383
2012-03-27 08:36:15 -05:00
Nate Jensen
8b06b02281
Merge "Issue #232 - Added JAXB serialization support" into 11-Collaboration
...
Former-commit-id: 978b76066c
[formerly 096bb25790809f6f0919d518a29dca4f36bbd7f7]
Former-commit-id: ed44b0d93f
2012-03-27 08:32:19 -05:00
Roger Ferrel
26122319db
Issue #244 Tied CollaboratonEditor to the view.
...
Change-Id: I67b9b2f9f1a71f1f131584cdb138c54788cac165
Former-commit-id: a270259553
[formerly fd9eb8cbf048ce03bce27c4d1249596f5649d2a7]
Former-commit-id: d001287c94
2012-03-26 17:30:51 -05:00
Roger Ferrel
8f75dd68de
Issue #244 Localization of login data and removal of messanger and participant listeners.
...
Change-Id: I247199030152575c82b8320fa0cbdeddb62fa662
Former-commit-id: b180f9b45e
[formerly 4e4a705b98070d2e671133e6acc29dc72617505a]
Former-commit-id: 95d8d85fd0
2012-03-26 17:30:50 -05:00
James Korman
02bbe80c7c
Issue #232 - Added JAXB serialization support
...
Former-commit-id: 72e9c2eb52
[formerly dd4502d4e7d38df28ebd93340d978653b32cd5f5]
Former-commit-id: 221a5a65b0
2012-03-26 16:48:04 -05:00
Nate Jensen
e28fc62a56
Issue #427 event controllers use ISharedDisplaySession
...
Change-Id: Ia0e41dcb7f0b49956a4a3c88a037894b972435c9
Former-commit-id: f6226a89d9
[formerly bf6cf477825be1d19081965ca9e958ebf423c0af]
Former-commit-id: cbf105015f
2012-03-26 16:37:44 -05:00