Fay.Liang
5accdbf2e7
Merge branch 'field_15.1.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_15.1.1
...
Former-commit-id: 3c4a22bf33c9f1147c6ebb263e6102294b33f65f
2015-04-08 12:27:57 -04:00
Steve Harris
f7af8ee606
Merge branch 'omaha_15.1.1' into omaha_16.1.1
...
Former-commit-id: cf70a7888a39667c54b344274c76d5106927fa30
2015-04-01 17:22:45 -05:00
Fay.Liang
a204a6210e
Merge branch 'asm_15.1.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_15.1.1
...
Former-commit-id: 5e481a056337b7f502921886725382258c6e29d1
2015-04-01 13:04:48 -04:00
Slav Korolev
5454637848
Omaha #4297 - Ingest and display of ECMWF wave guidance
...
Former-commit-id: 06c58d85cb62fad4fe6fffdcd319fdd9356f1ff7
2015-03-26 14:19:39 -04:00
Melissa Porricel
9a2a726fb9
ASM #16905 - Implement missing RTMA/URMA parameters
...
Change-Id: I4ec616b80b6c8f85bafec46f0c840c3c43a9c527
Former-commit-id: d68078b665787d91bfd92440345d41f9fcc98b3d
2015-03-26 09:58:45 -04:00
Joshua Watson
5ad258d80d
VLab Issue #7124 - Added new HRRRFamily.xml to volume bundles. Edited Volume menu entry for HRRR model to call HRRRFamily.xml bundle; fixes #7124
...
Change-Id: I201d1c46c179d958360e9ff027fd6dfc35100403
Former-commit-id: c0d0fe36c45049e3a069ffe87bca4d8430d9f3c3
2015-03-24 15:01:55 -04:00
Fay.Liang
86a8041062
Merge branch 'asm_15.1.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_15.1.1
...
Conflicts:
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/resource/MultiPointResource.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
edexOsgi/build.edex/edex/common.properties
Former-commit-id: ba576b948587ea7b1c077ebad7113bc4e7504c00
2015-03-19 12:35:31 -04:00
Melissa Porricel
fcdcb81963
ASM #7951 - Add Capabilities for CONUS RTMA at 2.5km
...
Change-Id: Iab79fc17b3b648ffa39c8385c581392e3cf58f9c
Former-commit-id: 9c7d466213eaac3a46fddf416967d00e3446bfee
2015-03-16 17:14:56 -04:00
Melissa Porricel
2cec5c0b3c
ASM #14542 - Add HPCGuide wxType
...
Change-Id: Ie42a870c8bfede85cf00bb1d71a68f9fe4bafc1d
Former-commit-id: 1f1fe776f013990637d04f168c6c3df22aeb01fb
2015-03-09 12:48:02 -04:00
Ana Rivera
28fdf68b74
Merge branch 'master_14.4.1'(14.4.1-14m) into field_15.1.1
...
Change-Id: Ie5167c7fc48c61759032b0eb3fd9a2e88b53cc76
Former-commit-id: 38cf0f33a18d7fd399c46b60486db8bee383f1c0
2015-03-03 17:07:44 +00:00
Steve Harris
ead97f053e
Merge tag 'OB_14.4.1-14m' into omaha_15.1.1
...
14.4.1-14
Former-commit-id: cdca3c5b9eb65bed9d773019917245d1000d78dd
2015-03-02 10:58:40 -06:00
Steve Harris
78b41638b9
Merge tag 'OB_14.4.1-13m' into omaha_15.1.1
...
14.4.1-13
Former-commit-id: ea76883b615967a79e8c9d0ee16accebd210ee0b
2015-02-20 13:17:47 -06:00
Joshua Watson
a1a7877f92
VLab Issue #6496 - Key in sfcGrid.xml changed from HI-MOSGuide to MOSGuide-HI; fixes #6496
...
Change-Id: I4571bb639d474a86df39b7ea3bde1a23bad8f37f
Former-commit-id: aa05e8a312511e61c0dd01680b536282ee733154
2015-02-18 16:17:16 -05:00
Roger Ferrel
aa6f2d3270
Omaha #4105 synchronize forcastTimeMap to prevent ConcurrentModificationException.
...
Change-Id: Ie6dbeff173ce0165638301625f285601d649dd1b
Former-commit-id: 95f8fbb4fafd7e6e2235e4baac42b75c21ce0549
2015-02-13 07:36:31 -06:00
Roger Ferrel
112c0322b2
Omaha #4053 Added Great Lakes Wave Model 2.5KM to product browser, volume browser and GFE.
...
Change-Id: Iabb0b401a51e7fbb069ed8c6e7b44e2d9382c421
Former-commit-id: 66098b89fcf6cd5bcf950024c5a40722018b02d5
2015-02-12 13:43:37 -06:00
Joshua Watson
f6cf02c893
VLab Issue #6363 - Fixed malformed xml in GFSLAMPGridded.xml, changed ClgHgt to CigHgt in serverConfig.py and GFSLAMPGrid.py smart init; fixes #6363
...
Change-Id: Ibee986bdef73cdb6883fdd50e725d28d3838c848
Former-commit-id: 0017f74dfa8ce2c3dd386ea89547ec76f87bfdff
2015-02-06 16:06:37 -05:00
Steve Harris
d95158ec53
Merge tag 'OB_14.4.1-7m' into omaha_15.1.1
...
14.4.1-7
Former-commit-id: bf0368503a8defd41a20e369e154d560b93bee6c
2015-02-03 17:30:23 -06:00
Steve Harris
afb3d31759
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: 9fd5ed1aea1a667552144da88dcc394a99133c52
2015-02-03 12:25:05 -06:00
Fay.Liang
f1c34884a5
Merge branch 'gsd_14.4.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.4.1
...
Former-commit-id: 06a34c609a217ca98b027ac6d92a31faf802b668
2015-02-03 11:24:57 -05:00
Ana Rivera
070f0136ec
Merge branch 'master_14.4.1' into gsd_14.4.1
...
Change-Id: I5b7c7e17031ec4d081c03e3c4378faf6122849d5
Former-commit-id: d5996a81aad0809aaddbb8df99a985c86c66aaf8
2015-01-30 19:29:29 +00:00
Steve Harris
47234a3757
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: 28075dabb4b6421ddaee3af71518f565d9bc7e90
2015-01-28 13:45:36 -06:00
Ana Rivera
20ad0a65f3
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: 291d66c66af4f1f4d298185412d5930714ffb2c5
2015-01-27 22:05:59 +00:00
Ana Rivera
327945af8b
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: 889608360567b829f81ed6392c64c669798f34a9
2015-01-27 16:28:42 +00:00
Ana Rivera
7c25945fd9
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: 51ef304bd94fd003a1e7349a22c41e21b340ac8a
2015-01-26 18:45:26 +00:00
Steve Harris
9234ceb485
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: 01c4aa19ab0b21f331c2200076efbd44eb3b2af6
2015-01-23 09:32:44 -06:00
David Gillingham
4604975854
Omaha #4014 : Add ingest and display support for ETSS model.
...
Change-Id: I5bff5985d779a9d665cbe5a005171b2076212846
Former-commit-id: fa7e11a22b47a48d2bc7b9cf6f0ddfd97ea2fea7
2015-01-20 14:02:06 -06:00
Joshua Watson
5aa4748569
VLab Issue #5238 DR_14024 Code changes for gridded LAMP modifications; fixes #5238
...
Change-Id: I9e13afd8f7736f71fe8d584b1ff9a5b1ec943667
Former-commit-id: 5f730d514fd3e4b6780d7a3d60dcb08b102ecd29
2014-12-17 08:38:27 -05:00
Ana Rivera
1823ed3596
Merge branch 'omaha_14.4.1' into field_14.4.1. Conflicts resolved: VLab Issue #4129 , #5421 , #5345 .
...
Conflicts:
cave/com.raytheon.uf.viz.image.export/src/com/raytheon/uf/viz/image/export/dialog/ImageExportDialog.java
cave/com.raytheon.uf.viz.image.export/src/com/raytheon/uf/viz/image/export/options/ImageExportOptions.java
cave/com.raytheon.viz.feature.awips.developer/feature.xml
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: Ic838b8b0499b1022a555915c7264b414d6948895
Former-commit-id: 111ae763e6becb944e34e262e1d87d2d344236e4
2014-12-16 23:39:02 +00:00
Evan Polster
992cb6506f
VLab Issue #5056 . Ensemble Tool Feature; fixes #5056
...
Change-Id: I4333c27b7b10bf3fb5a78509a9f8cf752519083b
Former-commit-id: 546a3a1ec028f3ee72fa94c8525d4c92902319c3
2014-12-15 21:31:58 +00:00
Richard Peter
8de1ebcb65
Merge tag 'OB_14.3.2-8m' into omaha_14.4.1
...
Conflicts:
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/PointFreezePlotResource.java
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/PointPrecipPlotResource.java
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/PointTempPlotResource.java
edexOsgi/com.raytheon.edex.common/src/com/raytheon/edex/utility/EDEXLocalizationAdapter.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/textproducts/AreaDictionaryMaker.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/textproducts/Configurator.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/AbstractWatchNotifierSrv.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/SPCWatchSrv.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/TPCWatchSrv.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/textproducts/Generator.py
edexOsgi/com.raytheon.edex.plugin.warning/res/spring/warning-ingest.xml
edexOsgi/com.raytheon.uf.edex.activetable/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.uf.edex.activetable/res/spring/activetable-ingest.xml
edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/decoder/PracticeVtecDecoder.java
edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/handler/SendPracticeProductHandler.java
Change-Id: Ibd2a1524e6b4169679be97de2dcfe83e6a819df5
Former-commit-id: e190a710b1b9506c99120fdaa1ebfdb144fcbf6f
2014-12-12 10:36:04 -06:00
Joshua Watson
bca4b40eed
VLab Issue #4129 - DR_17246 Code changes for gridded MOS modifications; fixes #4129
...
Change-Id: I4fc4436af321baf3b6057229b982f0aba35f5840
Former-commit-id: cfce2a5f633a7312b9ad64dafb559c834b0ceddf
2014-12-11 11:39:00 -05:00
Nate Jensen
8dbe6abbe4
Omaha #3549 remove jdt prefs for faster builds
...
Change-Id: I82156718a52c37adecc8260fa40a2b0d93453b29
Former-commit-id: 3ba611e111585d2aa9cd9f647687fedb794077f7
2014-12-03 15:47:10 -06:00
Ana Rivera
fe5bfbaa73
VLab Issue #5194 - Ingest and Display NWPS data; fixes #5194
...
Change-Id: Ib617760363c10e72ee54fd9ca30656fd0b7bd02f
Former-commit-id: 6866439b0a7075f04146af4b4bdce59477269f4d
2014-12-02 15:44:07 +00:00
Ana Rivera
5abf37ea62
VLab Issue #5472 - Revert VLab Issue #5034 (first NWPS code merge); fixes #5472
...
This reverts commit f1f5f2c717
2014-12-02 13:43:03 +00:00
Roger Ferrel
0df840602e
Omaha #3866 Configuration files for GFS20KM for product and volume browsers.
...
Former-commit-id: 56833ab1b84e50c6ca4150d3c90501448233313b
2014-11-25 10:01:30 -06:00
Ana Rivera
1999049d90
Merge branch 'master_14.4.1' into emc_14.4.1
...
Change-Id: I4984b06810f3484e919a4a4a5853435ca34167bb
Former-commit-id: c69e94f227cb908a9af2e1cd2db35b25bef28701
2014-11-21 14:23:49 +00:00
Roger Ferrel
71db8afbaa
Issue #3439 Changed id=gfs90 to id=gfs to avoid confusion in these xml files.
...
Change-Id: I55b44a25196e9dcbc0a5e1417da1c39e5b978f3e
Former-commit-id: a9ce685c99dbdc1442f022cda7af09af5bdabf87
2014-11-20 12:25:00 -06:00
Roger Ferrel
b88300a5fc
Issue #3439 Replaced GFS213 with GFS229.
...
Change-Id: I6cd7774c4897273944c56c39d087bb5cf98f4b15
Former-commit-id: 6cb88075375e3703b5ffe559ebd5e4f57d016880
2014-11-18 17:42:39 -06:00
Mark Peters
666e8d4332
Omaha #3300 Merge fixes for volume browser menus
...
Change-Id: Id2d6f643f80982d7b5c4f195e21775ec5def4b43
Former-commit-id: 1694a064c9496599532e9348a5eb89e558862e60
2014-11-18 16:03:42 -06:00
Roger Ferrel
739b253792
Omaha #3727 Place HFR and HiResW entries in sub-menus.
...
Change-Id: I602cf35675c6ea4255ade4cb42ebe5c97207d62e
Former-commit-id: 0456cbbaf9c694a73c9862773b0e42165114b78d
2014-11-11 16:10:48 -06:00
Brian.Dyke
acf00264f4
Merge branch 'master_14.2.4' into master_14.3.1
...
Conflicts:
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/ParmManager.java
cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-common.xml
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/config/GFESiteActivation.java
edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/MessageProducer.java
rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
Former-commit-id: 5c2079dd25181c68f872691e81842aff0f696f8d
2014-11-06 12:55:21 -05:00
Ana Rivera
f1f5f2c717
VLab Issue #5034 - Ingest and Display NWPS model data; fixes #5034
...
Change-Id: I836ffda083281073f5cf1d20de79f73091d49426
Former-commit-id: a72135fc85a602b67b929b6870edbaabf4dc8fc1
2014-10-22 17:03:07 +00:00
Richard Peter
fa15d4ff21
Merge "Omaha #3300 Merge conflict resolution with old Vbsources.xml." into omaha_14.4.1
...
Former-commit-id: 157588d388b9033424ddc46a22d74ccc302eea85
2014-10-08 12:02:17 -05:00
Mark Peters
5ed537572a
Omaha #2618 Deleted points don't get removed from the selected list
...
Change-Id: I0c85af77c4c46c825b6f80ace4df9cce759e981e
Former-commit-id: 5f22815ea1ca5a1fbd010f642afe6a83778f6f58
2014-10-07 11:42:44 -05:00
Roger Ferrel
d4ef865375
Omaha #3300 Merge conflict resolution with old Vbsources.xml.
...
Former-commit-id: be87967bf65bc07af5f89c13bf4cfd8eff9b4db6
2014-10-06 15:34:30 -05:00
Steve Harris
2db03d95b3
Merge tag 'OB_14.3.1-24m' into omaha_14.4.1
...
Former-commit-id: df9ef1f664e14fa7843328338c5b234022f4bfd4
2014-10-06 13:57:59 -05:00
Brian.Dyke
f3f95aabb0
Merge branch 'mdl_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
...
Former-commit-id: 8fa6749e28cb247ae63307f1423351c23ec0eb87
2014-10-02 10:38:51 -04:00
Slav Korolev
ad4bae10c9
Issue #3659 - Enabled to display HFR-EAST_6KM or HFR-WEST_6KM data as a Time Series
...
Former-commit-id: 2a03c64bb098a141c82aac4bab42d7d9f4a6296f
2014-10-01 16:45:33 -04:00
dmsys
9f4560c480
Merge branch 'master_14.2.4' into master_14.3.1 CM-MERGE:14.2.4-13-14 into 14.3.1
...
Conflicts:
cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/StormTrackDisplay.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/IFPClient.java
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/specialWeatherStatement.vm
Former-commit-id: 0bf7ecb27d41f81f1d6727674fc1475eeaa8512c
2014-09-30 13:45:54 -04:00
Steve Harris
3b6a8a1447
Merge branch 'master_14.3.1' (14.3.1-22m) into omaha_14.4.1
...
Conflicts:
cave/com.raytheon.viz.volumebrowser/localization/menus/xml/fieldsMenus.xml
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/ohdlib/GagePP.java
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/T.xml
edexOsgi/com.raytheon.uf.tools.cli/impl/src/textdb/TextDB.py
Former-commit-id: c8b5d89c2e202e8bb4ad59d9ced8882ec8c2a6c1
2014-09-29 12:58:56 -05:00
