Nate Jensen
ae769c490b
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: 0f20bba4069b4b691ca9
2012-04-10 18:15:36 -05:00
Bryan Kowal
61d0a876dd
Merge "Issue #450 - the pde build will now build a p2 repository for collaboration. Removed org.jivesoftware.smack from the collaboration feature because it is already in the cots feature which is included in the collaboration feature. Had to remove and re-add log4j to the alertviz and cots features." into 11-Collaboration
...
Former-commit-id: 82783e27fd3baf9d03c2
2012-04-10 17:40:58 -05:00
Brad Gonzales
1b7e35f876
Issue #440 keep login window up when a username or password is incorrect.
...
Former-commit-id: ac35f8f2fb107c8ba7b9
2012-04-10 17:20:38 -05:00
Roger Ferrel
8fa193bcbe
Issue #437 Added change status menu option.
...
Change-Id: Ie4b1d453aa3e75b77e360c26dcc838c13b7b6223
Former-commit-id: 69ea7c724e020be00301
2012-04-10 16:50:26 -05:00
Bryan Kowal
10a291afa1
Issue #450 - the pde build will now build a p2 repository for collaboration. Removed org.jivesoftware.smack from the collaboration feature because it is already in the cots feature which is included in the collaboration feature. Had to remove and re-add log4j to the alertviz and cots features.
...
Former-commit-id: 6ddeef48face99417a2a
2012-04-10 16:42:36 -05:00
James Korman
7272ede3c4
Issue #437 - Updates to status handling - Added SessionManager user presence.
...
Former-commit-id: 7bf01ecbc907bc1bf83e
2012-04-10 15:55:12 -05:00
Max Schenkelberg
0d21a9a35e
Issue #239 Got zoom/pan events working for remote users
...
Former-commit-id: 6e0c5c3cdf18e9f2c6ad
2012-04-10 14:40:51 -05:00
Matt Nash
52e27b63f7
Issue #429 comment out ability to start in debug mode for the connection
...
Former-commit-id: 202fe2bb5ef05b486e33
2012-04-10 13:22:42 -05:00
Roger Ferrel
57e809d913
Issue #437 User status now properly displayed and updated in sessions.
...
Change-Id: I7b0e077cb87f97388fddff27b846ce856cb6a999
Former-commit-id: d2e2fd8da33fd25ff1cf
2012-04-10 11:11:26 -05:00
Nate Jensen
a924bd6489
Issue #427 cleanup
...
Change-Id: I3ae5c84feead4bccf49007ddb16a9ed61fa49024
Former-commit-id: 2e5272cff9ec92c842c4
2012-04-10 10:35:03 -05:00
Brad Gonzales
8d170cd14b
Issue #440 Changed login icon to green.
...
Former-commit-id: a378fea5d1ca2a35d77c
2012-04-10 10:01:11 -05:00
Roger Ferrel
946f7963c4
Issue #437 Presence status sent out when logged on to the server.
...
Change-Id: I44d0cfd8e37aeda4d0eadaf80b9c014494258164
Former-commit-id: b4c8d3a0d9521127b589
2012-04-09 16:00:25 -05:00
Matt Nash
d6731254d6
Issue #429 changing 'private' aspect
...
Former-commit-id: 988767859098350f4ba5
2012-04-09 15:21:07 -05:00
Roger Ferrel
1e4ed16880
Issue #437 Change to up date Presence in the Group View.
...
Change-Id: I59d4f4fcc14f59dc3017c118d3613f6f7040dca8
Former-commit-id: c5399687bc2109190752
2012-04-09 15:16:19 -05:00
Matt Nash
22aec07dfd
Issue #429 add resource data to ISerializableObject file to fix error
...
Former-commit-id: 42ce0e72f0b340718346
2012-04-09 12:42:44 -05:00
James Korman
0d6a5312d1
Issue #437 - Updated Presence - Add properties and new constructor
...
Former-commit-id: 48397d1d9553dc047d3d
2012-04-09 11:42:19 -05:00
Brad Gonzales
552ce918ef
Issue #440 added login icon. Changed Logon to Login.
...
Former-commit-id: 44a83e92ed7937986b11
2012-04-09 11:38:08 -05:00
James Korman
f535049780
Issue #437 - Add code to update and post roster presence changes.
...
Former-commit-id: bb31e9e2eadf0cdcb563
2012-04-09 10:01:55 -05:00
Max Schenkelberg
824b24dfcb
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: cbe92bdf326812c1ba2b
2012-04-06 10:23:24 -05:00
Matt Nash
437aa74095
Issue #429 remove unused com.raytheon.viz.drawing plugin
...
Former-commit-id: af0513690d5bd8e5e47c
2012-04-06 07:16:15 -05:00
Nate Jensen
ac109d3e72
Issue #444 initial role transfer code and some cleanup
...
Change-Id: I45abf42df8da789532a4420259065fbb1f7ed04f
Former-commit-id: c1543afc440ef84129c4
2012-04-05 17:49:12 -05:00
Max Schenkelberg
b4b754c7cc
Issue #239 Added remote capability injection code through factory
...
method. Cleaned up old/unmaintained 3D references
Former-commit-id: 54aaf0520916056d53c5
2012-04-05 13:52:20 -05:00
Matt Nash
7edacef530
Issue #429 alert of new messages when in background
...
Former-commit-id: d62a660e52f314b2475d
2012-04-05 12:38:35 -05:00
Matt Nash
7dd1657774
Issue #429 clear,undo,redo
...
Former-commit-id: c53719be8a328d7e1287
2012-04-05 11:49:57 -05:00
Matt Nash
fd1b123912
Issue #429 telestrator allows all users to draw
...
Former-commit-id: f200e37a3609c022bda8
2012-04-05 10:27:10 -05:00
Roger Ferrel
f9aa115a2b
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: afc79a14f372bf5460d7
2012-04-05 08:09:15 -05:00
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
