Nate Jensen
477d1bb013
Issue #427 fixed subject
...
Change-Id: Ieb5499e16b2c30169fe49eb06d73b8e3ede6ce70
Former-commit-id: b084156a304999e547a1
2012-04-04 17:06:00 -05:00
Bradley Gonzales
c345b2614e
Issue #440 more descriptive login failure message
...
Former-commit-id: 6fc14461ee74ce6f2140
2012-04-04 16:26:58 -05:00
Nate Jensen
0f5b0f7e9e
Issue #427 instantiate collaboration resource
...
Change-Id: I5aa7ec5d7dfb3f2373730eb40dd9ea3178112d20
Former-commit-id: 260c7c10ebf06338bcd4
2012-04-04 14:05:12 -05:00
James Korman
44b07395fb
Issue #437 - Corrected venue command message loopback
...
Former-commit-id: 23a2cd033ae663a9e5dc
2012-04-04 13:41:25 -05:00
Matt Nash
28df06150e
Issue #429 working telestration collaboration capabilities
...
Former-commit-id: 3c2fcc59d0c27a3cf672
2012-04-04 11:23:34 -05:00
Roger Ferrel
5145bb9e7e
Issue #244 Fix bug in handleInvitationEvent
...
Change-Id: Ic47628203707a8238b1d3c0982d177641bba53a9
Former-commit-id: a39475e04d46ddf008b8
2012-04-03 17:28:27 -05:00
James Korman
f496523681
Issue #437 - Adding roster api message handling.
...
Former-commit-id: 4c7f2465fcafeea4d9d2
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: 78502719e946addc13cf
2012-04-03 16:20:07 -05:00
Roger Ferrel
5b943096c5
Merge branch 'new_devel' into 11-Collaboration
...
Former-commit-id: b8df9f46e4395ae5ae63
2012-04-03 15:29:53 -05:00
Max Schenkelberg
5d7e504e89
Issue #239 Start of remote target capabilities
...
Former-commit-id: 6c411ffb07d2d03e2c64
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: 7d7ee818559dd257f28a
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: e78aad4bc5138114e3dc
2012-04-03 13:15:31 -05:00
James Korman
46a646f7f7
Issue #232 - Corrected problem using participant identifiers
...
Former-commit-id: b89a89def396cd7bea11
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: 5cb40430a78e16194370
2012-04-03 12:23:11 -05:00
Nate Jensen
6319166680
Issue #427 open editor when joining session
...
Change-Id: I6094a7a909584acb8b10236119ec3eb5dd965e59
Former-commit-id: 223eb82fe0c29a5a75d9
2012-04-03 08:44:58 -05:00
Max Schenkelberg
e3477c90ae
Merge branch 'ss_sync (12.3.1)' into 11-Collaboration
...
Former-commit-id: 23d65caf2e753de872e0
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: 146a421ccbdbec72645a
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: 27e850d203236ae6f26c
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: 442500aeae232df64e22
2012-03-30 15:06:35 -05:00
James Korman
48fb9fe7e4
Issue #232 - Modified invitation methods
...
Former-commit-id: 436b967ff10b6a076129
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: 9b0d01f8b507cf5069ba
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: 22fff3a4b8108ac66214
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: d3ad6095b75cdda77afb
2012-03-30 09:50:48 -05:00
Steve Harris
ce3b74c605
12.3.1-10 baseline
...
Former-commit-id: 4068f5295f22bd792cd9
2012-03-30 08:38:33 -05:00
Roger Ferrel
30fe4140ba
Issue #244 Gett color coding on messages
...
Change-Id: Ibe54e07c26336899198093b0a104f8796ebc0d47
Former-commit-id: 9bd5aa57b6d9ca310d94
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: 7facfe9b7c0338159662
2012-03-29 16:32:15 -05:00
James Korman
2eedb16808
Issue #232 - Added support for session creation from invitation
...
Former-commit-id: d048f0f3246381932f6e
2012-03-29 16:30:29 -05:00
Nate Jensen
14883dfa58
Issue #427 clean up
...
Change-Id: Id4bc3b27bfcbc324138a11998255a6f662f31255
Former-commit-id: d60fcaa4f3a85aa4595f
2012-03-29 15:45:16 -05:00
Nate Jensen
25cf424a42
Merge "Issue #429 added wrong cursor code" into 11-Collaboration
...
Former-commit-id: b7fda1f8529ce74d9430
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: bf55bc0d86c27ee0903c
2012-03-29 14:36:53 -05:00
Matt Nash
acf376e126
Issue #429 added wrong cursor code
...
Former-commit-id: 4e003f87233d81840532
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: 89d401550a9beef61917
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: d2d3a245b3aa000b4b06
2012-03-29 10:44:08 -05:00
James Korman
7f12149d98
Issue #232 - Added message routing/corrected roster creation
...
Former-commit-id: b45ea1e0a76149d30b13
2012-03-29 10:16:15 -05:00
Steve Harris
6884520750
Merge branch 'sync_test' (VCModules) into ss_sync
...
Former-commit-id: 70357d90bca0abcf8120
2012-03-29 10:03:05 -05:00
Nate Jensen
ec0896c28d
Merge "Issue #429 telestrator merging" into 11-Collaboration
...
Former-commit-id: cf880ddd0d676746126c
2012-03-28 15:10:34 -05:00
Matt Nash
aeb022880c
Issue #429 telestrator merging
...
Change-Id: I18f8f283db617d0865b274dcf6003a24e2cf2028
Former-commit-id: d55dab5c3439670f6755
2012-03-28 15:09:18 -05:00
Nate Jensen
a5d38a0968
Issue #427 initial input event code
...
Change-Id: I37dc96ed8dbef37d8e3f7a8ae39fc6fcad59f4aa
Former-commit-id: 5fdc253d77bbf96992ee
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: 15a9245592f10f1a5319
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: 5d95a69f39dc2f3316e6
2012-03-28 11:23:51 -05:00
James Korman
0ff25a5258
Issue #232 - Added addition peer-to-peer events
...
Former-commit-id: e8b23e3687ae6eddcd68
2012-03-27 16:31:26 -05:00
Nate Jensen
a692caba1c
Issue #427 minor fixes
...
Change-Id: I9788992b2de751f75ab2cc5112f2cf0492c214ad
Former-commit-id: fa8b5b34000f25c8ffa6
2012-03-27 09:56:46 -05:00
Nate Jensen
9602216cda
Issue #427 small improvements
...
Change-Id: I9a28888dceb268ab62f60bc9686b0130da01ca0e
Former-commit-id: 89d7f5ec7e80500eec9c
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: c6e046f11eb2655debe8
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: d40b15acc2d09c8a9383
2012-03-27 08:36:15 -05:00
Nate Jensen
8b06b02281
Merge "Issue #232 - Added JAXB serialization support" into 11-Collaboration
...
Former-commit-id: 978b76066ced44b0d93f
2012-03-27 08:32:19 -05:00
Roger Ferrel
26122319db
Issue #244 Tied CollaboratonEditor to the view.
...
Change-Id: I67b9b2f9f1a71f1f131584cdb138c54788cac165
Former-commit-id: a270259553d001287c94
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: b180f9b45e95d8d85fd0
2012-03-26 17:30:50 -05:00
James Korman
02bbe80c7c
Issue #232 - Added JAXB serialization support
...
Former-commit-id: 72e9c2eb52221a5a65b0
2012-03-26 16:48:04 -05:00
Nate Jensen
e28fc62a56
Issue #427 event controllers use ISharedDisplaySession
...
Change-Id: Ia0e41dcb7f0b49956a4a3c88a037894b972435c9
Former-commit-id: f6226a89d9cbf105015f
2012-03-26 16:37:44 -05:00
