Commit graph

6096 commits

Author SHA1 Message Date
Xuezhi.Wei
6afc985ebe ASM #648 fix for the top of the hour issue for hourlypp
Change-Id: I794837427ee6f8dbc615cbd010aeb662ccad9896

Former-commit-id: bca2affc40 [formerly 42719b2d5b [formerly 2d36b1b9ed31404ca9c9a4ecfdbf5f1e40c05b54]]
Former-commit-id: 42719b2d5b
Former-commit-id: 0933440c37
2014-09-15 18:14:54 +00:00
Matthew Howard
9fc2f41a93 Merge "ASM #16693 - Fix spelling checker suggests swear words" into asm_14.3.1
Former-commit-id: 155df2bedc [formerly 811b79d748 [formerly 04c6dfae9b8edb836a1bad54e1b8b327c66325bb]]
Former-commit-id: 811b79d748
Former-commit-id: b6d2bf1d13
2014-09-15 12:28:25 -05:00
Ying-Lian.Shi
86c761c8a4 ASM #16693 - Fix spelling checker suggests swear words
Change-Id: Ie9e5bc5c26b16655185b81cf4b4cf2f758693566

Former-commit-id: 6e88d5f39c [formerly 11b40e167c [formerly 094cb9dba5d6e0da22b32b85dcc5049fd629fe5e]]
Former-commit-id: 11b40e167c
Former-commit-id: 83536a6b09
2014-09-15 14:56:32 +00:00
Brian.Dyke
eb63c3e61a Merge branch 'master_14.3.1' into asm_14.3.1
Former-commit-id: 1541e4c255 [formerly 216f34fb25 [formerly 8e4f6e96f7b70d6f2b7517f3f0695350506169c7]]
Former-commit-id: 216f34fb25
Former-commit-id: 54b26b3616
2014-09-15 10:46:25 -04:00
Matthew Howard
4b00403145 Merge "ASM #657 - Errors loading Distance Speed tool and Time of Arrival Tool" into asm_14.3.1
Former-commit-id: 7121e2e6e1 [formerly 6e0dbf4fb5 [formerly 57ba27ba3d21e8f96affe5056d20d6e0b1540dc7]]
Former-commit-id: 6e0dbf4fb5
Former-commit-id: c0a43b73ce
2014-09-11 08:56:49 -05:00
Matthew Howard
79c408d965 Merge "ASM #657 - Errors loading Distance Speed tool and Time of Arrival Tool" into asm_14.3.1
Former-commit-id: 708e8a8886 [formerly f14ea5f877 [formerly c4a0a681a3f0ea21237684cdadb2aab8ac8ca078]]
Former-commit-id: f14ea5f877
Former-commit-id: 05aea71f77
2014-09-09 14:01:39 -05:00
Brian.Dyke
d8271549ff Merge branch 'master_14.2.4' into master_14.3.1 CM-MERGE:14.2.4-6-7-8 into 14.3.1
Conflicts:
	cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/ArchiveRetentionDlg.java
	cave/com.raytheon.uf.viz.ui.menus/src/com/raytheon/uf/viz/ui/menus/widgets/tearoff/MenuItemComposite.java

Former-commit-id: 01dfe503f5 [formerly 3d9a3de6e4 [formerly a3365943e7b7972a5c86f8cb1ad39667ab9e0695]]
Former-commit-id: 3d9a3de6e4
Former-commit-id: fe85eb9f70
2014-09-09 11:44:30 -04:00
Qinglu.Lin
f2bd188b06 ASM #657 - Errors loading Distance Speed tool and Time of Arrival Tool
Change-Id: I68c2b4b336a5145de20f70cb0967c9dc484f3b09

Former-commit-id: 3f666817e0 [formerly 51d48a6fdc [formerly 7a75687b76584b4578fad4c31c8557d78e507f46]]
Former-commit-id: 51d48a6fdc
Former-commit-id: 517f0c9d0c
2014-09-09 08:07:46 -04:00
Brian.Dyke
a344be95c8 Merge branch 'field_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Conflicts:
	cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml

Former-commit-id: af477df90e [formerly 858b91d677 [formerly 7b49ea6d9c45c0624017bbe7ffb1297a402ee875]]
Former-commit-id: 858b91d677
Former-commit-id: 5415a4939a
2014-09-08 14:54:16 -04:00
Matthew Howard
e8f6419c58 Merge "ASM #539 Multiple flag functionality for textdb is not working properly" into asm_14.3.1
Former-commit-id: fdfe97c659 [formerly 8ebfa3edce [formerly 764e268bcccec4a805509a11fbd9c9f4e1860842]]
Former-commit-id: 8ebfa3edce
Former-commit-id: 8e65a175fc
2014-09-08 08:23:57 -05:00
Brian.Dyke
4b84db346d Merge branch 'master_14.2.3' into master_14.2.4
Former-commit-id: 702dd65aa7 [formerly 9e1ee22146 [formerly 876c6fc4db3901fdcd8dd9a6fb343d2f65254569]]
Former-commit-id: 9e1ee22146
Former-commit-id: 4220590613
2014-09-05 11:13:12 -04:00
Brian.Dyke
aac4db559a Merge branch 'field_14.2.4' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.2.4
Former-commit-id: 9f7fabb002 [formerly d7407481ef [formerly c1f870d9df7579741e5a1d79cdec77293115e968]]
Former-commit-id: d7407481ef
Former-commit-id: cdd1e08ee3
2014-09-05 10:57:14 -04:00
Ana Rivera
5a534e377c VLab Issue #4601 - Update to SMS DR #16720; Remove HRRR entries in master_grib2_lookup.txt; fixes #4601
Change-Id: I0dfe0991503e6d87ce2db9713bb016d68cd1c152

Former-commit-id: a8b04b8e63 [formerly 6d48576930 [formerly 084970f8445dbb6b76bbad84b5dc986d961d2383]]
Former-commit-id: 6d48576930
Former-commit-id: c77e5412a6
2014-09-05 13:27:29 +00:00
Brian.Dyke
2d86fd1bf1 Merge branch 'asm_14.2.3' of winter:/data/gerrit2/git/AWIPS2_baseline into master_14.2.3
Former-commit-id: a610fe6475 [formerly 7b7ef56b04 [formerly a77577595da1e2dcc8057c5a8b8643a612780339]]
Former-commit-id: 7b7ef56b04
Former-commit-id: 15381f5e9f
2014-09-04 15:59:00 -04:00
Brian.Dyke
8216b05646 Merge branch 'master_14.2.2' into master_14.2.3
Former-commit-id: e5227e90de [formerly e762271240 [formerly ad120a9357402fbdedb350cabe88d2becf5d7361]]
Former-commit-id: e762271240
Former-commit-id: c586c26447
2014-09-04 14:18:34 -04:00
Qinglu.Lin
efd54751a5 ASM #15551 - WarnGen: only WCN should be used while including TOR/SVR watches in WarnGen products
Change-Id: I0438af111b0db290373c7553006002edec2b2110

Former-commit-id: 902b6c55bd [formerly 8c28597210 [formerly 33adaf353c6a4b7dc418dc86428257dae260c4c5]]
Former-commit-id: 8c28597210
Former-commit-id: 62bcefb9e1
2014-09-04 14:09:24 -04:00
Brian.Dyke
a05fabaeef Merge branch 'omaha_14.2.2' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.2.2
Former-commit-id: 9e94c2c571 [formerly 72e2882496 [formerly 2c4c1a5babcfdcfadeb042a190bc79c7973e1a36]]
Former-commit-id: 72e2882496
Former-commit-id: 2b613a26fd
2014-09-04 14:01:26 -04:00
Nate Jensen
8cad8cb257 Issue #3574 Properly dispose radar graphics graphics objects.
Change-Id: Ica8c630325bada6fd508eeb6b1b4d881a5169320

Former-commit-id: 87d507313b [formerly 2cfbfc1dc4 [formerly 78172a4ac0b9ece26cdc07da3a8f9a70bbc11782]]
Former-commit-id: 2cfbfc1dc4
Former-commit-id: a1bccdc57f
2014-09-04 10:10:37 -05:00
Brian.Dyke
9c9de8b351 Merge branch 'master_14.2.2' into master_14.2.3
Former-commit-id: d695dd0084 [formerly 043a95d35e [formerly 3385f2bc24dfb42e82f9e3451cd44da8dfb89e9a]]
Former-commit-id: 043a95d35e
Former-commit-id: fa6b302ab6
2014-09-03 21:14:27 -04:00
Brian.Dyke
08ec7d5802 ASM #15697 - Fix Hydro Perspective Issue
Former-commit-id: cfe03adff6 [formerly 121a2d100f [formerly 82d7bbe6bf005e543e1ad6772c6a18024f1b0764]]
Former-commit-id: 121a2d100f
Former-commit-id: 3ddb5831a0
2014-09-03 21:10:16 -04:00
Steve Harris
197e5ad6ff Merge branch 'master_14.2.4' (14.2.4-7) into omaha_14.2.4
Former-commit-id: afa45bf919 [formerly 0e869fa6c1 [formerly 2391bc928e8798f022c3ca5ad8a1d5619ae4e2a4]]
Former-commit-id: 0e869fa6c1
Former-commit-id: 0ea6b72088
2014-09-03 15:22:00 -05:00
Richard Peter
63e9bd37c1 Merge "Issue #3560 Registry objects not re-sent after fully sync" into omaha_14.2.4
Former-commit-id: af87813ea9 [formerly 3de26efce6 [formerly 5f9298d52d0a11775588ed3742f2c2d3f19da1d0]]
Former-commit-id: 3de26efce6
Former-commit-id: 1c05f1b459
2014-09-03 09:42:34 -05:00
Nate Jensen
585516210d Merge "Issue #3572 Fixed getNumpy errors for Grid2DFloat" into omaha_14.2.4
Former-commit-id: c23071f48c [formerly 0f35426ad0 [formerly 9e0f31fc6601a39938deeaf7e1c8ed8849e43288]]
Former-commit-id: 0f35426ad0
Former-commit-id: a690b853bb
2014-09-02 17:34:59 -05:00
Brian.Dyke
bdba05f6b1 Merge branch 'master_14.2.3' into master_14.2.4 CM-MERGE:14.2.3-1 (14.2.2-30,-31) into 14.2.4
Former-commit-id: 14e64881a1 [formerly fd8ad016ef [formerly bc9f03426304e3bb194fbf7f356d8dd3816cd836]]
Former-commit-id: fd8ad016ef
Former-commit-id: 9e156775e5
2014-09-02 16:32:54 -04:00
Brian.Dyke
9105ef9aa2 Merge branch 'field_14.2.4' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.2.4
Former-commit-id: 611e036e75 [formerly f0875e724f [formerly 40efe51cafd5589ef0a640041ad0539e454b6f8d]]
Former-commit-id: f0875e724f
Former-commit-id: e425e5bf8c
2014-09-02 16:30:51 -04:00
Benjamin Phillippe
0c5dad994f Issue #3560 Registry objects not re-sent after fully sync
Change-Id: Id38989cf953aacb985d627422c043f8768df2ed0

Former-commit-id: 955ac3a670 [formerly 7265bf54c7 [formerly 15e57fc58bee1045c5574e4d66a727a672ac83cb]]
Former-commit-id: 7265bf54c7
Former-commit-id: 30f3289917
2014-09-02 14:46:50 -05:00
Brian.Dyke
a76150b1a7 Merge branch 'master_14.2.2' into master_14.2.3
Former-commit-id: b1dbaa0b50 [formerly 368f80f220 [formerly f9daf7d6e906904e96438fabc510e24ff66536d4]]
Former-commit-id: 368f80f220
Former-commit-id: 65f8fc89f0
2014-09-02 15:09:06 -04:00
Qinglu.Lin
dda32f85e9 ASM #15551 - WarnGen: only WCN should be used while including TOR/SVR watches in WarnGen products
Change-Id: I286bc4cc809fcc9257f72051f1bb74f8acc24c05

Former-commit-id: ae13ea419e [formerly 2374673f8d [formerly 59890eef397f3282ef26f259ca85ffea3db7b710]]
Former-commit-id: 2374673f8d
Former-commit-id: b32ea40289
2014-09-02 14:37:19 -04:00
Ron Anderson
c5a32980d6 Issue #3572 Fixed getNumpy errors for Grid2DFloat
Change-Id: I6caf979c1d531a842f77d23dbd7f8e0865afecce

Former-commit-id: 434d412882 [formerly 46c62a1db6 [formerly e2ecb91569c2f622d45f7301c1eb4e058a2ab641]]
Former-commit-id: 46c62a1db6
Former-commit-id: c7fbca0298
2014-09-02 12:21:42 -05:00
Richard Peter
9489243db9 Merge "Issue #3560 Fix for registry memory issue" into omaha_14.2.4
Former-commit-id: 0e29b2d17f [formerly be2474da34 [formerly 6789576e88de568c6014c29d099349cec40c7c74]]
Former-commit-id: be2474da34
Former-commit-id: abc807850f
2014-09-02 12:15:38 -05:00
Benjamin Phillippe
c00e99fa33 Issue #3560 Fix for registry memory issue
Former-commit-id: 2da57d3bc2 [formerly ab8b2ef473 [formerly a6e4a2cac4d6f9390c5181439a6c834db56a95c6]]
Former-commit-id: ab8b2ef473
Former-commit-id: 12914fb1e5
2014-09-02 10:00:35 -05:00
Dave Hladky
4b22309742 Issue #3564 Allow for un-authenicated WFS HTTPS connections.
Change-Id: Ib144a570b2206b336aac0b9e8ebc00c9f096775a

Former-commit-id: 82fd7189b9 [formerly 9c3b002990 [formerly 7afe5332fcf41bbc8bb2411944584405f3ba686a]]
Former-commit-id: 9c3b002990
Former-commit-id: 534b784843
2014-09-02 09:38:21 -05:00
Steve Harris
9e79ff1cff Merge branch 'master_14.2.4' (14.2.4-6) into omaha_14.2.4
Former-commit-id: e7705c328e [formerly 3b6a003884 [formerly 09b94266f1f3aeaaa7fcf622487d751097d271a4]]
Former-commit-id: 3b6a003884
Former-commit-id: f7e39c9d6f
2014-09-02 08:12:49 -05:00
Steve Harris
db74ef9c6d Merge branch 'master_14.2.2' (14.2.2-31) into omaha_14.2.2
Former-commit-id: 425e8243f2 [formerly db74dc031e [formerly 80f0a6df2aeaffce0a58119ae4c3558c7fd08f21]]
Former-commit-id: db74dc031e
Former-commit-id: 142f1bff66
2014-09-02 08:09:48 -05:00
Kiran.Shrestha
b4a897c5a7 ASM #506 - TextWS: Unable to save unofficial text products from text editor.
Change-Id: I969cd9ddaa9adc83d5e65571fbb4f45ea89002a6

Former-commit-id: d8bd6a9c70 [formerly a285439c08 [formerly 1681bea10870df58b3f2cc0d0a59f21c596e9e95]]
Former-commit-id: a285439c08
Former-commit-id: 3abf28f856
2014-08-29 13:50:55 -04:00
Brian.Dyke
8f69c4b855 Merge branch 'master_14.3.1' into asm_14.3.1
Former-commit-id: 2c25f68437 [formerly 6f3d0508e4 [formerly f34bc4f81eb5ac92ef306f73f8c34243d3f78e31]]
Former-commit-id: 6f3d0508e4
Former-commit-id: cbe59aded5
2014-08-29 10:19:02 -04:00
Brian.Dyke
31c13bf0bf Merge branch 'master_14.2.4' into asm_14.2.4
Former-commit-id: a2f66c8d97 [formerly 37c926973c [formerly cff9bfd2697a73ccc18642d8dc057b6a27aa2991]]
Former-commit-id: 37c926973c
Former-commit-id: a5519a28d9
2014-08-29 10:07:14 -04:00
Brian Clements
c0b132d6ee Issue #3500 moved ProcedureXMLManager initialization to CAVE component subclass
Change-Id: Ie8a509a5f5b6b0a358460f0218925458106fd040

Former-commit-id: cfeb16eff8 [formerly b352bd3944 [formerly b3482522860408c2d052261e845899cf73c2ce96]]
Former-commit-id: b352bd3944
Former-commit-id: 981390eb22
2014-08-29 08:55:58 -05:00
Juliya Dynina
d911b87c7e Merge "ASM #15682 - D-2D: SPC Watches display: Watches do not disappear when expired" into asm_14.2.3
Former-commit-id: 58a3df78a8 [formerly 169dc0ba43 [formerly bb260c4003b477ca51cf5fd9c8d54275af906772]]
Former-commit-id: 169dc0ba43
Former-commit-id: 5f001b7ad7
2014-08-28 15:52:11 -05:00
Ana Rivera
b03dd41331 VLab Issue #3617 - RMDR_16720 Updates to HRRR DCS_266; fixes #3617
Change-Id: I159cbaed918fc48c31d115314e29ad9c2128a7f1

Former-commit-id: 9af77831a6 [formerly 160dabc4d1 [formerly 2df117a7aec644e6964da6c36326ab3b29b9f378]]
Former-commit-id: 160dabc4d1
Former-commit-id: e033ed5546
2014-08-28 18:38:26 +00:00
Roger Ferrel
60d6b770aa Issue #3553 - Force redisplay of data set table after all labels are generated.
Change-Id: Ie8c0195414102d046e5348e778ba8d5e1053e5ec

Former-commit-id: ef5dfb1f93 [formerly 6f8c6d6aa1 [formerly bcc9b0a6352151dfdf3ba75063bb87308cb162b4]]
Former-commit-id: 6f8c6d6aa1
Former-commit-id: 15c73be56c
2014-08-28 13:10:11 -05:00
David Friedman
16c903e2c5 ASM #15682 - D-2D: SPC Watches display: Watches do not disappear when expired
Change-Id: I3a29b5b0bb5c75dd5ac5f508391f5806cabf47fa

Former-commit-id: d5c086a022 [formerly de6e79f9e3 [formerly aca832a81bc18d954eadb51755ce04597cd264df]]
Former-commit-id: de6e79f9e3
Former-commit-id: 9c2545ed64
2014-08-28 18:08:23 +00:00
Daniel.Huffman
39f7795b7c ASM #16715 - Reverted and augmented Airports.xml and Fix.xml
Change-Id: Icd15e1947ec7d71b22d621b452d9e1c74767898e

Former-commit-id: ca2aa8811b [formerly c89a7169b0 [formerly 09e0b79b25ec4f8854dde331469b0e7d6c4ffa1f]]
Former-commit-id: c89a7169b0
Former-commit-id: c3731d5622
2014-08-28 17:20:30 +00:00
steve.naples
bf9924b0e9 ASM #14578 - Added Hydrologic date field ti Choose Hour dialog for Daily QC
Change-Id: I954833e37c579ab1eaddf95347ba53d73909b138

Former-commit-id: ff52f1dc0a [formerly 1856a05319 [formerly 2e8fb864f410b9b08ccc6de6c0d75666931da3a2]]
Former-commit-id: 1856a05319
Former-commit-id: 4205d83452
2014-08-28 16:08:17 +00:00
David Friedman
bb421fd3e4 ASM #15658 - WarnGen: inclusion of watch information in marine products
Change-Id: I9f99e6136027f1a6419800f87e5a5709fe5be6b9

Former-commit-id: ea9230b37c [formerly a2dfe8e8f6 [formerly 6bfa1d6662b00925814be7126592bbe340651649]]
Former-commit-id: a2dfe8e8f6
Former-commit-id: ea1e9feb1d
2014-08-28 15:43:32 +00:00
Brian.Dyke
cbfd380b43 Merge branch 'field_14.2.4' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.2.4
Former-commit-id: a24794ca7b [formerly 47ae6015e5 [formerly 3909fa46a4efffabb09303f139bc36accc064a6d]]
Former-commit-id: 47ae6015e5
Former-commit-id: 76bd6575b6
2014-08-28 11:39:48 -04:00
Kiran.Shrestha
64e37ed9b4 ASM #539 Multiple flag functionality for textdb is not working properly
Change-Id: Iaae81cace051d97db464e6610d6fa94f86086fb8

Former-commit-id: 571f6fb8ea [formerly f11699eddd [formerly 0220801fc1747c7659e3db7cf734538fdda270ef]]
Former-commit-id: f11699eddd
Former-commit-id: e38e3af172
2014-08-28 10:05:41 -04:00
Steve Harris
b551b21437 Merge branch 'master_14.2.2' (14.2.2-30) into omaha_14.2.2
Former-commit-id: d3b18900b3 [formerly 891019aadd [formerly 579781387325a36e27135b8384b2a8b14cb38317]]
Former-commit-id: 891019aadd
Former-commit-id: 080a50d28c
2014-08-27 11:34:06 -05:00
Brian.Dyke
0a5ddf7457 Merge branch 'master_14.2.4' into master_14.3.1 CM-MERGE:14.2.4-5 into 14.3.1
Conflicts:
	cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/StormTrackDisplay.java
	cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java
	cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
	edexOsgi/com.raytheon.uf.common.comm/src/com/raytheon/uf/common/comm/HttpClient.java

Former-commit-id: aa83bf804f [formerly e654318431 [formerly 7334d3991903dfe8a62728de33c21e81534fdbb6]]
Former-commit-id: e654318431
Former-commit-id: a08db8d73d
2014-08-27 11:19:19 -04:00
Brian.Dyke
aa2b4835e3 Merge branch 'master_14.3.1' into asm_14.3.1
Former-commit-id: 175f4e67c1 [formerly d168e371aa [formerly a6d5822b5cb5bb3aa62fcc95e980b08c685a3be3]]
Former-commit-id: d168e371aa
Former-commit-id: 3459e1fcbc
2014-08-26 15:00:55 -04:00