Yun.Teng
3c02c9885a
ASM #13261 - Change an alertviz message in PFM formatter
...
Change-Id: Ia0f2f553076e3ca022ef13a4802163776ac26279
Former-commit-id: b88cd2dece4fed8608cf3f56998ab115ba06f6fb
2016-02-02 19:20:49 +00:00
Pam Johnson
9d2810402f
Merge "ASM #14802 - Fix RTMA Max/Min Temperature" into asm_16.2.2
...
Former-commit-id: 367aad8c67f62f33673da3d3917dbc210e61c928
2016-01-29 11:20:32 -05: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
Melissa Porricel
3fcb8eacc5
ASM #14802 - Fix RTMA Max/Min Temperature
...
Change-Id: Icadec9812609a13f5ba28530aefd89ea97612256
Former-commit-id: cc337b50fb34f78622170bf42dea47e0d5402c7c
2016-01-11 11:07:16 -05:00
Shawn.Hooper
221d0396b2
ASM #18056 - Fix merge issues for serverConfig.py found in 16.2.1-5
...
Change-Id: Id36309a56d4e13093c4073256bba9aa5521e929d
Former-commit-id: ab99fdc554ed8da307b88c463fb9302476def68b
2016-01-06 13:58:41 -05:00
Shawn.Hooper
98d9f5522b
Merge remote-tracking branch 'asm/asm_16.1.2' into master_16.1.2
...
Former-commit-id: 0ce43bc7d48723d2aebc2e6281a0e3356eb65beb
2016-01-05 23:09:53 -05:00
Shawn.Hooper
fad499c581
Merge remote-tracking branch 'omaha/omaha_16.1.1.1' into master_16.1.2
...
Conflicts:
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/MPEFieldResource.java
Change-Id: I2e27575f864da841a07ca019a12819e0fcb16ced
Former-commit-id: 4b93303cd64cdae241f4dfc02fbdc3ab8a2c31f2
2016-01-05 20:33:34 -05:00
Shawn.Hooper
417410b5c0
Merge remote-tracking branch 'asm/asm_16.2.1' into master_16.2.1
...
Former-commit-id: 5baf7ac552321cff537ab8ff1c90d864b2c508c6
2016-01-04 17:27:00 -05:00
Shawn.Hooper
f27a0b1e80
ASM #18056 - Fix merge issues for serverConfig.py in 1621-4
...
Change-Id: I22fb443dbdc32da185f1cec2ed1e427048d74e19
Former-commit-id: 497cbf7a4c272b823064edeeb55a36063ff09c6b
2016-01-04 16:54:55 -05:00
Shawn.Hooper
f3fafae42e
Merge remote-tracking branch 'origin/master_16.2.1' into asm_16.2.1
...
Conflicts:
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
Change-Id: Ie67d751b1c68099a98826e6542ebff4cf0aae7e5
Former-commit-id: b9b551d68ed55536b2480b60ef1269bcf5402004
2016-01-04 16:47:59 -05:00
Shawn.Hooper
f7b4040970
ASM #18179 - WarnGen: Template Corrections for the hydro CTA, mixed case and other issues
...
Change-Id: Ibd5db3a6aa75f80f5700925596753231f484777a
Former-commit-id: fe5c90a91d03a24d5f16f47d4834807576ceac23
2016-01-04 13:59:00 -05:00
Shawn.Hooper
dc86635bb9
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
Former-commit-id: 071dbbc21ea440c1c4cb5bbd739ddcba861cdefd
2015-12-31 09:31:25 -05:00
Shawn.Hooper
c7c3d81479
Merge remote-tracking branch 'vlab/tcv_16.1.2' into master_16.1.2
...
Former-commit-id: abfd5978ff55d595eaba09c4a70f763fb56986f9
2015-12-28 09:56:50 -05:00
Shawn.Hooper
c98e7908fe
Merge remote-tracking branch 'asm/asm_16.1.2' into master_16.1.2
...
Former-commit-id: b4a41b2992ddfa2cea55a3ae25204ba57aeb3a00
2015-12-28 09:46:49 -05:00
Shawn.Hooper
c03bf2fc84
Merge tag 'OB_16.1.1-32' into master_16.1.2
...
16.1.1-32
Conflicts:
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/EditPrecipStationsDialog.java
Former-commit-id: bbe412da6e8b600bfcab446d46619c57a65efbe8
2015-12-22 10:23:34 -05:00
David Friedman
86673672a5
ASM #17942 - WarnGen Improvements: Polygon extension area
...
Change-Id: Ic3b0c5e74dddb8dc5f973b41ae78d85ffe50a002
Former-commit-id: dfc678f705d33e1245bec773cc8fac7594de7579
2015-12-21 16:55:59 +00:00
Sean.Webb
74dadb8f58
ASM #18420 - Removed incorrect entry for channel 10
...
Change-Id: I5db2433a32a1c29123d750157889e990ef905cce
Former-commit-id: 71c49c12ede410301f4906d13ea17e6817138463
2015-12-17 09:21:41 -05:00
Michael Gamazaychikov
29c59eda80
ASM #17933 - WarnGen: add capability to suppress 'ern' in, for example, Southern Texas for state location.
...
Change-Id: I9fad8c7dcad62dbec0585e09bba21d4e8aec97f1
Former-commit-id: d1de4f89ee8a7d87375c9bdadafee3e914d0e89c
2015-12-15 10:19:29 -05:00
Shawn.Hooper
7b8cdf795e
Merge remote-tracking branch 'asm/asm_16.1.2' into master_16.1.2
...
Former-commit-id: 786609a690462809e0c2c8f8ef7ebfdffb191137
2015-12-11 09:28:48 -05:00
steve.naples
5c496d624a
ASM #18391 - HRAP grid displaced South and West of where it should be.
...
Change-Id: Ida23e2029950b2feaf24c8da8b6b12c806f8458f
Former-commit-id: e243dc23ff4529c6e1498335793dc16ce7d4931a
2015-12-10 18:22:37 +00:00
Ana Rivera
01ac45b8cf
VLab Issue #12688 - DR18179(set_3) WarnGen: Template Corrections for the hydro CTA, mixed case and other issues; fixes #12688
...
Change-Id: Icd22291002f7ee2949c8718321e19addfc3b29eb
Former-commit-id: 3329560da2bed8516e69e8100de423ade5940257
2015-12-10 11:06:33 -05:00
David Friedman
d13c574a57
ASM #18209 - WarnGen: dam break FFW outside the local CWA
...
Change-Id: I03a9a49010bb813a146512af9fda95c934b1c146
Former-commit-id: 47c44418a10af8badd4deea264774748ef5ea3cb
2015-12-09 22:21:35 +00:00
Nate Jensen
9114c1ad37
Merge "Omaha #5197 Fixed copy/paste error in ActiveTableUtil." into omaha_16.2.1
...
Former-commit-id: f28431606e20aa32c7dcd72e6247335be395fba9
2015-12-09 13:51:37 -06:00
Robert Blum
42a4d9d508
Omaha #5197 Fixed copy/paste error in ActiveTableUtil.
...
Former-commit-id: a1ec70ea5653830fe7a6068fd96d01e04b6685db
2015-12-09 11:27:45 -06:00
Nate Jensen
e39521e223
Merge "Omaha #5164 Updated userRoles.xml for Hazard Services." into omaha_16.2.1
...
Former-commit-id: a6e2f7a35bf16d93417ae5b4b9589e51dbd48163
2015-12-09 11:14:26 -06:00
Robert Blum
54aec797b5
Omaha #5164 Updated userRoles.xml for Hazard Services.
...
Former-commit-id: c1864894785c124c5412b2a5c3899ecacbeb42e7
2015-12-08 17:50:38 -06:00
Shawn.Hooper
9ec3b521af
Merge remote-tracking branch 'asm/asm_16.1.2' into master_16.1.2
...
Former-commit-id: 20d9e9d92f02e06efe36e15e75d199e09dfa33e7
2015-12-08 17:01:09 -05:00
Shawn.Hooper
200c59cef5
Merge remote-tracking branch 'origin/master_16.1.1' into master_16.1.2
...
Former-commit-id: 4afa2fe0d7abd2180b40a0737a3b372325d2621c
2015-12-08 16:11:35 -05:00
Ron Anderson
7c64c3acea
Merge "Omaha #5168 Fix smartInits with calcMethods using both accumulative and non-accumulative parameters" into omaha_16.1.1.1
...
Former-commit-id: fd8343669181bc76fde5d00a2c9031ea9afa32dc
2015-12-08 10:53:43 -06:00
Ron Anderson
4569a74582
Omaha #5168 Fix smartInits with calcMethods using both accumulative and non-accumulative parameters
...
Change-Id: I91871ab604df0b1df6115ddedc490f6703606950
Former-commit-id: 19d92a19705f35b63c3ee56b912871e0d8ae5241
2015-12-07 15:09:54 -06:00
Lee Venable
232ee4c664
Merge "Omaha #3841 Allowed for zone updates to be reflected in table on area configuration updates. Change-Id: I273a306ae7fb5e4c813b94d908820f1175b6b1ad" into omaha_16.2.1
...
Former-commit-id: 0249e48794658ff34bca5baa93a5f78114bcb296
2015-12-07 13:21:58 -06:00
Dave Hladky
ed8aeb4e52
Omaha #3873 Moving platforms not appearing in safeseas display.
...
Change-Id: Id2c4372360370af52a0ff2441e64d5f6bb85a4b4
Former-commit-id: 329e0538a81244a547461d7588f742c0b8afc785
2015-12-07 10:56:38 -06:00
Shawn.Hooper
98e669bb00
ASM #17596 - Update column layout
...
Change-Id: I924d8ac5e5baa490ac2f06d00b8f4bc06dd86660
Former-commit-id: abdd7962267c4fe06b467441170f7dae9b17c17a
2015-12-04 17:07:20 -05:00
Richard Peter
210270699e
Omaha #4911 - Check all columns on common_obs_spatial update
...
Change-Id: I97099be8a84f5706cae7ba64bb69c50437f3b0f9
Former-commit-id: c3af448f2fc2ffa4cfbf3bcb075c8d6d0a8da410
2015-12-04 10:50:26 -06:00
Nathan Bowler
dcfe7af688
Omaha #5154 Handle level id == 0 in when validating levels in GridDao.
...
Change-Id: Ia79dc179eabbf32c525e20b2e663d85838642120
Former-commit-id: 7d53cb7550e8550f3bab4645b1b2980cf15d8d03
2015-12-02 11:45:47 -05:00
Shawn.Hooper
adbf370067
Merge branch 'ncep_16.2.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_16.2.1
...
Former-commit-id: 308e957ad19bc4edd76fba59ad7d0f77a5f887e2
2015-11-25 16:21:43 -05:00
Shawn.Hooper
6691e00db0
Merge branch 'field_16.2.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_16.2.1
...
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
Former-commit-id: 47c4fb84dd4338fc820871adf2733a8835e981a4
2015-11-25 14:37:37 -05:00
Shawn.Hooper
e93839673c
Merge branch 'asm_16.2.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_16.2.1
...
Conflicts:
cave/com.raytheon.viz.gfe/localization/gfe/userPython/textUtilities/headline/HazardsTable.py
Former-commit-id: 0d5c4caf82d74459f9412800955d6cb9da18f3fb
2015-11-25 14:31:20 -05:00
Bryan Kowal
8faa97d87a
Omaha #5151 - allow additional features to be read from an external file and built in the exact order specified.
...
Eliminates the need for separate WA-specific properties files now that WAs are permanent separate repositories.
Former-commit-id: de0f6e355d849c3dec8c7878d6d00e584812795d
2015-11-24 14:55:33 -06:00
Brian Clements
82bcf58cbc
Omaha #5087 moved edex.soap to OGC repo
...
Change-Id: If9caa175840bc7c70fac657a7e379a149243762b
Former-commit-id: ab98251c7c3f8941f2a7c01c47bd52020deb62d9
2015-11-23 10:47:20 -06:00
Shawn.Hooper
3bbc0622b4
Merge branch 'tcv_16.1.2' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_16.1.2
...
Former-commit-id: b1befee21578d2ee52e4ed99335042ecfdeded75
2015-11-20 12:59:00 -05:00
Ana Rivera
37e11e50c4
Merge "VLab Issue #12487 serverConfig.py; fixes #12487 " into field_16.2.1
...
Former-commit-id: 639372e3bd6686318b18bf3b1652e604a1050ed8
2015-11-20 00:27:49 +00:00
Sarah Pontius
917effa917
VLab Issue #12917 - TCV and HLS Improvements; fixes #12917
...
Change-Id: I9f9c652d32176e0e12317896001eb8613ef21c57
Former-commit-id: 2f562bdb68479d53997788b9227b7f25b972231f
2015-11-19 15:36:50 -07:00
Shawn.Hooper
8aa9c7a246
Merge branch 'omaha_16.1.2' of ssh://awips2omaha.com:29418/AWIPS2_baseline into master_16.1.2
...
Former-commit-id: b41c829627607c30cb9196cf54ca6509d7db96e2
2015-11-19 17:05:45 -05:00
Shawn.Hooper
550d647399
Merge branch 'asm_16.1.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_16.1.1
...
Former-commit-id: ca7cd31d6b8b3c148ce8cd9b4c222e480c034a5a
2015-11-19 13:05:28 -05:00
Greg Armendariz
1c8b75ee95
Omaha #5087 - Include foss directory in plugin directory list
...
Former-commit-id: 2b145c9149ec3410f07ced8fa8f32604a02cd44b
2015-11-19 11:23:08 -06:00
Shawn.Hooper
174c93ae67
Merge branch 'field_16.2.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_16.2.1
...
Former-commit-id: e93e644b58fc753255c07a98a30936ce0cd5508e
2015-11-17 16:49:09 -05:00
Ana Rivera
c76b1a69fb
Merge "VLab Issue #12735 - GFS20PostProcessor does not handle CP grids; fixes #12735 " into field_16.2.1
...
Former-commit-id: de86308c40fe4f437778eaa63d9c48a935da11c0
2015-11-17 19:36:17 +00:00
Tom Filiaggi
3cbd3714bd
VLab Issue #12487 serverConfig.py; fixes #12487
...
More responses (minor code changes) to review feedback.
Change-Id: I2ff5d25d2b13fb8f7b5e50343777b76c76b42eb5
Former-commit-id: 007439c210853856c5814b53bb17f06ba9f48bbe
2015-11-17 09:57:08 -07:00
David Friedman
738cb0d430
ASM #18257 - Some DPR products not being ingested correctly
...
Change-Id: I6fe2d7de51a5ec668170d4d12a694632038026e9
Former-commit-id: 039a485a5abf332df83cd6d91d2e4092965bb725
2015-11-17 16:26:55 +00:00
