Dave Hladky
|
3052a38081
|
Issue #3026 Fixed null metaData lookups in resource.
Change-Id: I29d17ea990ac5516b67ac18fadf4267663a23efb
Former-commit-id: 3f6bba1fda61fe283be47af1a4245d196f94f998
|
2014-11-11 10:18:47 -06:00 |
|
Brian.Dyke
|
1cd471ed72
|
Merge branch 'omaha_14.3.1' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.3.1
Conflicts:
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/ParmManager.java
Former-commit-id: b9d6c75a5c5f4cbe6b1e32f37e044989edf7c39f
|
2014-11-06 13:14:24 -05:00 |
|
Brian.Dyke
|
aae68215c8
|
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 |
|
Steve Harris
|
98f2a877f6
|
Merge branch 'master_14.3.1' (14.3.1-31) into omaha_14.3.1
Former-commit-id: b70eb5b35985453e77ef2337728c65161ba60422
|
2014-11-04 13:05:36 -06:00 |
|
Ron Anderson
|
b508a7134c
|
Issue #3775 Fix db does not exist for getParmList() error when runProcedure creates new mutable db.
Change-Id: I28eef61e4eea77278efe3cbf8828c3357c856785
Former-commit-id: de45da45f39169e3924122a7baf68ab6762e74e2
|
2014-11-04 11:03:42 -06:00 |
|
Brian.Dyke
|
f3b80f319d
|
Merge branch 'omaha_14.3.1' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.3.1
Former-commit-id: 4be7b001bc98e6fe81b3e66940d025fd7511060b
|
2014-11-03 14:45:24 -05:00 |
|
Matthew Howard
|
36e73a31df
|
Merge "ASM #16693 handles more swear words" into asm_14.3.1
Former-commit-id: a6ed07b8c01df8576cc54f88dc52d2110d211707
|
2014-11-03 09:56:09 -05:00 |
|
Brian.Dyke
|
5e04756c0c
|
Merge branch 'master_14.2.3' into master_14.2.4
Former-commit-id: 78923886791099b8e4564dd780d8ed64db16a5c1
|
2014-10-30 15:03:19 -04:00 |
|
Ying-Lian.Shi
|
ea9e231074
|
ASM #16693 handles more swear words
Change-Id: I0b892e3e6748919a206597106604a50f108b1bf7
Former-commit-id: 6133c233bd3e02b0a8e1540dd6c496997184f11d
|
2014-10-30 18:22:34 +00:00 |
|
Ron Anderson
|
0c3e19449f
|
Issue #3776 Cache SWT fill patterns used in history mode.
Change-Id: Ibb48a997fd0b9c2308ae9f492c7837a10db7285d
Former-commit-id: baefc78796f3d4826d32e5324dd88fa01d242ed5
|
2014-10-29 15:20:18 -05:00 |
|
Steve Harris
|
1753861b41
|
Merge branch 'master_14.3.1' (14.3.1-29) into omaha_14.3.1
Former-commit-id: 9d95570c1686978a5c84a21af29dbc84e53355a3
|
2014-10-29 08:21:13 -05:00 |
|
Ben Steffensmeier
|
1591c9cbb8
|
Issue #3767 Change default image export name to screenCapture.png.
Former-commit-id: 021367d3212e185a2d8d4e5970fc268204bf070b
|
2014-10-28 14:18:02 -05:00 |
|
Matthew Howard
|
f1d793c8f5
|
Merge "ASM #16863 - GFE: Check in version 2.12 of the Objective Analysis utility" into asm_14.3.1
Former-commit-id: aa43d958820f8873a982d24d9c73760eb430ddc7
|
2014-10-24 10:06:56 -05:00 |
|
Rici.Yu
|
45e3b2895b
|
ASM #16863 - GFE: Check in version 2.12 of the Objective Analysis utility
Change-Id: Ia377d571db68d0078399460ad1d434ba4dad510b
Former-commit-id: 902d1b1e4fed90ff216eab2ee5fc3f198bf7fc6d
|
2014-10-24 10:54:37 -04:00 |
|
Shawn.Hooper
|
7a7d877c17
|
ASM #16871 - Checkin: MPE Gage Table: columns do not sort in descending order
Change-Id: I197c3049e39ad0c5f5edca8926ff1afdaca20e2f
Former-commit-id: ce7ade3d25263f5af09073e4877b018a84f195a3
|
2014-10-24 09:47:54 -04:00 |
|
Rici.Yu
|
9c2555466c
|
ASM #16858 - Check in SerpISC tool.
Change-Id: I4c15360c377370bd757ed2eaad7aeade49412fd6
Former-commit-id: 1e8961e4f4a8168b667ce4b689efd88157dfb61c
|
2014-10-20 14:39:46 -04:00 |
|
Brian.Dyke
|
41e3037133
|
Merge branch 'master_14.3.1' into asm_14.3.1
Former-commit-id: b0fef17ac648ed5d13d6125fa600c915b131147d
|
2014-10-15 13:55:32 -04:00 |
|
David Friedman
|
955809450d
|
ASM #16844 - WarnGen can become disabled when moving storm track
Change-Id: Ic54b4f10eea64db40ce7f9c5a787fe344a8d916a
Former-commit-id: f4000b425b8da6bb16fe124c0e5eaaab78a6b3b2
|
2014-10-10 19:33:21 +00:00 |
|
Brian.Dyke
|
f85eb2d0ac
|
Merge branch 'asm_14.3.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.3.1
Former-commit-id: 344f436cfabfa5c1d0aa552467be7a6f9656a1ec
|
2014-10-10 11:01:01 -04:00 |
|
Ron Anderson
|
c7bf818989
|
Issue #3684 Fix GFE notification sending
Change-Id: I3b2ab7f454cb9454a9827ef994002d1b2348f462
Former-commit-id: b538cd55c0662d3d593522817986109c7e03625a
|
2014-10-09 09:21:29 -05:00 |
|
Nate Jensen
|
ef6da2a181
|
Merge "Issue #3686 fix kml export when maps are the only thing loaded" into omaha_14.3.1
Former-commit-id: 03ed17c8994b00ea37c1c591760c9b7c452dfcde
|
2014-10-06 15:53:19 -05:00 |
|
Nate Jensen
|
446e0bcdf6
|
Issue #3686 fix kml export when maps are the only thing loaded
Change-Id: I4741da935b0ef24bd8d0d0d114151404038828a0
Former-commit-id: 9dac0fcf997feeecdd8c581ae8fd72581c32d095
|
2014-10-06 15:41:42 -05:00 |
|
Michael Gamazaychikov
|
f0b644d92e
|
ASM #513 - Maps loaded before opening WarnGen not retained when WarnGen is closed.
Change-Id: Iee5611826c4f26cec95daa6277c84a2e6a7ae410
Former-commit-id: dff1c1d6fcc5fd0572dd924cfdf7979fc2a18463
|
2014-10-06 15:32:10 -04:00 |
|
Brian.Dyke
|
f440da9c70
|
Merge branch 'omaha_14.3.1' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.3.1
Former-commit-id: 23d16004c389f0ef708bee2a8bfb84d465b7b36b
|
2014-10-03 14:04:46 -04:00 |
|
Brian.Dyke
|
2a911984f0
|
Merge branch 'asm_14.3.1' of winter:/data/gerrit2/git/AWIPS2_baseline into master_14.3.1
Former-commit-id: 441fc7561a8526422f9b73b9c47cd220f0babb54
|
2014-10-02 10:44:50 -04:00 |
|
Brian.Dyke
|
65ad6056b6
|
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 |
|
Brian.Dyke
|
f47840e4d9
|
Merge branch 'field_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Former-commit-id: ece734cb6218a80fa2dda1b3c43673dc5a31bfbb
|
2014-10-02 10:24:04 -04:00 |
|
Steve Harris
|
e201e1a493
|
Merge branch 'master_14.3.1' (14.3.1-23) into omaha_14.3.1
Former-commit-id: ace8473f96c6151918ee8ecf61e3b8986d98a68a
|
2014-10-02 08:09:02 -05:00 |
|
Slav Korolev
|
f7bcb81010
|
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 |
|
Brian.Dyke
|
5ed17c0e24
|
Merge branch 'master_14.3.1' into asm_14.3.1
Former-commit-id: 622e63224b6d6bf1d6ced874658bbd9db381799b
|
2014-10-01 15:36:06 -04:00 |
|
Nate Jensen
|
482af416b3
|
Issue #3679 fix bug when performance pref page changes
Change-Id: I15db22a05e5f50b2555c924f61cd52245963ef15
Former-commit-id: e2d5957c02ba210e1964d00f37a00455f3326b37
|
2014-10-01 11:53:40 -05:00 |
|
dmsys
|
8c3625cfec
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|