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 |
|
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 |
|
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
|
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 |
|
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
|
429de3224f
|
Issue #3648 Improve GFE error handling for getAllAvailableParms.
Change-Id: I13d41a3c231a56fe7d6fc4bc3cbfd96e1bdcdccf
Former-commit-id: b77b3c916b4dcc9034408220006f941cd301ed3c
|
2014-09-23 18:47:38 -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 |
|
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 |
|
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 |
|
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 |
|
Ana Rivera
|
9d8c08a09a
|
VLab Issue #4794 - RM 16720 Update LevelMappingFile.xml; fixes #4794
Change-Id: I58d0cb7e38d5ed483db5c87cc322c93764e21f06
Former-commit-id: 3af534fb2778268fee650c09c5aa0346df746ce8
|
2014-09-19 15:17:46 +00:00 |
|
Brian.Dyke
|
c6b0adfc53
|
Merge branch 'ohd_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Former-commit-id: de22db308f36c42d5c7e0989dbd7decfaaf3adbb
|
2014-09-18 12:43:01 -04:00 |
|
Chip Gobs
|
0d046a56e8
|
VLab Issue #4611
Adding missing changed file.
Change-Id: Ifcc56c121bb13806a5a5e7fc4e6de6e36900867e
Former-commit-id: e68f56628f035ca2a20848a0e76f6efa8bbe1e8a
|
2014-09-18 12:12:42 -04:00 |
|
Matthew Howard
|
27c31ea90f
|
Merge "ASM #15465 - No variable for failed site's MND Header location available for WarnGen to use" into asm_14.3.1
Former-commit-id: 0b0c2e1ea8188cd88c92fde4d4b999670aad17dc
|
2014-09-18 10:36:17 -05:00 |
|
Qinglu.Lin
|
10da99d3f7
|
ASM #15465 - No variable for failed site's MND Header location available for WarnGen to use
Change-Id: I8bc59786379680f635e85917eebf4c9d6b4ea683
Former-commit-id: f79ed1b1867b5516a390a8f70b2141052be3eb38
|
2014-09-18 11:21:18 -04:00 |
|
Matthew Howard
|
7b369e5ccc
|
Merge "ASM #537 - fix for AvnFPS: Syntax failed to flag format error" into asm_14.3.1
Former-commit-id: 45a5185657de4c3e3c330a5a8604078fe1ccde2a
|
2014-09-17 15:40:40 -05:00 |
|
Brian.Dyke
|
e1c88f287a
|
Merge branch 'ops_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Former-commit-id: 5703d4fbb0fa5e422e3fbd62529928091a2bdb1f
|
2014-09-17 15:50:13 -04:00 |
|
Brian.Dyke
|
a155bbd8c1
|
Merge branch 'field_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Former-commit-id: 0813f96fbb673fdbbdb2c0f049ec722a80b212f9
|
2014-09-17 15:45:27 -04:00 |
|
Zhidong.Hao
|
237b09c2ad
|
ASM #537 - fix for AvnFPS: Syntax failed to flag format error
Change-Id: I39615891fb92f876e06d13eb3232ee937ec9080a
Former-commit-id: 52d355b81fd7f7376d26f43ca6abe4d2ee744adf
|
2014-09-17 15:02:13 -04:00 |
|
Brian.Dyke
|
cb7a266271
|
Merge branch 'ohd_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Former-commit-id: dcfe2369455e6b7f27039418b090c9c577400a63
|
2014-09-17 14:39:56 -04:00 |
|
Brian.Dyke
|
4bd417b313
|
Merge branch 'master_14.3.1' into asm_14.3.1
Former-commit-id: 1f186fb314e78d93adefe03faaa71f348ee207c7
|
2014-09-17 13:32:25 -04:00 |
|
Qinglu.Lin
|
0e2be5afd8
|
ASM #15551 - WarnGen: only WCN should be used while including TOR/SVR watches in WarnGen products
Change-Id: Ia4350f8c17166c8f972779f8bde1763ec4cd3bd5
Former-commit-id: e7ab29fbfebb1943e0b0702547dbd353367e797d
|
2014-09-17 10:26:25 -04:00 |
|
Brian.Dyke
|
6ad97675c4
|
Merge branch 'omaha_14.2.4' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.2.4
Former-commit-id: f08b8e1a7f684c419abe7995dc3441e6d38b79ce
|
2014-09-16 10:53:58 -04:00 |
|
Matthew Howard
|
9b7823084f
|
Merge "ASM #529 Invalid QC message for Areal Flood Advisory" into asm_14.3.1
Former-commit-id: f08b93fb1bd32ec83a2e590d29d5e4d0fe18c0a9
|
2014-09-16 08:32:37 -05:00 |
|
Michael Gamazaychikov
|
fdaf681e8c
|
ASM #529 Invalid QC message for Areal Flood Advisory
Change-Id: I392d32b4d7ccc94c88404a85f22f2f306d34ee33
Former-commit-id: d3247df563831f017f69faf1edbde5aea3c2a507
|
2014-09-16 09:12:06 -04:00 |
|
Steve Harris
|
d5c0049ba2
|
Merge branch 'master_14.3.1' (14.3.1-17) into omaha_14.3.1
Former-commit-id: 74d4b836dd8b2eb9a70cf772127d9b7eee23c1bf
|
2014-09-15 21:13:56 -05:00 |
|
Jordan Gerth
|
86b34a2f70
|
VLab Issue #4487 - Dim. DR 17313, Additional true color capabilities; fixes #4487
Change-Id: I701f302aa5958e89522208fd7915f5077cf97616
Former-commit-id: 1300009502bafd34fee13c8d21d65208b1069bda
|
2014-09-15 19:14:13 -05:00 |
|
Slav Korolev
|
d682a69b8d
|
Issue #2757 - Removed unnecessary dialogs.
Former-commit-id: 1a906e4f7a5e7cc9e4cd8b4a717f0f2bb02cbb61
|
2014-09-15 17:46:10 -04:00 |
|
Matthew Howard
|
aa273ffb70
|
Merge "ASM #641 - Filtered cases where Areas do not match Zones." into asm_14.3.1
Former-commit-id: f33abc302597a3120c9220278e28d865d5f185b6
|
2014-09-15 15:03:36 -05:00 |
|
Daniel.Huffman
|
bacc914bd0
|
ASM #641 - Filtered cases where Areas do not match Zones.
Change-Id: I1207442f77aece9d79b010669755ee7fc6f82362
Former-commit-id: bf6acaafc42ba98e4257d3eb089b7a1e7adf7bd4
|
2014-09-15 19:18:33 +00:00 |
|
Matthew Howard
|
811b79d748
|
Merge "ASM #16693 - Fix spelling checker suggests swear words" into asm_14.3.1
Former-commit-id: 04c6dfae9b8edb836a1bad54e1b8b327c66325bb
|
2014-09-15 12:28:25 -05:00 |
|
Stephen Gilbert
|
5bf2ed644a
|
Merge remote branch 'origin/master_14.3.1' into ncep_14.3.1
Former-commit-id: 2cf0da849d50a31d2ca54efeaf6e0258f33ff1d3
|
2014-09-15 13:20:34 -04:00 |
|
Ying-Lian.Shi
|
11b40e167c
|
ASM #16693 - Fix spelling checker suggests swear words
Change-Id: Ie9e5bc5c26b16655185b81cf4b4cf2f758693566
Former-commit-id: 094cb9dba5d6e0da22b32b85dcc5049fd629fe5e
|
2014-09-15 14:56:32 +00:00 |
|
Brian.Dyke
|
216f34fb25
|
Merge branch 'master_14.3.1' into asm_14.3.1
Former-commit-id: 8e4f6e96f7b70d6f2b7517f3f0695350506169c7
|
2014-09-15 10:46:25 -04:00 |
|
Roger Ferrel
|
fa91c4ac44
|
Issue #3516 ColorMapTree change listener now only gets colormaps changes.
Change-Id: Id19d0c0e958ec64a19abc064817780d067add023
Former-commit-id: bb265611d13e6cb9812aca3966d9fe2a20990a36
|
2014-09-12 15:03:13 -05:00 |
|
Brian.Dyke
|
21fedc3565
|
Merge branch 'field_14.2.4' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.2.4
Former-commit-id: ab9b7ec5424512656d2fb343773fa97658c04ecd
|
2014-09-12 14:11:57 -04:00 |
|
Ana Rivera
|
09152bc49b
|
VLab Issue #4671 - Remove duplicate entries from fieldsMenus.xml, updates SMS RM 16720 (HRRR); fixes #4671
Change-Id: I9708b606e5a7d2c2fc9355d765fbad9113a40493
Former-commit-id: 94e5089beb782011d107de4aeeb8b35694f2f5c3
|
2014-09-11 21:17:43 +00:00 |
|