James Korman
|
4c7f2465fc
|
Issue #437 - Adding roster api message handling.
Former-commit-id: 8c7b4a55e6fa10e3e120e12334ba2d04d2d40a32
|
2012-04-03 16:57: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
|
b8df9f46e4
|
Merge branch 'new_devel' into 11-Collaboration
Former-commit-id: a441dcd259dbf3ecd77464d1bd0cbe1f4cdb1cb6
|
2012-04-03 15:29:53 -05:00 |
|
Max Schenkelberg
|
6c411ffb07
|
Issue #239 Start of remote target capabilities
Former-commit-id: 30b76609cff9a737b8e4190bbfebb5a37a259fad
|
2012-04-03 15:11:20 -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 |
|
Max Schenkelberg
|
e78aad4bc5
|
Merge branch '11-Collaboration' of ssh://lightning.omaha.us.ray.com:29418/thunder into 11-Collaboration
Former-commit-id: 5bd4a3ccbcb84443eb342670c2a4ea6e083527b7
|
2012-04-03 13:15:31 -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 |
|
Max Schenkelberg
|
23d65caf2e
|
Merge branch 'ss_sync (12.3.1)' into 11-Collaboration
Former-commit-id: e8402b080c7d2a712f4f385293aa9b5d1a18484e
|
2012-04-02 16:15:21 -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 |
|
Matt Nash
|
27e850d203
|
Issue #429 fix minor issues with toolbar and updated eraser code
Former-commit-id: f6f3bcc2596735c8371256f4274c9b9e21445f1a
|
2012-03-30 16:35:02 -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 |
|
Max Schenkelberg
|
9b0d01f8b5
|
Issue #358 Fixed merge errors when merging core_exp into ss_sync
Former-commit-id: beb6a1d49fac8e3e7b2ba8cbc52a8980d06e9885
|
2012-03-30 10:51:31 -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 |
|
Steve Harris
|
d3ad6095b7
|
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: 879a2e0a4a31999bf4d624ff59e77bbd68195458
|
2012-03-30 09:50:48 -05:00 |
|
Steve Harris
|
4068f5295f
|
12.3.1-10 baseline
Former-commit-id: 7d62bca046401a670ef7bd917cbcbb073e061b60
|
2012-03-30 08:38:33 -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 |
|
Nate Jensen
|
7facfe9b7c
|
Merge "Issue #232 - Added support for session creation from invitation" into 11-Collaboration
Former-commit-id: 459aa33b196c8c37897575636ae670505d959330
|
2012-03-29 16:32:15 -05:00 |
|
James Korman
|
d048f0f324
|
Issue #232 - Added support for session creation from invitation
Former-commit-id: 7d17d39b73ff66275ba247bd21e28b468ae87892
|
2012-03-29 16:30:29 -05:00 |
|
Nate Jensen
|
d60fcaa4f3
|
Issue #427 clean up
Change-Id: Id4bc3b27bfcbc324138a11998255a6f662f31255
Former-commit-id: 9eb405723f355343545b1f9d4fe3925d9d1a1f24
|
2012-03-29 15:45:16 -05:00 |
|
Nate Jensen
|
b7fda1f852
|
Merge "Issue #429 added wrong cursor code" into 11-Collaboration
Former-commit-id: d99655bcb8042378594ef31ad52305120808ca7e
|
2012-03-29 14:36:24 -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
|
4e003f8723
|
Issue #429 added wrong cursor code
Former-commit-id: 88143adba6d493b49f87da30773bdd205a6e7948
|
2012-03-29 13:46:21 -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 |
|
James Korman
|
b45ea1e0a7
|
Issue #232 - Added message routing/corrected roster creation
Former-commit-id: b7040976e3c8fd029a0d821511f977cfd4b4888e
|
2012-03-29 10:16:15 -05:00 |
|
Steve Harris
|
70357d90bc
|
Merge branch 'sync_test' (VCModules) into ss_sync
Former-commit-id: e68338cecbe85a62835633e9aba0925344fb80f1
|
2012-03-29 10:03:05 -05:00 |
|
Steve Harris
|
132d68acc6
|
Merge branch '104-integration' into ss_sync; 4-Thin_Client and 10-Tech_Blocked (tear-off menus) -> ss_sync
Former-commit-id: 296cc5a5a6bcc45cd92198a045a88620d7d18653
|
2012-03-29 10:01:55 -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 |
|
Max Schenkelberg
|
15a9245592
|
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: 265ccb3e22aa0122dbd74e83d0af202596c1941c
|
2012-03-28 13:32:04 -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 |
|
James Korman
|
e8b23e3687
|
Issue #232 - Added addition peer-to-peer events
Former-commit-id: 34994534b7e9b80b96e5ca038afef1977ba02383
|
2012-03-27 16:31:26 -05:00 |
|
Nate Jensen
|
fa8b5b3400
|
Issue #427 minor fixes
Change-Id: I9788992b2de751f75ab2cc5112f2cf0492c214ad
Former-commit-id: 40e9906f41f0fa2ae4c87d3c2a2acb2406fd4e25
|
2012-03-27 09:56:46 -05:00 |
|
Nate Jensen
|
89d7f5ec7e
|
Issue #427 small improvements
Change-Id: I9a28888dceb268ab62f60bc9686b0130da01ca0e
Former-commit-id: 3a268a54417ee7ed6fcef6549b9c47b86fadfc82
|
2012-03-27 09:42:39 -05:00 |
|
Nate Jensen
|
c6e046f11e
|
Merge "Issue #244 Tied CollaboratonEditor to the view." into 11-Collaboration
Former-commit-id: f5ace8ee9561bb02311414ac82b0bbe93a5ff3b6
|
2012-03-27 08:36:25 -05:00 |
|
Nate Jensen
|
d40b15acc2
|
Merge "Issue #244 Localization of login data and removal of messanger and participant listeners." into 11-Collaboration
Former-commit-id: 9dc29b49a619cca5613e72858099029b4ffc724e
|
2012-03-27 08:36:15 -05:00 |
|
Nate Jensen
|
978b76066c
|
Merge "Issue #232 - Added JAXB serialization support" into 11-Collaboration
Former-commit-id: 096bb25790809f6f0919d518a29dca4f36bbd7f7
|
2012-03-27 08:32:19 -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 |
|
James Korman
|
72e9c2eb52
|
Issue #232 - Added JAXB serialization support
Former-commit-id: dd4502d4e7d38df28ebd93340d978653b32cd5f5
|
2012-03-26 16:48:04 -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 |
|