Steve Harris
|
04546b20ef
|
Merge branch 'omaha_14.4.1' into omaha_pda
Former-commit-id: 0804064f01610ff9873e997c8a0d026002b7c571
|
2014-09-30 09:22:39 -05:00 |
|
Nate Jensen
|
057e5eda1a
|
Merge "Issue #3669 Ensure best res does not parse alert messages." into omaha_14.3.1
Former-commit-id: 9e22fa02bb9f47d8332815059f2f5ae2d2ef6083
|
2014-09-29 17:50:34 -05:00 |
|
Nate Jensen
|
1b51c48468
|
Omaha #3663 move features that contain primarily ncep plugins to ncep
folder
Change-Id: I5d59e1c0618fa26c1f8b3e6f340f255119a72a40
Former-commit-id: f785d88ee1c388b564921c3ecd8c931329639f04
|
2014-09-29 17:24:34 -05:00 |
|
Ron Anderson
|
a9827b0545
|
Merge "Omaha #2975 optimize lookup of edit areas and gfe configs" into omaha_14.4.1
Former-commit-id: 918dcb1b91fb45b84a82df42b7fe2d3fc2f86fa0
|
2014-09-29 16:10:37 -05:00 |
|
Steve Harris
|
90e08b96e1
|
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 |
|
Nate Jensen
|
1b70e053a1
|
Omaha #2975 optimize lookup of edit areas and gfe configs
Change-Id: Ic89c84e79a27476ebb28573d49f60429424d4c37
Former-commit-id: 860bcc70144d9a8478aef3cc9ebfe84e98b6c4a7
|
2014-09-29 12:29:25 -05:00 |
|
Ben Steffensmeier
|
c573db2918
|
Issue #3669 Ensure best res does not parse alert messages.
Former-commit-id: e93157375f90c6cc2038db9a78346592e4d46b0e
|
2014-09-29 11:20:33 -05:00 |
|
Steve Harris
|
46da726675
|
Merge branch 'master_14.3.1' (14.3.1-21,22) into omaha_14.3.1
Former-commit-id: 49ad8e0e780443a0439227694a92ec8ab683b125
|
2014-09-29 11:14:32 -05:00 |
|
Ben Steffensmeier
|
f92d021e96
|
Omaha #3132 - merge master_14.3.1 into omaha_14.4.1
Former-commit-id: 00d314b6b493bc34ccd77f731307b5039e22d844
|
2014-09-29 10:49:14 -05:00 |
|
Brian.Dyke
|
0a497fc015
|
Merge branch 'master_14.2.3' into master_14.2.4
Former-commit-id: 01cb1dc674ae1249d97dc10be5c068de0ed2a222
|
2014-09-29 11:20:57 -04:00 |
|
Brian.Dyke
|
550ffba7b0
|
Merge branch 'asm_14.2.3' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.2.3
Former-commit-id: 93ddf672c137c7221e9595e8b5c1b279084cb451
|
2014-09-26 16:14:06 -04:00 |
|
David Friedman
|
6791e8d885
|
ASM #15658 - WarnGen: inclusion of watch information in marine products
Change-Id: I13d9e58b1df3dd434cdea66060dbc5886c0e27f2
Former-commit-id: 78cc67f9d2f86c2088ffc5695c4dea879a9e2ebb
|
2014-09-26 20:05:46 +00:00 |
|
Brian.Dyke
|
1ac61fb612
|
Merge branch 'field_14.2.4' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.2.4
Former-commit-id: 5b570e5229628de88068edee1c70c26eec13f71a
|
2014-09-26 14:19:03 -04:00 |
|
Brian.Dyke
|
8245370186
|
Merge branch 'master_14.3.1' into asm_14.3.1
Former-commit-id: 6ed90023551e25216c10d05f2568593992326900
|
2014-09-26 13:02:49 -04:00 |
|
Brian.Dyke
|
586a504500
|
Merge branch 'omaha_14.2.3' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.2.3
Former-commit-id: d6369c8346d1ed4d86ed3eb7adc47de0891c7fd7
|
2014-09-26 11:47:38 -04:00 |
|
David Friedman
|
33aee54b8f
|
ASM #15551 - WarnGen: only WCN should be used while including TOR/SVR watches in WarnGen products
Change-Id: I8b8e9ae40596e5a3d5f0aa44d2e946aa7a68a1ae
Former-commit-id: c8aa2fbfc35c872e2d50de2212eaf16db9b5483d
|
2014-09-26 15:13:56 +00:00 |
|
David Friedman
|
41820f112f
|
ASM #15551 - WarnGen: only WCN should be used while including TOR/SVR watches in WarnGen products
Change-Id: I1698025cad4310f8fc30938294c161c1f9797f03
Former-commit-id: 70b520c08670646047ffa753814f98c032938ff8
|
2014-09-26 13:07:28 +00:00 |
|
David Friedman
|
5755c120d5
|
ASM #16783 - Warngen: Possible problem when there are two effective VTEC actions for a watch
Change-Id: I76599d23396fe64c9448440787e67d752ed6b028
Former-commit-id: 117c2f072b647e353456832f2f0088d51a660d65
|
2014-09-25 22:10:42 +00:00 |
|
David Friedman
|
b3025aacb0
|
ASM #16773 - WarnGen can become disabled when a followup is selected
Change-Id: Ibe0e3b18914840515f8bc9d844a2ffb0a6abddf0
Former-commit-id: 5048af915b004067ec8a6e788a0e9ad3e006c9d8
|
2014-09-25 21:07:16 +00:00 |
|
Qinglu.Lin
|
94fed71091
|
ASM #15551 - WarnGen: only WCN should be used while including TOR/SVR watches in WarnGen products
Change-Id: I33fb6fab8d49aca4f12f76c763e5f3ddbd9272b5
Former-commit-id: 8b194664458246dad7509c44bcc07480cb088ddd
|
2014-09-25 15:16:42 -04:00 |
|
Ana Rivera
|
d96f5fe229
|
VLab Issue #4794 - O&M RM16720; Update planesMenusPlanView.xml; fixes #4794
Change-Id: I8e4b7c563e74e18c3c60e858cd7e6bd3cdaff8e8
Former-commit-id: 833cff4f37542078578de96b3b59723f77c31f4c
|
2014-09-25 17:46:53 +00:00 |
|
Nate Jensen
|
c0b7fc0ac7
|
Omaha #3571 better error handling of invalid geom with map caching
Change-Id: I3947613aab5a7789b32ea1d0e3a8e3091d9690d8
Former-commit-id: 0f2066e985dcbcedd2794ce226232efe999b1312
|
2014-09-25 11:30:27 -05:00 |
|
Nate Jensen
|
364aff9278
|
Merge "Omaha #3220 - Changes in the area configuration files for FSSObs monitors." into omaha_14.4.1
Former-commit-id: e2f23221c3f8301460df2945deb8c760cdf216e9
|
2014-09-25 08:44:50 -05:00 |
|
Slav Korolev
|
7b1a4c6774
|
Omaha #3220 - Changes in the area configuration files for FSSObs monitors.
Former-commit-id: d7a921d6206f5b09e7a6784c7e86b9167b74685f
|
2014-09-25 09:02:27 -04:00 |
|
Lee Venable
|
77afac746c
|
Merge "Issue #2757 - Fixed problem with adding and removing zones." into omaha_14.3.1
Former-commit-id: 2ec651b767555946485c8a087f891c8736f59105
|
2014-09-24 16:23:23 -05:00 |
|
Nate Jensen
|
4cf93c0acb
|
Omaha #3663 move airep and pirep plguins to ncep features
Change-Id: I2c9a274ee85b24e93800fa7c0f73739030995219
Former-commit-id: 8f743862722b2af08e6659ca3beb0366095bcf79
|
2014-09-24 15:20:17 -05:00 |
|
Ana Rivera
|
535f254357
|
VLab Issue #4669 - Add Beach Hazards Statement (RM 13467); fixes #4669
Change-Id: I54c1055b87b7bfab0a35fd391c6ef7156fc3d297
Former-commit-id: 2c16492202230dcbec93cf390b47f400a77a545e
|
2014-09-24 20:11:29 +00:00 |
|
Brian.Dyke
|
4b418918d4
|
Merge branch 'master_14.2.4' into master_14.3.1 CM-MERGE:14.2.4-10-11-12 into 14.3.1
Conflicts:
cave/com.raytheon.viz.grid/localization/volumebrowser/FieldDisplayTypes.xml
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/GRID/HRRR/HRRR.xml
ncep/gov.noaa.nws.ncep.viz.localization/localization/ncep/ResourceDefns/ResourceFilters.xml
Former-commit-id: e04ad21771ce410beb25e15fe300a34796a1a062
|
2014-09-24 11:05:37 -04:00 |
|
Ron Anderson
|
b1fa793541
|
Issue #2729 Revert changes made to PythonPreferenceStore.java in favor changes to GfePyIncludeUtil.java made in #3500.
This reverts commit 11c8529862 [formerly 552c3e9485ee03c552851c98455e57f12a8f033f].
Change-Id: I50a580d7c038b039cc8ebf3e05dd16c4453f8355
Former-commit-id: d1c6475343160eeb02171fb8fc3b04f527203154
|
2014-09-24 09:17:43 -05:00 |
|
Slav Korolev
|
443c7c7482
|
Issue #2757 - Fixed problem with adding and removing zones.
Former-commit-id: 31ccaf218df628327fe4b27d69a4500eb1dc8d84
|
2014-09-24 09:34:43 -04:00 |
|
Ying-Lian.Shi
|
2a38e3eca5
|
ASM #16693 Fix spelling checker swear words
Change-Id: I0a31429fa35a5c5a8f4d2f000021db4e4304de9e
Former-commit-id: 1686a947c8a740c34339d9cf17749a6b92d776ab
|
2014-09-24 12:08:43 +00:00 |
|
Steve Harris
|
374a8cf99b
|
Merge branch 'omaha_14.4.1' into omaha_pda
Former-commit-id: 03a52fa50e7e51eccf7ccc8d80c851c3ab221fdb
|
2014-09-23 21:43:25 -05:00 |
|
Ron Anderson
|
429de3224f
|
Issue #3648 Improve GFE error handling for getAllAvailableParms.
Change-Id: I13d41a3c231a56fe7d6fc4bc3cbfd96e1bdcdccf
Former-commit-id: b77b3c916b4dcc9034408220006f941cd301ed3c
|
2014-09-23 18:47:38 -05:00 |
|
Nate Jensen
|
8ac422d642
|
Omaha #3009 make ffmp play nice with collaboration
Change-Id: Iccccec6dbe999d7677520a5b0f0464a2186f8174
Former-commit-id: ac15b82ed3c493a5ea8cca01ba304e95c965365e
|
2014-09-23 15:37:09 -05:00 |
|
David Friedman
|
a6acf71a0a
|
ASM #15658 - WarnGen: inclusion of watch information in marine products
Change-Id: I545d1b07444c9ca00ea2e95c4ccaed79946bbead
Former-commit-id: e0f6cc70bf5258d66bfa8a4ddb1daf871b6c92c5
|
2014-09-23 18:39:22 +00:00 |
|
Steve Harris
|
7692e3f21d
|
Merge tag 'OB_14.3.1-19m' into omaha_14.4.1
Conflicts:
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/ext/imaging/GLColormappedImageExtension.java
cave/com.raytheon.viz.satellite/src/com/raytheon/viz/satellite/rsc/SatResource.java
cave/com.raytheon.viz.volumebrowser/localization/menus/xml/planesMenusPlanView.xml
edexOsgi/com.raytheon.edex.plugin.satellite/src/com/raytheon/edex/util/satellite/SatSpatialFactory.java
edexOsgi/com.raytheon.uf.common.colormap/src/com/raytheon/uf/common/colormap/prefs/DataMappingPreferences.java
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/mmp.xml
nativeLib/files.native/awipsShare/hydroapps/lib/native/linux32/library.ohd.pproc.so
nativeLib/files.native/edex/lib/native/linux32/library.ohd.pproc.so
ohd/gov.noaa.nws.ohd.edex.plugin.hydrodualpol/src/gov/noaa/nws/ohd/edex/plugin/hydrodualpol/DSAProductProcessor.java
Former-commit-id: 72f387d2802c12eedfe5643616fe5a54420aef66
|
2014-09-23 11:41:10 -05:00 |
|
Lee Venable
|
b82ea41f9d
|
Merge "Omaha #3356 remove unnecessary import" into omaha_14.4.1
Former-commit-id: a158d4dbdf27311a04684bbda1afb3991fb0e09a
|
2014-09-23 10:56:20 -05:00 |
|
Nate Jensen
|
41fcd2b7b6
|
Omaha #3356 remove unnecessary import
Change-Id: Id1ad295d1adb29de072173a4137a5e5f612b48ac
Former-commit-id: ad3753d57709fe8efeab2fb400d92b6ec61c2a3e
|
2014-09-23 08:21:18 -05:00 |
|
Steve Harris
|
3301300c7e
|
Merge branch 'master_14.3.1' (14.3.1-20) into omaha_14.3.1
Former-commit-id: 68ff0acbe3739e2fd3aa89b13ed070c39db48551
|
2014-09-22 22:18:26 -05:00 |
|
Brian.Dyke
|
5d0347f589
|
Merge branch 'master_14.3.1' into asm_14.3.1
Former-commit-id: 414a695e6423fa291936d15a999113f4a518b097
|
2014-09-22 16:51:47 -04:00 |
|
Nate Jensen
|
e163ae0e5b
|
Omaha #3356 fix apps_dir setting detection in viz/cave
Change-Id: If78a4ec84f6237450a6494c06b5a5271c66f10a3
Former-commit-id: ca8195c7835b9d96158d048fdd548cc744ba96bc
|
2014-09-22 13:00:04 -05:00 |
|
Brian.Dyke
|
4db67c581c
|
Merge branch 'asm_14.3.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.3.1
Former-commit-id: 8d5d8cdfd272f8000a6a21a4128998889eb2ab30
|
2014-09-19 16:56:50 -04:00 |
|
Ben Steffensmeier
|
72f5799c44
|
Omaha #3300 Fix component and mosaic merge problems
Former-commit-id: 201854ac4154dc8526bf99bde69674ad51ec50ad
|
2014-09-19 15:08:21 -05:00 |
|
Slav Korolev
|
71c4d8db07
|
Issue #2757 - Updated handlers for dialog buttons.
Former-commit-id: 69a82633c287bf18c9f436014bb552829dcb62ea
|
2014-09-19 15:02:59 -04:00 |
|
Brian.Dyke
|
6ad8d500ef
|
Merge branch 'ncep_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Former-commit-id: e895f7927a95c2416c05953e131d9e0c6095beb3
|
2014-09-19 14:42:29 -04:00 |
|
Brian.Dyke
|
88d5f872ae
|
Merge branch 'field_14.2.4' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.2.4
Former-commit-id: aaae61509d743553186cdefdea0557158b139527
|
2014-09-19 13:14:13 -04:00 |
|
Brian.Dyke
|
7f49052445
|
Merge branch 'master_14.2.3' into master_14.2.4
Former-commit-id: 88e26cd8b378ffc81db87aee226ceca47ae58aa7
|
2014-09-19 13:08:06 -04:00 |
|
Mark Peters
|
048e8339fd
|
Omaha #3300 Merge fixes for 14.4.1
Change-Id: I9a7e4131bfbd6503e70001594b93492c7cbad5fd
Former-commit-id: 1ecf38ee8614f3df751fe9debbdfdb2771e5bea1
|
2014-09-19 12:01:07 -05:00 |
|
Darrel Kingfield
|
1cabae50b1
|
VLab Issue #4603 - MRMS SBN Display initial code check-in v3 - update purge rules; fixes #4603
Change-Id: Ic38722b3080edc3f9a9f8d35d4b2271d34b63872
Former-commit-id: a9bc901ed4b9157a4cb1a042d5fabe628cfd4b2a
|
2014-09-19 11:14:09 -05:00 |
|
Steve Harris
|
07a7645fcd
|
Merge branch 'master_14.3.1' (14.3.1-19) into omaha_14.3.1
Former-commit-id: c72e05b87f6eb6d094bde5e7caec3cccb20476ce
|
2014-09-19 11:13:46 -05:00 |
|