Matt Nash
|
b35a748e5c
|
#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: efea51faca [formerly 217d707198] [formerly 5cb40430a7] [formerly efea51faca [formerly 217d707198] [formerly 5cb40430a7] [formerly 8e16194370 [formerly 5cb40430a7 [formerly be35f7e75bbeb89fe160e24d9ff691f62753c96b]]]]
Former-commit-id: 8e16194370
Former-commit-id: 398916d8da [formerly f11fcc7d8e] [formerly e258c6a2303e7abb5e8a1dcd44fafd1f26622886 [formerly ce79d3bec3]]
Former-commit-id: 6d4aacaad98a18b05d4ccb1dff57583eef20ce90 [formerly 76adccc98e]
Former-commit-id: ea8bbffd0b
|
2012-04-03 12:23:11 -05:00 |
|
Nate Jensen
|
38243e08be
|
Issue #427 open editor when joining session
Change-Id: I6094a7a909584acb8b10236119ec3eb5dd965e59
Former-commit-id: d75858ffa0 [formerly 19bb87346c] [formerly 223eb82fe0] [formerly d75858ffa0 [formerly 19bb87346c] [formerly 223eb82fe0] [formerly c29a5a75d9 [formerly 223eb82fe0 [formerly f1c0549a84b0aa0d4829ca1bc584165ca98dbbb6]]]]
Former-commit-id: c29a5a75d9
Former-commit-id: 7c5b10222e [formerly b740924cdc] [formerly fc1d5c60e4ec9729575efed47af8bb8e49d4f3b5 [formerly 6319166680]]
Former-commit-id: 6e1fa133a8684b61cab2e2c8a7bfad9b76152409 [formerly 28ed07b65a]
Former-commit-id: cfc10b64f6
|
2012-04-03 08:44:58 -05:00 |
|
Max Schenkelberg
|
fb2aac38df
|
Merge branch 'ss_sync (12.3.1)' into 11-Collaboration
Former-commit-id: 0b1caa67df [formerly c56707c6bc] [formerly 23d65caf2e] [formerly 0b1caa67df [formerly c56707c6bc] [formerly 23d65caf2e] [formerly 753de872e0 [formerly 23d65caf2e [formerly e8402b080c7d2a712f4f385293aa9b5d1a18484e]]]]
Former-commit-id: 753de872e0
Former-commit-id: f3ff93f96f [formerly c7165384f1] [formerly adc59a45b53d18b81a0ef2d2163602690fcd76f2 [formerly e3477c90ae]]
Former-commit-id: fd2fce7269f96cccd09b7c752b9ea972105488bb [formerly 5ebb709ef6]
Former-commit-id: 8e521d2c29
|
2012-04-02 16:15:21 -05:00 |
|
Roger Ferrel
|
00ae91e2d5
|
Issue #244 Invite form Creat Session dialog implementd. Change code to use ParticipantRole enum.
Change-Id: If1c7268bded530312d9c132edacef00cd1dcdfd2
Former-commit-id: f03f683fd1 [formerly 6aa7fb3d65] [formerly 146a421ccb] [formerly f03f683fd1 [formerly 6aa7fb3d65] [formerly 146a421ccb] [formerly dbec72645a [formerly 146a421ccb [formerly 89978ed4bcf7c3b65c6038c6403874ba812f835b]]]]
Former-commit-id: dbec72645a
Former-commit-id: bdb0fd86c6 [formerly 63bfc3a073] [formerly a4c58eddc7662ec65730b4e49c7cf78697573cb8 [formerly bd37fffbeb]]
Former-commit-id: 290b88478f5b41716a5f7aeaf2cbe20781d057f7 [formerly 7ff96826db]
Former-commit-id: 6a9c473b0e
|
2012-04-02 12:13:26 -05:00 |
|
Matt Nash
|
e414c6c180
|
Issue #429 fix minor issues with toolbar and updated eraser code
Former-commit-id: 48eb644d69 [formerly 25a539a1c8] [formerly 27e850d203] [formerly 48eb644d69 [formerly 25a539a1c8] [formerly 27e850d203] [formerly 236ae6f26c [formerly 27e850d203 [formerly f6f3bcc2596735c8371256f4274c9b9e21445f1a]]]]
Former-commit-id: 236ae6f26c
Former-commit-id: 8cfbc1e384 [formerly 5e3bebc033] [formerly c7bbc8af81d1470fb9f760fffe73f1516e976a49 [formerly 0a97f20f3a]]
Former-commit-id: 94a8ece70e11de0ce034b84f543172f55a0366c8 [formerly e7d6b86a2f]
Former-commit-id: 5794564ebd
|
2012-03-30 16:35:02 -05:00 |
|
Roger Ferrel
|
c2b244db59
|
Issue #244 Active Sessions node only displays rooms the user is in.
Change-Id: I2a0ba28e4519102fe26498eb578e83c4a92163a4
Former-commit-id: d0b78dff9e [formerly fac1db8b37] [formerly 442500aeae] [formerly d0b78dff9e [formerly fac1db8b37] [formerly 442500aeae] [formerly 232df64e22 [formerly 442500aeae [formerly 17c8ca27316951cb97c48c8172d669cc65bbd6cd]]]]
Former-commit-id: 232df64e22
Former-commit-id: 5bb351c6a9 [formerly a8b643dc2a] [formerly 8f5c3def1b69709d11f92f1d49bd0b55d0b70089 [formerly 21b19df9db]]
Former-commit-id: 54d98d7977c603b82250243ea574f8e6a273959d [formerly cf2054fe6a]
Former-commit-id: a866109133
|
2012-03-30 15:06:35 -05:00 |
|
James Korman
|
529d3554ad
|
Issue #232 - Modified invitation methods
Former-commit-id: 80ea4c0104 [formerly a907eeb4ed] [formerly 436b967ff1] [formerly 80ea4c0104 [formerly a907eeb4ed] [formerly 436b967ff1] [formerly 0b6a076129 [formerly 436b967ff1 [formerly 1c9381e1ba1a8b01084717db7ff3e94b26eb0b89]]]]
Former-commit-id: 0b6a076129
Former-commit-id: ea6d408a9e [formerly ae115263ce] [formerly 110dbacc4d32bab470b9fd9825b11ea1516e3ff2 [formerly 48fb9fe7e4]]
Former-commit-id: 0f4cb887489c8dd70e7ccdb01d47abc6a18ba81f [formerly 58221261f5]
Former-commit-id: c4102180c6
|
2012-03-30 11:27:09 -05:00 |
|
Max Schenkelberg
|
d25bbaaea2
|
Issue #358 Fixed merge errors when merging core_exp into ss_sync
Former-commit-id: 25cf44a674 [formerly 74458bfb73] [formerly 9b0d01f8b5] [formerly 25cf44a674 [formerly 74458bfb73] [formerly 9b0d01f8b5] [formerly 07cf5069ba [formerly 9b0d01f8b5 [formerly beb6a1d49fac8e3e7b2ba8cbc52a8980d06e9885]]]]
Former-commit-id: 07cf5069ba
Former-commit-id: ea7fcde242 [formerly 4234b91d5b] [formerly bf3b4f5b4265812c5767225a4547be327787f7dd [formerly 993cac891e]]
Former-commit-id: 28b91cc7176d4b78395f3f59578f0b975773db53 [formerly f20e674318]
Former-commit-id: e8bc0cfa66
|
2012-03-30 10:51:31 -05:00 |
|
Roger Ferrel
|
2b0045bbc9
|
Issue #244 Send and accept invites now works.
Change-Id: I8d2c5e04f0d7dab6eb81a7321130533e5cfd6148
Former-commit-id: 4e48f2c007 [formerly dc50eb06d7] [formerly 22fff3a4b8] [formerly 4e48f2c007 [formerly dc50eb06d7] [formerly 22fff3a4b8] [formerly 108ac66214 [formerly 22fff3a4b8 [formerly 6929e4f068cc397d253b3fabd712e093c4c16dbe]]]]
Former-commit-id: 108ac66214
Former-commit-id: 36cba09ccb [formerly d3a8343de0] [formerly 737fe76ebc1e23495d7116a07b8528bef6de9d05 [formerly 1fd4aa5cf3]]
Former-commit-id: 8fe9a2933904b539425c3d98dc38073db0c77a0a [formerly e3f637d951]
Former-commit-id: ef55405397
|
2012-03-30 10:45:26 -05:00 |
|
Steve Harris
|
095b190063
|
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: b4846ce8a8 [formerly a4e4792bb5] [formerly d3ad6095b7] [formerly b4846ce8a8 [formerly a4e4792bb5] [formerly d3ad6095b7] [formerly 5cdda77afb [formerly d3ad6095b7 [formerly 879a2e0a4a31999bf4d624ff59e77bbd68195458]]]]
Former-commit-id: 5cdda77afb
Former-commit-id: c6071e24c5 [formerly 9845ef53f9] [formerly a5d7cad4cf9dcde7d77f5ce8ca8a3ccca2fdde58 [formerly 6aa18f74f6]]
Former-commit-id: 863dd9f649ac647186ce86d3db6a31c7237682d4 [formerly 9fee09c9e4]
Former-commit-id: 1556e72eeb
|
2012-03-30 09:50:48 -05:00 |
|
Steve Harris
|
9340618732
|
12.3.1-10 baseline
Former-commit-id: 760ead2047 [formerly 0e4128712b] [formerly 4068f5295f] [formerly 760ead2047 [formerly 0e4128712b] [formerly 4068f5295f] [formerly 22bd792cd9 [formerly 4068f5295f [formerly 7d62bca046401a670ef7bd917cbcbb073e061b60]]]]
Former-commit-id: 22bd792cd9
Former-commit-id: 11e448aa39 [formerly 8bc60b1e32] [formerly b700b47e15bf8e3b38455fe3bf3c827edd272477 [formerly ce3b74c605]]
Former-commit-id: cdb2bb52e23fe42c5a5b48dfdf59046836f2f615 [formerly 2e0f4b241b]
Former-commit-id: 293563cfe7
|
2012-03-30 08:38:33 -05:00 |
|
Roger Ferrel
|
30c8ea8b63
|
Issue #244 Gett color coding on messages
Change-Id: Ibe54e07c26336899198093b0a104f8796ebc0d47
Former-commit-id: a3daafd560 [formerly 24affbfe73] [formerly 9bd5aa57b6] [formerly a3daafd560 [formerly 24affbfe73] [formerly 9bd5aa57b6] [formerly d9ca310d94 [formerly 9bd5aa57b6 [formerly 3fa0c543f02ccb556b5d1898e359f1e2b6e63819]]]]
Former-commit-id: d9ca310d94
Former-commit-id: 103827c7eb [formerly 7ebba67ec3] [formerly d5c8a8cdcdb8458628c53f51a75da196cc234d16 [formerly 30fe4140ba]]
Former-commit-id: d7e57acf12a81fa797c13f25deb8890af5a014b4 [formerly c2c3215e2d]
Former-commit-id: 5ce1b1bdd6
|
2012-03-29 16:52:11 -05:00 |
|
Nate Jensen
|
5c6cd68df5
|
Merge "Issue #232 - Added support for session creation from invitation" into 11-Collaboration
Former-commit-id: a2f8042f73 [formerly 97898c1a3c] [formerly 7facfe9b7c] [formerly a2f8042f73 [formerly 97898c1a3c] [formerly 7facfe9b7c] [formerly 0338159662 [formerly 7facfe9b7c [formerly 459aa33b196c8c37897575636ae670505d959330]]]]
Former-commit-id: 0338159662
Former-commit-id: 4c0398406e [formerly 43f59bf791] [formerly 3124eb7bcf67afb0f9b3ceb6729a2ec7bf4e8522 [formerly 40839a5c6e]]
Former-commit-id: c142a5aea5c4f571f87a9462105933fdd696effb [formerly 1d9caad6ba]
Former-commit-id: e3b025bcfc
|
2012-03-29 16:32:15 -05:00 |
|
James Korman
|
39e0718e8a
|
Issue #232 - Added support for session creation from invitation
Former-commit-id: f0580d9c1f [formerly 08db3b2920] [formerly d048f0f324] [formerly f0580d9c1f [formerly 08db3b2920] [formerly d048f0f324] [formerly 6381932f6e [formerly d048f0f324 [formerly 7d17d39b73ff66275ba247bd21e28b468ae87892]]]]
Former-commit-id: 6381932f6e
Former-commit-id: 1ff41ef8d7 [formerly ea7a6ea10b] [formerly 8c5ebd3d5cf4e6660db94269c72ad7893d1de017 [formerly 2eedb16808]]
Former-commit-id: 44fe4c2a8ea875a049e7af689c97358d1519bb95 [formerly ec96f988c5]
Former-commit-id: d0faf1bfc4
|
2012-03-29 16:30:29 -05:00 |
|
Nate Jensen
|
d072f35123
|
Issue #427 clean up
Change-Id: Id4bc3b27bfcbc324138a11998255a6f662f31255
Former-commit-id: 6ce796108f [formerly ddfab0e4e3] [formerly d60fcaa4f3] [formerly 6ce796108f [formerly ddfab0e4e3] [formerly d60fcaa4f3] [formerly a85aa4595f [formerly d60fcaa4f3 [formerly 9eb405723f355343545b1f9d4fe3925d9d1a1f24]]]]
Former-commit-id: a85aa4595f
Former-commit-id: cff197dce8 [formerly d775bee7ae] [formerly ab19b6732644883121451944d78d207ba21f4faf [formerly 14883dfa58]]
Former-commit-id: 30a58b2d9e5ea800c858a2518bb5d4902c73ac25 [formerly ced9e83aec]
Former-commit-id: 48bf706df1
|
2012-03-29 15:45:16 -05:00 |
|
Nate Jensen
|
94bff98b9d
|
Merge "Issue #429 added wrong cursor code" into 11-Collaboration
Former-commit-id: 8da45f26b2 [formerly 5f09f55f6b] [formerly b7fda1f852] [formerly 8da45f26b2 [formerly 5f09f55f6b] [formerly b7fda1f852] [formerly 9ce74d9430 [formerly b7fda1f852 [formerly d99655bcb8042378594ef31ad52305120808ca7e]]]]
Former-commit-id: 9ce74d9430
Former-commit-id: d0faddc33a [formerly 2c4a626723] [formerly 70699592bd222de1179b07bbb30d06b9f321ff7e [formerly 25cf424a42]]
Former-commit-id: 9b7c2049124988237ad1f5161e72f7957e625522 [formerly 84caa31cb7]
Former-commit-id: 5169c34b03
|
2012-03-29 14:36:24 -05:00 |
|
Steve Harris
|
1d35018fa3
|
Issue #244 Roster groups now display and improved presents.
Change-Id: I7965201692cab4472ce85d2525e39cf3823ab16f
Former-commit-id: 13821eae48 [formerly b4aa83517d] [formerly bf55bc0d86] [formerly 13821eae48 [formerly b4aa83517d] [formerly bf55bc0d86] [formerly c27ee0903c [formerly bf55bc0d86 [formerly 7f4e485aae341b11beb4a55c895a86cd6ff13635]]]]
Former-commit-id: c27ee0903c
Former-commit-id: 082c9136eb [formerly 8bda505069] [formerly 3a6fa3d350a3772089c61ec046b095783245f807 [formerly fbdf4d5c37]]
Former-commit-id: 5dfbcf57603cf5bfc2c599b70a59b28de22316d3 [formerly 5a22143834]
Former-commit-id: 807547cb8d
|
2012-03-29 14:36:53 -05:00 |
|
Matt Nash
|
ef49ce6d34
|
Issue #429 added wrong cursor code
Former-commit-id: d18ed573eb [formerly c1ee2d1718] [formerly 4e003f8723] [formerly d18ed573eb [formerly c1ee2d1718] [formerly 4e003f8723] [formerly 3d81840532 [formerly 4e003f8723 [formerly 88143adba6d493b49f87da30773bdd205a6e7948]]]]
Former-commit-id: 3d81840532
Former-commit-id: 4c44a6824b [formerly 3a890f0c68] [formerly 84963db7a0c7cdc0da49dace56a590ffafba84c1 [formerly acf376e126]]
Former-commit-id: cfc91798c6eec2d7d894fef6ce3bf3313142b22a [formerly 219e197290]
Former-commit-id: 1c54506eed
|
2012-03-29 13:46:21 -05:00 |
|
Matt Nash
|
d895713084
|
Issue #429 fix proxied handler error, added toolbar for drawing tool
Former-commit-id: 89b9d575ff [formerly 057ffedb23] [formerly 89d401550a] [formerly 89b9d575ff [formerly 057ffedb23] [formerly 89d401550a] [formerly 9beef61917 [formerly 89d401550a [formerly 5728e687e79a54da8313b444a48db18c6671e79e]]]]
Former-commit-id: 9beef61917
Former-commit-id: 910a9447a4 [formerly fdde739063] [formerly c1a428c83f39039d8711dd56a44b9155703dfd85 [formerly 18291c4101]]
Former-commit-id: 00e43c76e035b2e3325ca04d238f0e0942201dcf [formerly b07f565ab9]
Former-commit-id: 9f25ebc259
|
2012-03-29 12:24:27 -05:00 |
|
Nate Jensen
|
0fa5ab5052
|
Issue #427 Right click on editor tab support
Change-Id: Ia9240a01c145c81bbf98268d4df5fd2242ca7987
Former-commit-id: a4965d6bf9 [formerly 202bd0adf8] [formerly d2d3a245b3] [formerly a4965d6bf9 [formerly 202bd0adf8] [formerly d2d3a245b3] [formerly aa000b4b06 [formerly d2d3a245b3 [formerly 7597db5bbc0642072143e4c7ea0291108154eb40]]]]
Former-commit-id: aa000b4b06
Former-commit-id: 274e2df586 [formerly 9792be406a] [formerly a6d73562ce75aff32ab9bfe5f1b0ddce7553fd0c [formerly 6aae45687a]]
Former-commit-id: ba593db28636bbaf2f46e5a77d5b70b957e81f82 [formerly ac8087a21a]
Former-commit-id: a0c6c92587
|
2012-03-29 10:44:08 -05:00 |
|
James Korman
|
c136659e2c
|
Issue #232 - Added message routing/corrected roster creation
Former-commit-id: 08704e35ea [formerly 8dde3a0798] [formerly b45ea1e0a7] [formerly 08704e35ea [formerly 8dde3a0798] [formerly b45ea1e0a7] [formerly 6149d30b13 [formerly b45ea1e0a7 [formerly b7040976e3c8fd029a0d821511f977cfd4b4888e]]]]
Former-commit-id: 6149d30b13
Former-commit-id: afa5959912 [formerly 842b2c6f7d] [formerly da3c8be6247c3d87d4c725b5a9091556aed4e49b [formerly 7f12149d98]]
Former-commit-id: 381193c2c838124a2efe2583abc63197659941a2 [formerly acc37a06c5]
Former-commit-id: 4527f71129
|
2012-03-29 10:16:15 -05:00 |
|
Steve Harris
|
8850e44772
|
Merge branch 'sync_test' (VCModules) into ss_sync
Former-commit-id: b05701d2d7 [formerly 0665862abe] [formerly 70357d90bc] [formerly b05701d2d7 [formerly 0665862abe] [formerly 70357d90bc] [formerly a0abcf8120 [formerly 70357d90bc [formerly e68338cecbe85a62835633e9aba0925344fb80f1]]]]
Former-commit-id: a0abcf8120
Former-commit-id: 239813406d [formerly 65aa72fee7] [formerly 7c1f75dd0fbc3e3a61f9128ed10a9a9c268a43da [formerly 6884520750]]
Former-commit-id: 5a694628c15cf0ff0b617182e7f4ca869e47cb8d [formerly 5a310acb18]
Former-commit-id: 0a7cb5fd7a
|
2012-03-29 10:03:05 -05:00 |
|
Steve Harris
|
7780277dc6
|
Merge branch '104-integration' into ss_sync; 4-Thin_Client and 10-Tech_Blocked (tear-off menus) -> ss_sync
Former-commit-id: 770ccb1520 [formerly 94e6323c0a] [formerly 132d68acc6] [formerly 770ccb1520 [formerly 94e6323c0a] [formerly 132d68acc6] [formerly 54a1d9cdbc [formerly 132d68acc6 [formerly 296cc5a5a6bcc45cd92198a045a88620d7d18653]]]]
Former-commit-id: 54a1d9cdbc
Former-commit-id: 1bc33e26e6 [formerly 2c3f9271bf] [formerly 304f45749b88cc183853e0c60cef2ea2e8139d31 [formerly 4b853c56c6]]
Former-commit-id: 8f6b48e74fefd33ca573f4aeadc0712c9df68566 [formerly 2f6a9ef2ac]
Former-commit-id: 0a5780c005
|
2012-03-29 10:01:55 -05:00 |
|
Nate Jensen
|
7e20b0350c
|
Merge "Issue #429 telestrator merging" into 11-Collaboration
Former-commit-id: 5999d295f4 [formerly aaba32c4c1] [formerly cf880ddd0d] [formerly 5999d295f4 [formerly aaba32c4c1] [formerly cf880ddd0d] [formerly 676746126c [formerly cf880ddd0d [formerly eda16f8aa5a9aa88a8e947070d8e9df32c36c114]]]]
Former-commit-id: 676746126c
Former-commit-id: 418fa15cc7 [formerly 7d5d70bf55] [formerly 0db4f826ae255081ca710d80835f257db3c69ddc [formerly ec0896c28d]]
Former-commit-id: ffa79a6786e487f4bb1e2fd696315a724eb3dcd2 [formerly f809bbcb0d]
Former-commit-id: 80ea8cc05d
|
2012-03-28 15:10:34 -05:00 |
|
Matt Nash
|
454e4e94a3
|
Issue #429 telestrator merging
Change-Id: I18f8f283db617d0865b274dcf6003a24e2cf2028
Former-commit-id: f5eee3d7cc [formerly b86ee8584f] [formerly d55dab5c34] [formerly f5eee3d7cc [formerly b86ee8584f] [formerly d55dab5c34] [formerly 39670f6755 [formerly d55dab5c34 [formerly b1a679a2e37bdd7a887fffe82a3d735cdb60f7f9]]]]
Former-commit-id: 39670f6755
Former-commit-id: 0717f545ca [formerly 4871565ff0] [formerly 61b25ce243bb8fbf9e6499922e3ab168af901387 [formerly aeb022880c]]
Former-commit-id: 25d3843c62e8d28ef2ca1974858fa8d8f4c3fff9 [formerly 6ec5f3b2ea]
Former-commit-id: f58c0816fe
|
2012-03-28 15:09:18 -05:00 |
|
Nate Jensen
|
1b3258cdff
|
Issue #427 initial input event code
Change-Id: I37dc96ed8dbef37d8e3f7a8ae39fc6fcad59f4aa
Former-commit-id: dc7c88c652 [formerly 40dd73ba4d] [formerly 5fdc253d77] [formerly dc7c88c652 [formerly 40dd73ba4d] [formerly 5fdc253d77] [formerly bbf96992ee [formerly 5fdc253d77 [formerly 6297c04332bb349d8351b07e2ffd1c24c046ccd7]]]]
Former-commit-id: bbf96992ee
Former-commit-id: 4b4b9a03ce [formerly 8fbe658c89] [formerly 43d8d9028dd4a466a9034287dba2bdd45ddb912b [formerly a5d38a0968]]
Former-commit-id: e7473c9397454f5664a17495cb1fc90c7a5d4feb [formerly 454e8a72f8]
Former-commit-id: 6018238348
|
2012-03-28 14:34:25 -05:00 |
|
Max Schenkelberg
|
e6fcc458e5
|
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: 86d3763df0 [formerly 66eaffb9ee] [formerly 15a9245592] [formerly 86d3763df0 [formerly 66eaffb9ee] [formerly 15a9245592] [formerly f10f1a5319 [formerly 15a9245592 [formerly 265ccb3e22aa0122dbd74e83d0af202596c1941c]]]]
Former-commit-id: f10f1a5319
Former-commit-id: 5fc757226e [formerly bbab188fb9] [formerly 6d1ea66ba9a1390c296443e20785aa9ef4a890fa [formerly ac11dd0c18]]
Former-commit-id: cb1bc79da744506da785204d429e696d9676fb32 [formerly 2f3b9f0067]
Former-commit-id: e73e40dc78
|
2012-03-28 13:32:04 -05:00 |
|
Roger Ferrel
|
08c8cd1244
|
Issue #244 Clean up and Link editor to chat now works.
Change-Id: I23b12fa44b8908b6a0c5ce79ca79ad73ff26df9d
Former-commit-id: 2c61bc2a50 [formerly fae1527331] [formerly 5d95a69f39] [formerly 2c61bc2a50 [formerly fae1527331] [formerly 5d95a69f39] [formerly dc2f3316e6 [formerly 5d95a69f39 [formerly 51e85606ad7d7462ce84bb14bd4df0c792997a59]]]]
Former-commit-id: dc2f3316e6
Former-commit-id: f1a9b8265c [formerly d29d2a1c92] [formerly 27bd3129b256af64b1bce9adcab5ca25bc1e9327 [formerly 9712ba2751]]
Former-commit-id: 996507114e4f808d9a2a5758117e98559a4da0d7 [formerly a5b05aeebd]
Former-commit-id: dbb7bdf9a8
|
2012-03-28 11:23:51 -05:00 |
|
James Korman
|
efff6a8028
|
Issue #232 - Added addition peer-to-peer events
Former-commit-id: 9791cc693a [formerly fc99959e3c] [formerly e8b23e3687] [formerly 9791cc693a [formerly fc99959e3c] [formerly e8b23e3687] [formerly ae6eddcd68 [formerly e8b23e3687 [formerly 34994534b7e9b80b96e5ca038afef1977ba02383]]]]
Former-commit-id: ae6eddcd68
Former-commit-id: f834bf7ca2 [formerly 356892acd6] [formerly 653449fc2f2973859a684acad815bda3e8ddda5c [formerly 0ff25a5258]]
Former-commit-id: ed85fcbd5271b86e762bd07906ba4a6ba486f8a5 [formerly 64be5deba5]
Former-commit-id: 979397b7be
|
2012-03-27 16:31:26 -05:00 |
|
Nate Jensen
|
2d15b6b34b
|
Issue #427 minor fixes
Change-Id: I9788992b2de751f75ab2cc5112f2cf0492c214ad
Former-commit-id: 1952d1fbfe [formerly ab63accc61] [formerly fa8b5b3400] [formerly 1952d1fbfe [formerly ab63accc61] [formerly fa8b5b3400] [formerly 0f25c8ffa6 [formerly fa8b5b3400 [formerly 40e9906f41f0fa2ae4c87d3c2a2acb2406fd4e25]]]]
Former-commit-id: 0f25c8ffa6
Former-commit-id: 316ee943cd [formerly f1c0104885] [formerly ae7a75e9886a4da3c8fde7c46fdf504fd79b25c1 [formerly a692caba1c]]
Former-commit-id: 57ee24a6f84224f00686d374b7198adaaf101812 [formerly efe77c3542]
Former-commit-id: 30740b4e48
|
2012-03-27 09:56:46 -05:00 |
|
Nate Jensen
|
01e2a8c6ed
|
Issue #427 small improvements
Change-Id: I9a28888dceb268ab62f60bc9686b0130da01ca0e
Former-commit-id: 2132a997ca [formerly 4180979cf4] [formerly 89d7f5ec7e] [formerly 2132a997ca [formerly 4180979cf4] [formerly 89d7f5ec7e] [formerly 80500eec9c [formerly 89d7f5ec7e [formerly 3a268a54417ee7ed6fcef6549b9c47b86fadfc82]]]]
Former-commit-id: 80500eec9c
Former-commit-id: 3320d18ed5 [formerly 7d6bfd3a0b] [formerly 9d8e2d15c09b14a4f1b60f41a2add68cea557677 [formerly 9602216cda]]
Former-commit-id: c8325f496f4f6be805799fc8938eb13dbb361e2a [formerly 92a9726d83]
Former-commit-id: e2e9fb87dc
|
2012-03-27 09:42:39 -05:00 |
|
Nate Jensen
|
8abc0aa1f6
|
Merge "Issue #244 Tied CollaboratonEditor to the view." into 11-Collaboration
Former-commit-id: 16d1762f6d [formerly fc5e53b1c2] [formerly c6e046f11e] [formerly 16d1762f6d [formerly fc5e53b1c2] [formerly c6e046f11e] [formerly b2655debe8 [formerly c6e046f11e [formerly f5ace8ee9561bb02311414ac82b0bbe93a5ff3b6]]]]
Former-commit-id: b2655debe8
Former-commit-id: 95d02a28f3 [formerly 54469fd8b5] [formerly 923ca1bcfb8afff29f419a61aae88a15ffd4bf8e [formerly 43b58266c5]]
Former-commit-id: 5f72d5e0d044713a57a4ea43d16d6421aa0e0ec9 [formerly cc6b5250b3]
Former-commit-id: 272563edbf
|
2012-03-27 08:36:25 -05:00 |
|
Nate Jensen
|
db3fd4abdc
|
Merge "Issue #244 Localization of login data and removal of messanger and participant listeners." into 11-Collaboration
Former-commit-id: f74079fc42 [formerly 4d32c5e078] [formerly d40b15acc2] [formerly f74079fc42 [formerly 4d32c5e078] [formerly d40b15acc2] [formerly d09c8a9383 [formerly d40b15acc2 [formerly 9dc29b49a619cca5613e72858099029b4ffc724e]]]]
Former-commit-id: d09c8a9383
Former-commit-id: 40a55a68e8 [formerly 4a2d3cd071] [formerly 178e1688c450a9e861bb089ca84a1c5258705ee0 [formerly f95cba545b]]
Former-commit-id: b85fa21cceb7be4f0772063aef314c591642059b [formerly 4653f3dd4f]
Former-commit-id: e839afd355
|
2012-03-27 08:36:15 -05:00 |
|
Nate Jensen
|
df50b19661
|
Merge "Issue #232 - Added JAXB serialization support" into 11-Collaboration
Former-commit-id: f9aa0e1d4c [formerly 4073ba7e7d] [formerly 978b76066c] [formerly f9aa0e1d4c [formerly 4073ba7e7d] [formerly 978b76066c] [formerly ed44b0d93f [formerly 978b76066c [formerly 096bb25790809f6f0919d518a29dca4f36bbd7f7]]]]
Former-commit-id: ed44b0d93f
Former-commit-id: 811c0bff6d [formerly d62fc78291] [formerly 54c68ee512f0450e40dde713319fad1e53eb4602 [formerly 8b06b02281]]
Former-commit-id: e8a823ab74eb5ce0f3c9ff95184233e2e16f6e64 [formerly 0805c13d39]
Former-commit-id: 009ae65184
|
2012-03-27 08:32:19 -05:00 |
|
Roger Ferrel
|
f38ac43930
|
Issue #244 Tied CollaboratonEditor to the view.
Change-Id: I67b9b2f9f1a71f1f131584cdb138c54788cac165
Former-commit-id: bd96e3040d [formerly 76f9c71d41] [formerly a270259553] [formerly bd96e3040d [formerly 76f9c71d41] [formerly a270259553] [formerly d001287c94 [formerly a270259553 [formerly fd9eb8cbf048ce03bce27c4d1249596f5649d2a7]]]]
Former-commit-id: d001287c94
Former-commit-id: 9817fc2214 [formerly 8dae356572] [formerly a07ca5bee7be77863145825ee6241be901b91e09 [formerly 26122319db]]
Former-commit-id: 71db4aa54d8906f6abd5e0104f0d1dc06224b9ea [formerly ebbf625538]
Former-commit-id: 027e4f4254
|
2012-03-26 17:30:51 -05:00 |
|
Roger Ferrel
|
d9b1d1715c
|
Issue #244 Localization of login data and removal of messanger and participant listeners.
Change-Id: I247199030152575c82b8320fa0cbdeddb62fa662
Former-commit-id: 05c5b5339d [formerly df5a2662ba] [formerly b180f9b45e] [formerly 05c5b5339d [formerly df5a2662ba] [formerly b180f9b45e] [formerly 95d8d85fd0 [formerly b180f9b45e [formerly 4e4a705b98070d2e671133e6acc29dc72617505a]]]]
Former-commit-id: 95d8d85fd0
Former-commit-id: 9d523d8366 [formerly c132fbf641] [formerly 90b8c63352a86a05c76f20466c3ca0e3dd390d83 [formerly 8f75dd68de]]
Former-commit-id: 55b593bebab15bdffba13c00ef7e1c57d05fac2f [formerly c06762598e]
Former-commit-id: cca7866880
|
2012-03-26 17:30:50 -05:00 |
|
James Korman
|
be149070fb
|
Issue #232 - Added JAXB serialization support
Former-commit-id: 56dd3e7c15 [formerly fc2bd8c666] [formerly 72e9c2eb52] [formerly 56dd3e7c15 [formerly fc2bd8c666] [formerly 72e9c2eb52] [formerly 221a5a65b0 [formerly 72e9c2eb52 [formerly dd4502d4e7d38df28ebd93340d978653b32cd5f5]]]]
Former-commit-id: 221a5a65b0
Former-commit-id: 83190cb431 [formerly eff90a5c4b] [formerly 47ece3d642df95a9db106bc8ce90b932a97a3afb [formerly 02bbe80c7c]]
Former-commit-id: 51c2957995878ca8ba796bcdda8b8ce89d1f2b27 [formerly 745f256590]
Former-commit-id: 0d10f43adb
|
2012-03-26 16:48:04 -05:00 |
|
Nate Jensen
|
e1e8d6c091
|
Issue #427 event controllers use ISharedDisplaySession
Change-Id: Ia0e41dcb7f0b49956a4a3c88a037894b972435c9
Former-commit-id: 1af05f177c [formerly ef03821455] [formerly f6226a89d9] [formerly 1af05f177c [formerly ef03821455] [formerly f6226a89d9] [formerly cbf105015f [formerly f6226a89d9 [formerly bf6cf477825be1d19081965ca9e958ebf423c0af]]]]
Former-commit-id: cbf105015f
Former-commit-id: e93c521327 [formerly ff5fec3f09] [formerly 5385afe9ce1d1a6ded716c4d96c0ce04ff2b6cf7 [formerly e28fc62a56]]
Former-commit-id: f2ba609b9ffdb06232123d1fdbdafaa1a5e08879 [formerly b6be43d0e5]
Former-commit-id: e9f2d75d95
|
2012-03-26 16:37:44 -05:00 |
|
Nate Jensen
|
422f7ea302
|
Issue #427 fix xml serialization
Change-Id: I795fe5a47fc2ed678a431795a6242382b3ef6654
Former-commit-id: c43746bbf1 [formerly e24039ae5c] [formerly 7c6e0a41f7] [formerly c43746bbf1 [formerly e24039ae5c] [formerly 7c6e0a41f7] [formerly 2a1e40b2d5 [formerly 7c6e0a41f7 [formerly eb39d19f3940ba57e1322a786d0dd535289b2a1e]]]]
Former-commit-id: 2a1e40b2d5
Former-commit-id: e10704c2fa [formerly ecc3dc9a70] [formerly 5a795729fff7ba187286a7ae5aaad4eeaa8b98a9 [formerly a1e2c3173d]]
Former-commit-id: 0346bf396c82f33647996ebe1c35e2ee67c52e45 [formerly c8b94860a0]
Former-commit-id: 4605f1b00a
|
2012-03-26 15:47:34 -05:00 |
|
Nate Jensen
|
b134fa347e
|
Issue #427 initial role based event handling
Change-Id: I73d4df3f09c7cfa60025142ec5a4dccdad4423bb
Former-commit-id: e76039c56e [formerly bac31f3613] [formerly 4d7a53c583] [formerly e76039c56e [formerly bac31f3613] [formerly 4d7a53c583] [formerly 619d19e24c [formerly 4d7a53c583 [formerly b752ced02d726771a6e11a9982967a892d2e55f3]]]]
Former-commit-id: 619d19e24c
Former-commit-id: 0e9194429e [formerly 998c9df260] [formerly 4440838cbe883a84c237cc8d0f49c75f814df106 [formerly 62b16fef0d]]
Former-commit-id: d7e2ddbfd4840e5201fa1400a1816256f6e2b4e1 [formerly 2e4e000720]
Former-commit-id: 6580f92e65
|
2012-03-26 13:05:01 -05:00 |
|
James Korman
|
79af426295
|
Issue #232 : Large refactor - Add command interfaces
Former-commit-id: a32e1d4b85 [formerly 5bb4a7952b] [formerly e408ed1a28] [formerly a32e1d4b85 [formerly 5bb4a7952b] [formerly e408ed1a28] [formerly d51a8521f8 [formerly e408ed1a28 [formerly e82a81cb465b07710b8b2cd6c99e87f97311d316]]]]
Former-commit-id: d51a8521f8
Former-commit-id: c442754471 [formerly fb0614ad9e] [formerly 4daa44c17ead88be2b1a8e6a6f9f3b84f376b884 [formerly e83de7447b]]
Former-commit-id: 84dd38f7c1603c1515e50f75f66c52a543e3cb1d [formerly 61f8b804cb]
Former-commit-id: 551d38bee3
|
2012-03-26 10:17:17 -05:00 |
|
Roger Ferrel
|
869cbb9156
|
Issue #244 Added participant even handler for SessionView and put in code to get groups(rosters).
Change-Id: I4a7501859f2681b290ad0babf4dab9cbca80e102
Former-commit-id: 8d7cad314e [formerly cd66a9c29c] [formerly 04b5a92838] [formerly 8d7cad314e [formerly cd66a9c29c] [formerly 04b5a92838] [formerly ce72b7b583 [formerly 04b5a92838 [formerly a264abfff059a9c5942ef1db91a6390fad12a110]]]]
Former-commit-id: ce72b7b583
Former-commit-id: 15245a25d6 [formerly e649f9da42] [formerly 3e15f252346e997b4631ee9819dc1ded143057fb [formerly 053c4ba597]]
Former-commit-id: 2274356808f6d699c33a0cb2f7dafe5be436ccc5 [formerly 3f08de49fd]
Former-commit-id: ff4822d3ef
|
2012-03-22 16:57:30 -05:00 |
|
Nate Jensen
|
b54807f36a
|
Issue #427 Share maps and editor
Change-Id: I6bd3148ec199c348ffd85d08322fdb8befa4096c
Former-commit-id: e9b2e70892 [formerly 37d4401747] [formerly 615962f5dd] [formerly e9b2e70892 [formerly 37d4401747] [formerly 615962f5dd] [formerly 0e214bcd7c [formerly 615962f5dd [formerly 7a58d8a17be53fc504cafe32d19de2f52121eeff]]]]
Former-commit-id: 0e214bcd7c
Former-commit-id: 2ba6735324 [formerly 8d94771854] [formerly 2f70306617907f26efb4f42d9c736b68c3f4f5a2 [formerly 2801c4fdfb]]
Former-commit-id: 02922d354abd7bde98ea1ad74b2d1aa2c178b78f [formerly 98fb91164b]
Former-commit-id: 28931de3c6
|
2012-03-22 09:39:59 -05:00 |
|
Bryan Kowal
|
db90c1809d
|
Issue #19 - fix ldm so that it will handle both date and sequence substitutions correctly.
Former-commit-id: 69e6f68295 [formerly 5ba68624c5] [formerly 8a4c883e0b] [formerly 69e6f68295 [formerly 5ba68624c5] [formerly 8a4c883e0b] [formerly 31f989ecb4 [formerly 8a4c883e0b [formerly efc134f920b0cc0e493d74f1bb14b22fdc8013ca]]]]
Former-commit-id: 31f989ecb4
Former-commit-id: 5009de761a [formerly e27502effd] [formerly a23c215ea5b5c94cb670f657e0aafe5ca63f7dde [formerly 81a360d139]]
Former-commit-id: 8fe130f1144ae3cbedbd14148c987770a657bb45 [formerly 339d963f90]
Former-commit-id: c52c131e5c
|
2012-03-21 16:49:38 -05:00 |
|
James Korman
|
266eef93fa
|
Issue #232 - Delete files from original locations
Former-commit-id: 9c17874f37 [formerly 4dabfd8c2a] [formerly 90b74b258a] [formerly 9c17874f37 [formerly 4dabfd8c2a] [formerly 90b74b258a] [formerly 55f269100c [formerly 90b74b258a [formerly b34ddc7ead0853a152baa8b95c950f9c714a4ff7]]]]
Former-commit-id: 55f269100c
Former-commit-id: ef3fdd7171 [formerly d0976e4703] [formerly 4d86c3e4eddb68e0dd4e867b58d0cb40e7d9c96c [formerly 9badd0fb07]]
Former-commit-id: 17cd4afec08291d9dbd8eb15c752b80e0e01b4d1 [formerly f3f6778df2]
Former-commit-id: 5702fc837c
|
2012-03-20 14:55:27 -05:00 |
|
James Korman
|
01711bd11f
|
Issue #232 - Considerable refactoring/event processing
Former-commit-id: cbe20ea7ca [formerly 60ff4d139b] [formerly 4ba4ccb404] [formerly cbe20ea7ca [formerly 60ff4d139b] [formerly 4ba4ccb404] [formerly cc5cc2d409 [formerly 4ba4ccb404 [formerly 0b229e6992b40060d43ac560e0a3fa532635f5a1]]]]
Former-commit-id: cc5cc2d409
Former-commit-id: 34eeb34b66 [formerly 8be6351348] [formerly 341fef17dc14e38a04e3f4f94ca5a333eca1128e [formerly c5e9df26c1]]
Former-commit-id: e9fdce70700c9e3594e32595761afa08bbd875e2 [formerly 7f895ac63d]
Former-commit-id: 9d51b9c893
|
2012-03-20 13:59:55 -05:00 |
|
Roger Ferrel
|
6730ac0a98
|
Issue #244 Creted AbstarctSessonView and PeerToPeerView. Code clean up so CAVE exits properly.
Change-Id: Ibd5feeb0412e4afbe8e1f0eac79944bb059b4687
Former-commit-id: 3ea86c6609 [formerly ce3b5728c5] [formerly 1f4edd08e4] [formerly 3ea86c6609 [formerly ce3b5728c5] [formerly 1f4edd08e4] [formerly a7f1fc18b1 [formerly 1f4edd08e4 [formerly e92969cb1440f3f6477a7003b031faab6ed484fc]]]]
Former-commit-id: a7f1fc18b1
Former-commit-id: e5a1786d4f [formerly 002e7eab3f] [formerly f37ef7c801a95dba643b2270726b5d75cbb30f5d [formerly 9f6642d572]]
Former-commit-id: cdd69c632a5500993bcb56095ae1f03e5392fb57 [formerly f58fa980f2]
Former-commit-id: 3d8af5815a
|
2012-03-20 10:42:57 -05:00 |
|
Greg Armendariz
|
399103daef
|
Merge "Issue #18 - wes2bridge will now correctly handle starting multiple instances of edex; a new wes2bridge.instance jvm parameter was added to edex so the edex service startup script will be able to correctly determine which edex instance is associated with a particular wes2bridge case." into 9-Wes2Bridge
Former-commit-id: f49e1f5e03 [formerly 9a0f313c23] [formerly 65b8521ccb] [formerly f49e1f5e03 [formerly 9a0f313c23] [formerly 65b8521ccb] [formerly d45249fb2f [formerly 65b8521ccb [formerly 866c197c927445c1572fd19da1ebd3c8dee46d97]]]]
Former-commit-id: d45249fb2f
Former-commit-id: 5a0a8b242e [formerly bf867f91d3] [formerly 0ce00cf1a62830ded14e3abd22f133c7ff516662 [formerly f5c96c4af2]]
Former-commit-id: c2e4c9799d04d5d5864e79ad4c41bb6b59ffc40a [formerly 1929f1df8e]
Former-commit-id: 249304a035
|
2012-03-17 10:35:17 -05:00 |
|
Bryan Kowal
|
1fe1eeccc6
|
Issue #18 - wes2bridge will now correctly handle starting multiple instances of edex; a new wes2bridge.instance jvm parameter was added to edex so the edex service startup script will be able to correctly determine which edex instance is associated with a particular wes2bridge case.
Former-commit-id: dd9c964943 [formerly 97cb8ab51c] [formerly 55a759fb8a] [formerly dd9c964943 [formerly 97cb8ab51c] [formerly 55a759fb8a] [formerly 64cdd27f62 [formerly 55a759fb8a [formerly 47807beb71c03e26cbe4fa78bf9cdb0811a51042]]]]
Former-commit-id: 64cdd27f62
Former-commit-id: 5eaec7c5eb [formerly 3914878a65] [formerly 4d0abefebcd64ca578719d844b51d428715ea13d [formerly 117306c734]]
Former-commit-id: 3bc0454eafc8d8cfa60eb285412d45b69a7c2067 [formerly a01d2a17f9]
Former-commit-id: d7f5da6110
|
2012-03-16 12:16:48 -05:00 |
|
Max Schenkelberg
|
5706cf4610
|
Issue #422 Set "numericValue" to null in RadarDefaultInterrogator in
case of "NO DATA"
Former-commit-id: a0663a2791 [formerly 468c812dde] [formerly cd6ebd80d4] [formerly a0663a2791 [formerly 468c812dde] [formerly cd6ebd80d4] [formerly b9085db25d [formerly cd6ebd80d4 [formerly 89521a4df36d18ecb64b4cce248f150f0a0e4957]]]]
Former-commit-id: b9085db25d
Former-commit-id: 13f08a98a9 [formerly 81bc45f071] [formerly 46b9ad1c87f0e0eaf7fe167226e5b9dfa00844ed [formerly 954073b38c]]
Former-commit-id: d43b048af219f6ced6cf70ae84cf53f92bf3cae7 [formerly 645900727c]
Former-commit-id: 8878a9732d
|
2012-03-16 10:13:31 -05:00 |
|