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

334 commits

Author SHA1 Message Date
Nate Jensen
c98cf48092 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: ff36181458 [formerly 0f20bba406] [formerly ff36181458 [formerly 0f20bba406] [formerly 9b4b691ca9 [formerly 4aa478bd573ad7d9a801658c37a1d229d7bf5862]]]
Former-commit-id: 9b4b691ca9
Former-commit-id: 929365719e [formerly ae769c490b]
Former-commit-id: a554e754bd
 2012-04-10 18:15:36 -05:00
Bryan Kowal
3806dad754 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: 5d1892242a [formerly 82783e27fd] [formerly 5d1892242a [formerly 82783e27fd] [formerly 3baf9d03c2 [formerly b1420977f92e3b5b206f33ce2e1275aee53cc2ae]]]
Former-commit-id: 3baf9d03c2
Former-commit-id: 929a056e1b [formerly 61d0a876dd]
Former-commit-id: c8ae36a6b2
 2012-04-10 17:40:58 -05:00
Brad Gonzales
86360a2744 Issue #440 keep login window up when a username or password is incorrect. 
Former-commit-id: 7229f9b92a [formerly ac35f8f2fb] [formerly 7229f9b92a [formerly ac35f8f2fb] [formerly 107c8ba7b9 [formerly dc4bf6dfbb2f0c58f9986b524ad49f18656cebc7]]]
Former-commit-id: 107c8ba7b9
Former-commit-id: 7d7e792ed8 [formerly 1b7e35f876]
Former-commit-id: c25f8c2ee2
 2012-04-10 17:20:38 -05:00
Roger Ferrel
2327436f8a Issue #437 Added change status menu option. 
Change-Id: Ie4b1d453aa3e75b77e360c26dcc838c13b7b6223

Former-commit-id: ced485f863 [formerly 69ea7c724e] [formerly ced485f863 [formerly 69ea7c724e] [formerly 020be00301 [formerly 82ae4e9433e71e9027566aed4595046ce0ef6dfa]]]
Former-commit-id: 020be00301
Former-commit-id: 40b73d902c [formerly 8fa193bcbe]
Former-commit-id: ca8d18c8f9
 2012-04-10 16:50:26 -05:00
Bryan Kowal
07e4ddc1b9 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: b1a5abc6b3 [formerly 6ddeef48fa] [formerly b1a5abc6b3 [formerly 6ddeef48fa] [formerly ce99417a2a [formerly b6c8b811ad911f13503859f7af09b916eb16a1d4]]]
Former-commit-id: ce99417a2a
Former-commit-id: 541fe8fbbb [formerly 10a291afa1]
Former-commit-id: 47c7cba3f5
 2012-04-10 16:42:36 -05:00
James Korman
cb8d2f17ff Issue #437 - Updates to status handling - Added SessionManager user presence. 
Former-commit-id: 44eae46180 [formerly 7bf01ecbc9] [formerly 44eae46180 [formerly 7bf01ecbc9] [formerly 07bc1bf83e [formerly 77520e5b98de679a1f08b523fb85464a31bd4c02]]]
Former-commit-id: 07bc1bf83e
Former-commit-id: 8afc2bc1a8 [formerly 7272ede3c4]
Former-commit-id: d8e1fad3c0
 2012-04-10 15:55:12 -05:00
Max Schenkelberg
5977b8bcba Issue #239 Got zoom/pan events working for remote users 
Former-commit-id: 65f6c07530 [formerly 6e0c5c3cdf] [formerly 65f6c07530 [formerly 6e0c5c3cdf] [formerly 18e9f2c6ad [formerly a817a720868fe887deca6ce6589014f0cd439c2d]]]
Former-commit-id: 18e9f2c6ad
Former-commit-id: 9853d46099 [formerly 0d21a9a35e]
Former-commit-id: dbd37bb4ae
 2012-04-10 14:40:51 -05:00
Matt Nash
4a3b1b2591 Issue #429 comment out ability to start in debug mode for the connection 
Former-commit-id: 62564ebb0c [formerly 202fe2bb5e] [formerly 62564ebb0c [formerly 202fe2bb5e] [formerly f05b486e33 [formerly 8293c897e3b11c026b2f07eb45e72f48897f8d9f]]]
Former-commit-id: f05b486e33
Former-commit-id: 96f45cdb58 [formerly 52e27b63f7]
Former-commit-id: fb87eac0a7
 2012-04-10 13:22:42 -05:00
Roger Ferrel
1923bf67ed Issue #437 User status now properly displayed and updated in sessions. 
Change-Id: I7b0e077cb87f97388fddff27b846ce856cb6a999

Former-commit-id: 7ebea1d964 [formerly d2e2fd8da3] [formerly 7ebea1d964 [formerly d2e2fd8da3] [formerly 3fd25ff1cf [formerly 8ee6d7cf1a8b7e0bd2fa0abfe016cb221c60f2b3]]]
Former-commit-id: 3fd25ff1cf
Former-commit-id: 16857ccb3a [formerly 57e809d913]
Former-commit-id: c259f5c643
 2012-04-10 11:11:26 -05:00
Nate Jensen
35316d2fe3 Issue #427 cleanup 
Change-Id: I3ae5c84feead4bccf49007ddb16a9ed61fa49024

Former-commit-id: 68a3867d06 [formerly 2e5272cff9] [formerly 68a3867d06 [formerly 2e5272cff9] [formerly ec92c842c4 [formerly 93a7d3b6f52331034efe1e02fdd073959eee56ee]]]
Former-commit-id: ec92c842c4
Former-commit-id: a16929c9bc [formerly a924bd6489]
Former-commit-id: 4ac068d140
 2012-04-10 10:35:03 -05:00
Brad Gonzales
f2f5f2725d Issue #440 Changed login icon to green. 
Former-commit-id: 0eefb140ac [formerly a378fea5d1] [formerly 0eefb140ac [formerly a378fea5d1] [formerly ca2a35d77c [formerly 69549e0e64ff8d14892db9e908692c47aeb3043c]]]
Former-commit-id: ca2a35d77c
Former-commit-id: d7421465f7 [formerly 8d170cd14b]
Former-commit-id: a18f4944a4
 2012-04-10 10:01:11 -05:00
Roger Ferrel
a7cd6a8ece Issue #437 Presence status sent out when logged on to the server. 
Change-Id: I44d0cfd8e37aeda4d0eadaf80b9c014494258164

Former-commit-id: 57abf56e09 [formerly b4c8d3a0d9] [formerly 57abf56e09 [formerly b4c8d3a0d9] [formerly 521127b589 [formerly 9391b95b6a26b34675370b3f7347fab4f08444e5]]]
Former-commit-id: 521127b589
Former-commit-id: 35c753c07f [formerly 946f7963c4]
Former-commit-id: 06933e6f92
 2012-04-09 16:00:25 -05:00
Matt Nash
b2aa6417c7 Issue #429 changing 'private' aspect 
Former-commit-id: eba8ac8dd9 [formerly 9887678590] [formerly eba8ac8dd9 [formerly 9887678590] [formerly 98350f4ba5 [formerly 4c475ace9b0803b40bc90eca71a800a1ca2da4b5]]]
Former-commit-id: 98350f4ba5
Former-commit-id: 1c93a3d702 [formerly d6731254d6]
Former-commit-id: f850f8ef2a
 2012-04-09 15:21:07 -05:00
Roger Ferrel
245e7171ac Issue #437 Change to up date Presence in the Group View. 
Change-Id: I59d4f4fcc14f59dc3017c118d3613f6f7040dca8

Former-commit-id: 225a8762d1 [formerly c5399687bc] [formerly 225a8762d1 [formerly c5399687bc] [formerly 2109190752 [formerly b64a623cda4ec00d555d8542da496286e0210dac]]]
Former-commit-id: 2109190752
Former-commit-id: 7be7bceeaa [formerly 1e4ed16880]
Former-commit-id: c620bc2ef5
 2012-04-09 15:16:19 -05:00
Matt Nash
a8366aca54 Issue #429 add resource data to ISerializableObject file to fix error 
Former-commit-id: 2a7698e284 [formerly 42ce0e72f0] [formerly 2a7698e284 [formerly 42ce0e72f0] [formerly b340718346 [formerly b8fc69fc6746566e83b19ed4dfa8611858332aac]]]
Former-commit-id: b340718346
Former-commit-id: 80da3ac38f [formerly 22aec07dfd]
Former-commit-id: 37671e80ad
 2012-04-09 12:42:44 -05:00
James Korman
a2f35b7885 Issue #437 - Updated Presence - Add properties and new constructor 
Former-commit-id: 9aa0176bb7 [formerly 48397d1d95] [formerly 9aa0176bb7 [formerly 48397d1d95] [formerly 53dc047d3d [formerly 5f94c705fa50346aca0befcc8eca7b609e685719]]]
Former-commit-id: 53dc047d3d
Former-commit-id: 9a7c440f2d [formerly 0d6a5312d1]
Former-commit-id: 1a5f500029
 2012-04-09 11:42:19 -05:00
Brad Gonzales
9fe4d27470 Issue #440 added login icon. Changed Logon to Login. 
Former-commit-id: 008b670b6a [formerly 44a83e92ed] [formerly 008b670b6a [formerly 44a83e92ed] [formerly 7937986b11 [formerly d2b9c7981006dad91c5781fe0df96113530491df]]]
Former-commit-id: 7937986b11
Former-commit-id: 8084909235 [formerly 552ce918ef]
Former-commit-id: 98d9c96a4f
 2012-04-09 11:38:08 -05:00
James Korman
bdf28406dc Issue #437 - Add code to update and post roster presence changes. 
Former-commit-id: 31a93f32ab [formerly bb31e9e2ea] [formerly 31a93f32ab [formerly bb31e9e2ea] [formerly df0cdcb563 [formerly 8c5406eb39e9bd8590817e5eda854e20866ebbae]]]
Former-commit-id: df0cdcb563
Former-commit-id: 5062cfd2a3 [formerly f535049780]
Former-commit-id: 21dead0af7
 2012-04-09 10:01:55 -05:00
Max Schenkelberg
54d8c44956 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: a5fa19c914 [formerly cbe92bdf32] [formerly a5fa19c914 [formerly cbe92bdf32] [formerly 6812c1ba2b [formerly c7badfd1c2a77d410cd3b841fef967c07c9e6434]]]
Former-commit-id: 6812c1ba2b
Former-commit-id: 532f2d691b [formerly 824b24dfcb]
Former-commit-id: a6c9c88b4f
 2012-04-06 10:23:24 -05:00
Matt Nash
57d981ed28 Issue #429 remove unused com.raytheon.viz.drawing plugin 
Former-commit-id: 922fffeeed [formerly af0513690d] [formerly 922fffeeed [formerly af0513690d] [formerly 5bd8e5e47c [formerly b02beff8d7beb6f33e5bcdcfb72a423d7f18584e]]]
Former-commit-id: 5bd8e5e47c
Former-commit-id: 803d45adfe [formerly 437aa74095]
Former-commit-id: 789a792adf
 2012-04-06 07:16:15 -05:00
Nate Jensen
bd482c4334 Issue #444 initial role transfer code and some cleanup 
Change-Id: I45abf42df8da789532a4420259065fbb1f7ed04f

Former-commit-id: 28684fd160 [formerly c1543afc44] [formerly 28684fd160 [formerly c1543afc44] [formerly 0ef84129c4 [formerly c7276b7fddee718fd47f1f1b3fb75d5b483e62fc]]]
Former-commit-id: 0ef84129c4
Former-commit-id: c5130d8361 [formerly ac109d3e72]
Former-commit-id: 8cc53dc431
 2012-04-05 17:49:12 -05:00
Max Schenkelberg
01bf183cf3 Issue #239 Added remote capability injection code through factory 
method. Cleaned up old/unmaintained 3D references

Former-commit-id: 48ca9ca105 [formerly 54aaf05209] [formerly 48ca9ca105 [formerly 54aaf05209] [formerly 16056d53c5 [formerly e3b171f34fb7610f4f5796d0dcdf32f7a298c8ca]]]
Former-commit-id: 16056d53c5
Former-commit-id: 20ad9fe872 [formerly b4b754c7cc]
Former-commit-id: 9bcd4b911a
 2012-04-05 13:52:20 -05:00
Matt Nash
330cf41623 Issue #429 alert of new messages when in background 
Former-commit-id: 5d0ae7ff9f [formerly d62a660e52] [formerly 5d0ae7ff9f [formerly d62a660e52] [formerly f314b2475d [formerly 8e8fbe73b41f6457c085ab11939fdbd1242d4383]]]
Former-commit-id: f314b2475d
Former-commit-id: 95f85cde78 [formerly 7edacef530]
Former-commit-id: 8c2de7189e
 2012-04-05 12:38:35 -05:00
Matt Nash
533259729a Issue #429 clear,undo,redo 
Former-commit-id: 52c0508781 [formerly c53719be8a] [formerly 52c0508781 [formerly c53719be8a] [formerly 328d7e1287 [formerly 69fcd977767dec591f2132cc6b13f9e48a3180b0]]]
Former-commit-id: 328d7e1287
Former-commit-id: 27c3cf3f38 [formerly 7dd1657774]
Former-commit-id: fb4d76d08b
 2012-04-05 11:49:57 -05:00
Matt Nash
9916b2c095 Issue #429 telestrator allows all users to draw 
Former-commit-id: 916b8428e4 [formerly f200e37a36] [formerly 916b8428e4 [formerly f200e37a36] [formerly 09c022bda8 [formerly ed59b0803da528f391db3c71aac1184581cc353d]]]
Former-commit-id: 09c022bda8
Former-commit-id: f985ddaa7e [formerly fd1b123912]
Former-commit-id: 9d21c94293
 2012-04-05 10:27:10 -05:00
Roger Ferrel
01fa3302df 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: d197ea6fd2 [formerly afc79a14f3] [formerly d197ea6fd2 [formerly afc79a14f3] [formerly 72bf5460d7 [formerly 898e1a503af21abef70afc734924332e7de249ee]]]
Former-commit-id: 72bf5460d7
Former-commit-id: 98c83d5322 [formerly f9aa115a2b]
Former-commit-id: 3dbb7266f9
 2012-04-05 08:09:15 -05:00
Nate Jensen
80914de8cf Issue #427 fixed subject 
Change-Id: Ieb5499e16b2c30169fe49eb06d73b8e3ede6ce70

Former-commit-id: d68efe319e [formerly b084156a30] [formerly d68efe319e [formerly b084156a30] [formerly 4999e547a1 [formerly 8908b81e0e47cfe112ad132a82f2b2cb1a0dd55e]]]
Former-commit-id: 4999e547a1
Former-commit-id: a20e542438 [formerly 477d1bb013]
Former-commit-id: 1e29a9f45c
 2012-04-04 17:06:00 -05:00
Bradley Gonzales
60d8ddce72 Issue #440 more descriptive login failure message 
Former-commit-id: 391f8e4d58 [formerly 6fc14461ee] [formerly 391f8e4d58 [formerly 6fc14461ee] [formerly 74ce6f2140 [formerly 909362d88423e3c5a39c73b5e5da2d2168f5ed91]]]
Former-commit-id: 74ce6f2140
Former-commit-id: 2d7e2b456e [formerly c345b2614e]
Former-commit-id: 7a125d179c
 2012-04-04 16:26:58 -05:00
Nate Jensen
900ad65c76 Issue #427 instantiate collaboration resource 
Change-Id: I5aa7ec5d7dfb3f2373730eb40dd9ea3178112d20

Former-commit-id: 9c4b29c3aa [formerly 260c7c10eb] [formerly 9c4b29c3aa [formerly 260c7c10eb] [formerly f06338bcd4 [formerly 5cd5a85bf836ade2da3b43b2797c2a65d61be461]]]
Former-commit-id: f06338bcd4
Former-commit-id: a2d7bdb709 [formerly 0f5b0f7e9e]
Former-commit-id: 2f8e80b254
 2012-04-04 14:05:12 -05:00
James Korman
b1ca31467c Issue #437 - Corrected venue command message loopback 
Former-commit-id: fad1fa7362 [formerly 23a2cd033a] [formerly fad1fa7362 [formerly 23a2cd033a] [formerly e663a9e5dc [formerly c3ba8bd9416f18358f2a976ee2104e4e614321c3]]]
Former-commit-id: e663a9e5dc
Former-commit-id: 9c924ccb25 [formerly 44b07395fb]
Former-commit-id: 27c2635ce2
 2012-04-04 13:41:25 -05:00
Matt Nash
0e37e6938f Issue #429 working telestration collaboration capabilities 
Former-commit-id: 86e2f1a7ad [formerly 3c2fcc59d0] [formerly 86e2f1a7ad [formerly 3c2fcc59d0] [formerly c27a3cf672 [formerly f1c9552a757e7d194e31ed9786cb358c53e631b7]]]
Former-commit-id: c27a3cf672
Former-commit-id: a7544fadf9 [formerly 28df06150e]
Former-commit-id: 64ef004e78
 2012-04-04 11:23:34 -05:00
Roger Ferrel
d5bf79f20d Issue #244 Fix bug in handleInvitationEvent 
Change-Id: Ic47628203707a8238b1d3c0982d177641bba53a9

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

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

Former-commit-id: 1db237e408 [formerly 7d7ee81855] [formerly 1db237e408 [formerly 7d7ee81855] [formerly 9dd257f28a [formerly dde6ebb7a4ce4cdee62b1d4e31d33694c331309e]]]
Former-commit-id: 9dd257f28a
Former-commit-id: 034540cb01 [formerly 813e91d1cc]
Former-commit-id: 0680f7fe4e
 2012-04-03 13:28:40 -05:00
Max Schenkelberg
178196ef0e Merge branch '11-Collaboration' of ssh://lightning.omaha.us.ray.com:29418/thunder into 11-Collaboration 
Former-commit-id: ccde60b87e [formerly e78aad4bc5] [formerly ccde60b87e [formerly e78aad4bc5] [formerly 138114e3dc [formerly 5bd4a3ccbcb84443eb342670c2a4ea6e083527b7]]]
Former-commit-id: 138114e3dc
Former-commit-id: 52d1d31d7b [formerly bdc8c572a5]
Former-commit-id: bcf4a5888f
 2012-04-03 13:15:31 -05:00
James Korman
b449399206 Issue #232 - Corrected problem using participant identifiers 
Former-commit-id: 9387e6154c [formerly b89a89def3] [formerly 9387e6154c [formerly b89a89def3] [formerly 96cd7bea11 [formerly 5b102692838b42ffab97186742338494df78b978]]]
Former-commit-id: 96cd7bea11
Former-commit-id: f86eef9ef6 [formerly 46a646f7f7]
Former-commit-id: 0ce49560c3
 2012-04-03 12:45:00 -05:00
Matt Nash
ea8bbffd0b #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: 217d707198 [formerly 5cb40430a7] [formerly 217d707198 [formerly 5cb40430a7] [formerly 8e16194370 [formerly be35f7e75bbeb89fe160e24d9ff691f62753c96b]]]
Former-commit-id: 8e16194370
Former-commit-id: f11fcc7d8e [formerly ce79d3bec3]
Former-commit-id: 76adccc98e
 2012-04-03 12:23:11 -05:00
Nate Jensen
cfc10b64f6 Issue #427 open editor when joining session 
Change-Id: I6094a7a909584acb8b10236119ec3eb5dd965e59

Former-commit-id: 19bb87346c [formerly 223eb82fe0] [formerly 19bb87346c [formerly 223eb82fe0] [formerly c29a5a75d9 [formerly f1c0549a84b0aa0d4829ca1bc584165ca98dbbb6]]]
Former-commit-id: c29a5a75d9
Former-commit-id: b740924cdc [formerly 6319166680]
Former-commit-id: 28ed07b65a
 2012-04-03 08:44:58 -05:00
Max Schenkelberg
8e521d2c29 Merge branch 'ss_sync (12.3.1)' into 11-Collaboration 
Former-commit-id: c56707c6bc [formerly 23d65caf2e] [formerly c56707c6bc [formerly 23d65caf2e] [formerly 753de872e0 [formerly e8402b080c7d2a712f4f385293aa9b5d1a18484e]]]
Former-commit-id: 753de872e0
Former-commit-id: c7165384f1 [formerly e3477c90ae]
Former-commit-id: 5ebb709ef6
 2012-04-02 16:15:21 -05:00
Roger Ferrel
6a9c473b0e Issue #244 Invite form Creat Session dialog implementd. Change code to use ParticipantRole enum. 
Change-Id: If1c7268bded530312d9c132edacef00cd1dcdfd2

Former-commit-id: 6aa7fb3d65 [formerly 146a421ccb] [formerly 6aa7fb3d65 [formerly 146a421ccb] [formerly dbec72645a [formerly 89978ed4bcf7c3b65c6038c6403874ba812f835b]]]
Former-commit-id: dbec72645a
Former-commit-id: 63bfc3a073 [formerly bd37fffbeb]
Former-commit-id: 7ff96826db
 2012-04-02 12:13:26 -05:00
Matt Nash
5794564ebd Issue #429 fix minor issues with toolbar and updated eraser code 
Former-commit-id: 25a539a1c8 [formerly 27e850d203] [formerly 25a539a1c8 [formerly 27e850d203] [formerly 236ae6f26c [formerly f6f3bcc2596735c8371256f4274c9b9e21445f1a]]]
Former-commit-id: 236ae6f26c
Former-commit-id: 5e3bebc033 [formerly 0a97f20f3a]
Former-commit-id: e7d6b86a2f
 2012-03-30 16:35:02 -05:00
Roger Ferrel
a866109133 Issue #244 Active Sessions node only displays rooms the user is in. 
Change-Id: I2a0ba28e4519102fe26498eb578e83c4a92163a4

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

Former-commit-id: dc50eb06d7 [formerly 22fff3a4b8] [formerly dc50eb06d7 [formerly 22fff3a4b8] [formerly 108ac66214 [formerly 6929e4f068cc397d253b3fabd712e093c4c16dbe]]]
Former-commit-id: 108ac66214
Former-commit-id: d3a8343de0 [formerly 1fd4aa5cf3]
Former-commit-id: e3f637d951
 2012-03-30 10:45:26 -05:00
Steve Harris
1556e72eeb 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: a4e4792bb5 [formerly d3ad6095b7] [formerly a4e4792bb5 [formerly d3ad6095b7] [formerly 5cdda77afb [formerly 879a2e0a4a31999bf4d624ff59e77bbd68195458]]]
Former-commit-id: 5cdda77afb
Former-commit-id: 9845ef53f9 [formerly 6aa18f74f6]
Former-commit-id: 9fee09c9e4
 2012-03-30 09:50:48 -05:00
Steve Harris
293563cfe7 12.3.1-10 baseline 
Former-commit-id: 0e4128712b [formerly 4068f5295f] [formerly 0e4128712b [formerly 4068f5295f] [formerly 22bd792cd9 [formerly 7d62bca046401a670ef7bd917cbcbb073e061b60]]]
Former-commit-id: 22bd792cd9
Former-commit-id: 8bc60b1e32 [formerly ce3b74c605]
Former-commit-id: 2e0f4b241b
 2012-03-30 08:38:33 -05:00