Nate Jensen
|
0634bbc59f
|
Merge "Omaha #4897 - reverse fog, safeseas, and snow menu dependencies so that CAVE without the dat and hydro features can be started without errors." into omaha_16.2.1
Former-commit-id: 720ded6aa88c25107dce26c39e014d8f7c5b43af
|
2015-10-15 17:16:20 -05:00 |
|
Nate Jensen
|
5d966891e7
|
Merge "Omaha #4965 Move viz radarapps to their own feature." into omaha_16.2.1
Former-commit-id: 86f305ce92d2954b8d0b602961786f72c5d230a3
|
2015-10-15 17:14:05 -05:00 |
|
Shawn.Hooper
|
cb437cc9b7
|
Merge branch 'asm_16.1.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_16.1.1
Former-commit-id: f7ec5785f69196ffdd3c2069b7ecd388968283d4
|
2015-10-15 17:11:03 -04: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 |
|
Ben Steffensmeier
|
dea1859b69
|
Omaha #4965 Move viz radarapps to their own feature.
Former-commit-id: c7820c71c7bfb4b32e0771391ecc8130b3952108
|
2015-10-15 16:08:49 -05:00 |
|
Dave Hladky
|
726296059e
|
Omaha #4756 Wrong conversion bounds for ARI grids, fixed.
Change-Id: I19d7cfc22ae7042169f76422e5254161aa9b20c0
Former-commit-id: d28e6ab6e49596cc56c2030573e3266ab3696492
|
2015-10-15 15:58:04 -05:00 |
|
Bryan Kowal
|
4f930926be
|
Omaha #4897 - reverse fog, safeseas, and snow menu dependencies so that CAVE without the dat and hydro features
can be started without errors.
Former-commit-id: acca15e79c59c40c29310d622497c48ee7982844
|
2015-10-15 15:30:01 -05:00 |
|
Nate Jensen
|
26f70e4c4b
|
Merge "Omaha #4959: GFE formatter launcher word wrap calls to python now happen off UI thread." into omaha_16.2.1
Former-commit-id: 640f358dc092fcd9f04c51096959fa16f810b67c
|
2015-10-15 13:09:42 -05:00 |
|
Nathan Bowler
|
22c6f4e9a0
|
Omaha #4982 Force matching datatypes when replacing data.
Change-Id: I46dc17d118b52292e128950e16a58de2b2313ff3
Former-commit-id: 4c1b632bb1825e6292c78649c741d0d89149bf12
|
2015-10-15 13:44:31 -04:00 |
|
David Gillingham
|
5d75e31d00
|
Omaha #4959: GFE formatter launcher word wrap calls to python now happen off UI thread.
Change-Id: I9cc2c1c88a9dd554aa4a557f7658f5012671b357
Former-commit-id: 3f703cfef74d24af9f5b75500f28fae532130812
|
2015-10-15 11:45:43 -05:00 |
|
Nate Jensen
|
88ebf298c7
|
Merge "Omaha #4950 - remove ohd plugins from the viz hydro feature." into omaha_16.2.1
Former-commit-id: 6031d32f232a2f6f8d6f3ec2154387a9a3d1fd0a
|
2015-10-15 11:42:25 -05:00 |
|
Ben Steffensmeier
|
815f9d5dd4
|
Merge "Omaha #4627 Allow grib post processor overrides to append to base." into omaha_16.2.1
Former-commit-id: ceef121a37ae5999a13a5819a26a821db9757697
|
2015-10-15 10:56:46 -05:00 |
|
Bryan Kowal
|
e6c736ea41
|
Omaha #4950 - remove ohd plugins from the viz hydro feature.
Former-commit-id: e0b92f9f661319a95f25981c21b67875c91bb53d
|
2015-10-15 10:56:43 -05:00 |
|
Richard Peter
|
c7fa762fb5
|
Merge "Omaha #4985 Both UtilitySrv beans neede for registry operations." into omaha_16.2.1
Former-commit-id: 0eae57f066613b4f6c1e555638c90c6f63c07d81
|
2015-10-15 10:33:59 -05:00 |
|
Roger Ferrel
|
00514d7ad8
|
Omaha #4933 Refactored TabularTimeSeriesDlg to use selected valued and fixed NPE and resource leaks in TimeSeriesDlg.
Change-Id: I47a9e519eb7b75f6051009b6c46370418c08967d
Former-commit-id: 355c1522e1ebc455a2089b5ba676361d923fed66
|
2015-10-15 07:05:41 -05:00 |
|
Ron Anderson
|
82e09ad9b4
|
Omaha #4961 Create/update procedures for using GMTED2010 terrain in GFE.
Change-Id: I6b51386be983546d0637d4f85ebdad87abcce3a4
Former-commit-id: 2ff9b807b8586bbb56880fe5f3f26505bbd5d87d
|
2015-10-14 17:30:50 -05:00 |
|
Ron Anderson
|
d126af0f85
|
Merge branch 'omaha_16.1.1' into omaha_16.2.1
Conflicts:
cave/com.raytheon.viz.gfe/localization/gfe/userPython/utilities/SmartScript.py
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/actions/FormatterlauncherAction.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/actions/ShowProductScriptsDialog.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/actions/ShowPublishDialog.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/actions/ShowSendIscGridsDialog.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/DataManager.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/ProductAreaComp.java
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/StoreTransmitDlg.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/FormatterUtil.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenAction.java
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
edexOsgi/com.raytheon.uf.edex.plugin.loctables/src/com/raytheon/uf/edex/plugin/loctables/ingest/LocationTablesIngest.java
rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
Change-Id: Ie790e3a9a0c3829655a5a798a2c8b6740d02be6c
Former-commit-id: 691ca66a6f15c3cfae1bd1c8990644951d68a46f
|
2015-10-14 16:31:41 -05:00 |
|
Nathan Bowler
|
ad756774f3
|
Omaha #4627 Allow grib post processor overrides to append to base.
Change-Id: I063cbbfe25dc1b004d63c86b7f19e32fe8d2b055
Former-commit-id: 99db3b3e5fd596a2ab4016dc8945114a3d896754
|
2015-10-14 17:07:29 -04:00 |
|
Ron Anderson
|
ff254a9936
|
Omaha #3841 Reverting - Corrected dialogs for adding and editing the new zones and stations.
This reverts commit 3379aa3316 [formerly 640a7d9e6bfcd25248a36b5babb527cca4baeb7a].
Conflicts:
edexOsgi/com.raytheon.uf.edex.plugin.loctables/src/com/raytheon/uf/edex/plugin/loctables/ingest/LocationTablesIngest.java
Change-Id: I6bc25eef13c33f57343a50e0127e0e34fd0945f2
Former-commit-id: 5bb4921060968a359b9db6ba85aa2dae15492906
|
2015-10-14 15:50:02 -05:00 |
|
Shawn.Hooper
|
36cd5d746f
|
Merge branch 'ohd_15.1.2' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_15.1.2
Former-commit-id: 2f4d8341aa625341a95cf77348316a80db33524f
|
2015-10-14 15:45:46 -04:00 |
|
Richard Peter
|
045b707b7d
|
Merge "Omaha #4931 Fix invalid xml on RH_001_perts" into omaha_16.2.1
Former-commit-id: 8402f3068c7421ae2118df35cb38f58845be8371
|
2015-10-14 14:35:59 -05:00 |
|
Dave Hladky
|
56ba2b8ba2
|
Omaha #4985 Both UtilitySrv beans neede for registry operations.
Former-commit-id: 20963eefc8ac341a263555d67da872a75e67f281
|
2015-10-14 14:03:17 -05:00 |
|
Bryan Kowal
|
115701dc11
|
Merge "Omaha #4759 - pre-order features for now." into omaha_16.2.1
Former-commit-id: c8a90d616767b053c5162e4fb0af273a9cb3bcc2
|
2015-10-14 13:21:16 -05:00 |
|
Bryan Kowal
|
5f525ee17c
|
Omaha #4759 - pre-order features for now.
amend: rebase
Change-Id: Iab7d4772394e82ac86d6f23d8bef2ce774223466
Former-commit-id: 64ce95e78663ea1757b414c046458981708564cb
|
2015-10-14 13:07:16 -05:00 |
|
Nate Jensen
|
b28da70328
|
Merge "Omaha #4410 Allow localization perspective to mix files for multiple Localization Types." into omaha_16.2.1
Former-commit-id: 86890f96c10ee34da2636d97b73c12c05a8638d5
|
2015-10-14 12:37:06 -05:00 |
|
Jingtao Deng
|
1234ccdfae
|
VLab Issue #12477 - Hydrobase cannot update certain textfields with special char; fixes #12477
Change-Id: I1f97bc6c9c1610080297d7968f7653c446a107eb
Former-commit-id: 37350d2119e037f22fb3c41090512b961347a84e
|
2015-10-14 13:31:58 -04:00 |
|
Matthew Howard
|
d7a2a809ef
|
Merge "ASM #16938 - Fix data error when HDF5 storage type changes" into asm_16.1.1
Former-commit-id: 54bc640cc1fd6676711bb7517935721ec362b70e
|
2015-10-14 12:31:53 -05:00 |
|
Ben Steffensmeier
|
d9d6e7ffbf
|
Omaha #4410 Allow localization perspective to mix files for multiple Localization Types.
Former-commit-id: aca2b3fa1fe242b4fb93f68808be7fa67566c268
|
2015-10-14 11:52:37 -05:00 |
|
Juliya Dynina
|
9bf4ba2014
|
Merge "ASM #17977 - MPE: Daily QC does not display subarea data." into asm_16.1.1
Former-commit-id: 1fa643f98076ca6f9db1f9a883a8af483590d9cb
|
2015-10-14 11:18:57 -05:00 |
|
steve.naples
|
a0ee8f6cc0
|
ASM #17977 - MPE: Daily QC does not display subarea data.
Change-Id: Ida8ed71ea8b39df58143cd69515ccfc3259d3e00
Former-commit-id: 415e268723240f6fcf56b44464aefb80afdae445
|
2015-10-14 15:58:14 +00:00 |
|
Ben Steffensmeier
|
4379063069
|
Omaha #4931 Fix invalid xml on RH_001_perts
Former-commit-id: 92924c45a1471a7905afb3c40196d9a2dadf00de
|
2015-10-14 10:43:42 -05:00 |
|
Shawn.Hooper
|
09897e6636
|
Merge remote-tracking branch 'origin/master_15.1.1' into master_15.1.2
Former-commit-id: ba403a0bea15ed6157a09aa7ee33168235930873
|
2015-10-14 10:41:28 -04:00 |
|
Richard Peter
|
c0aa08888e
|
Omaha #3315 - fix checking amount of memory
Change-Id: Ia62a299606d127847b2e621cd1b2a16bd10911cf
Former-commit-id: f974cf32c757d8e999338d475e345b3d30701194
|
2015-10-13 17:33:17 -05:00 |
|
Richard Peter
|
6f878a164e
|
Merge "Omaha #4673 - Resolve dependency issue" into omaha_16.2.1
Former-commit-id: 59ec03d8663bb8ac350e3f43e02e301bed10bb8d
|
2015-10-13 17:02:51 -05:00 |
|
Nate Jensen
|
e709ae5f89
|
Merge "Omaha #3315 - Turn off G1 due to yajsw monitor conflicts" into omaha_16.2.1
Former-commit-id: cad255af687a199760a8a61b053ad99d9ea2dfb3
|
2015-10-13 16:33:15 -05:00 |
|
Nate Jensen
|
2370f8a27e
|
Merge "Omaha #4948 Improved Forced FFG handling" into omaha_16.2.1
Former-commit-id: 78c11b7982a35dcf9635acb1e6923d9d8eab7096
|
2015-10-13 16:32:35 -05:00 |
|
Greg Armendariz
|
e7ee830fe3
|
Omaha #4673 - Resolve dependency issue
Former-commit-id: e0a5f626a35c52b508cb5a4f074fc57cb44068ac
|
2015-10-13 16:17:50 -05:00 |
|
Richard Peter
|
fcb4a50701
|
Omaha #3315 - Turn off G1 due to yajsw monitor conflicts
Change-Id: Ib0a8cf470b98f95499ec3d870b6fde30d8b0c5b2
Former-commit-id: 9a3f37953225724a70e603b6d791b2bdc6bbfb8e
|
2015-10-13 16:02:00 -05: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 |
|
Shawn.Hooper
|
6d69c7bdcf
|
Merge branch 'asm_15.1.2' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_15.1.2
Former-commit-id: 5a64d1821525d8d00e53998063adc09ff81f4807
|
2015-10-13 15:17:20 -04:00 |
|
Nate Jensen
|
c13cb5b0e7
|
Merge "Omaha #4897 - The Collection/Dissemination menu item is now optional." into omaha_16.2.1
Former-commit-id: 00b80b788219861d39b9cbcc7c709e9493770552
|
2015-10-13 14:07:51 -05:00 |
|
Juliya Dynina
|
1e05ee2925
|
Merge "ASM #18154 - assigning 1 to usedirs in warngenloc table results in incorrect third bullet in a SVR product" into asm_15.1.2
Former-commit-id: 3c35925a69fee77fa9ac46c2caf128df417d807c
|
2015-10-13 14:01:14 -05:00 |
|
Steve Harris
|
68edb4bcbb
|
Merge tag 'OB_16.1.1-16' into omaha_16.1.1
16.1.1-16
Former-commit-id: e0531f2a2c30054701f27f3e72c10571ad9df24c
|
2015-10-13 13:37:31 -05:00 |
|
Kiran.Shrestha
|
1914a40b5e
|
ASM #13456 NamDNG5 not available in Volume Browser
Change-Id: Id8b3d884ca9ba9979526705f59da765b85bc3f3c
Former-commit-id: 50fa47c3914bc07e7d70a7ed63026afdabb3be42
|
2015-10-13 18:00:03 +00:00 |
|
Nate Jensen
|
ae81bc20b1
|
Merge "Omaha #3315 - Switch edex over to use G1 collector" into omaha_16.2.1
Former-commit-id: 6ba43ebaae0e4df8d18a266c61fd3750f5a13da6
|
2015-10-13 12:28:15 -05:00 |
|
Rici.Yu
|
34f59753f8
|
ASM #16938 - Fix data error when HDF5 storage type changes
Change-Id: Id750ad66426b4dec201a5e64ecc6d9db758480bd
Former-commit-id: 90cd6425a5e7a1fd7389f7e425031037aa840fd3
|
2015-10-13 13:25:06 -04:00 |
|
Richard Peter
|
144753bde1
|
Merge "Omaha #3756 Add configurable precipitation accumulation grib post processor." into omaha_16.2.1
Former-commit-id: 389b0eef844d9e89be582078ba40283694430339
|
2015-10-13 12:24:21 -05:00 |
|
Nate Jensen
|
e5bc62afa3
|
Merge "Omaha #4897 - break unnecessary dependency between viz radar and viz d2d xy." into omaha_16.2.1
Former-commit-id: 4255aeea1508f8d15f80edb9b9afda37666234b9
|
2015-10-13 12:23:58 -05:00 |
|
Richard Peter
|
b38fbc0306
|
Merge "Omaha #4929 No longer check for an alarm when Alarm Type value is not set." into omaha_16.2.1
Former-commit-id: 7387e834409a9a6f9a9df03e8f6d139c81451dd4
|
2015-10-13 11:56:48 -05:00 |
|
Dave Hladky
|
e5bed06160
|
Omaha #4948 Improved Forced FFG handling
Former-commit-id: ed2caee1aa466aea15479acfa31e130be026a618
|
2015-10-13 11:49:39 -05:00 |
|