Commit graph

6427 commits

Author SHA1 Message Date
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
Matthew Howard
e977069a71 Merge "ASM #16755 - Checkin fix for MPE and Hydro perspectives for Mike Duff" into asm_14.2.3
Former-commit-id: 0cfeb341bc827b707c932cd8ca2a1d8e5c1c8ad7
2014-09-23 10:23:16 -05:00
Brian.Dyke
e3276358dc Merge branch 'master_14.3.1' into asm_14.3.1
Former-commit-id: 74df3dae5b1d0644ee5c82a0bb65054eb3541427
2014-09-23 11:08:20 -04:00
Shawn.Hooper
99f6ff6d0a ASM #16755 - Checkin fix for MPE and Hydro perspectives for Mike Duff
Change-Id: Ibd5d2caad16de2ab2a645b507c0e00bea61e9d5e

Former-commit-id: 4ddd428c4168eb90b6d9b01db2e0bdd02206a9e7
2014-09-23 10:44:38 -04: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
Steve Harris
38daf108e6 Merge branch 'master_14.2.4' (14.2.4-12) into omaha_14.2.4
Former-commit-id: 9bc599dd5481360d7a00b9c8455805893922127d
2014-09-22 22:06:05 -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
Sean.Webb
4d2c798cc2 Merge "ASM #16761 - Fixed typo on variable character" into asm_14.2.3
Former-commit-id: 3592653ff850b2950d3ca4c0fead17292b58f971
2014-09-22 14:23:18 -05:00
Sean.Webb
9b164205c0 Merge "ASM #16761 - Fixed typo on variable character" into asm_14.2.3
Former-commit-id: d5f0fa6d025ec11eb83b9ceceb8309a23f80820b
2014-09-22 14:22:58 -05:00
Sean.Webb
00479a436d ASM #16761 - Fixed typo on variable character
Change-Id: Iaab6df0c74bd1745d81717590d9980e1057ece37

Former-commit-id: 97a94d4b1d612ca0878defd3e3fcf2b7391e3b36
2014-09-22 14:10:28 -04:00
Ron Anderson
5407eb6a71 Issue #3526 Fix errors found during testing in SS
Change-Id: Ic2a7f0b38f57fcae6b3fea904a457642472b2157

Former-commit-id: 0e3e60bcc4b8adcb9efa51df28d4b35bb6228ed7
2014-09-22 11:34:31 -05:00
Sean.Webb
47aef24f6f ASM #16761 - Fixed typo on variable character
Change-Id: Ibb44f6b6f969a92780d28676db930420bc7446c2

Former-commit-id: 721bead655f9a384ea12444617774b7ef404feb0
2014-09-22 07:18:21 -04:00
Brian.Dyke
c0dc990974 Merge branch 'ops_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Former-commit-id: 41a854146a3f4ab156b63e2ea24e60681fc586f2
2014-09-19 16:59:12 -04: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
Shawn Hooper
2df3755d31 Merge changes Ia37804af,I1649c38e,I9dc84e7e,Ie9e2ab55 into asm_14.2.3
* changes:
  ASM #16761 - Fixed typo on variable character
  ASM #16761 - Added ldm dir removal to prevent conflicts if libs change
  ASM #16761 - Added retrans code updates from ISG
  ASM #16761 - Updated ldm spec to add retrans


Former-commit-id: fc69e9debbbad3f8b82a8670f700a158fb68c12b
2014-09-19 14:05:35 -05:00
Slav Korolev
71c4d8db07 Issue #2757 - Updated handlers for dialog buttons.
Former-commit-id: 69a82633c287bf18c9f436014bb552829dcb62ea
2014-09-19 15:02:59 -04:00
Baoyu Yin
8568cd8419 VLab Issue #4796 - AWIPS2_DR_17420 WarnGen IBW templates and 14.2.1 template corrections; fixes #4796
Change-Id: Ieb4a6d68b48351deacbddda65f1ff53485c3402d

Former-commit-id: f077d3cd4084faf8ad7c8865e84df53e59a5db72
2014-09-19 15:02:23 -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
Sean.Webb
4368f4650b ASM #16761 - Fixed typo on variable character
Change-Id: Ia37804afe2f77e17dd76fcc52b3a7ad4870e5275

Former-commit-id: 5c541f50dcc68a856e8c81bff8577334abf1ff75
2014-09-19 13:43:45 -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
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
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
Sean.Webb
b0b01694f7 ASM #16761 - Added ldm dir removal to prevent conflicts if libs change
Change-Id: I1649c38e1aa9460f373d4500795a06cc849dd09b

Former-commit-id: 031c41d4f7801c8a5127cf007358856bf771593a
2014-09-19 09:29:31 -04:00
Sean.Webb
5c84cadaf6 ASM #16761 - Added retrans code updates from ISG
Change-Id: I9dc84e7ee45242f74f9676a8d265eba81af6a08c

Former-commit-id: 165b9a9b3481b3fa1d31b771eead03180430be59
2014-09-19 07:25:18 -04: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
Sean.Webb
35bfd8269c ASM #16761 - Updated ldm spec to add retrans
Change-Id: Ie9e2ab553410ef7d16c023d7af2178169c604229

Former-commit-id: bb9d431a842511b0081660224f3ddefd947f76fd
2014-09-18 09:33:47 -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
Brian.Dyke
546b43dff6 VLab Issue #4015 - MPE - This is the MPEFieldgen LSATPRE Field generation fix. Built library.ohd.pproc.so
Former-commit-id: 0448deecda7c53ac65bc66bc9751ec0e7f83eee1
2014-09-17 15:39:57 -04:00
Steve Harris
cf24ea5d59 Merge branch 'master_14.2.4' (14.2.4-11) into omaha_14.2.4
Former-commit-id: 3aced28e0b4fe7e9b64445c050d119f47844e136
2014-09-17 14:09:33 -05: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
Ron Anderson
f0c5e465b8 Issue #3592 Fix issue with priority of file updates
Change-Id: I1404fc8f3c03fab7e828bf40ee01c8d03cfbda58

Former-commit-id: 554ea4118615055d4f2e0d80c58788f55c4b41e9
2014-09-16 17:25:43 -05:00
Ron Anderson
5c7290bf7c Issue #3592 Significantly reworked SampleSetManager and sample set dialogs to better match A1 behavior.
Change-Id: I8aef618a5091ee7acae470f5729add3c44287f30

Former-commit-id: bb859073c6ab56141434b84dc104857759a81d82
2014-09-16 13:20:40 -05: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
Steve Harris
c5187836e9 Merge branch 'master_14.2.4' (14.2.4-10) into omaha_14.2.4
Former-commit-id: 4302fd0afe104f3ebdfbd23a771816262a551ecb
2014-09-16 08:35:36 -05: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
Ana Rivera
2e66ced748 Merge "VLab Issue #4723 - Ingest LambertConformal projection with two standard parallels using RegionalSat; fixes #4723" into field_14.3.1
Former-commit-id: c7c530f99f8585817544db2d7be5b13d47c3e62e
2014-09-16 08:05:51 -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