Commit graph

5543 commits

Author SHA1 Message Date
Steve Harris
2b750a291a Merge tag 'OB_16.2.1-8' into omaha_16.2.1
16.2.1-8


Former-commit-id: b22a2cd9f647e0cffe3bd013138b6617e34379ac
2016-01-28 15:32:25 -06:00
Shawn.Hooper
b647c15e95 Merge remote-tracking branch 'asm/asm_16.2.1' into master_16.2.1
Former-commit-id: bcf253983defc3cf0d85c604b3208365190752ca
2016-01-28 15:12:55 -05:00
Zhidong.Hao
da6473473a ASM #18395 AvnFPS: When append new data from NCDC for multiple sites it only processes a single site.
Change-Id: I398e7b983624273ae857c5fd78db65ce1062ed58

Former-commit-id: 2fcd057860f9cf013b7a19ab0fb8da420ec2fb6e
2016-01-28 12:29:18 -05:00
Shawn.Hooper
76a9b29e4c Merge remote-tracking branch 'origin/master_16.2.1' into asm_16.2.1
Former-commit-id: 23408c239024fd4da7400adb720b81e6a349e2aa
2016-01-28 11:03:53 -05:00
Ana Rivera
c10d68e689 Merge branch 'master_16.1.2' into tcv_16.1.2
Change-Id: I2af0dba1d21aa045890559f51cba12fcb4b0f335

Former-commit-id: 1f4c836a341afab4728dd9462139fed44e7b454c
2016-01-28 15:54:43 +00:00
Shawn.Hooper
65ed37fe67 Merge remote-tracking branch 'asm/asm_16.2.1' into master_16.2.1
Former-commit-id: f9d6debd8f835e8fd9f80fab2a70460ad06303c8
2016-01-27 17:14:01 -05:00
Shawn.Hooper
12fc325051 Merge remote-tracking branch 'omaha/omaha_16.2.1' into master_16.2.1
Former-commit-id: 38a3f56c751b61b312e3f031d00f07cc9b9d420d
2016-01-27 17:13:38 -05:00
Bruce.Hundermark
3e9df01b7a ASM #18562 - ISC_Discrepancies not working for time range between current time and zulu
Change-Id: I0b25fb0600a3605c4cddab60174ca75e9d3f724c

Former-commit-id: 2d031529e12189b451582b8cd4797c8e91e09772
2016-01-27 18:35:20 +00:00
Shawn.Hooper
9efc850e4a Merge remote-tracking branch 'vlab/tcv_16.1.2' into master_16.1.2
Former-commit-id: fe5781c930e4cab0ece462f9ae6152b1d4f4633c
2016-01-26 17:16:15 -05:00
Shawn.Hooper
d7a87dff09 Merge remote-tracking branch 'omaha/omaha_16.1.2' into master_16.1.2
Former-commit-id: 93d9124d9b4a83d781824b1c8abeb8c3e40b25a4
2016-01-26 16:15:09 -05:00
Sarah Pontius
da545043c9 VLab Issue #15111 - TCV and HLS Revisions; fixes #15111
Change-Id: I013d6f23d30fb7471923fe1ad3883f4329b77cbf

Former-commit-id: fc7322a5615887e12ddd5364ed593b7d3595b967
2016-01-26 11:40:15 -07:00
Shawn.Hooper
2861d7abd7 Merge tag 'OB_16.1.2-14' into master_16.2.1
16.1.2-14

Conflicts:
	cave/com.raytheon.uf.viz.d2d.core/src/com/raytheon/uf/viz/d2d/core/time/D2DTimeMatcher.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java

Change-Id: If4483610b92d4c2ef975c3ac75403e12a70d612c

Former-commit-id: 66d3cd35731e59996c34f003e42cbb2a41010717
2016-01-25 14:32:31 -05:00
Matthew Howard
8da9fddea8 Merge "ASM #18505 GFE: Resent product should have same WMO, MND, and segment times as original product." into asm_16.1.2
Former-commit-id: ef104e0404b16c2ed85b67c8900e055ae58400d3
2016-01-22 11:12:07 -05:00
Ying-Lian.Shi
ba9a1d66a5 ASM #18505 GFE: Resent product should have same WMO, MND, and segment times as original product.
Change-Id: I8fa675e63f05e16547fdc8ed108790bcbccb0bf7

Former-commit-id: 851ff43a2ba628cc4d239e15784e52ea7d1f1ab1
2016-01-21 19:28:55 +00:00
Ron Anderson
3d867790f3 Omaha #4751 Fix type of mask returned from getComposite()
Change-Id: I0c136042a0ea43bb2cf7b9462eb9fea257b19ab9

Former-commit-id: 23bed260bc1e1302070f49dadc3a978e218ee513
2016-01-20 18:22:39 -06:00
Shawn.Hooper
007b844b3b Merge remote-tracking branch 'vlab/asdt_16.2.1' into master_16.2.1
Former-commit-id: 15caeb10ad31fa9ffb405b4411ccff22b421dd75
2016-01-20 16:50:40 -05:00
Shawn.Hooper
3f05c3da44 Merge remote-tracking branch 'vlab/field_16.2.1' into master_16.2.1
Conflicts:
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py

Change-Id: I279d046dc8a054563c9ddabd92350f8d97222355

Former-commit-id: f9ff90f121eff9ae632b8bcc47c3500d9f647d00
2016-01-20 16:49:53 -05:00
Shawn.Hooper
da0ff43173 Merge remote-tracking branch 'omaha/omaha_16.2.1' into master_16.2.1
Conflicts:
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java

Change-Id: I123674540179ec5fd35a953cb652f613a3400ed5

Former-commit-id: 9f821c69fc8c198fc44529e2e00ecaa13b286e6f
2016-01-20 16:48:34 -05:00
Steve Harris
dfcc52e766 Merge tag 'OB_16.2.1-6' into omaha_16.2.1
16.2.1-6


Former-commit-id: 29a43c58b69086667c47e86c4a0bb1c849ad4367
2016-01-20 13:29:19 -06:00
Steve Harris
e78c125f67 Merge tag 'OB_16.1.2-13' into omaha_16.1.2
16.1.2-13


Former-commit-id: 5ff01e4ff76eeb79a9d25f0f9896df90e6e47082
2016-01-20 13:15:51 -06:00
Penghai Wang
b1adfc8043 Merge branch 'master_16.2.1' into asdt_16.2.1
Former-commit-id: 8ee3557b04ad9054e8e0c0e0671efa6f4e3abdad
2016-01-20 17:09:39 +00:00
Steve Harris
3d1db61e5f Merge tag 'OB_16.1.2-12' into omaha_16.1.2
16.1.2-12


Former-commit-id: 1bb82b12851f4fae00e1b6f5bec759765be5ac40
2016-01-18 10:02:36 -06:00
Shawn.Hooper
ac9dcbe1f3 Merge remote-tracking branch 'omaha/omaha_16.1.2' into master_16.1.2
Former-commit-id: 8eaf12426893ce248724986d9c1f7d49ae2dcf76
2016-01-15 16:46:56 -05:00
Zhidong.Hao
7255a50ee6 ASM #18482 AvnFPS: Improve help instructions for climate data update
Change-Id: Ibd14e269c06276bfee4f23b3511c7f716ded4b84

Former-commit-id: bb40c336afd2afcdb11b80e03ac3a6fa33ee6232
2016-01-15 14:24:51 -05:00
Michael Gamazaychikov
3801978f1c ASM #18522 - TextWS: FWM product converts commas into three dots (...).
Change-Id: I70021085a560c769cb6fe126e2690681d8cd0644

Former-commit-id: da891cb519ac13885e2edf82156d04042de5895f
2016-01-15 13:39:25 -05:00
Shawn.Hooper
9dfa998295 Merge remote-tracking branch 'origin/master_16.1.2' into asm_16.1.2
Former-commit-id: 82cba204a74b5724c06ac06160e57d63eaf75b34
2016-01-15 11:50:18 -05:00
Ana Rivera
35b00be61e Merge branch 'master_16.2.1' into field_16.2.1
Change-Id: I197477fc4ceeb0efbd47335a98df7a2bedb703e0

Former-commit-id: 521d1a43251c5c8a697eccd7d09965dee58fd50b
2016-01-15 16:09:14 +00:00
Shawn.Hooper
94eba993a6 Merge branch 'master_16.2.1' into asm_16.2.1
Former-commit-id: 10740febfd3631d4c31312c9427a172cd29c9e62
2016-01-14 16:10:45 -05:00
Lee Venable
397852a1d7 Merge "Omaha #5173 - Do not estimate a station that has been forced good. Eliminated warnings." into omaha_16.1.2
Former-commit-id: cc6f5823cb910efb10b566bf1656cae764bb11a2
2016-01-14 12:57:37 -06:00
Mark Ruebens
3cee7e5e93 Merge "ASM #18092 - MPE: Fix GageTable column select saving and applying settings." into asm_16.1.2
Former-commit-id: 236cc7a1c0b9ffd06690fdfc4dd6915de8df1f97
2016-01-14 12:52:19 -05:00
Shawn.Hooper
7a488c23aa Merge remote-tracking branch 'asm/asm_16.1.2' into master_16.1.2
Former-commit-id: 87c09b5ec9ec7cf95c4d1516e505336e923b2ec5
2016-01-13 17:04:59 -05:00
Shawn.Hooper
a86c0e7f69 Merge remote-tracking branch 'vlab/tcv_16.1.2' into master_16.1.2
Former-commit-id: c2d823607b087491d48c69d9de6c3da75155fe73
2016-01-13 17:04:48 -05:00
Matthew Howard
37488a5bb5 Merge "ASM #18495 - WarnGen: Does not load from a procedure after DCS 1794" into asm_16.1.2
Former-commit-id: f95450c52bb1305cc2664bc121561c32ff2bc267
2016-01-13 15:39:40 -05:00
Ben Steffensmeier
8b1291798a Omaha #5246 Fix blank graph panels.
Former-commit-id: da4a78cf8302da5679776c8021871b91e27ab5c1
2016-01-13 13:45:54 -06:00
Lee Venable
effad35c7b Merge "Omaha #5219 Fixed cache management issues caused by recent updates. Change-Id: Id3ac7cc51ce11b38abb2ea295d65511804643113" into omaha_16.1.2
Former-commit-id: 4315ec392034c96871308ea5445cca99b0657aa1
2016-01-13 12:47:03 -06:00
steve.naples
ec95cc5f9c ASM #18092 - MPE: Fix GageTable column select saving and applying settings.
Change-Id: Ic2497d99a27a1efe58afcb4929f9513d6071c097

Former-commit-id: 2a00e1f6e14946d4a15613f2fa42da6c6a4b157e
2016-01-13 18:39:47 +00:00
Ana Rivera
ce676e7137 VLab Issue #14839 - DR18499 HTI Improvements:TCFloodingRainThreat; fixes #14839
Modify script to avoid duplication in modelList. (Ref: DCS16913)

Change-Id: I2f0d5eaafee7b391b3e6af58e01f4ec51f4d13cd

Former-commit-id: 6ee88ef090e525fd1552d0c3a48f09c6a6722623
2016-01-13 16:16:44 +00:00
David Friedman
192f4686b8 ASM #18495 - WarnGen: Does not load from a procedure after DCS 1794
Change-Id: Ice3cd107970b964360ed6431b63e4ddfa51b7f85

Former-commit-id: d26c2b47a709baf47f14a21e14666e5b51622307
2016-01-13 15:34:48 +00:00
Dave Hladky
87ad02ee80 Omaha #5219 Fixed cache management issues caused by recent updates.
Change-Id: Id3ac7cc51ce11b38abb2ea295d65511804643113

Former-commit-id: 07b96987cc6d35c838afe4ad58ba88eb4b05d309
2016-01-13 09:01:32 -06:00
Steve Harris
d9dc7ac24a Merge tag 'OB_16.2.1-5' into omaha_16.2.1
16.2.1-5

 Conflicts:
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java


Former-commit-id: 158c21db5a297b68b9c7007ebcbfd5374df3c648
2016-01-13 08:58:43 -06:00
Steve Harris
bb2e8ed61c Merge tag 'OB_16.1.2-9' into omaha_16.1.2
16.1.2-9


Former-commit-id: da4f441760adce5953a50919fbc0e5f692a3bf81
2016-01-13 08:49:07 -06:00
David Friedman
a07a62f95e ASM #18480 - Loading 4 panels from procedures are not time matched (additional DR 13900 fix)
Change-Id: Ic8189b8b8e2e23f1752c35e71d7b062d57a9e96a

Former-commit-id: 43e7b1ccd8bb8bc946d420660327705d1ff1407d
2016-01-13 01:17:40 +00:00
Shawn.Hooper
bd27f40c6d Merge tag 'OB_16.1.2-9' into master_16.2.1
16.1.2-9

Conflicts:
	cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/data/ObHourReports.java
	cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/data/ObMultiHrsReports.java
	cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/AddNewStationDlg.java
	cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/AddNewZoneDlg.java
	cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/DeleteStationDlg.java
	cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/EditNewZoneDlg.java
	cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/MonitoringAreaConfigDlg.java
	cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/ZoneTableDlg.java
	cave/com.raytheon.viz.gfe/localization/gfe/userPython/procedures/TCFloodingRainThreat.py
	cave/com.raytheon.viz.gfe/localization/gfe/userPython/procedures/TCStormSurgeThreat.py
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/ProductEditorComp.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/StyledTextComp.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TabularTimeSeriesDlg.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	cave/com.raytheon.viz.warngen/META-INF/MANIFEST.MF
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFED2DDao.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/smartinit/Init.py
	edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_NCEP-7.xml
	edexOsgi/com.raytheon.edex.plugin.warning/src/com/raytheon/edex/plugin/warning/gis/GeospatialDataGenerator.java
	edexOsgi/com.raytheon.uf.common.dataplugin.fssobs/src/com/raytheon/uf/common/dataplugin/fssobs/FSSObsRecord.java
	edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/config/FSSObsMonitorConfigurationManager.java
	edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/xml/AreaIdXML.java
	edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/xml/MonAreaConfigXML.java
	edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/xml/StationIdXML.java
	edexOsgi/com.raytheon.uf.edex.plugin.fssobs/src/com/raytheon/uf/edex/plugin/fssobs/FSSObsGenerator.java
	edexOsgi/com.raytheon.uf.edex.plugin.npp.viirs/utility/edex_static/base/viirs/viirsHeaderMapping.xml
	rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template

Change-Id: Ife2115435399146e4873a14f80e73acc15ad1b5c

Former-commit-id: 3d8811acf334fb06854bbaa71d35cff2657b3b7b
2016-01-12 15:10:02 -05:00
Bryan Kowal
8550d0e6c3 Omaha #5173 - Do not estimate a station that has been forced good. Eliminated warnings.
Former-commit-id: 30adae423e3b73c70636dfd4274a31ce9e1d7cd8
2016-01-11 18:10:30 -06:00
Shawn.Hooper
bc127e6826 Merge remote-tracking branch 'asm/asm_16.1.2' into master_16.1.2
Former-commit-id: 5ea4620e2b80b2cfd1ae8d9346dc80b21118ca0c
2016-01-11 13:26:29 -05:00
Matthew Howard
8abc8625b5 Merge "ASM #18474 - WarnGen polygon extension capability allows polygon to be expanded on followup" into asm_16.1.2
Former-commit-id: eb5e563a4025fc7a5cb1f5eb10ac3b8a19d37396
2016-01-11 12:43:10 -05:00
Shawn.Hooper
668ecd8724 ASM #18478 - Removed DamagePath from tools menu
Change-Id: I9d60d78cf7ef91ddb2441510555436b7254849f5

Former-commit-id: ac8d612dbacfdfa9aa4443fa8990284ca30f7378
2016-01-11 12:24:06 -05:00
David Friedman
732ce00ab8 ASM #18474 - WarnGen polygon extension capability allows polygon to be expanded on followup
Change-Id: I08bd2b3d14d73377276a8cbf0ec4aeb8f57356ba

Former-commit-id: 8d264e4261d22fa7184eafa41a072290c783f67d
2016-01-11 14:32:45 +00:00
Shawn.Hooper
996eee12da Merge remote-tracking branch 'omaha/omaha_16.1.2' into master_16.1.2
Former-commit-id: 6727735b54f2fa9c463a5826bcd09505e6de13da
2016-01-08 17:26:48 -05:00
Shawn.Hooper
93f78bd124 Merge remote-tracking branch 'origin/master_16.1.1' into master_16.1.2
Former-commit-id: ed7f25bdaa0b440c9c1343a4e900780a4d73fb05
2016-01-08 17:06:55 -05:00