Shawn.Hooper
|
663c44637f
|
Merge tag 'OB_16.1.2-20' into asm_16.2.1
16.1.2-20
Conflicts:
cave/com.raytheon.viz.gfe/localization/gfe/userPython/procedures/TCStormSurgeThreat.py
rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
Change-Id: I9ed1c12896ffa710e7995f9682b4be1de88fa077
Former-commit-id: 9e3470f2b741592182dfae3e873503eb22df4f18
|
2016-02-22 11:13:16 -05:00 |
|
Shawn.Hooper
|
28598f153b
|
ASM #18626 - Fix typo: parseSting to parseString
Change-Id: I514532b35eb8750ad6acb8b3634879442a048abe
Former-commit-id: 49f2e585dd47426e2395e4f2ab7f6c17b96420ed
|
2016-02-10 10:41:09 -05:00 |
|
Shawn.Hooper
|
ecaa153f91
|
ASM #18626 - WarnGen: Softball/Grapefruit hail clarifications and CTA parsing corrections
Change-Id: I65490b00dc2c8beb4424896532d722e76a009e63
Former-commit-id: fe5ed11c398ba08c0beb3681aa433615946604b2
|
2016-02-09 11:04:47 -05: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 |
|
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 |
|
Qinglu.Lin
|
11c90c6c30
|
ASM #15688 - WarnGen: wrong portions of counties at PQR
Change-Id: Ifb9cbc44ac406727cb541aa676168214008b63c5
Former-commit-id: 092a701c6cf21dcd8a60baf92046ef0d8f6cb0e1
|
2016-01-05 12:46:43 -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
|
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 |
|
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 |
|
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 |
|
Shawn.Hooper
|
98e669bb00
|
ASM #17596 - Update column layout
Change-Id: I924d8ac5e5baa490ac2f06d00b8f4bc06dd86660
Former-commit-id: abdd7962267c4fe06b467441170f7dae9b17c17a
|
2015-12-04 17:07:20 -05:00 |
|
Ana Rivera
|
95d0d1e81a
|
VLab Issue #12688 - DR18179 WarnGen:Template Corrections-VM_global_library.vm; fixes 12688
Set_2: revised VM_global_library.vm
Change-Id: I0311acc9ecd9a44005c1f6a6b59ab1fa0245ff75
Former-commit-id: ddf5e7aec89cadf041455d5ad7e75c6383fb3014
|
2015-11-04 20:28:53 +00:00 |
|
Qinglu.Lin
|
0edd2da34d
|
ASM #15688 - WarnGen: wrong portions of counties at PQR
Change-Id: I50c2e123a3d3748c33823fe6a875c3d0bac3c69f
Former-commit-id: 508318d30bfc6f9429e1311429d30e097669d14e
|
2015-11-04 13:43:40 -05:00 |
|
Ana Rivera
|
93b89ee2c3
|
VLab Issue #12688 - DR18179 WarnGen: Template Corrections for the hydro CTA, mixed case and other issues; fixes #12688
Change-Id: Ifc130391dc3ec8f1ddd15e49e11332ebe2e5726e
Former-commit-id: dd3cf2d8135473e4dc1daa8731411d2c4e2e4c41
|
2015-10-30 12:08:43 +00:00 |
|
Steve Harris
|
56131ac305
|
Merge branch 'omaha_16.1.1' into omaha_16.2.1
Conflicts:
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/smarttool/Tool.java
cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/data/GageData.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
Former-commit-id: fa9ad9b8a3900bd5f94017f27bec9a5673ecb881
|
2015-10-21 09:22:00 -05:00 |
|
Shawn.Hooper
|
90badd7a3e
|
Merge tag 'OB_15.1.2-9' into master_16.1.1
15.1.2-9
Conflicts:
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/data/RiverStatData.java
cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/datamanager/ContactsDataManager.java
cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/datamanager/DescriptionDataManager.java
cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/datamanager/LocationAreaManager.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
Former-commit-id: e9e9660925d0afc016f88ec73182f9eae6ab0c18
|
2015-10-15 17:10:19 -04:00 |
|
Shawn.Hooper
|
becd5935a5
|
Merge branch 'asm_16.1.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_16.1.1
Former-commit-id: 19aefb32d4243a30511b9d5de557c51adf689d2d
|
2015-10-13 16:21:51 -04:00 |
|
Qinglu.Lin
|
bae2c8d0b6
|
ASM #18154 - assigning 1 to usedirs in warngenloc table results in incorrect third bullet in a SVR product
Change-Id: I121d2610ea72f9afdd21bb2fb790e26c5aeb1b4d
Former-commit-id: b5534ca240aa8931ac0f09d945b1d99f307ff982
|
2015-10-09 08:53:35 -04:00 |
|
Juliya Dynina
|
75371216ad
|
Merge "ASM #17978 fixed the hydroview display for time step" into asm_16.1.1
Former-commit-id: 82ea99a28bb9183b347c816889679bf8a8e0c27e
|
2015-10-08 14:41:27 -05:00 |
|
Shawn.Hooper
|
9f01e98c45
|
ASM #17785 - Minor Template Change for Flash Flood Warning
Change-Id: I5e25d173c261e92a7341f8fc5704165669115e93
Former-commit-id: eb717cbd6fd6da565bd6bf99d81db7c89f19c2df
|
2015-10-07 12:29:53 -04:00 |
|
Steve Harris
|
b0cb953346
|
Merge branch 'omaha_16.1.1' into omaha_16.2.1
Former-commit-id: dcdb27bc06556bccae34817d33b7a096ebb1def4
|
2015-10-01 12:39:24 -05:00 |
|
Ron Anderson
|
10bb106c51
|
Omaha #4547 Fixes for impact SVR TOR and SVS.
Change-Id: If567839abf4d8ed7e2112ef7fdca1a8d3a2961a4
Former-commit-id: 934a0e78ceee78058cfde647390ea107052f1896
|
2015-09-29 12:46:31 -05:00 |
|
Ron Anderson
|
51a2690f2a
|
Omaha #4547 One more template fix
Change-Id: Icfc06c02fd38145344954011da52476e26e2b09c
Former-commit-id: 31966b8a4b1bca7553fe0cfccbfc67e0632de87b
|
2015-09-29 09:51:52 -05:00 |
|
Ron Anderson
|
e053bbb0a5
|
Omaha #4547 One more set of changes based on Richard Barnhill's findings
Change-Id: I1ec96073a03fb3a2e7a9e01f4d6379db6844cee5
Former-commit-id: 9a5014cde9a12682209ca04500abd05c9d4d3a98
|
2015-09-23 18:35:11 -05:00 |
|
Steve Harris
|
bc84d97750
|
Merge branch 'omaha_16.1.1' into omaha_16.2.1
Conflicts:
cave/com.raytheon.uf.viz.product.alertviz/src/com/raytheon/uf/viz/product/alertviz/AlertVizApplication.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/perspective/GFEPerspectiveManager.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/textformatter/FormatterScriptFactory.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFED2DDao.java
Former-commit-id: 3ba87373d75582c47288fe39e8f72aa404de0a94
|
2015-09-22 15:57:39 -05:00 |
|
Steve Harris
|
aea911a2c1
|
Merge tag 'OB_16.1.1-13' into omaha_16.1.1
16.1.1-13
Former-commit-id: c1757c2e5d3957cb70565c4783daee0bb19cad4c
|
2015-09-22 15:42:47 -05:00 |
|
Shawn.Hooper
|
4154b5d9bd
|
Merge branch 'omaha_16.1.1' of ssh://awips2omaha.com:29418/AWIPS2_baseline into master_16.1.1
Former-commit-id: bf5ffd9fe9726c04ca6f82ae85c56b894d519289
|
2015-09-22 14:07:52 -04:00 |
|
Ron Anderson
|
5f0e28c992
|
Omaha #4547 Template changes from Richard Barnhill
Change-Id: I311c5b895053e53fa3325067a223b089f36be891
Former-commit-id: 742865eed638292576a19cedf7a7bd94ae0d162c
|
2015-09-21 14:37:31 -05:00 |
|
Ron Anderson
|
204788532e
|
Omaha #4547 Template changes from Richard Barnhill
Change-Id: I5e1d840a1e2695c45f087da975d603fe0eb67767
Former-commit-id: cd674630a1e4ce62cafcdeeaaf2a9a90362f96c3
|
2015-09-21 12:22:47 -05:00 |
|
Ron Anderson
|
f34b2b5c35
|
Omaha #4547 Fix letter case in arealFloodWarningFollowup.vm
Change-Id: I600b00d7135292cf7e7391092da0ee5091b0f140
Former-commit-id: cbc4b0ad0793f9a43d732a0ff549d7a5049533b5
|
2015-09-16 15:12:59 -05:00 |
|
Ron Anderson
|
2a482bac00
|
Omaha #4547 Fix letter case in nonCOnvectiveFlashFloodWarningFollowup.vm
Change-Id: I3a79c15b430cd65f9f8618be91adf6cc0a7b5dac
Former-commit-id: 9d7fb2c428199d0484c9889af18c02947d0e706c
|
2015-09-16 14:38:18 -05:00 |
|
Ron Anderson
|
5aadd51c5e
|
Omaha #4547 Fixed CTA heading in arealFloodWarning.vm
Change-Id: I4c6745ef9750c9bfd45bf27fbf3bc5c3a0a9bf47
Former-commit-id: a045db497ccdcd9148916a7ff8017288fdbe3607
|
2015-09-16 09:19:08 -05:00 |
|
Qinglu.Lin
|
43d40f5484
|
ASM #17890 - WarnGen can format a duplicate second time zone time in headlines
Change-Id: If0d324ad55af6f5bf4d8862993ba88641fe94a9f
Former-commit-id: 4225721333c99f6e16e28f7c40c147021bda39d4
|
2015-09-11 16:52:23 -04:00 |
|
Ron Anderson
|
0d3e04935f
|
Omaha #4853 TO56 - Comment out "affectedZones" in geospatialConfig_COUNTY.xml
Change-Id: I449c946255a3cdaa43ca43e0f27021768372ebe7
Former-commit-id: dea2bfdc4cc26392fc001e83382a1de135704740
|
2015-09-09 14:19:53 -05:00 |
|
Steve Harris
|
4bb1dfd213
|
Merge tag 'OB_16.1.1-9' into omaha_16.2.1
16.1.1-9
Conflicts:
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/ProductEditorComp.java
Former-commit-id: 4ff4f4722a0fd37cf6ec75c701acd43d778ce7c2
|
2015-09-01 16:06:40 -05:00 |
|
Roger Ferrel
|
ae170f08ff
|
Omaha #4360 Changes to use annotatin to obtain null values to use in non-nullable fields.
Change-Id: Ide533d105f8a02cf88fdeb25970b99a5c6399eb2
Former-commit-id: c00e44bcae398aaa2af21d8be2e133eba41b94ff
|
2015-08-25 07:24:29 -05:00 |
|
Shawn.Hooper
|
5759470634
|
Merge tag 'OB_15.1.1-32' into master_16.1.1
15.1.1-32
Conflicts:
cave/com.raytheon.uf.viz.d2d.core/src/com/raytheon/uf/viz/d2d/core/time/D2DTimeMatcher.java
cave/com.raytheon.viz.gfe/localization/gfe/userPython/procedures/MakeHazard.py
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/ProductEditorComp.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/text/AbstractLockingBehavior.java
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/VM_global_library.vm
edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/fax/FaxSender.java
Former-commit-id: f925ff11b783389e5ca32a2d7cd1ec5edfa835db
|
2015-08-19 14:58:31 -04:00 |
|
David Friedman
|
bf77ad45c5
|
ASM #17841 - WarnGen can format a duplicate second time zone time
Change-Id: Ib6462575756af85757f1c4de79f4936c10300b48
Former-commit-id: 2bcda119b2d8cfb9b831868b4ef4df4b3fcae9f6
|
2015-08-11 21:08:17 +00:00 |
|
Steve Harris
|
943628f462
|
Merge branch 'omaha_16.1.1' into omaha_16.2.1
Conflicts:
rpms/build/common/lookupRPM.sh
Former-commit-id: 8db96f4003ee58a46c7b37c385d0683329b66d55
|
2015-08-10 20:42:11 -05:00 |
|
Ron Anderson
|
ea8812f51c
|
Omaha #4547 More template fixes
Change-Id: Ifbf3341f669682157fd95d64bcccfd7c1b4243e7
Former-commit-id: 5a02fe4695575b841675dfde6ec3a7ce38c028b8
|
2015-08-10 11:58:14 -05:00 |
|
Richard Peter
|
5d7f17e149
|
Omaha #4486 - Hibernate return java.util.Date instead of java.sql.Timestamp
Change-Id: Ib425d2f4021a587b5c8cd52bfe3816c723f6b0a1
Former-commit-id: 06d943d51fec264ec34a45ed84547b7972925e7e
|
2015-08-05 15:19:05 -05:00 |
|
Steve Harris
|
716970c597
|
Merge branch 'omaha_16.1.1' into omaha_16.2.1
Former-commit-id: 2c28db21de36edb64a6a741e93803b3423f5c22c
|
2015-08-04 13:41:21 -05:00 |
|
Roger Ferrel
|
80c5050404
|
Omaha #4360 AbstractWarning's etn value now initialized to a non-null value.
Former-commit-id: 6c56abd9f6928b4cc8e3528ea29e418c6e1c416d
|
2015-07-31 09:06:17 -05:00 |
|
Ron Anderson
|
f24e1831f0
|
Omaha #4547 Fix case inconsistency impactTornadoWarning.vm for TORNADO EMERGENCY
Change-Id: I2a7b755fb61b2728b20884da839388a226c84152
Former-commit-id: 5759c8af522ade5a0a18535a2676451daaacd5c3
|
2015-07-30 13:23:53 -05:00 |
|
Roger Ferrel
|
6e0b8fca6a
|
Omaha #4360 DataURI updated for tables derived from AbstractWarningRecord.
Former-commit-id: 6f9c0267f5aad993db4e4d6a3449561dcc6e64d5
|
2015-07-29 14:58:16 -05:00 |
|
Ron Anderson
|
64741d7a70
|
Omaha #4547 More warngen template fixes.
Change-Id: I9619681888bbebc681461f190231cebf325d405f
Former-commit-id: 66b051d8a7a791c8ffc2cf48e1f15f40d47ae71a
|
2015-07-21 12:56:12 -05:00 |
|
Ron Anderson
|
df708de1e4
|
Omaha #4547 Fix some more issues with warngen templates
Change-Id: I4d7d2635def75a7262b2c70bd699ce37914cbe1f
Former-commit-id: 908dbaea4585226b8742f713dc2a7f20752cee2c
|
2015-07-17 10:09:57 -05:00 |
|
Ron Anderson
|
aff1b9b21e
|
Omaha #4547 Fix more issues with extremWindWarningFollowup.vm
Change-Id: Ic3b1311c445507170ebd8a175767d2816731254c
Former-commit-id: 6a31d2379a8b5be9fb2bf51ac43e251a4541d523
|
2015-07-13 17:44:22 -05:00 |
|
Ron Anderson
|
190049ee38
|
Omaha #4547 Fix more issues in extremeWindWarningFollowup.vm
Change-Id: I8b8ce5da4950c581f556b4f6a2744ec87aff8d52
Former-commit-id: 3058151ebcaeef7bd794d110ac28efd7144945ad
|
2015-07-13 09:33:30 -05:00 |
|