Commit graph

4062 commits

Author SHA1 Message Date
Ana Rivera
a9619b5bca VLab Issue #5194 - Ingest and Display NWPS data; fixes #5194
Change-Id: Ib617760363c10e72ee54fd9ca30656fd0b7bd02f

Former-commit-id: edfb394f22 [formerly 709d571947] [formerly edfb394f22 [formerly 709d571947] [formerly fe5bfbaa73 [formerly 6866439b0a7075f04146af4b4bdce59477269f4d]]]
Former-commit-id: fe5bfbaa73
Former-commit-id: 985e612d6d [formerly 8eaeb7b322]
Former-commit-id: ccbb684974
2014-12-02 15:44:07 +00:00
Zhidong.Hao
f12b569b26 ASM #15007 AvnFPS: TAF Editor 'Restore From' function not working properly
Change-Id: I6cd12030643a1bbc68b6be8cfb70961e4aac7234

Former-commit-id: 50f4e9a7fc [formerly b2260aa614] [formerly 50f4e9a7fc [formerly b2260aa614] [formerly 1e0ffe6a38 [formerly 96e179b48217dab20e8e657ed8e2a74410cf56ae]]]
Former-commit-id: 1e0ffe6a38
Former-commit-id: fc31ec7438 [formerly 2c427924b8]
Former-commit-id: cb638617e9
2014-12-02 10:13:53 -05:00
Slav Korolev
f4d9f7fb90 Omaha #3841 - Updated the dialogs for adding and editing a new zone/station.
Former-commit-id: f20361a507 [formerly 8763f67abf] [formerly f20361a507 [formerly 8763f67abf] [formerly dc1722a8b7 [formerly 5a7e13b6a6db5ca766da3ad957c12077470359e7]]]
Former-commit-id: dc1722a8b7
Former-commit-id: 76f0dab0ca [formerly c69cbc10be]
Former-commit-id: 8560c35c26
2014-12-02 09:09:05 -05:00
Ana Rivera
d2a979a0e5 VLab Issue #5472 - Revert VLab Issue #5034 (first NWPS code merge); fixes #5472
This reverts commit 227ca65a041b4cf1c6930926ce67b7f4394e1097 [formerly f1f5f2c717] [formerly 53b96c2b8e [formerly c245f3a3c4] [formerly 53b96c2b8e [formerly c245f3a3c4] [formerly f1f5f2c717 [formerly a72135fc85a602b67b929b6870edbaabf4dc8fc1]]]].

Change-Id: I631bb1722abea96e08967a8d9fa9f175a886f685

Former-commit-id: eb0253f820 [formerly 0e8473e91e] [formerly eb0253f820 [formerly 0e8473e91e] [formerly 5abf37ea62 [formerly 373acfce57d5e0044f13382b926cb2fc1f830e54]]]
Former-commit-id: 5abf37ea62
Former-commit-id: 79b19d6368 [formerly 7c3dd12351]
Former-commit-id: 899a9d762d
2014-12-02 13:43:03 +00:00
Nate Jensen
6a53100fb7 Omaha #3549 remove dead code
Change-Id: I17d4d7536e86d022726fa5cee389dad67fca9ee8

Former-commit-id: a4a3cc6deb [formerly faf88fc3cb] [formerly a4a3cc6deb [formerly faf88fc3cb] [formerly 731cf6fdbe [formerly b594cd797b675120634454ffffccbb785fd917ae]]]
Former-commit-id: 731cf6fdbe
Former-commit-id: d903df671b [formerly d28b902955]
Former-commit-id: 77892d1ba0
2014-12-01 15:23:48 -06:00
Zhidong.Hao
3385c51c37 ASM #624 GFE: default file save directory different from AWIPS 1
Change-Id: I71a9cc3f284ce1c05c3729afc4444362bd0ccd28

Former-commit-id: 9a65c297a6 [formerly 5fd962449b] [formerly 9a65c297a6 [formerly 5fd962449b] [formerly 58a27aeb75 [formerly e6d7e8b2bec9c7cebdf25618897443cff909879d]]]
Former-commit-id: 58a27aeb75
Former-commit-id: a336ce07d3 [formerly 1086bdcf98]
Former-commit-id: 6669d2e47c
2014-12-01 14:39:07 -05:00
Nate Jensen
223f259943 Omaha #3300 undo bad product file that merged from pda branch
Change-Id: I5425e002fcdbc78db66644dd04022767fae0acbd

Former-commit-id: fa378abf2a [formerly 584297e2aa] [formerly fa378abf2a [formerly 584297e2aa] [formerly ad8aadf385 [formerly 6155a8f3d541ee05d4d2f99cdd211e521d4ed19b]]]
Former-commit-id: ad8aadf385
Former-commit-id: ec05762f89 [formerly bf4e3b56d3]
Former-commit-id: 4048b90428
2014-12-01 12:19:14 -06:00
Zhidong.Hao
0ea82934aa ASM #649 BOIVerifySumTemps crashes on dbName
Change-Id: Iaf05fcbae36ca0afe4c7350b4acf512f8b25111c

Former-commit-id: 10257af037 [formerly cfe7f318d8] [formerly 10257af037 [formerly cfe7f318d8] [formerly 4d57e40049 [formerly 164a7a624780596376b68b7488257b94d4661e80]]]
Former-commit-id: 4d57e40049
Former-commit-id: 1d4b52e5ad [formerly 20d2c3987d]
Former-commit-id: b18ec06b44
2014-11-26 14:10:27 -05:00
Zhidong.Hao
53818b7aef ASM #633 GFE: SmartScript method loadParm() exception handler broken
Change-Id: Ic7bef317b06dd695889bcc72cceee4ef41b147bc

Former-commit-id: 0580bc3c94 [formerly a7019b2c0c] [formerly 0580bc3c94 [formerly a7019b2c0c] [formerly 1f19ce8a20 [formerly 12ed9574fa7f62d200d50419f88b8ab773930e7a]]]
Former-commit-id: 1f19ce8a20
Former-commit-id: ef8b20e25e [formerly 20a71df198]
Former-commit-id: 0932274b3f
2014-11-26 13:52:01 -05:00
steve.naples
5b67fa0f7c ASM #16889 - Daily QC does not display SNOTEL data.
Change-Id: I42035d5d4d856a395400a1be1d0c6a24bc64b0d8

Former-commit-id: 74aa7ae98b [formerly ec656123f2] [formerly 74aa7ae98b [formerly ec656123f2] [formerly a0face5b02 [formerly 01735909fffdc9b5ef14ed072253eed6deaecad9]]]
Former-commit-id: a0face5b02
Former-commit-id: ffb601d560 [formerly 5845c1d382]
Former-commit-id: 98e2feaf8d
2014-11-26 18:24:53 +00:00
Roger Ferrel
c79c325df6 Omaha #3866 Configuration files for GFS20KM for product and volume browsers.
Former-commit-id: da25f4588d [formerly 9b986c7cf8] [formerly da25f4588d [formerly 9b986c7cf8] [formerly 0df840602e [formerly 56833ab1b84e50c6ca4150d3c90501448233313b]]]
Former-commit-id: 0df840602e
Former-commit-id: 2d763dc64a [formerly 4ba718da37]
Former-commit-id: 975ee3aba9
2014-11-25 10:01:30 -06:00
Nate Jensen
cf303fb976 Merge "Issue #3026 - Fix for HPE displays is volume browser" into omaha_14.3.1
Former-commit-id: e4da2244f9 [formerly b46b4b51a8] [formerly e4da2244f9 [formerly b46b4b51a8] [formerly 63c505f357 [formerly 1cf731bc43346810f1976650ad509ee538cf3067]]]
Former-commit-id: 63c505f357
Former-commit-id: e2f2a73ae3 [formerly 102d0e7a29]
Former-commit-id: c99b5a5ae6
2014-11-21 15:46:16 -06:00
Nate Jensen
a01abd0ca5 Merge "Omaha #3709 Collaboration chat colors for PeerToPeerView" into omaha_14.4.1
Former-commit-id: 42caba5dc9 [formerly 737fa5c716] [formerly 42caba5dc9 [formerly 737fa5c716] [formerly 2f4b6deaee [formerly 68880c0426392a15fc1d05a423c381856b032634]]]
Former-commit-id: 2f4b6deaee
Former-commit-id: 7cea027028 [formerly deaabfbac8]
Former-commit-id: 281be7da90
2014-11-21 14:59:08 -06:00
Mike Duff
fab77b664b Issue #3026 - Fix for HPE displays is volume browser
Change-Id: I1ef2766e9bf74e7ad82cc36cd4e4a35659aacf39

Former-commit-id: 3ab236aca3 [formerly 67f3b00beb] [formerly 3ab236aca3 [formerly 67f3b00beb] [formerly c1bea3b41f [formerly a375e64e7ee3276be47b26f4386e7bc6491bc740]]]
Former-commit-id: c1bea3b41f
Former-commit-id: 04222b8e43 [formerly 3f0f42a7df]
Former-commit-id: aff7af3377
2014-11-21 13:56:46 -06:00
Mark Peters
0dd5b76917 Omaha #3709 Collaboration chat colors for PeerToPeerView
Change-Id: I78a5f13caa685c993a28293f6a110fd52b2b7b08

Former-commit-id: 10179bb1f4 [formerly 0332e4e693] [formerly 10179bb1f4 [formerly 0332e4e693] [formerly 3d43e87374 [formerly 341b54d6d23f08499345b8972a77acc9e2ca8c8b]]]
Former-commit-id: 3d43e87374
Former-commit-id: a800e0eb0b [formerly 6ff9cdd45b]
Former-commit-id: 80202e6821
2014-11-21 12:57:08 -06:00
Fay.Liang
bbdc78e867 Merge branch 'tcv_14.3.2' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.2
Former-commit-id: 14f518ff86 [formerly 744fc3f9d7] [formerly 14f518ff86 [formerly 744fc3f9d7] [formerly d4845b8b03 [formerly 21e36577299266c03c8d860afa844cae29538b0f]]]
Former-commit-id: d4845b8b03
Former-commit-id: dca4f4479a [formerly f53a91518c]
Former-commit-id: f1583bb7aa
2014-11-21 13:48:43 -05:00
Zihou Wang
de979397f4 VLab Issue #5020 - DCS_16776 Ingest and display MBA; fixes #5020
Change-Id: I5206e4efa240924caf07c4499bfb3b4cdf5aee5d

Former-commit-id: 8d24be996a [formerly 4fe74892ea] [formerly 8d24be996a [formerly 4fe74892ea] [formerly 5c86a177b7 [formerly e5e15da2f57e336d8f23444ab0932b710ad2c033]]]
Former-commit-id: 5c86a177b7
Former-commit-id: 30be251dc9 [formerly d4ca49f01d]
Former-commit-id: a47f4908e7
2014-11-21 15:42:48 +00:00
Ying-Lian.Shi
9cc833a566 ASM #646 GFE: Event end time cannot be set beyond 96 hours on the MakeHazard GUI
Change-Id: I83e1701be2417e7ee6c0223e192cb9e0731c761b

Former-commit-id: d5036028d9 [formerly 89fca6f761] [formerly d5036028d9 [formerly 89fca6f761] [formerly 58958ef423 [formerly 6341d72f458c62756f27c851f0db654ab901b7af]]]
Former-commit-id: 58958ef423
Former-commit-id: bbc3892a5e [formerly f55dd98ae8]
Former-commit-id: d1c3156ebc
2014-11-21 14:32:17 +00:00
Fay.Liang
2a82c86d9e Merge branch 'tcv_14.3.2' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.2
Former-commit-id: 4205453aa9 [formerly 00a63ad80c] [formerly 4205453aa9 [formerly 00a63ad80c] [formerly 5de19378ee [formerly 9daaa34c341929f784628782c98d5edcf9944ed2]]]
Former-commit-id: 5de19378ee
Former-commit-id: 6ea952ccc6 [formerly 5329eea699]
Former-commit-id: 749466a919
2014-11-21 09:31:58 -05:00
Ana Rivera
eb1f2809b0 Merge branch 'master_14.4.1' into emc_14.4.1
Change-Id: I4984b06810f3484e919a4a4a5853435ca34167bb

Former-commit-id: 02e630bc93 [formerly 1645ccd9ca] [formerly 02e630bc93 [formerly 1645ccd9ca] [formerly 1999049d90 [formerly c69e94f227cb908a9af2e1cd2db35b25bef28701]]]
Former-commit-id: 1999049d90
Former-commit-id: 0fcfcbc05b [formerly 95b016ef4e]
Former-commit-id: e5f6dae5bd
2014-11-21 14:23:49 +00:00
Ana Rivera
1cac098a78 VLab Issue #5408 - TCV Update: TCVDictionary.py (O&M RM14468); fixes #5408
Change-Id: If7b45b6415653efe11485956755cd7aaeb49356b

Former-commit-id: 144d7201a3 [formerly 250ba9f14c] [formerly 144d7201a3 [formerly 250ba9f14c] [formerly 4a4e53cab1 [formerly 82e3e8e69e7ebe738a84603c6f901d619004fe8a]]]
Former-commit-id: 4a4e53cab1
Former-commit-id: 9183d5c2bc [formerly 1d3efeb9d9]
Former-commit-id: ab3eea02bb
2014-11-21 13:19:59 +00:00
Mark Peters
819ff15009 Omaha #3768 Add localization to build.properties in uf.viz.aviation.advisory
Change-Id: I96afa121509b7e70fbb0113843924737330366a5

Former-commit-id: 34e3301c73 [formerly 5bff597f00] [formerly 34e3301c73 [formerly 5bff597f00] [formerly 55e6a1d8a2 [formerly 42faaabd5fb640add67bd1c68898e87af670db3e]]]
Former-commit-id: 55e6a1d8a2
Former-commit-id: cd91095ec7 [formerly 3f2ce8f8de]
Former-commit-id: 0def10d88e
2014-11-20 17:50:52 -06:00
Ron Anderson
76b3a4ab74 VLab Issue #4953 Build fix and another cleanup item.
Change-Id: I5d92df3f452259c93784cd19e75cc7efd8e04dc4

Former-commit-id: cd44c42d18 [formerly 9485f33476] [formerly cd44c42d18 [formerly 9485f33476] [formerly 8e4f2100cb [formerly 7a33861e7ac4475855778f50e0a5fca5227e5f97]]]
Former-commit-id: 8e4f2100cb
Former-commit-id: 898e4993b2 [formerly 5181e9ab47]
Former-commit-id: 0ebb70f6ae
2014-11-20 17:07:58 -06:00
Shawn Hooper
7f987bad7a VLab Issue #5395 - Update gfeConfig.py based on Pablo's email
Change-Id: I100a8d2bb79092bca2157bba018566a650c55f4a

Former-commit-id: 5773b07a29 [formerly 31d8337c56] [formerly 5773b07a29 [formerly 31d8337c56] [formerly 8376f3fce5 [formerly c5278c1a2d81d995ae9df252c461123bcc870320]]]
Former-commit-id: 8376f3fce5
Former-commit-id: 3661050896 [formerly d7d73c4635]
Former-commit-id: 0a72c2be37
2014-11-20 17:11:42 -05:00
Fay.Liang
d7f86a9a63 Merge branch 'tcv_14.3.2' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.2
Former-commit-id: 069db81e14 [formerly 99263f79e1] [formerly 069db81e14 [formerly 99263f79e1] [formerly 5bd22b74c6 [formerly 9dd4c18d8a4d2f8741ff7e79c2018bbe6cd10fe9]]]
Former-commit-id: 5bd22b74c6
Former-commit-id: acdabae0ab [formerly 7aa08b8ba4]
Former-commit-id: 59f64b29b1
2014-11-20 13:32:25 -05:00
Roger Ferrel
d310b78363 Issue #3439 Changed id=gfs90 to id=gfs to avoid confusion in these xml files.
Change-Id: I55b44a25196e9dcbc0a5e1417da1c39e5b978f3e

Former-commit-id: 4bcfb3ccaf [formerly 4d06812d30] [formerly 4bcfb3ccaf [formerly 4d06812d30] [formerly 71db8afbaa [formerly a9ce685c99dbdc1442f022cda7af09af5bdabf87]]]
Former-commit-id: 71db8afbaa
Former-commit-id: 1a39fc8b9c [formerly a188c5443b]
Former-commit-id: 77118778ae
2014-11-20 12:25:00 -06:00
Shawn Hooper
6699c18a7a VLab Issue #5395 - Build fixes and gfeConfig.py update
Change-Id: I94c02a82c7305dc9eb7d31bc941e6e7b0e4a7ba1

Former-commit-id: fd57e5334c [formerly b7369c5eef] [formerly fd57e5334c [formerly b7369c5eef] [formerly cf72b5753d [formerly 94093accc4b2adc4c12cea0a3af0e037c1be52d8]]]
Former-commit-id: cf72b5753d
Former-commit-id: 2f954d65be [formerly 330eae9f9e]
Former-commit-id: b6d1f3aef4
2014-11-20 13:12:16 -05:00
Ana Rivera
35dd2f3c52 Merge branch 'master_14.4.1' into field_14.4.1
Change-Id: I4ffce1e09a6ad2c8a2428907a8b8e2bcedcefe4c

Former-commit-id: 6749c3e52f [formerly b377106409] [formerly 6749c3e52f [formerly b377106409] [formerly 0fa5c4e483 [formerly ea2276a9ac116613b032828e4a4b82f67fc6ba8d]]]
Former-commit-id: 0fa5c4e483
Former-commit-id: 506895ce06 [formerly 729e77624e]
Former-commit-id: 8c29e1de8c
2014-11-20 16:17:42 +00:00
Ana Rivera
198c136131 VLab Issue #5388 - HTI Update: replace 'MFL' references with SITE in HTI.xml (O&M RM16791); fixes #5388
Change-Id: I69ead4e0ed1103ca21728e46fa654ebaa85258a0

Former-commit-id: ed6514067f [formerly 29ff0e472b] [formerly ed6514067f [formerly 29ff0e472b] [formerly c8a750b063 [formerly 27d2c6133b5563614b88fa03e3e706c6da2070a4]]]
Former-commit-id: c8a750b063
Former-commit-id: 2b181f5204 [formerly efdfe7dc36]
Former-commit-id: 02fd661e82
2014-11-20 13:57:19 +00:00
Fay.Liang
5c3a6d006c Merge branch 'tcv_14.3.2' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.2
Former-commit-id: a32ec39df2 [formerly 29561d5324] [formerly a32ec39df2 [formerly 29561d5324] [formerly 45b80432d6 [formerly 28c3dbd91c1e89ffffd19afa811a08e228a995dd]]]
Former-commit-id: 45b80432d6
Former-commit-id: a75d5d336d [formerly de4ab82df7]
Former-commit-id: e61707aefc
2014-11-19 22:07:54 -05:00
Ana Rivera
b776357dad Merge "VLab Issue #4953 Added support for managing JSON files in practice mode." into tcv_14.3.2
Former-commit-id: 419dc9ff10 [formerly 7dacc070d2] [formerly 419dc9ff10 [formerly 7dacc070d2] [formerly 40855f4ebd [formerly a0946643e3dab3f54c9d1d7a48dbb06b82207b55]]]
Former-commit-id: 40855f4ebd
Former-commit-id: 168fe90936 [formerly ae6d3b9e33]
Former-commit-id: babb82777c
2014-11-19 16:27:03 -05:00
Ana Rivera
b9cdd89b29 VLab Issue #5382 - HTI Update: add GFE templates (O&M RM16791); fixes #5382
Change-Id: I1a37fafbb9c2846749a33dd85772f53ccfb514df

Former-commit-id: befcdc96f9 [formerly 2c388bd379] [formerly befcdc96f9 [formerly 2c388bd379] [formerly af00fd8a98 [formerly 7d9cf7bfb3f513314608b6269f437061fc36d090]]]
Former-commit-id: af00fd8a98
Former-commit-id: 28033b25f7 [formerly dd4a60d370]
Former-commit-id: 9a2763a294
2014-11-19 20:29:42 +00:00
Ron Anderson
727b5f7c57 VLab Issue #4953 Added support for managing JSON files in practice mode.
Change-Id: I081a11bd2ed9370c32354a0c5728400561f3d7f8

Former-commit-id: f88fc45470 [formerly bb451e58c3] [formerly f88fc45470 [formerly bb451e58c3] [formerly 9104023408 [formerly e8ac81c5850b8565ea1e375857cf9dfe531848a0]]]
Former-commit-id: 9104023408
Former-commit-id: 72e6e56c75 [formerly 0991f722ec]
Former-commit-id: 2e14733f66
2014-11-19 11:31:49 -06:00
Ron Anderson
8fa1e18fcc Merge "Omaha #3549 improve performance of DataStoreResource processing of requests" into omaha_14.4.1
Former-commit-id: 81ea897d8e [formerly 1823bd4801] [formerly 81ea897d8e [formerly 1823bd4801] [formerly 0610c71e2a [formerly e572e5586d80623e8c6453404dc94691bfd5014d]]]
Former-commit-id: 0610c71e2a
Former-commit-id: 7b4fa1f69d [formerly 66f0e607c9]
Former-commit-id: 88b8660a53
2014-11-18 18:43:41 -06:00
Roger Ferrel
4006dd2e2b Issue #3439 Replaced GFS213 with GFS229.
Change-Id: I6cd7774c4897273944c56c39d087bb5cf98f4b15

Former-commit-id: 85d717b49c [formerly 90a8b262f3] [formerly 85d717b49c [formerly 90a8b262f3] [formerly b88300a5fc [formerly 6cb88075375e3703b5ffe559ebd5e4f57d016880]]]
Former-commit-id: b88300a5fc
Former-commit-id: b86d906a5a [formerly 83c738abd9]
Former-commit-id: 6e58de9ef0
2014-11-18 17:42:39 -06:00
Mark Peters
45edaf0ac1 Omaha #3300 Merge fixes for volume browser menus
Change-Id: Id2d6f643f80982d7b5c4f195e21775ec5def4b43

Former-commit-id: b98bcbdb35 [formerly bcff3fc981] [formerly b98bcbdb35 [formerly bcff3fc981] [formerly 666e8d4332 [formerly 1694a064c9496599532e9348a5eb89e558862e60]]]
Former-commit-id: 666e8d4332
Former-commit-id: 5ee156873c [formerly e08f52cc99]
Former-commit-id: 5d90bf9d76
2014-11-18 16:03:42 -06:00
Nate Jensen
67aa47351c Omaha #3549 improve performance of DataStoreResource processing of
requests

Change-Id: Ica72cded45aff23737c4b2aab8bbe94e0fc99755

Former-commit-id: 5d6dae89f2 [formerly 95d510849a] [formerly 5d6dae89f2 [formerly 95d510849a] [formerly 089292dbd0 [formerly bab091169dff1383a3b78ea4b94ec67d446e5f80]]]
Former-commit-id: 089292dbd0
Former-commit-id: 80a5beed26 [formerly 5de7b5ec07]
Former-commit-id: 764e724298
2014-11-18 15:22:09 -06:00
Ana Rivera
242e79187d VLab Issue #5355 - HTI Update: TCFloodingRainThreat.py (O&M RM16791); fixes #5355
Change-Id: I6461bf9294f037a361f02d3a0de83bf41147e819

Former-commit-id: e125c384f5 [formerly ac523f4a45] [formerly e125c384f5 [formerly ac523f4a45] [formerly f1009bccc2 [formerly 682cf4e6376265d0e590cfd1c05f7591204d0e0a]]]
Former-commit-id: f1009bccc2
Former-commit-id: 1e2e8ab03a [formerly 4bdfe38866]
Former-commit-id: a4bfb13dc0
2014-11-18 16:06:22 +00:00
Steve Harris
4bbeef346b Merge tag 'OB_14.3.1-33m' into omaha_14.4.1
Conflicts:
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPResource.java
	edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/MessageProducer.java

Former-commit-id: bab60d0d89 [formerly e1106f77eb] [formerly bab60d0d89 [formerly e1106f77eb] [formerly 1d18722dca [formerly 9c77ee7c19b87501983acf88279205644e1692f2]]]
Former-commit-id: 1d18722dca
Former-commit-id: 602bd4ce21 [formerly c2309d6d4a]
Former-commit-id: d887ad316f
2014-11-17 14:31:43 -06:00
Fay.Liang
69898f4fae Merge branch 'asm_14.3.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.3.1
Former-commit-id: 99f1259dda [formerly 82f427924a] [formerly 99f1259dda [formerly 82f427924a] [formerly d666aca2b4 [formerly 3b21d69375ceb9c07377082c5e46a094742406a0]]]
Former-commit-id: d666aca2b4
Former-commit-id: 1d42c33173 [formerly 03a71aa13a]
Former-commit-id: c2cf04d82c
2014-11-14 16:24:25 -05:00
Fay.Liang
1def1c0d2e Merge branch 'tcv_14.3.2' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.2
Former-commit-id: e78e70cb81 [formerly 766685c4ec] [formerly e78e70cb81 [formerly 766685c4ec] [formerly 8ced3a4c73 [formerly 7fd3b02016b0d9eed7ecca9c2fd70c3f83695abc]]]
Former-commit-id: 8ced3a4c73
Former-commit-id: fc4643d2eb [formerly b7da8368d3]
Former-commit-id: 72a92ec456
2014-11-14 12:47:46 -05:00
Lee Venable
06c35b4096 Merge "Omaha #3741 - Updated procedures for calculation of a center for zone and station." into omaha_14.4.1
Former-commit-id: 2bcf529bd9 [formerly f198da3f4d] [formerly 2bcf529bd9 [formerly f198da3f4d] [formerly 9fde70a354 [formerly b6d35ac4e3aa430de7057a16f9d5516584833150]]]
Former-commit-id: 9fde70a354
Former-commit-id: 58cf38e8f0 [formerly aba5c0cc19]
Former-commit-id: 521a4549f7
2014-11-14 11:14:16 -06:00
Ana Rivera
75bce54e24 VLab Issue #5318 - Baseline Hurricane Threats and Impacts (O&M RM16791); fixes #5318
Change-Id: Ibbc9e39a294417524c57c86e68e92644433ba847

Former-commit-id: 499c58a253 [formerly 061fd0af28] [formerly 499c58a253 [formerly 061fd0af28] [formerly e54f3305d8 [formerly 8a4e53a23a222dc88e3db8cc053fc31c33d3ed42]]]
Former-commit-id: e54f3305d8
Former-commit-id: e49972bfcd [formerly 23b3f1bc77]
Former-commit-id: c7e3d0197c
2014-11-14 16:58:11 +00:00
Lee Venable
8af02179aa Merge "Omaha #3650 - Added confirmation box for unsaved changes in the dialog." into omaha_14.4.1
Former-commit-id: 8c05a42e49 [formerly d28ecb61cf] [formerly 8c05a42e49 [formerly d28ecb61cf] [formerly d0b2cb955c [formerly 8632472592ff0dc8611e528cb774d6b1586fea58]]]
Former-commit-id: d0b2cb955c
Former-commit-id: 2debdb91ca [formerly 859b98a4e8]
Former-commit-id: 16cb050748
2014-11-13 14:47:58 -06:00
Fay.Liang
51c57e8b48 Merge branch 'tcv_14.3.2' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.2
Former-commit-id: aef63b4991 [formerly 3ed251486c] [formerly aef63b4991 [formerly 3ed251486c] [formerly cfe2f18790 [formerly 3f94c7f0ddbf580576b435a715366e3b9f3d9a53]]]
Former-commit-id: cfe2f18790
Former-commit-id: cc1cda2e98 [formerly e3c647e49e]
Former-commit-id: 2730ff96c6
2014-11-13 11:50:16 -05:00
Nate Jensen
1686d435dd Merge "Omaha #3705 fixed collaboration public room empty participants list problem" into omaha_14.4.1
Former-commit-id: f6e9759779 [formerly 3d945c4772] [formerly f6e9759779 [formerly 3d945c4772] [formerly 3e2e3761de [formerly 6ad3a9d449cbdc06d68335d49bb0ac5620585758]]]
Former-commit-id: 3e2e3761de
Former-commit-id: eaae6c7e5e [formerly b1ea383f58]
Former-commit-id: d4d8efd8f5
2014-11-13 09:45:21 -06:00
Slav Korolev
d1a90459ba Omaha #3650 - Added confirmation box for unsaved changes in the dialog.
Former-commit-id: 60511bf4bc [formerly 87a369bc98] [formerly 60511bf4bc [formerly 87a369bc98] [formerly dac55d1f49 [formerly d24676cfc946cb31618e0178d67d2d687e6a4599]]]
Former-commit-id: dac55d1f49
Former-commit-id: 4e05fe9f63 [formerly 150391790b]
Former-commit-id: 60273e68d5
2014-11-13 10:33:58 -05:00
Paula McCaslin
01dc07b991 VLab Issue #5061. LAPS Tools; fixes #5061
Change-Id: I447e7e94b931ad2efad687efa90e16cebb2e7bf9

Former-commit-id: 1375bc38f3 [formerly e2e8faf273] [formerly 1375bc38f3 [formerly e2e8faf273] [formerly a5c805cf4d [formerly e05f01c705953d0c9528cfea6604f88455a5f5ac]]]
Former-commit-id: a5c805cf4d
Former-commit-id: 0b569fcba8 [formerly 1038498ced]
Former-commit-id: 1d9995c826
2014-11-12 13:58:24 -07:00
Ron Anderson
66c29416f7 VLab Issue #4953 Added support for writing Python and/or Java objects to JSON localization files.
Change-Id: Ie25fce637e4294dd20bcfa3933d29b7bf6cc1f30

Former-commit-id: 80670c1b7a [formerly 04b8ffbcd2] [formerly 80670c1b7a [formerly 04b8ffbcd2] [formerly fe531a33e5 [formerly c9d45db2fe6d4693c02b8788d0c7d44b21f5359f]]]
Former-commit-id: fe531a33e5
Former-commit-id: 19800d6f27 [formerly 0a6164461a]
Former-commit-id: 692de129af
2014-11-12 14:50:21 -06:00
Ben Steffensmeier
763a6f927d Omaha #3810 Make D2D nsharp more thread safe.
Former-commit-id: 094dae6108 [formerly 376f566451] [formerly 094dae6108 [formerly 376f566451] [formerly 0021311cb2 [formerly 31901b563e4169cc44494134e3cac55a5542a79f]]]
Former-commit-id: 0021311cb2
Former-commit-id: 557aa3778a [formerly 718d1f63c3]
Former-commit-id: 8ac09c9b75
2014-11-12 14:48:08 -06:00