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

804 commits

This branch
This branch
All branches
Author SHA1 Message Date
Matt Nash
bf85a9c5b8 Issue #429 changing 'private' aspect 
Former-commit-id: e94db84585 [formerly eba8ac8dd9] [formerly 9887678590] [formerly 98350f4ba5 [formerly 9887678590 [formerly 4c475ace9b0803b40bc90eca71a800a1ca2da4b5]]]
Former-commit-id: 98350f4ba5
Former-commit-id: 841444a4f8bb6733bfb89cf8569094f97587343f [formerly d6731254d6]
Former-commit-id: 1c93a3d702
 2012-04-09 15:21:07 -05:00
Roger Ferrel
e29b208070 Issue #437 Change to up date Presence in the Group View. 
Change-Id: I59d4f4fcc14f59dc3017c118d3613f6f7040dca8

Former-commit-id: 61f3e1fb0e [formerly 225a8762d1] [formerly c5399687bc] [formerly 2109190752 [formerly c5399687bc [formerly b64a623cda4ec00d555d8542da496286e0210dac]]]
Former-commit-id: 2109190752
Former-commit-id: 22d05609434586e7662300f737604417f4a3acb6 [formerly 1e4ed16880]
Former-commit-id: 7be7bceeaa
 2012-04-09 15:16:19 -05:00
Slav Korolev
c158df01f8 Issue #449. Fixed problem with simulated time for trend plots in FSS 
monitors.

Former-commit-id: 273abf0ca5 [formerly bf5cf6a903] [formerly 8d29726365] [formerly f02da69ff5 [formerly 8d29726365 [formerly 79b81f2a734142d212d7bc0ad3686c7b64f433c5]]]
Former-commit-id: f02da69ff5
Former-commit-id: 7c520a3f99ccdf1fa13ed92436ba78b85df449ea [formerly 47ba302180]
Former-commit-id: 45d4f9fb86
 2012-04-09 14:50:19 -04:00
Bryan Kowal
b211dd30d2 Issue #18 - jvm argument names are no longer used when re-configuring setup.env; renamed variables that referenced jettyPort. 
Former-commit-id: 1e2c3602c2 [formerly 898487c15c] [formerly 94b327d00f] [formerly 2386dd5890 [formerly 94b327d00f [formerly 1c18ec39ea8a1bf1867ee96d6a33a9c595951d1f]]]
Former-commit-id: 2386dd5890
Former-commit-id: 3b24d926ddb3ebbebc0f6748565aa093085dcc7c [formerly 5395b66d6e]
Former-commit-id: ee210d909f
 2012-04-09 13:15:50 -05:00
Matt Nash
638bc4ea08 Issue #429 add resource data to ISerializableObject file to fix error 
Former-commit-id: 47a24a20c2 [formerly 2a7698e284] [formerly 42ce0e72f0] [formerly b340718346 [formerly 42ce0e72f0 [formerly b8fc69fc6746566e83b19ed4dfa8611858332aac]]]
Former-commit-id: b340718346
Former-commit-id: 8ffec5acab3087d00d96c6843996f230186044ba [formerly 22aec07dfd]
Former-commit-id: 80da3ac38f
 2012-04-09 12:42:44 -05:00
James Korman
4d47a5bd03 Issue #437 - Updated Presence - Add properties and new constructor 
Former-commit-id: 3e0929bc19 [formerly 9aa0176bb7] [formerly 48397d1d95] [formerly 53dc047d3d [formerly 48397d1d95 [formerly 5f94c705fa50346aca0befcc8eca7b609e685719]]]
Former-commit-id: 53dc047d3d
Former-commit-id: 0f523247a9d4006ee425b68577045c883a21f008 [formerly 0d6a5312d1]
Former-commit-id: 9a7c440f2d
 2012-04-09 11:42:19 -05:00
Brad Gonzales
faaaedf5a7 Issue #440 added login icon. Changed Logon to Login. 
Former-commit-id: 5a1970c902 [formerly 008b670b6a] [formerly 44a83e92ed] [formerly 7937986b11 [formerly 44a83e92ed [formerly d2b9c7981006dad91c5781fe0df96113530491df]]]
Former-commit-id: 7937986b11
Former-commit-id: d66ee38a743e9cdf115c208d9f81a7a986381f5e [formerly 552ce918ef]
Former-commit-id: 8084909235
 2012-04-09 11:38:08 -05:00
James Korman
799c36fc42 Issue #437 - Add code to update and post roster presence changes. 
Former-commit-id: f631252562 [formerly 31a93f32ab] [formerly bb31e9e2ea] [formerly df0cdcb563 [formerly bb31e9e2ea [formerly 8c5406eb39e9bd8590817e5eda854e20866ebbae]]]
Former-commit-id: df0cdcb563
Former-commit-id: df208c8a5f493e9b29484d90e37b78e16afb2504 [formerly f535049780]
Former-commit-id: 5062cfd2a3
 2012-04-09 10:01:55 -05:00
Bryan Kowal
438e88cc58 Issue #18 - rename jetty.port to web.port; the default for web.port is now 8080. The wes2bridge utilities are now built from source. 
Former-commit-id: 476ad5de1f [formerly f49aadd9c8] [formerly 1afa927c33] [formerly 839d7c886f [formerly 1afa927c33 [formerly f11953c494fac20b2ad53b41069cfcb24281eb4a]]]
Former-commit-id: 839d7c886f
Former-commit-id: 52c4e4a8f476851151cdf69f82896ccf0b965430 [formerly 24148c19a9]
Former-commit-id: ab70749ea4
 2012-04-09 09:32:45 -05:00
Bryan Kowal
0591ab00cc Merge branch '9-Wes2Bridge' of ssh://lightning:29418/thunder into 9-Wes2Bridge 
Former-commit-id: 4d73e617c8 [formerly 21ff4bf657] [formerly f1e81b1a95] [formerly dcc3c7bb59 [formerly f1e81b1a95 [formerly f0c0e0692dae0ee53a43b714be9dfb6df0f4c7a6]]]
Former-commit-id: dcc3c7bb59
Former-commit-id: d309520ea9fa039612c8a81873e58c06eedee69b [formerly 240c3a1806]
Former-commit-id: 774d05de1b
 2012-04-09 09:19:02 -05:00
Max Schenkelberg
c19de5dcc3 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: 65e7184cc4 [formerly a5fa19c914] [formerly cbe92bdf32] [formerly 6812c1ba2b [formerly cbe92bdf32 [formerly c7badfd1c2a77d410cd3b841fef967c07c9e6434]]]
Former-commit-id: 6812c1ba2b
Former-commit-id: a24149c0db6c44d2a20bc8fb7a45708e704473a7 [formerly 824b24dfcb]
Former-commit-id: 532f2d691b
 2012-04-06 10:23:24 -05:00
Matt Nash
8e9e8b1c18 Issue #429 remove unused com.raytheon.viz.drawing plugin 
Former-commit-id: 30c3a6b53c [formerly 922fffeeed] [formerly af0513690d] [formerly 5bd8e5e47c [formerly af0513690d [formerly b02beff8d7beb6f33e5bcdcfb72a423d7f18584e]]]
Former-commit-id: 5bd8e5e47c
Former-commit-id: 4e43e26431e7cd66057f3709784fff899ebcb823 [formerly 437aa74095]
Former-commit-id: 803d45adfe
 2012-04-06 07:16:15 -05:00
Nate Jensen
788e4610bb Issue #444 initial role transfer code and some cleanup 
Change-Id: I45abf42df8da789532a4420259065fbb1f7ed04f

Former-commit-id: e1fb02a18e [formerly 28684fd160] [formerly c844026ff0cf81c160ed04f062d39ae45428738c [formerly c1543afc44]] [formerly 0ef84129c4 [formerly c1543afc44 [formerly c7276b7fddee718fd47f1f1b3fb75d5b483e62fc]]]
Former-commit-id: 0ef84129c4
Former-commit-id: 6358fcd88066c928d88642b03cca77b80dc49efc [formerly ac109d3e72]
Former-commit-id: c5130d8361
 2012-04-05 17:49:12 -05:00
David Gillingham
c39ee5a3c0 Issue #435: Prevent NullPointerExceptions from being thrown when 
serializing AirepRecords and NcAirepRecords.

Issue #435: Address peer review comments on previous change.

Change-Id: I7af20fd0d0d12c819c8df8aaba12318dcba574ac

Former-commit-id: 3b47db9541 [formerly 5193184abf] [formerly 87142f9f4e] [formerly e0e57577ff [formerly 87142f9f4e [formerly d2e45df86fb0dbbe234c55cdb0cfc9cb31b71c43]]]
Former-commit-id: e0e57577ff
Former-commit-id: f9200a739ae6f82c440eea10738de05476856c19 [formerly 84f0765dba]
Former-commit-id: bef6e3d504
 2012-04-05 15:49:23 -05:00
Max Schenkelberg
4fbb7ea290 Issue #239 Added remote capability injection code through factory 
method. Cleaned up old/unmaintained 3D references

Former-commit-id: e525c9c35d [formerly 48ca9ca105] [formerly 54aaf05209] [formerly 16056d53c5 [formerly 54aaf05209 [formerly e3b171f34fb7610f4f5796d0dcdf32f7a298c8ca]]]
Former-commit-id: 16056d53c5
Former-commit-id: 265f2d1efade092dd1793dfa515ef1708447df02 [formerly b4b754c7cc]
Former-commit-id: 20ad9fe872
 2012-04-05 13:52:20 -05:00
Matt Nash
0d348a7133 Issue #429 alert of new messages when in background 
Former-commit-id: 7e6c9ae5b2 [formerly 5d0ae7ff9f] [formerly d62a660e52] [formerly f314b2475d [formerly d62a660e52 [formerly 8e8fbe73b41f6457c085ab11939fdbd1242d4383]]]
Former-commit-id: f314b2475d
Former-commit-id: 2d3eb9b2cc8eee90ec0b299c23462e14c6474380 [formerly 7edacef530]
Former-commit-id: 95f85cde78
 2012-04-05 12:38:35 -05:00
Matt Nash
c090e70e60 Issue #429 clear,undo,redo 
Former-commit-id: ca62e2ef7f [formerly 52c0508781] [formerly c53719be8a] [formerly 328d7e1287 [formerly c53719be8a [formerly 69fcd977767dec591f2132cc6b13f9e48a3180b0]]]
Former-commit-id: 328d7e1287
Former-commit-id: c69a919b5228950032736860af83f5f74049f499 [formerly 7dd1657774]
Former-commit-id: 27c3cf3f38
 2012-04-05 11:49:57 -05:00
Matt Nash
aa10e7b505 Issue #429 telestrator allows all users to draw 
Former-commit-id: 31f63e0cd0 [formerly 916b8428e4] [formerly f200e37a36] [formerly 09c022bda8 [formerly f200e37a36 [formerly ed59b0803da528f391db3c71aac1184581cc353d]]]
Former-commit-id: 09c022bda8
Former-commit-id: 229755d5b98679de40f3d5d0f5e10d09a00c8399 [formerly fd1b123912]
Former-commit-id: f985ddaa7e
 2012-04-05 10:27:10 -05:00
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
Bryan Kowal
f24e7a4d31 Issue #18 - fix port conflicts that prevented multiple instances of edex request from starting; fix a problem that prevented the selected http port in setup.env from propogating throughout the edex instances. 
Former-commit-id: 5f9463bc57 [formerly 3e039dc79f] [formerly e792b2a16f] [formerly 2ed20e107d [formerly e792b2a16f [formerly 6b206773eff05abf20ecc87b27e96c47b67ba600]]]
Former-commit-id: 2ed20e107d
Former-commit-id: f64428b1eaf89e8c4b8fc84f44d88dfab230717f [formerly 5f4d6f600a]
Former-commit-id: edb7431d0a
 2012-04-04 18:29:13 -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
David Gillingham
0fd14b8a0b Issue #435: Ensure associated HDF5 data is always captured when 
archiving PDOs, alter binlightning so insert time is based on
system time like all other plugins.

Change-Id: I450a0a9b44ef2334b6f9f37f4d6a4a3f900ddee2

Issue #435: Add comment to previous change as requested by peer review, fix binlightning insert time.

Change-Id: I450a0a9b44ef2334b6f9f37f4d6a4a3f900ddee2

Former-commit-id: ae703513d7 [formerly c9d5823d2c] [formerly a9398fe4cd] [formerly e0e8e6d00a [formerly a9398fe4cd [formerly cefe2475f239ccd73b72f74f8571c8eee13267f0]]]
Former-commit-id: e0e8e6d00a
Former-commit-id: 0f166301c2c892f4b1314f13084e1d03103fbf79 [formerly b4439bc5e8]
Former-commit-id: 4ff79099ac
 2012-04-03 14:16:33 -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