AWIPS User
|
375ca58d7d
|
menu changes and grid names
Former-commit-id: 7b419a2fd1 [formerly aac1cde7c4]
Former-commit-id: 6daec9740c
|
2015-07-22 17:24:11 -06:00 |
|
AWIPS User
|
69ee6fe160
|
putback models menu organization
Former-commit-id: 47c6fcc9e3 [formerly 2f2511e6b2]
Former-commit-id: 8bb527f8a5
|
2015-07-20 11:50:16 -06:00 |
|
AWIPS User
|
773e6e66bc
|
models menu organized by modelname first
Former-commit-id: ecea3d51dd [formerly efe62c136f]
Former-commit-id: c42c02b44e
|
2015-07-20 11:47:32 -06:00 |
|
AWIPS User
|
0633275b22
|
NPP menus, sat imagery rules, precip/MSLP bundle added
Former-commit-id: 1ba31c289f [formerly a5196fe357]
Former-commit-id: 79b3407065
|
2015-07-03 09:16:24 -06:00 |
|
AWIPS User
|
008922e706
|
begin 2-panel
Former-commit-id: fe5d6b1a65 [formerly 801bc8f96e]
Former-commit-id: 6370b56276
|
2015-05-09 00:38:51 -05:00 |
|
AWIPS User
|
9a79e57d73
|
LDM pqact and ingestGrib product updates
Former-commit-id: fb99a25a52 [formerly 2a29315894]
Former-commit-id: 68793205ea
|
2015-04-28 21:52:28 -06:00 |
|
AWIPS User
|
22b168b5dc
|
forecast models: menus and names
Former-commit-id: 65f6b45d4d [formerly 33dd7cec73]
Former-commit-id: 2895d9ddb6
|
2015-04-28 21:42:24 -06:00 |
|
mjames-upc
|
877f18c243
|
LDM pqact and ingestGrib product updates
Former-commit-id: c779c551ca [formerly 3c41589061]
Former-commit-id: 835f0e0f02
|
2015-04-28 16:01:39 -06:00 |
|
AWIPS User
|
f75e5a3169
|
remove subgrid files; update volume browser menus
Former-commit-id: 3eae4296f9 [formerly 70ce2e57d7]
Former-commit-id: 725176f853
|
2015-04-28 13:16:45 -06:00 |
|
AWIPS User
|
3337eead54
|
D2D menus
Former-commit-id: 0e116e6e5a [formerly 2a6d837672]
Former-commit-id: 9ba75100cb
|
2015-04-22 17:05:35 -06:00 |
|
AWIPS User
|
8cea282ebe
|
menu:volume -> models
Former-commit-id: 9abc4703bb [formerly 39c005444f]
Former-commit-id: ae10fa0d0d
|
2015-04-22 15:05:02 -06:00 |
|
mjames-upc
|
93b22eeb17
|
Merge branch upc_14.4.1 into master_14.4.1
Former-commit-id: f71c396cef [formerly 2288995260]
Former-commit-id: cd4cb8eb1d
|
2015-04-22 15:11:19 -06:00 |
|
AWIPS User
|
df41a52dec
|
volume browser organization
Former-commit-id: 00d54e44ac [formerly bcaa201de4]
Former-commit-id: 5ad9c4e049
|
2015-04-19 23:37:37 -06:00 |
|
AWIPS User
|
1ac670fc00
|
merge upc development orphan branch into upc_14.4.1
Former-commit-id: 06a7f2ad9d [formerly c9f28fd594]
Former-commit-id: 892c265b12
|
2015-03-01 12:44:45 -07:00 |
|
Joshua Watson
|
ffeb125843
|
VLab Issue #6496 - Key in sfcGrid.xml changed from HI-MOSGuide to MOSGuide-HI; fixes #6496
Change-Id: I4571bb639d474a86df39b7ea3bde1a23bad8f37f
Former-commit-id: 2c4042f5d9 [formerly 20dbdea326] [formerly 2c4042f5d9 [formerly 20dbdea326] [formerly a1a7877f92 [formerly aa05e8a312511e61c0dd01680b536282ee733154]]]
Former-commit-id: a1a7877f92
Former-commit-id: 8347778ba0 [formerly 6af80563ef]
Former-commit-id: ba500bb277
|
2015-02-18 16:17:16 -05:00 |
|
Joshua Watson
|
fa057c8063
|
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: cb6420914f [formerly 05c119663f] [formerly cb6420914f [formerly 05c119663f] [formerly f6cf02c893 [formerly 0017f74dfa8ce2c3dd386ea89547ec76f87bfdff]]]
Former-commit-id: f6cf02c893
Former-commit-id: 7235e8444e [formerly 5a136bb86b]
Former-commit-id: 4827934718
|
2015-02-06 16:06:37 -05:00 |
|
Fay.Liang
|
7f3a53beaf
|
Merge branch 'gsd_14.4.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.4.1
Former-commit-id: 5550322f62 [formerly ae85ade54d] [formerly 5550322f62 [formerly ae85ade54d] [formerly f1c34884a5 [formerly 06a34c609a217ca98b027ac6d92a31faf802b668]]]
Former-commit-id: f1c34884a5
Former-commit-id: 7ac4ff3f48 [formerly 82b3637598]
Former-commit-id: 37f830c123
|
2015-02-03 11:24:57 -05:00 |
|
Ana Rivera
|
7cea67cfc6
|
Merge branch 'master_14.4.1' into gsd_14.4.1
Change-Id: I5b7c7e17031ec4d081c03e3c4378faf6122849d5
Former-commit-id: ccd0a40621 [formerly ea92049aac] [formerly ccd0a40621 [formerly ea92049aac] [formerly 070f0136ec [formerly d5996a81aad0809aaddbb8df99a985c86c66aaf8]]]
Former-commit-id: 070f0136ec
Former-commit-id: e358377ca7 [formerly 1bbb9bad78]
Former-commit-id: 0715e923df
|
2015-01-30 19:29:29 +00:00 |
|
Ana Rivera
|
cf29758096
|
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: 4071b58b85 [formerly 8bfa7c4087] [formerly 4071b58b85 [formerly 8bfa7c4087] [formerly 20ad0a65f3 [formerly 291d66c66af4f1f4d298185412d5930714ffb2c5]]]
Former-commit-id: 20ad0a65f3
Former-commit-id: de74e8a90d [formerly 3696a3a1d1]
Former-commit-id: 0af5d55eb6
|
2015-01-27 22:05:59 +00:00 |
|
Ana Rivera
|
d4e36fe496
|
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: 62094315d2 [formerly 7c5fc26537] [formerly 62094315d2 [formerly 7c5fc26537] [formerly 327945af8b [formerly 889608360567b829f81ed6392c64c669798f34a9]]]
Former-commit-id: 327945af8b
Former-commit-id: a84f43a8c6 [formerly 5e97e24201]
Former-commit-id: ef4ca10b8a
|
2015-01-27 16:28:42 +00:00 |
|
Ana Rivera
|
aa04bff454
|
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: 654d08a588 [formerly 98ac97e397] [formerly 654d08a588 [formerly 98ac97e397] [formerly 7c25945fd9 [formerly 51ef304bd94fd003a1e7349a22c41e21b340ac8a]]]
Former-commit-id: 7c25945fd9
Former-commit-id: d6630d8f35 [formerly eae1bd317d]
Former-commit-id: cd2841195b
|
2015-01-26 18:45:26 +00:00 |
|
mjames-upc
|
ba80d4303b
|
modified code CAVE - merge remotes/origin/ncep_14.4.1 to upc development
Former-commit-id: e104fc35e2
|
2015-01-12 14:07:28 -07:00 |
|
mjames-upc
|
886cd5940f
|
Additions and deletions - merge remotes/origin/ncep_14.4.1 to upc development
Former-commit-id: 7eacf4dc1c
|
2015-01-12 14:02:58 -07:00 |
|
Joshua Watson
|
8dd62191ae
|
VLab Issue #5238 DR_14024 Code changes for gridded LAMP modifications; fixes #5238
Change-Id: I9e13afd8f7736f71fe8d584b1ff9a5b1ec943667
Former-commit-id: 0c375981e7 [formerly 3f2f7f2f3a] [formerly 0c375981e7 [formerly 3f2f7f2f3a] [formerly 5aa4748569 [formerly 5f730d514fd3e4b6780d7a3d60dcb08b102ecd29]]]
Former-commit-id: 5aa4748569
Former-commit-id: 1040be8594 [formerly 094e8048e9]
Former-commit-id: eb68dac32d
|
2014-12-17 08:38:27 -05:00 |
|
Ana Rivera
|
40df82b005
|
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: 214be0a93b [formerly 043bc3a8b7] [formerly 214be0a93b [formerly 043bc3a8b7] [formerly 1823ed3596 [formerly 111ae763e6becb944e34e262e1d87d2d344236e4]]]
Former-commit-id: 1823ed3596
Former-commit-id: ef35771bfa [formerly d2d8127363]
Former-commit-id: f7c0319ee4
|
2014-12-16 23:39:02 +00:00 |
|
Evan Polster
|
6f0683449a
|
VLab Issue #5056. Ensemble Tool Feature; fixes #5056
Change-Id: I4333c27b7b10bf3fb5a78509a9f8cf752519083b
Former-commit-id: 4ebed922bd [formerly f5dd6a6d93] [formerly 4ebed922bd [formerly f5dd6a6d93] [formerly 992cb6506f [formerly 546a3a1ec028f3ee72fa94c8525d4c92902319c3]]]
Former-commit-id: 992cb6506f
Former-commit-id: b4b407f9e7 [formerly e1cb0fc2da]
Former-commit-id: e7ca46c58a
|
2014-12-15 21:31:58 +00:00 |
|
Richard Peter
|
59e9fe78f2
|
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: 23eafaba3d [formerly 2457d0e6f7] [formerly 23eafaba3d [formerly 2457d0e6f7] [formerly 8de1ebcb65 [formerly e190a710b1b9506c99120fdaa1ebfdb144fcbf6f]]]
Former-commit-id: 8de1ebcb65
Former-commit-id: 746bbb0885 [formerly f7d8755ba9]
Former-commit-id: bf3ddbb62b
|
2014-12-12 10:36:04 -06:00 |
|
Joshua Watson
|
8789ca8e8e
|
VLab Issue #4129 - DR_17246 Code changes for gridded MOS modifications; fixes #4129
Change-Id: I4fc4436af321baf3b6057229b982f0aba35f5840
Former-commit-id: 0c8b629c96 [formerly a8f5bb480b] [formerly 0c8b629c96 [formerly a8f5bb480b] [formerly bca4b40eed [formerly cfce2a5f633a7312b9ad64dafb559c834b0ceddf]]]
Former-commit-id: bca4b40eed
Former-commit-id: ce1476d78f [formerly 9383635749]
Former-commit-id: 33e4b8bc88
|
2014-12-11 11:39:00 -05:00 |
|
Nate Jensen
|
0bb18f02d0
|
Omaha #3549 remove jdt prefs for faster builds
Change-Id: I82156718a52c37adecc8260fa40a2b0d93453b29
Former-commit-id: 6c1391e938 [formerly ec28d2f1a0] [formerly 6c1391e938 [formerly ec28d2f1a0] [formerly 8dbe6abbe4 [formerly 3ba611e111585d2aa9cd9f647687fedb794077f7]]]
Former-commit-id: 8dbe6abbe4
Former-commit-id: 1c5057a13f [formerly 291de3f039]
Former-commit-id: e53063661e
|
2014-12-03 15:47:10 -06:00 |
|
Ana Rivera
|
a9619b5bca
|
VLab Issue #5194 - Ingest and Display NWPS data; fixes #5194
Change-Id: Ib617760363c10e72ee54fd9ca30656fd0b7bd02f
Former-commit-id: edfb394f22 [formerly 709d571947] [formerly edfb394f22 [formerly 709d571947] [formerly fe5bfbaa73 [formerly 6866439b0a7075f04146af4b4bdce59477269f4d]]]
Former-commit-id: fe5bfbaa73
Former-commit-id: 985e612d6d [formerly 8eaeb7b322]
Former-commit-id: ccbb684974
|
2014-12-02 15:44:07 +00:00 |
|
Ana Rivera
|
d2a979a0e5
|
VLab Issue #5472 - Revert VLab Issue #5034 (first NWPS code merge); fixes #5472
This reverts commit 227ca65a041b4cf1c6930926ce67b7f4394e1097 [formerly f1f5f2c717] [formerly 53b96c2b8e [formerly c245f3a3c4] [formerly 53b96c2b8e [formerly c245f3a3c4] [formerly f1f5f2c717 [formerly a72135fc85a602b67b929b6870edbaabf4dc8fc1]]]].
Change-Id: I631bb1722abea96e08967a8d9fa9f175a886f685
Former-commit-id: eb0253f820 [formerly 0e8473e91e] [formerly eb0253f820 [formerly 0e8473e91e] [formerly 5abf37ea62 [formerly 373acfce57d5e0044f13382b926cb2fc1f830e54]]]
Former-commit-id: 5abf37ea62
Former-commit-id: 79b19d6368 [formerly 7c3dd12351]
Former-commit-id: 899a9d762d
|
2014-12-02 13:43:03 +00:00 |
|
Roger Ferrel
|
c79c325df6
|
Omaha #3866 Configuration files for GFS20KM for product and volume browsers.
Former-commit-id: da25f4588d [formerly 9b986c7cf8] [formerly da25f4588d [formerly 9b986c7cf8] [formerly 0df840602e [formerly 56833ab1b84e50c6ca4150d3c90501448233313b]]]
Former-commit-id: 0df840602e
Former-commit-id: 2d763dc64a [formerly 4ba718da37]
Former-commit-id: 975ee3aba9
|
2014-11-25 10:01:30 -06:00 |
|
Ana Rivera
|
eb1f2809b0
|
Merge branch 'master_14.4.1' into emc_14.4.1
Change-Id: I4984b06810f3484e919a4a4a5853435ca34167bb
Former-commit-id: 02e630bc93 [formerly 1645ccd9ca] [formerly 02e630bc93 [formerly 1645ccd9ca] [formerly 1999049d90 [formerly c69e94f227cb908a9af2e1cd2db35b25bef28701]]]
Former-commit-id: 1999049d90
Former-commit-id: 0fcfcbc05b [formerly 95b016ef4e]
Former-commit-id: e5f6dae5bd
|
2014-11-21 14:23:49 +00:00 |
|
Roger Ferrel
|
d310b78363
|
Issue #3439 Changed id=gfs90 to id=gfs to avoid confusion in these xml files.
Change-Id: I55b44a25196e9dcbc0a5e1417da1c39e5b978f3e
Former-commit-id: 4bcfb3ccaf [formerly 4d06812d30] [formerly 4bcfb3ccaf [formerly 4d06812d30] [formerly 71db8afbaa [formerly a9ce685c99dbdc1442f022cda7af09af5bdabf87]]]
Former-commit-id: 71db8afbaa
Former-commit-id: 1a39fc8b9c [formerly a188c5443b]
Former-commit-id: 77118778ae
|
2014-11-20 12:25:00 -06:00 |
|
Roger Ferrel
|
4006dd2e2b
|
Issue #3439 Replaced GFS213 with GFS229.
Change-Id: I6cd7774c4897273944c56c39d087bb5cf98f4b15
Former-commit-id: 85d717b49c [formerly 90a8b262f3] [formerly 85d717b49c [formerly 90a8b262f3] [formerly b88300a5fc [formerly 6cb88075375e3703b5ffe559ebd5e4f57d016880]]]
Former-commit-id: b88300a5fc
Former-commit-id: b86d906a5a [formerly 83c738abd9]
Former-commit-id: 6e58de9ef0
|
2014-11-18 17:42:39 -06:00 |
|
Mark Peters
|
45edaf0ac1
|
Omaha #3300 Merge fixes for volume browser menus
Change-Id: Id2d6f643f80982d7b5c4f195e21775ec5def4b43
Former-commit-id: b98bcbdb35 [formerly bcff3fc981] [formerly b98bcbdb35 [formerly bcff3fc981] [formerly 666e8d4332 [formerly 1694a064c9496599532e9348a5eb89e558862e60]]]
Former-commit-id: 666e8d4332
Former-commit-id: 5ee156873c [formerly e08f52cc99]
Former-commit-id: 5d90bf9d76
|
2014-11-18 16:03:42 -06:00 |
|
Roger Ferrel
|
6322e45910
|
Omaha #3727 Place HFR and HiResW entries in sub-menus.
Change-Id: I602cf35675c6ea4255ade4cb42ebe5c97207d62e
Former-commit-id: 6494c71a41 [formerly 28041de97e] [formerly 6494c71a41 [formerly 28041de97e] [formerly 739b253792 [formerly 0456cbbaf9c694a73c9862773b0e42165114b78d]]]
Former-commit-id: 739b253792
Former-commit-id: 81fde984dc [formerly 5f53024f75]
Former-commit-id: 8f06e69f21
|
2014-11-11 16:10:48 -06:00 |
|
Brian.Dyke
|
f25f4ecb2c
|
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: 4ac24af0a9 [formerly aae68215c8] [formerly 4ac24af0a9 [formerly aae68215c8] [formerly acf00264f4 [formerly 5c2079dd25181c68f872691e81842aff0f696f8d]]]
Former-commit-id: acf00264f4
Former-commit-id: 2743718323 [formerly 2b470ad1a1]
Former-commit-id: 54f82d7f6f
|
2014-11-06 12:55:21 -05:00 |
|
Ana Rivera
|
8dcce407dd
|
VLab Issue #5034 - Ingest and Display NWPS model data; fixes #5034
Change-Id: I836ffda083281073f5cf1d20de79f73091d49426
Former-commit-id: 53b96c2b8e [formerly c245f3a3c4] [formerly 53b96c2b8e [formerly c245f3a3c4] [formerly f1f5f2c717 [formerly a72135fc85a602b67b929b6870edbaabf4dc8fc1]]]
Former-commit-id: f1f5f2c717
Former-commit-id: 7c67376e2c [formerly c76ed237ac]
Former-commit-id: ab680bc174
|
2014-10-22 17:03:07 +00:00 |
|
mjames-upc
|
7eeb299578
|
pull and merge for HRRR re-edits
Former-commit-id: 0116938d64
|
2014-10-09 16:14:37 -06:00 |
|
mjames-upc
|
a18fdadf38
|
HRRR menu additions for D2D and NCP
Former-commit-id: a6f311f847
|
2014-10-09 16:10:13 -06:00 |
|
Richard Peter
|
e5b9aa8b3f
|
Merge "Omaha #3300 Merge conflict resolution with old Vbsources.xml." into omaha_14.4.1
Former-commit-id: 04bf8666b3 [formerly e8bc97501b] [formerly 04bf8666b3 [formerly e8bc97501b] [formerly fa15d4ff21 [formerly 157588d388b9033424ddc46a22d74ccc302eea85]]]
Former-commit-id: fa15d4ff21
Former-commit-id: baabb4a12f [formerly d97655272f]
Former-commit-id: 26ee8506f5
|
2014-10-08 12:02:17 -05:00 |
|
mjames-upc
|
678cb6b929
|
HRRR resource added to D2D and NCP
Former-commit-id: b5232c09cb
|
2014-10-07 11:34:16 -06:00 |
|
Mark Peters
|
dffbaa684d
|
Omaha #2618 Deleted points don't get removed from the selected list
Change-Id: I0c85af77c4c46c825b6f80ace4df9cce759e981e
Former-commit-id: dc27d9252c [formerly 3464751716] [formerly dc27d9252c [formerly 3464751716] [formerly 5ed537572a [formerly 5f22815ea1ca5a1fbd010f642afe6a83778f6f58]]]
Former-commit-id: 5ed537572a
Former-commit-id: 82e2a2bbb5 [formerly c50ae98b5f]
Former-commit-id: c2173b1925
|
2014-10-07 11:42:44 -05:00 |
|
Roger Ferrel
|
861da21f34
|
Omaha #3300 Merge conflict resolution with old Vbsources.xml.
Former-commit-id: 2f8d5263b9 [formerly dfbf07f377] [formerly 2f8d5263b9 [formerly dfbf07f377] [formerly d4ef865375 [formerly be87967bf65bc07af5f89c13bf4cfd8eff9b4db6]]]
Former-commit-id: d4ef865375
Former-commit-id: 05c00c7bc7 [formerly 96f484e323]
Former-commit-id: 7afe6d2df6
|
2014-10-06 15:34:30 -05:00 |
|
Steve Harris
|
afd3d3fa2d
|
Merge tag 'OB_14.3.1-24m' into omaha_14.4.1
Former-commit-id: 06a27b2d3c [formerly 39c5e9c314] [formerly 06a27b2d3c [formerly 39c5e9c314] [formerly 2db03d95b3 [formerly df9ef1f664e14fa7843328338c5b234022f4bfd4]]]
Former-commit-id: 2db03d95b3
Former-commit-id: bcf1265a16 [formerly 3542caf090]
Former-commit-id: cfd49c8ca0
|
2014-10-06 13:57:59 -05:00 |
|
Brian.Dyke
|
e100894074
|
Merge branch 'mdl_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Former-commit-id: 006bdb00ad [formerly 65ad6056b6] [formerly 006bdb00ad [formerly 65ad6056b6] [formerly f3f95aabb0 [formerly 8fa6749e28cb247ae63307f1423351c23ec0eb87]]]
Former-commit-id: f3f95aabb0
Former-commit-id: d174db3b0c [formerly e77f1e126e]
Former-commit-id: 1d2dfd264a
|
2014-10-02 10:38:51 -04:00 |
|
Slav Korolev
|
55c7492692
|
Issue #3659 - Enabled to display HFR-EAST_6KM or HFR-WEST_6KM data as a Time Series
Former-commit-id: 05a7f534bf [formerly f7bcb81010] [formerly 05a7f534bf [formerly f7bcb81010] [formerly ad4bae10c9 [formerly 2a03c64bb098a141c82aac4bab42d7d9f4a6296f]]]
Former-commit-id: ad4bae10c9
Former-commit-id: c00a8eb707 [formerly 8fddad1cd1]
Former-commit-id: f05360e224
|
2014-10-01 16:45:33 -04:00 |
|
dmsys
|
71d6e48473
|
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: f704781f4f [formerly 8c3625cfec] [formerly f704781f4f [formerly 8c3625cfec] [formerly 9f4560c480 [formerly 0bf7ecb27d41f81f1d6727674fc1475eeaa8512c]]]
Former-commit-id: 9f4560c480
Former-commit-id: 07f84c6b26 [formerly b884e5e32d]
Former-commit-id: e00ea2d8cd
|
2014-09-30 13:45:54 -04:00 |
|
Steve Harris
|
4c4380580f
|
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: 3598e9b5b6 [formerly 90e08b96e1] [formerly 3598e9b5b6 [formerly 90e08b96e1] [formerly 3b6a8a1447 [formerly c8b5d89c2e202e8bb4ad59d9ced8882ec8c2a6c1]]]
Former-commit-id: 3b6a8a1447
Former-commit-id: 842abaad49 [formerly 6330a62e85]
Former-commit-id: 30f0d27dfb
|
2014-09-29 12:58:56 -05:00 |
|