xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
248 commits 31 branches 40 tags 3.8 GiB
Commit graph

159 commits

Author SHA1 Message Date
Roger Ferrel
8b5cc65466 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: 85b6b8a196 [formerly d197ea6fd2] [formerly afc79a14f3] [formerly 72bf5460d7 [formerly afc79a14f3 [formerly 898e1a503af21abef70afc734924332e7de249ee]]]
Former-commit-id: 72bf5460d7
Former-commit-id: c32cf26a4426276e64d2389dd034f2f15ecb5f69 [formerly f9aa115a2b]
Former-commit-id: 98c83d5322
 2012-04-05 08:09:15 -05:00
Nate Jensen
aa0ab9a3ef Issue #427 fixed subject 
Change-Id: Ieb5499e16b2c30169fe49eb06d73b8e3ede6ce70

Former-commit-id: 956c125095 [formerly d68efe319e] [formerly 8c140e089568e9a209541cdeb7ed2d7a770256cc [formerly b084156a30]] [formerly 4999e547a1 [formerly b084156a30 [formerly 8908b81e0e47cfe112ad132a82f2b2cb1a0dd55e]]]
Former-commit-id: 4999e547a1
Former-commit-id: 7eb6f6e7efab34a92a0b53d6fb26d16c6ce23123 [formerly 477d1bb013]
Former-commit-id: a20e542438
 2012-04-04 17:06:00 -05:00
Bradley Gonzales
7945fe90e6 Issue #440 more descriptive login failure message 
Former-commit-id: 9d44aabf06 [formerly 391f8e4d58] [formerly 6fc14461ee] [formerly 74ce6f2140 [formerly 6fc14461ee [formerly 909362d88423e3c5a39c73b5e5da2d2168f5ed91]]]
Former-commit-id: 74ce6f2140
Former-commit-id: 098005964c92d44ded39c3c5e5194fbf5527436a [formerly c345b2614e]
Former-commit-id: 2d7e2b456e
 2012-04-04 16:26:58 -05:00
Nate Jensen
63e389da6e Issue #427 instantiate collaboration resource 
Change-Id: I5aa7ec5d7dfb3f2373730eb40dd9ea3178112d20

Former-commit-id: bea3b8fb0c [formerly 9c4b29c3aa] [formerly 260c7c10eb] [formerly f06338bcd4 [formerly 260c7c10eb [formerly 5cd5a85bf836ade2da3b43b2797c2a65d61be461]]]
Former-commit-id: f06338bcd4
Former-commit-id: 805a0a7445263fe4b32c76b708b396734638f2b0 [formerly 0f5b0f7e9e]
Former-commit-id: a2d7bdb709
 2012-04-04 14:05:12 -05:00
James Korman
ae78c1b570 Issue #437 - Corrected venue command message loopback 
Former-commit-id: 47c16c8eda [formerly fad1fa7362] [formerly 23a2cd033a] [formerly e663a9e5dc [formerly 23a2cd033a [formerly c3ba8bd9416f18358f2a976ee2104e4e614321c3]]]
Former-commit-id: e663a9e5dc
Former-commit-id: e217bf264f1ab514e6d3916f5243a815bc38ff93 [formerly 44b07395fb]
Former-commit-id: 9c924ccb25
 2012-04-04 13:41:25 -05:00
Matt Nash
c010118826 Issue #429 working telestration collaboration capabilities 
Former-commit-id: cb909ce21f [formerly 86e2f1a7ad] [formerly 3c2fcc59d0] [formerly c27a3cf672 [formerly 3c2fcc59d0 [formerly f1c9552a757e7d194e31ed9786cb358c53e631b7]]]
Former-commit-id: c27a3cf672
Former-commit-id: 3c3dd55c6aa4fca138d9d2c15294dd9bfbddabdc [formerly 28df06150e]
Former-commit-id: a7544fadf9
 2012-04-04 11:23:34 -05:00
Roger Ferrel
c3b0f8dc27 Issue #244 Fix bug in handleInvitationEvent 
Change-Id: Ic47628203707a8238b1d3c0982d177641bba53a9

Former-commit-id: c2b5a62e38 [formerly 7aa926028e] [formerly a39475e04d] [formerly 46ddf008b8 [formerly a39475e04d [formerly 12e29dfb9e3a77e44b7b946f138c84e082e0990a]]]
Former-commit-id: 46ddf008b8
Former-commit-id: 17eff5c7bcf326f80da2ab7de13763602e79ffb9 [formerly 5145bb9e7e]
Former-commit-id: d1ce0844e3
 2012-04-03 17:28:27 -05:00
James Korman
7a848dae25 Issue #437 - Adding roster api message handling. 
Former-commit-id: ffa4d5377f [formerly dcdb98319d] [formerly 4c7f2465fc] [formerly afeea4d9d2 [formerly 4c7f2465fc [formerly 8c7b4a55e6fa10e3e120e12334ba2d04d2d40a32]]]
Former-commit-id: afeea4d9d2
Former-commit-id: 77b08819fd1463e43c942fb3612d79bd289af01e [formerly f496523681]
Former-commit-id: 2307245201
 2012-04-03 16:57:27 -05:00
Roger Ferrel
6ca13f94ef Issue #244 Change user status now send Presence update to the server. 
Change-Id: Id0a455633693db251d03a85343f526905a9c4364

Former-commit-id: 7cc492b43c [formerly 3d9fcb3273] [formerly 78502719e9] [formerly 46addc13cf [formerly 78502719e9 [formerly fd8a0cad3ded983308f1f0d983a9f9a42ade7f2b]]]
Former-commit-id: 46addc13cf
Former-commit-id: 806bc0fd135adc0a6dd1389dacfb8fdca37c8725 [formerly 7cf6e6166d]
Former-commit-id: 06b9147bd2
 2012-04-03 16:20:07 -05:00
Roger Ferrel
5c5f8799fb Merge branch 'new_devel' into 11-Collaboration 
Former-commit-id: ea093e60c2 [formerly 6ae33324f3] [formerly b8df9f46e4] [formerly 395ae5ae63 [formerly b8df9f46e4 [formerly a441dcd259dbf3ecd77464d1bd0cbe1f4cdb1cb6]]]
Former-commit-id: 395ae5ae63
Former-commit-id: f40e950bca5418b047772f8ab1a47e5d6a510551 [formerly 5b943096c5]
Former-commit-id: 4b49ba50a7
 2012-04-03 15:29:53 -05:00
Max Schenkelberg
275030f23b Issue #239 Start of remote target capabilities 
Former-commit-id: 6e94ff6098 [formerly ac1fc79f5b] [formerly 6c411ffb07] [formerly d2d03e2c64 [formerly 6c411ffb07 [formerly 30b76609cff9a737b8e4190bbfebb5a37a259fad]]]
Former-commit-id: d2d03e2c64
Former-commit-id: 320620d9bdec1aae5cb62ad9138b5b802bf7ddf7 [formerly 5d7e504e89]
Former-commit-id: 3b9699d896
 2012-04-03 15:11:20 -05:00
Roger Ferrel
ca1e1abaee Issue #244 Peer to Peer chat implemented. Change Passwor implemtned. 
Change-Id: I4949d5ff82a1046d344cd63e32842b2d67717681

Former-commit-id: ce37b8ff40 [formerly 1db237e408] [formerly 7d7ee81855] [formerly 9dd257f28a [formerly 7d7ee81855 [formerly dde6ebb7a4ce4cdee62b1d4e31d33694c331309e]]]
Former-commit-id: 9dd257f28a
Former-commit-id: 92524bcc01705c62843e81ef79fc9be0b92157cd [formerly 813e91d1cc]
Former-commit-id: 034540cb01
 2012-04-03 13:28:40 -05:00
Max Schenkelberg
228ccb613b Merge branch '11-Collaboration' of ssh://lightning.omaha.us.ray.com:29418/thunder into 11-Collaboration 
Former-commit-id: 6a3162d5b8 [formerly ccde60b87e] [formerly e78aad4bc5] [formerly 138114e3dc [formerly e78aad4bc5 [formerly 5bd4a3ccbcb84443eb342670c2a4ea6e083527b7]]]
Former-commit-id: 138114e3dc
Former-commit-id: f23e954a5d5d3e8f71fa70f6593b6ce00ab3755f [formerly bdc8c572a5]
Former-commit-id: 52d1d31d7b
 2012-04-03 13:15:31 -05:00
James Korman
5f44b3505b Issue #232 - Corrected problem using participant identifiers 
Former-commit-id: 32d9bac2c5 [formerly 9387e6154c] [formerly b89a89def3] [formerly 96cd7bea11 [formerly b89a89def3 [formerly 5b102692838b42ffab97186742338494df78b978]]]
Former-commit-id: 96cd7bea11
Former-commit-id: f081524b8a1555bd32d5e7d61586122840674ca8 [formerly 46a646f7f7]
Former-commit-id: f86eef9ef6
 2012-04-03 12:45:00 -05:00
Matt Nash
398916d8da #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 8e16194370 [formerly 5cb40430a7 [formerly be35f7e75bbeb89fe160e24d9ff691f62753c96b]]]
Former-commit-id: 8e16194370
Former-commit-id: e258c6a2303e7abb5e8a1dcd44fafd1f26622886 [formerly ce79d3bec3]
Former-commit-id: f11fcc7d8e
 2012-04-03 12:23:11 -05:00
Nate Jensen
7c5b10222e Issue #427 open editor when joining session 
Change-Id: I6094a7a909584acb8b10236119ec3eb5dd965e59

Former-commit-id: d75858ffa0 [formerly 19bb87346c] [formerly 223eb82fe0] [formerly c29a5a75d9 [formerly 223eb82fe0 [formerly f1c0549a84b0aa0d4829ca1bc584165ca98dbbb6]]]
Former-commit-id: c29a5a75d9
Former-commit-id: fc1d5c60e4ec9729575efed47af8bb8e49d4f3b5 [formerly 6319166680]
Former-commit-id: b740924cdc
 2012-04-03 08:44:58 -05:00
Max Schenkelberg
f3ff93f96f Merge branch 'ss_sync (12.3.1)' into 11-Collaboration 
Former-commit-id: 0b1caa67df [formerly c56707c6bc] [formerly 23d65caf2e] [formerly 753de872e0 [formerly 23d65caf2e [formerly e8402b080c7d2a712f4f385293aa9b5d1a18484e]]]
Former-commit-id: 753de872e0
Former-commit-id: adc59a45b53d18b81a0ef2d2163602690fcd76f2 [formerly e3477c90ae]
Former-commit-id: c7165384f1
 2012-04-02 16:15:21 -05:00
Roger Ferrel
bdb0fd86c6 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 dbec72645a [formerly 146a421ccb [formerly 89978ed4bcf7c3b65c6038c6403874ba812f835b]]]
Former-commit-id: dbec72645a
Former-commit-id: a4c58eddc7662ec65730b4e49c7cf78697573cb8 [formerly bd37fffbeb]
Former-commit-id: 63bfc3a073
 2012-04-02 12:13:26 -05:00
Matt Nash
8cfbc1e384 Issue #429 fix minor issues with toolbar and updated eraser code 
Former-commit-id: 48eb644d69 [formerly 25a539a1c8] [formerly 27e850d203] [formerly 236ae6f26c [formerly 27e850d203 [formerly f6f3bcc2596735c8371256f4274c9b9e21445f1a]]]
Former-commit-id: 236ae6f26c
Former-commit-id: c7bbc8af81d1470fb9f760fffe73f1516e976a49 [formerly 0a97f20f3a]
Former-commit-id: 5e3bebc033
 2012-03-30 16:35:02 -05:00
Roger Ferrel
5bb351c6a9 Issue #244 Active Sessions node only displays rooms the user is in. 
Change-Id: I2a0ba28e4519102fe26498eb578e83c4a92163a4

Former-commit-id: d0b78dff9e [formerly fac1db8b37] [formerly 442500aeae] [formerly 232df64e22 [formerly 442500aeae [formerly 17c8ca27316951cb97c48c8172d669cc65bbd6cd]]]
Former-commit-id: 232df64e22
Former-commit-id: 8f5c3def1b69709d11f92f1d49bd0b55d0b70089 [formerly 21b19df9db]
Former-commit-id: a8b643dc2a
 2012-03-30 15:06:35 -05:00
James Korman
ea6d408a9e Issue #232 - Modified invitation methods 
Former-commit-id: 80ea4c0104 [formerly a907eeb4ed] [formerly 436b967ff1] [formerly 0b6a076129 [formerly 436b967ff1 [formerly 1c9381e1ba1a8b01084717db7ff3e94b26eb0b89]]]
Former-commit-id: 0b6a076129
Former-commit-id: 110dbacc4d32bab470b9fd9825b11ea1516e3ff2 [formerly 48fb9fe7e4]
Former-commit-id: ae115263ce
 2012-03-30 11:27:09 -05:00
Max Schenkelberg
ea7fcde242 Issue #358 Fixed merge errors when merging core_exp into ss_sync 
Former-commit-id: 25cf44a674 [formerly 74458bfb73] [formerly 9b0d01f8b5] [formerly 07cf5069ba [formerly 9b0d01f8b5 [formerly beb6a1d49fac8e3e7b2ba8cbc52a8980d06e9885]]]
Former-commit-id: 07cf5069ba
Former-commit-id: bf3b4f5b4265812c5767225a4547be327787f7dd [formerly 993cac891e]
Former-commit-id: 4234b91d5b
 2012-03-30 10:51:31 -05:00
Roger Ferrel
36cba09ccb Issue #244 Send and accept invites now works. 
Change-Id: I8d2c5e04f0d7dab6eb81a7321130533e5cfd6148

Former-commit-id: 4e48f2c007 [formerly dc50eb06d7] [formerly 22fff3a4b8] [formerly 108ac66214 [formerly 22fff3a4b8 [formerly 6929e4f068cc397d253b3fabd712e093c4c16dbe]]]
Former-commit-id: 108ac66214
Former-commit-id: 737fe76ebc1e23495d7116a07b8528bef6de9d05 [formerly 1fd4aa5cf3]
Former-commit-id: d3a8343de0
 2012-03-30 10:45:26 -05:00
Steve Harris
c6071e24c5 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 5cdda77afb [formerly d3ad6095b7 [formerly 879a2e0a4a31999bf4d624ff59e77bbd68195458]]]
Former-commit-id: 5cdda77afb
Former-commit-id: a5d7cad4cf9dcde7d77f5ce8ca8a3ccca2fdde58 [formerly 6aa18f74f6]
Former-commit-id: 9845ef53f9
 2012-03-30 09:50:48 -05:00
Steve Harris
11e448aa39 12.3.1-10 baseline 
Former-commit-id: 760ead2047 [formerly 0e4128712b] [formerly 4068f5295f] [formerly 22bd792cd9 [formerly 4068f5295f [formerly 7d62bca046401a670ef7bd917cbcbb073e061b60]]]
Former-commit-id: 22bd792cd9
Former-commit-id: b700b47e15bf8e3b38455fe3bf3c827edd272477 [formerly ce3b74c605]
Former-commit-id: 8bc60b1e32
 2012-03-30 08:38:33 -05:00
Roger Ferrel
103827c7eb Issue #244 Gett color coding on messages 
Change-Id: Ibe54e07c26336899198093b0a104f8796ebc0d47

Former-commit-id: a3daafd560 [formerly 24affbfe73] [formerly 9bd5aa57b6] [formerly d9ca310d94 [formerly 9bd5aa57b6 [formerly 3fa0c543f02ccb556b5d1898e359f1e2b6e63819]]]
Former-commit-id: d9ca310d94
Former-commit-id: d5c8a8cdcdb8458628c53f51a75da196cc234d16 [formerly 30fe4140ba]
Former-commit-id: 7ebba67ec3
 2012-03-29 16:52:11 -05:00
Nate Jensen
4c0398406e Merge "Issue #232 - Added support for session creation from invitation" into 11-Collaboration 
Former-commit-id: a2f8042f73 [formerly 97898c1a3c] [formerly 7facfe9b7c] [formerly 0338159662 [formerly 7facfe9b7c [formerly 459aa33b196c8c37897575636ae670505d959330]]]
Former-commit-id: 0338159662
Former-commit-id: 3124eb7bcf67afb0f9b3ceb6729a2ec7bf4e8522 [formerly 40839a5c6e]
Former-commit-id: 43f59bf791
 2012-03-29 16:32:15 -05:00
James Korman
1ff41ef8d7 Issue #232 - Added support for session creation from invitation 
Former-commit-id: f0580d9c1f [formerly 08db3b2920] [formerly d048f0f324] [formerly 6381932f6e [formerly d048f0f324 [formerly 7d17d39b73ff66275ba247bd21e28b468ae87892]]]
Former-commit-id: 6381932f6e
Former-commit-id: 8c5ebd3d5cf4e6660db94269c72ad7893d1de017 [formerly 2eedb16808]
Former-commit-id: ea7a6ea10b
 2012-03-29 16:30:29 -05:00
Nate Jensen
cff197dce8 Issue #427 clean up 
Change-Id: Id4bc3b27bfcbc324138a11998255a6f662f31255

Former-commit-id: 6ce796108f [formerly ddfab0e4e3] [formerly d60fcaa4f3] [formerly a85aa4595f [formerly d60fcaa4f3 [formerly 9eb405723f355343545b1f9d4fe3925d9d1a1f24]]]
Former-commit-id: a85aa4595f
Former-commit-id: ab19b6732644883121451944d78d207ba21f4faf [formerly 14883dfa58]
Former-commit-id: d775bee7ae
 2012-03-29 15:45:16 -05:00
Nate Jensen
d0faddc33a Merge "Issue #429 added wrong cursor code" into 11-Collaboration 
Former-commit-id: 8da45f26b2 [formerly 5f09f55f6b] [formerly b7fda1f852] [formerly 9ce74d9430 [formerly b7fda1f852 [formerly d99655bcb8042378594ef31ad52305120808ca7e]]]
Former-commit-id: 9ce74d9430
Former-commit-id: 70699592bd222de1179b07bbb30d06b9f321ff7e [formerly 25cf424a42]
Former-commit-id: 2c4a626723
 2012-03-29 14:36:24 -05:00
Steve Harris
082c9136eb Issue #244 Roster groups now display and improved presents. 
Change-Id: I7965201692cab4472ce85d2525e39cf3823ab16f

Former-commit-id: 13821eae48 [formerly b4aa83517d] [formerly bf55bc0d86] [formerly c27ee0903c [formerly bf55bc0d86 [formerly 7f4e485aae341b11beb4a55c895a86cd6ff13635]]]
Former-commit-id: c27ee0903c
Former-commit-id: 3a6fa3d350a3772089c61ec046b095783245f807 [formerly fbdf4d5c37]
Former-commit-id: 8bda505069
 2012-03-29 14:36:53 -05:00
Matt Nash
4c44a6824b Issue #429 added wrong cursor code 
Former-commit-id: d18ed573eb [formerly c1ee2d1718] [formerly 4e003f8723] [formerly 3d81840532 [formerly 4e003f8723 [formerly 88143adba6d493b49f87da30773bdd205a6e7948]]]
Former-commit-id: 3d81840532
Former-commit-id: 84963db7a0c7cdc0da49dace56a590ffafba84c1 [formerly acf376e126]
Former-commit-id: 3a890f0c68
 2012-03-29 13:46:21 -05:00
Matt Nash
910a9447a4 Issue #429 fix proxied handler error, added toolbar for drawing tool 
Former-commit-id: 89b9d575ff [formerly 057ffedb23] [formerly 89d401550a] [formerly 9beef61917 [formerly 89d401550a [formerly 5728e687e79a54da8313b444a48db18c6671e79e]]]
Former-commit-id: 9beef61917
Former-commit-id: c1a428c83f39039d8711dd56a44b9155703dfd85 [formerly 18291c4101]
Former-commit-id: fdde739063
 2012-03-29 12:24:27 -05:00
Nate Jensen
274e2df586 Issue #427 Right click on editor tab support 
Change-Id: Ia9240a01c145c81bbf98268d4df5fd2242ca7987

Former-commit-id: a4965d6bf9 [formerly 202bd0adf8] [formerly d2d3a245b3] [formerly aa000b4b06 [formerly d2d3a245b3 [formerly 7597db5bbc0642072143e4c7ea0291108154eb40]]]
Former-commit-id: aa000b4b06
Former-commit-id: a6d73562ce75aff32ab9bfe5f1b0ddce7553fd0c [formerly 6aae45687a]
Former-commit-id: 9792be406a
 2012-03-29 10:44:08 -05:00
James Korman
afa5959912 Issue #232 - Added message routing/corrected roster creation 
Former-commit-id: 08704e35ea [formerly 8dde3a0798] [formerly b45ea1e0a7] [formerly 6149d30b13 [formerly b45ea1e0a7 [formerly b7040976e3c8fd029a0d821511f977cfd4b4888e]]]
Former-commit-id: 6149d30b13
Former-commit-id: da3c8be6247c3d87d4c725b5a9091556aed4e49b [formerly 7f12149d98]
Former-commit-id: 842b2c6f7d
 2012-03-29 10:16:15 -05:00
Steve Harris
239813406d Merge branch 'sync_test' (VCModules) into ss_sync 
Former-commit-id: b05701d2d7 [formerly 0665862abe] [formerly 70357d90bc] [formerly a0abcf8120 [formerly 70357d90bc [formerly e68338cecbe85a62835633e9aba0925344fb80f1]]]
Former-commit-id: a0abcf8120
Former-commit-id: 7c1f75dd0fbc3e3a61f9128ed10a9a9c268a43da [formerly 6884520750]
Former-commit-id: 65aa72fee7
 2012-03-29 10:03:05 -05:00
Nate Jensen
418fa15cc7 Merge "Issue #429 telestrator merging" into 11-Collaboration 
Former-commit-id: 5999d295f4 [formerly aaba32c4c1] [formerly cf880ddd0d] [formerly 676746126c [formerly cf880ddd0d [formerly eda16f8aa5a9aa88a8e947070d8e9df32c36c114]]]
Former-commit-id: 676746126c
Former-commit-id: 0db4f826ae255081ca710d80835f257db3c69ddc [formerly ec0896c28d]
Former-commit-id: 7d5d70bf55
 2012-03-28 15:10:34 -05:00
Matt Nash
0717f545ca Issue #429 telestrator merging 
Change-Id: I18f8f283db617d0865b274dcf6003a24e2cf2028

Former-commit-id: f5eee3d7cc [formerly b86ee8584f] [formerly d55dab5c34] [formerly 39670f6755 [formerly d55dab5c34 [formerly b1a679a2e37bdd7a887fffe82a3d735cdb60f7f9]]]
Former-commit-id: 39670f6755
Former-commit-id: 61b25ce243bb8fbf9e6499922e3ab168af901387 [formerly aeb022880c]
Former-commit-id: 4871565ff0
 2012-03-28 15:09:18 -05:00
Nate Jensen
4b4b9a03ce Issue #427 initial input event code 
Change-Id: I37dc96ed8dbef37d8e3f7a8ae39fc6fcad59f4aa

Former-commit-id: dc7c88c652 [formerly 40dd73ba4d] [formerly 5fdc253d77] [formerly bbf96992ee [formerly 5fdc253d77 [formerly 6297c04332bb349d8351b07e2ffd1c24c046ccd7]]]
Former-commit-id: bbf96992ee
Former-commit-id: 43d8d9028dd4a466a9034287dba2bdd45ddb912b [formerly a5d38a0968]
Former-commit-id: 8fbe658c89
 2012-03-28 14:34:25 -05:00
Max Schenkelberg
5fc757226e 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 f10f1a5319 [formerly 15a9245592 [formerly 265ccb3e22aa0122dbd74e83d0af202596c1941c]]]
Former-commit-id: f10f1a5319
Former-commit-id: 6d1ea66ba9a1390c296443e20785aa9ef4a890fa [formerly ac11dd0c18]
Former-commit-id: bbab188fb9
 2012-03-28 13:32:04 -05:00
Roger Ferrel
f1a9b8265c Issue #244 Clean up and Link editor to chat now works. 
Change-Id: I23b12fa44b8908b6a0c5ce79ca79ad73ff26df9d

Former-commit-id: 2c61bc2a50 [formerly fae1527331] [formerly 5d95a69f39] [formerly dc2f3316e6 [formerly 5d95a69f39 [formerly 51e85606ad7d7462ce84bb14bd4df0c792997a59]]]
Former-commit-id: dc2f3316e6
Former-commit-id: 27bd3129b256af64b1bce9adcab5ca25bc1e9327 [formerly 9712ba2751]
Former-commit-id: d29d2a1c92
 2012-03-28 11:23:51 -05:00
James Korman
f834bf7ca2 Issue #232 - Added addition peer-to-peer events 
Former-commit-id: 9791cc693a [formerly fc99959e3c] [formerly e8b23e3687] [formerly ae6eddcd68 [formerly e8b23e3687 [formerly 34994534b7e9b80b96e5ca038afef1977ba02383]]]
Former-commit-id: ae6eddcd68
Former-commit-id: 653449fc2f2973859a684acad815bda3e8ddda5c [formerly 0ff25a5258]
Former-commit-id: 356892acd6
 2012-03-27 16:31:26 -05:00
Nate Jensen
316ee943cd Issue #427 minor fixes 
Change-Id: I9788992b2de751f75ab2cc5112f2cf0492c214ad

Former-commit-id: 1952d1fbfe [formerly ab63accc61] [formerly fa8b5b3400] [formerly 0f25c8ffa6 [formerly fa8b5b3400 [formerly 40e9906f41f0fa2ae4c87d3c2a2acb2406fd4e25]]]
Former-commit-id: 0f25c8ffa6
Former-commit-id: ae7a75e9886a4da3c8fde7c46fdf504fd79b25c1 [formerly a692caba1c]
Former-commit-id: f1c0104885
 2012-03-27 09:56:46 -05:00
Nate Jensen
3320d18ed5 Issue #427 small improvements 
Change-Id: I9a28888dceb268ab62f60bc9686b0130da01ca0e

Former-commit-id: 2132a997ca [formerly 4180979cf4] [formerly 89d7f5ec7e] [formerly 80500eec9c [formerly 89d7f5ec7e [formerly 3a268a54417ee7ed6fcef6549b9c47b86fadfc82]]]
Former-commit-id: 80500eec9c
Former-commit-id: 9d8e2d15c09b14a4f1b60f41a2add68cea557677 [formerly 9602216cda]
Former-commit-id: 7d6bfd3a0b
 2012-03-27 09:42:39 -05:00
Nate Jensen
95d02a28f3 Merge "Issue #244 Tied CollaboratonEditor to the view." into 11-Collaboration 
Former-commit-id: 16d1762f6d [formerly fc5e53b1c2] [formerly c6e046f11e] [formerly b2655debe8 [formerly c6e046f11e [formerly f5ace8ee9561bb02311414ac82b0bbe93a5ff3b6]]]
Former-commit-id: b2655debe8
Former-commit-id: 923ca1bcfb8afff29f419a61aae88a15ffd4bf8e [formerly 43b58266c5]
Former-commit-id: 54469fd8b5
 2012-03-27 08:36:25 -05:00
Nate Jensen
40a55a68e8 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 d09c8a9383 [formerly d40b15acc2 [formerly 9dc29b49a619cca5613e72858099029b4ffc724e]]]
Former-commit-id: d09c8a9383
Former-commit-id: 178e1688c450a9e861bb089ca84a1c5258705ee0 [formerly f95cba545b]
Former-commit-id: 4a2d3cd071
 2012-03-27 08:36:15 -05:00
Nate Jensen
811c0bff6d Merge "Issue #232 - Added JAXB serialization support" into 11-Collaboration 
Former-commit-id: f9aa0e1d4c [formerly 4073ba7e7d] [formerly 978b76066c] [formerly ed44b0d93f [formerly 978b76066c [formerly 096bb25790809f6f0919d518a29dca4f36bbd7f7]]]
Former-commit-id: ed44b0d93f
Former-commit-id: 54c68ee512f0450e40dde713319fad1e53eb4602 [formerly 8b06b02281]
Former-commit-id: d62fc78291
 2012-03-27 08:32:19 -05:00
Roger Ferrel
9817fc2214 Issue #244 Tied CollaboratonEditor to the view. 
Change-Id: I67b9b2f9f1a71f1f131584cdb138c54788cac165

Former-commit-id: bd96e3040d [formerly 76f9c71d41] [formerly a270259553] [formerly d001287c94 [formerly a270259553 [formerly fd9eb8cbf048ce03bce27c4d1249596f5649d2a7]]]
Former-commit-id: d001287c94
Former-commit-id: a07ca5bee7be77863145825ee6241be901b91e09 [formerly 26122319db]
Former-commit-id: 8dae356572
 2012-03-26 17:30:51 -05:00
Roger Ferrel
9d523d8366 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 95d8d85fd0 [formerly b180f9b45e [formerly 4e4a705b98070d2e671133e6acc29dc72617505a]]]
Former-commit-id: 95d8d85fd0
Former-commit-id: 90b8c63352a86a05c76f20466c3ca0e3dd390d83 [formerly 8f75dd68de]
Former-commit-id: c132fbf641
 2012-03-26 17:30:50 -05:00
James Korman
83190cb431 Issue #232 - Added JAXB serialization support 
Former-commit-id: 56dd3e7c15 [formerly fc2bd8c666] [formerly 72e9c2eb52] [formerly 221a5a65b0 [formerly 72e9c2eb52 [formerly dd4502d4e7d38df28ebd93340d978653b32cd5f5]]]
Former-commit-id: 221a5a65b0
Former-commit-id: 47ece3d642df95a9db106bc8ce90b932a97a3afb [formerly 02bbe80c7c]
Former-commit-id: eff90a5c4b
 2012-03-26 16:48:04 -05:00