Nate Jensen
f828f93223
Omaha #3974 harden damage path loading/saving
...
Change-Id: I6777e3af4a48db06a484db022df9c9dffc717be3
Former-commit-id: f79457d7befc4e34d743
2015-02-04 13:31:10 -06:00
Matthew Howard
b482802e1e
Merge "ASM #17039 - Remove HighlightFramingCodes feature" into asm_14.4.1
...
Former-commit-id: cfc96297744a46df6ed9
2015-02-04 11:16:20 -05:00
Rici.Yu
0a489fea9c
ASM #17039 - Remove HighlightFramingCodes feature
...
Change-Id: I7ee07ef64b1a16cdeb0b6af48ccaf3c228357891
Former-commit-id: 1188dab0f45470139b42
2015-02-04 10:23:30 -05:00
Steve Harris
e3f34455ce
Merge tag 'OB_14.4.1-7m' into omaha_15.1.1
...
14.4.1-7
Former-commit-id: d95158ec5385457e37cb
2015-02-03 17:30:23 -06:00
Steve Harris
8f2af8e359
Merge tag 'OB_14.4.1-7m' into omaha_14.4.1
...
14.4.1-7
Former-commit-id: 2468be4dd1f428e16ebb
2015-02-03 17:18:57 -06:00
Nate Jensen
b9e9ac9107
Merge "Omaha #3974 save damage path to user localization" into omaha_15.1.1
...
Former-commit-id: 86c2994048a680e0449f
2015-02-03 16:38:48 -06:00
Nate Jensen
2819bd9ccf
Omaha #3974 save damage path to user localization
...
Change-Id: I051a1ed2d15deb6a74d12d4213ddab27a607d0eb
Former-commit-id: f4778232702f7558a6c5
2015-02-03 14:15:07 -06:00
Steve Harris
da982be8b7
Merge tag 'OB_14.4.1-6m' into omaha_15.1.1
...
14.4.1-6
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
Former-commit-id: afb3d317598cd98ea3b9
2015-02-03 12:25:05 -06:00
Steve Harris
80dae4bc15
Merge tag 'OB_14.4.1-6m' into omaha_14.4.1
...
14.4.1-6
Former-commit-id: b684848820db185ed16c
2015-02-03 11:24:39 -06:00
Fay.Liang
5550322f62
Merge branch 'gsd_14.4.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.4.1
...
Former-commit-id: f1c34884a5ae85ade54d
2015-02-03 11:24:57 -05:00
Nate Jensen
3c782d6393
Omaha #3974 attempt to fix build
...
Change-Id: I05dfa32595d1c0e5dd113a8d018d4eb58c5ea824
Former-commit-id: 34c0bbc39e3929b38575
2015-02-03 09:10:01 -06:00
Ron Anderson
8c6c42fe43
Merge "Omaha #4018 Added logging of changes in GFE product editor. Additional code clean up." into omaha_14.4.1
...
Former-commit-id: 933590f36af280c0ab2e
2015-02-02 15:04:51 -06:00
Chris Cody
98531f44f1
Omaha #4075 Export Hydro Resources package for Hazard Services
...
Change-Id: I04d312f42859a0fcc840d04d685700487204e99c
Former-commit-id: 536396568a0619aac7fd
2015-02-02 14:52:48 -06:00
Bradley Mabe
e8dc39ee79
Merge remote branch 'origin/omaha_pgen' into ncep_14.4.1
...
Conflicts:
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/display/DisplayElementFactory.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/rsc/PgenResource.java
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/rsc/PgenResourceGhost.java
Change-Id: I8506bb7deb4f57f5989d3513d682561948870593
Former-commit-id: de986a26ed847c663329
2015-02-02 15:49:14 -05:00
Nate Jensen
e2b5ce05fd
Omaha #3974 initial extensible drawing of polygons and preliminary
...
damage path tool
Change-Id: I0355b0a8a889bb0339412e4ad17e1b3f678d06c2
Former-commit-id: 57d35bc0a6672b872990
2015-02-02 11:27:41 -06:00
Ron Anderson
67443be919
Omaha #4018 Added logging of changes in GFE product editor. Additional code clean up.
...
Change-Id: Ifa188f6e465062b1cf16042c87bf1074814909a2
Former-commit-id: 346ea417eabdc365d9c9
2015-02-02 11:26:59 -06:00
Fay.Liang
99b1511120
Merge branch 'master_14.3.1' into master_14.3.2
...
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/doConfig.py
Former-commit-id: 15f28c02454ddd4cec81
2015-02-02 10:06:58 -05:00
Ana Rivera
ccd0a40621
Merge branch 'master_14.4.1' into gsd_14.4.1
...
Change-Id: I5b7c7e17031ec4d081c03e3c4378faf6122849d5
Former-commit-id: 070f0136ecea92049aac
2015-01-30 19:29:29 +00:00
Slav Korolev
efee22d0fb
Omaha #3220 - Performance - Safe Seas, Snow, Fog.
...
Former-commit-id: 9e076f79702bb8bc22a6
2015-01-29 14:50:02 -05:00
Steve Harris
86c6f76ae2
Merge tag 'OB_14.4.1-5m' into omaha_15.1.1
...
14.4.1-5
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/grid/dataset/alias/gfeParamInfo.xml
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
Former-commit-id: 47234a3757995d60fb54
2015-01-28 13:45:36 -06:00
Steve Harris
1cce5ed9ef
Merge tag 'OB_14.4.1-5m' into omaha_14.4.1
...
14.4.1-5
Former-commit-id: bc3f196d489927bac8ed
2015-01-28 12:57:55 -06:00
Ana Rivera
4071b58b85
Merge branch 'master_14.4.1' into field_14.4.1
...
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
Change-Id: I1f3f22ff1e9dfa32f971136479bb312230c1fc40
Former-commit-id: 20ad0a65f38bfa7c4087
2015-01-27 22:05:59 +00:00
Ron Anderson
a7ab638203
Omaha #4018 Formatted all formatter launcher code to make later code reviews easier
...
Change-Id: Iaf415b8bdd3e8fdc46b8ea66e066b9c2ce3b6f7a
Former-commit-id: 8a86832fb25c08543da0
2015-01-27 13:43:44 -06:00
steve.naples
86b4054251
ASM #283 - MPE GroupEditPrecipStns updated to fix issue with selecting gages when filtered out with Reverse Point slider.
...
Change-Id: I9743b37adfb8658d40458c00204ad87c50c10528
Former-commit-id: 0260da784dd960e4bba1
2015-01-27 18:36:49 +00:00
steve.naples
ffb1fbe0e6
ASM #559 - Updated PostAnalysisManager and SummedHourlyMpeDlg to fix issue when opening PostAnalysis.
...
Change-Id: I9c2dcfd6af891b9ce0b60443a46e5cf9f3c7e99a
Former-commit-id: 565c4d69da349ff47f53
2015-01-27 18:36:07 +00:00
Steve Harris
16b0574adc
Merge tag 'OB_14.4.1-4m' into omaha_15.1.1
...
Conflicts:
cave/com.raytheon.uf.viz.collaboration.display/src/com/raytheon/uf/viz/collaboration/display/roles/DataProviderEventController.java
edexOsgi/com.raytheon.uf.edex.ohd/src/com/raytheon/uf/edex/ohd/reportalarm/AlertalarmRecord.java
Former-commit-id: 8eb10d0456716879f58b
2015-01-27 11:56:24 -06:00
Steve Harris
0ac687b980
Merge branch 'master_14.4.1' (14.4.1-4) into omaha_14.4.1
...
Former-commit-id: 82f2a146da1891ed5e5b
2015-01-27 11:34:06 -06:00
Fay.Liang
65d91d9113
Merge branch 'emc_14.4.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.4.1
...
Former-commit-id: 7bc10075e5d29d86ad05
2015-01-27 12:08:28 -05:00
Ana Rivera
62094315d2
Merge branch 'master_14.4.1' into field_14.4.1
...
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
Change-Id: Ia5c04c409d08280ae09f9999b2c6883fc0b47e18
Former-commit-id: 327945af8b7c5fc26537
2015-01-27 16:28:42 +00:00
Ana Rivera
f565ef4315
Merge branch 'emc_14.4.1' of gerrit:AWIPS2_Dev_Baseline into emc_14.4.1
...
Former-commit-id: dee10b3f6f171a38175c
2015-01-26 19:04:54 +00:00
Ana Rivera
654d08a588
Merge branch 'master_14.4.1' into emc_14.4.1
...
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/grid/dataset/alias/gfeParamInfo.xml
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
Change-Id: I3a9565d5861f431bd8ac74f8e20e5e79bbbdbad1
Former-commit-id: 7c25945fd998ac97e397
2015-01-26 18:45:26 +00:00
Shawn.Hooper
e6c4f29036
Merge branch 'omaha_14.4.1' of ssh://awips2omaha.com:29418/AWIPS2_baseline into master_14.4.1
...
Former-commit-id: e84a037b2e568b7c801a
2015-01-26 11:22:49 -05:00
Nate Jensen
7e8d355f62
Omaha #3952 remove custom gzip handling since it is by default enabled
...
by apache httpclient
Change-Id: I4a1f05c11228139c8df1d2883b951c8d876f3802
Former-commit-id: c4598baf1963189329a1
2015-01-26 09:10:36 -06:00
steve.naples
6811eb83a7
ASM #17051 MPE: Daily QC will not display Points+Grids together.
...
Change-Id: Ic74de62f60769456e7fd2762690e539cc553062a
Former-commit-id: 540ea644986488242165
2015-01-23 20:40:48 +00:00
Nate Jensen
dddc6c2cd4
Omaha #3952 disable cairo in alertviz for safety
...
Change-Id: If22ae5eee564dd19ae61211ad043d349f06e217f
Former-commit-id: 7c7c2e3a38415e2d4035
2015-01-23 12:57:24 -06:00
Steve Harris
b0c09c3ff7
Merge tag 'OB_14.4.1-2m' into omaha_15.1.1
...
Conflicts:
cave/com.raytheon.viz.gfe/localization/gfe/userPython/utilities/SmartScript.py (self-resolved)
edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/grid/dataset/alias/gfeParamInfo.xml (took both Anna and David's additions)
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py (took both Anna and David's additions)
Former-commit-id: 9234ceb4852c559f4c88
2015-01-23 09:32:44 -06:00
Steve Harris
8cd9e2e92f
Merge branch 'master_14.4.1' (OB_14.4.1-2m) into omaha_14.4.1
...
Conflicts:
rpms/awips2.qpid/0.18/SPECS/qpid-java.spec.patch0
rpms/awips2.qpid/0.18/SPECS/qpid-lib.spec
Former-commit-id: 0f05c53a53158fa16376
2015-01-23 09:08:06 -06:00
Ana Rivera
de1b989253
VLab Issue #5945 - Update NWPS: Run_NWPS.py; fixes #5945
...
Change-Id: Ib0d4356bd5d2c99f33204bf88bf65fe9a7db3278
Former-commit-id: 44fa40c0cc705f02f2be
2015-01-23 14:21:22 +00:00
Mark Peters
30229a25f2
Omaha #3768 Add localization to build.properties
...
Change-Id: I5f807ed34cf55868a9cf0883d9896cfaa5508b30
Former-commit-id: 7a69f354d9db69f5a0bc
2015-01-22 18:05:40 -06:00
Shawn.Hooper
7839dab5e6
Merge branch 'ohd_14.4.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.4.1
...
Former-commit-id: a757b554460bc501bd4c
2015-01-22 16:05:41 -05:00
Shawn.Hooper
9e83601505
ASM #17054 - Disable MRMS Menu in 14.3.1
...
Change-Id: I071606c7c14ed0332b3c714a67cebab29bfc67f0
Former-commit-id: d0b7b06d97bd5dfed072
2015-01-21 12:44:47 -05:00
Ron Anderson
d1ae28fe06
Omaha #4012 Create GFE procedure to mark grids updated without change for ISC
...
Change-Id: Iaf9be8083e1c15f0d39734691f88f39f1a897b93
Former-commit-id: 29a0caeae31defc08434
2015-01-20 16:36:19 -06:00
David Gillingham
a6b2a5cabf
Omaha #4014 : Add ingest and display support for ETSS model.
...
Change-Id: I5bff5985d779a9d665cbe5a005171b2076212846
Former-commit-id: 460497585441af2f661c
2015-01-20 14:02:06 -06:00
Nate Jensen
7a10bd5620
ensure PGEN appears in thinclient D2D Tools menu
...
Change-Id: Ib02d9f5f3c63edd963129e742da9c3b3e09e89fa
Former-commit-id: ac9d787a26bfcb36eeac
2015-01-20 11:52:37 -06:00
Ron Anderson
cbf8da3e81
Merge "Omaha #3955 Changes to support editing GFE topo and comparing with new Standard Terrain data" into omaha_15.1.1
...
Former-commit-id: b7b7670bd903df152b3d
2015-01-19 15:08:31 -06:00
Ron Anderson
6e97b2dd31
Merge "Omaha #3955 Move GridType enum into GridParmInfo where it belongs" into omaha_15.1.1
...
Former-commit-id: 305d1901fdb58904fe25
2015-01-19 15:08:08 -06:00
Ron Anderson
e238360309
Omaha #3955 Changes to support editing GFE topo and comparing with new Standard Terrain data
...
Change-Id: Ic12b1e257b7997fc2fbc5efd7a8833ac26366135
Former-commit-id: ea2dbf54ff596149053f
2015-01-19 14:02:42 -06:00
Lee Venable
e35eea1393
Merge "Omaha #4001 : Ensure WarnGen sends properly populated SendPracticeProductRequest objects when transmitting in practice mode, create delta script for hazard services db changes." into omaha_15.1.1
...
Former-commit-id: f0e2d151904721c5455f
2015-01-19 11:10:08 -06:00
Ron Anderson
79dc5f3c98
Omaha #3955 Move GridType enum into GridParmInfo where it belongs
...
Change-Id: Ia9265527302d8ff9213e8f55f63e5b6b91bdcd98
Former-commit-id: a955bd6e365dfd9d6f8c
2015-01-16 12:33:52 -06:00
Nate Jensen
4b9a4dd522
Omaha #4006 ensure mask has dtype bool for more strict numpy checks
...
Former-commit-id: b40ad431a177f6df5d34
2015-01-16 09:44:05 -06:00
