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
Shawn.Hooper
b9805ddf2e
Merge remote-tracking branch 'vlab/ohd_16.1.1.1' into master_16.1.2
...
Former-commit-id: 4fe656d88ae550c4ee836f1e4efb0e2294ff69dd
2016-01-07 17:15:01 -05:00
Shawn.Hooper
0836b37c4a
Merge remote-tracking branch 'asm/asm_16.1.2' into master_16.1.2
...
Former-commit-id: 6e90fbcc490105418e7fdfa377d9769206de6d17
2016-01-07 17:14:53 -05:00
David Friedman
5d173b95fd
ASM #18453 - WarnGen polygon extension area: cache generated areas
...
Change-Id: Ie565e35252db7969debe0268036957fe4ae26ba2
Former-commit-id: 8f699c2ca39fc4d9d65c4a2f3e55a4dbf0873fcd
2016-01-06 20:49:06 +00: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
Paul Tilles
e4bbb25301
VLab Issue #13938 - MPE DailyQC; fixes #13938
...
Change-Id: I66a97b07fe2dc7f7bebc38a5a90e009f90463f9e
Former-commit-id: 9f3c299bc8ac40831b96aaeec25695af45d99675
2016-01-06 16:07:56 +00: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
bbfdae229b
Merge remote-tracking branch 'omaha/omaha_16.1.2' into master_16.1.2
...
Former-commit-id: 51da3901f6362ad1e7d8be037a7cb741fa4c8224
2016-01-05 22:42:19 -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
b8033af017
Merge tag 'OB_16.1.1-33' into master_16.1.2
...
16.1.1-33
Former-commit-id: 1de8dc49d42d788ce1db425f7206000fdc3e9ca3
2015-12-23 14:30:07 -05:00
Shawn.Hooper
16f7b165ed
Merge remote-tracking branch 'asm/asm_16.1.1' into master_16.1.1
...
Former-commit-id: 84fee2e252b48be4922b51062d92b451c324c79f
2015-12-23 11:48:51 -05:00
Matthew Howard
649838ba5b
Merge "ASM #17933 - WarnGen: add capability to suppress 'ern' in, for example, Southern Texas for state location." into asm_16.2.1
...
Former-commit-id: 5d070bc16a46d8db2021188856098fcdaa44e383
2015-12-22 14:50:37 -05:00
Zhidong.Hao
40c3cb9749
ASM #18342 AvnFPS: Climatology chart calculation is incorrect as compared to A1
...
Change-Id: I19568e71de43f3eeec8412431e437ea01b76d7bc
Former-commit-id: 35d85e0599f73b5da4c4cc287fa7d25493ef5cab
2015-12-22 14:29:14 -05:00
Ying-Lian.Shi
13bf65cab5
ASM #18428 GFE: Issuing a Correction of a corrected product via an existing Product Editor in GFE throws an error and unlocks text
...
Change-Id: Ib0aac70c3f5592bee02446b307cecde18ada4cda
Former-commit-id: bc14cb7f4433caae5693ff7775f42bfe70988eac
2015-12-22 17:42:03 +00:00
Matthew Howard
4d28956c78
Merge "ASM #18341 AvnFPS: HDF5 climate NCDC data type conversion issue" into asm_16.1.2
...
Former-commit-id: 9529c06ec70a2711a9b9ec49ba85e5c1a46e3353
2015-12-22 11:41:57 -05:00
Matthew Howard
d1f8c45851
Merge "ASM #18341 AvnFPS: HDF5 climate NCDC data type conversion issue" into asm_16.1.2
...
Former-commit-id: fe020696e56a5be75ba3f92d717f76de37a09d73
2015-12-22 11:41:43 -05:00
Zhidong.Hao
0e3ba5c5fc
ASM #18341 AvnFPS: HDF5 climate NCDC data type conversion issue
...
Change-Id: If728efeec48dd74917a271a2351bf4bd777d3445
Former-commit-id: 8c9911836586c6760b7c4f844b54b2453be3a998
2015-12-22 11:02:46 -05:00
Zhidong.Hao
7ffc8d278e
ASM #18341 AvnFPS: HDF5 climate NCDC data type conversion issue
...
Change-Id: Ic8093a7213bdae6a4931619ad176bd0ac4e8fb0a
Former-commit-id: 69de9d7a87dd525d835ddf2ab204e57129d2e1a6
2015-12-22 10:57:02 -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
Shawn.Hooper
569b2449c1
Merge remote-tracking branch 'asm/asm_16.1.1' into master_16.1.1
...
Former-commit-id: 1479c66419b6a3b110ec5bca3e27409ec6a72d28
2015-12-21 13:18:24 -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
Mike Duff
0dd941a578
Omaha #5217 - Fix Areal Import in Hydrobase
...
Former-commit-id: 666ba9d0eea16944e4ed57ad225abc611f57ea76
2015-12-18 14:45:42 -06:00
Sean.Webb
5e31e4ba9b
ASM #14308 - Fixed KMSR pattern to handle grib2 products
...
Change-Id: If225bc33c9739c3fd72999a4c3ef3d4a2d99b979
Former-commit-id: 8d1eb0cda2ceef99b511d9e87a19c9bbb85467bd
2015-12-18 09:21:00 -05:00
Shawn.Hooper
5a1d836046
Merge remote-tracking branch 'asm/asm_16.1.1' into master_16.1.1
...
Former-commit-id: 23909c02db11527cf93054fc5ee43761b3f42bd7
2015-12-17 10:25:35 -05:00
Xuezhi.Wei
5ca77fc288
ASM #18407 XDAT in Hydro Perspective should allows user to view 30 days
...
Change-Id: I1f820cf7c2d80d586ad18fd0016d800308089d01
Former-commit-id: 01a236f6a635d3b677f98635767a58a18856264c
2015-12-17 15:12:37 +00:00
Ana Rivera
8736560556
VLab Issue #14020 - DR18419 Baseline GridManipulation.py; fixes #14020
...
Required by CopyNHCProposed.py. Code provided by Matt Belk.
Change-Id: Ibca897836b703c6af24c9e48ee8948edc2a9e77a
Former-commit-id: d47611ec55c292c0276145b2037e1e6153d65d77
2015-12-17 14:40:52 +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
Shawn.Hooper
0aa4bff53c
Merge remote-tracking branch 'asm/asm_16.1.1' into master_16.1.1
...
Conflicts:
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/StyledTextComp.java
Former-commit-id: 713eca23ad654688d6e2d83f2311fda973ca0d4c
2015-12-17 08:49:54 -05:00
Yun.Teng
63b7720760
ASM #18367 - Disable finalizing ETN when product is stored to text database
...
Change-Id: Ic04f222bcf6b0a8c6c4fb0265128f37607865f1c
Former-commit-id: ae843c763b2cff45b278e1f653979fce33b77770
2015-12-16 16:44:15 +00:00
Ying-Lian.Shi
a1d080004e
ASM #18410 For corrected products, both WMO time and MND time should match the current time
...
Change-Id: Ia4f7ff5c125798181ac3860e15174e45eecb3941
Former-commit-id: 50d447eeb936f6ef7f2952d6d9879f38905cb50b
2015-12-16 14:38:23 +00: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
Ana Rivera
4a018c01b6
Merge "VLab Issue #9806 - DCS16913(set_3) HTI Improvements: CopyNHCProposed.py; fixes #9806 " into tcv_16.1.2
...
Former-commit-id: 9a3bb8b395e4148f46e32fd1b306ba6cef6d3914
2015-12-14 16:05:22 +00:00
Michael Gamazaychikov
12981ba3d4
ASM #14752 - Word wrap not working properly for WarnGen impact warnings.
...
Change-Id: Ifdb6393cf070dc6e55b15dda22e8c93072ae1d79
Former-commit-id: 0c3307554bda52b437bdf2019c500bb4f6b8adcf
2015-12-14 09:49:22 -05:00
Slav Korolev
fdcddb9f50
Omaha #4645 - Removed popup menu persistance.
...
Former-commit-id: db10233638a504ed2455c43272d1fd1dff2b4194
2015-12-14 08:28:30 -05:00
Ana Rivera
cfc3107049
VLab Issue #9806 - DCS16913(set_3) HTI Improvements: CopyNHCProposed.py; fixes #9806
...
Change-Id: I1d5ac66566bb92c7e5aef9d264baab9325fdc264
Former-commit-id: 6834535722d3017b082239e3c72c24a4ead7a565
2015-12-12 18:06:19 +00:00
Shawn.Hooper
be77f3b2bb
Merge remote-tracking branch 'omaha/omaha_16.1.1-redelivery' into master_16.1.1
...
Former-commit-id: bc21b3c3012c608e2a327e55827fa7fb19a558c3
2015-12-11 14:43:06 -05:00
Shawn.Hooper
db7d68f3aa
Merge remote-tracking branch 'asm/asm_16.1.1' into master_16.1.1
...
Former-commit-id: 62dcc684705dac4cc7655cdbd77619b0c6f2ef88
2015-12-11 14:43:02 -05:00
Steve Harris
18b05381a8
Merge tag 'OB_16.1.1-29' into omaha_16.1.1
...
16.1.1-29
Conflicts:
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/StyledTextComp.java
Former-commit-id: eed5a5a8c0c4cbe5bd551187ea5dac6b449c5b3e
2015-12-11 12:44:10 -06:00
Shawn.Hooper
86d09e4d61
Merge remote-tracking branch 'omaha/omaha_16.1.2' into master_16.1.2
...
Former-commit-id: 447d9b7f91d836f1f84797dbaad34060079e0ebe
2015-12-11 09:28:55 -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
Dave Hladky
908b93cac5
Omaha #3873 Fog display of Maritime mobiles.
...
Former-commit-id: 32fdd3bb6cd664607ff431f2a120074490ec5f1a
2015-12-10 16:44:50 -06:00
Matthew Howard
11649f1286
Merge "ASM #17908 - WarnGen: End time changes randomly" into asm_16.2.1
...
Former-commit-id: 9488b304f04266433eb06a42e902c23d84592123
2015-12-10 15:49:28 -05:00
Qinglu.Lin
991416c11d
ASM #17908 - WarnGen: End time changes randomly
...
Change-Id: Ib46ae12a86bfee0d43b0c08d8b14e855022559a1
Former-commit-id: 7b59a3a45d3ce8dd5bab5a1da368e1b1c4952650
2015-12-10 15:20:25 -05:00
