Commit graph

5424 commits

Author SHA1 Message Date
Qinglu.Lin
2e3a1d2374 ASM #556 - WarnGen: use noon/midnight instead of 1200 PM/1200 AM
Change-Id: I31cc6fe46fff0f9246585ddbf84b2f94b3d8c22c

Former-commit-id: c9e359f947 [formerly b7d276d00f] [formerly 75c4b15e8e] [formerly c9e359f947 [formerly b7d276d00f] [formerly 75c4b15e8e] [formerly c5097660c2 [formerly 75c4b15e8e [formerly 763641d787f7f8c79bf28456314dcc16786702ed]]]]
Former-commit-id: c5097660c2
Former-commit-id: bdf527d5f2 [formerly bdae3cdfdf] [formerly cba5eacd009b07ca51d595c26e8a4b851d4605b4 [formerly 89fa05128e]]
Former-commit-id: 129e4eff1386649cdd84ed945399d5abd11dab4a [formerly 42c5ce2aff]
Former-commit-id: 603c6a1843
2014-05-14 15:30:16 -04:00
Matthew Howard
f2fda36e49 Merge "ASM #509 GFE: Product editor still auto-wraps when the option is turned off" into asm_14.3.1
Former-commit-id: 84f26ca9f5 [formerly 7b087f422d] [formerly 5a20085f32] [formerly 84f26ca9f5 [formerly 7b087f422d] [formerly 5a20085f32] [formerly 576a2d63ec [formerly 5a20085f32 [formerly 2052df4ca5f68165b477994b21357c245ff73546]]]]
Former-commit-id: 576a2d63ec
Former-commit-id: 07372d5761 [formerly c919d3503a] [formerly 47aa58262f08efbcc70ce1e004c35606ebb7c410 [formerly 1026f04671]]
Former-commit-id: 900606d92eeface052fd5eb0751fd480fc46e5f6 [formerly 56778b394b]
Former-commit-id: 26c357a549
2014-05-13 07:49:18 -05:00
Paul.Grell
2ee482c43e ASM #512 - Need radar data watchdog functionality
Change-Id: I3bcdbe8f267f78be1d0bc64e466ffed70be011a3

Former-commit-id: d74a7c5460 [formerly 0c8c5ef728] [formerly 9988804887] [formerly d74a7c5460 [formerly 0c8c5ef728] [formerly 9988804887] [formerly 7e036b2bbc [formerly 9988804887 [formerly ad727f0b3d820cf2310b4b8cc67639b6d141af6b]]]]
Former-commit-id: 7e036b2bbc
Former-commit-id: 8b27ddec12 [formerly 30dd189c72] [formerly 80c06a0313182172da2f1db53157034e32cdf346 [formerly c6aa190a43]]
Former-commit-id: 1ca89b462c6f0eb3a01f31d657f1509b68ac09f5 [formerly c741760dd2]
Former-commit-id: 4493e0608e
2014-05-12 20:00:18 -04:00
Juliya Dynina
2eba3d8214 Merge "ASM #539 - Multiple flag functionality for textdb is not working properly" into asm_14.3.1
Former-commit-id: acd50d3ec2 [formerly 161d2039f7] [formerly a203a14e52] [formerly acd50d3ec2 [formerly 161d2039f7] [formerly a203a14e52] [formerly 2578e13ee8 [formerly a203a14e52 [formerly 3fcd47133ac461046524837f085359b5eb1c7ba7]]]]
Former-commit-id: 2578e13ee8
Former-commit-id: df08ec72c7 [formerly f62a15f8e7] [formerly 963b1011316cdb307e20497d8a59a2f7bc6c4c80 [formerly 212d220bf7]]
Former-commit-id: 2721d69a7c14666f7c1884fd811590e97bb837e5 [formerly 783fd63389]
Former-commit-id: 3850e43354
2014-05-12 14:52:50 -05:00
Zhidong.Hao
32dfe53122 ASM #509 GFE: Product editor still auto-wraps when the option is turned off
Change-Id: Ibbd86588d2c7dd6a451803e03d6744c8471652f4

Former-commit-id: 1f48dcab3c [formerly 30b42030dd] [formerly d6cae51207] [formerly 1f48dcab3c [formerly 30b42030dd] [formerly d6cae51207] [formerly 030b767299 [formerly d6cae51207 [formerly a48b81894fed165aba58a0097359bbd0f1931be5]]]]
Former-commit-id: 030b767299
Former-commit-id: 79bdecf1b8 [formerly 31678eb223] [formerly 9d71f6e714e3aecf1dd6c690b838b59429ab91c9 [formerly 88c5e2d94c]]
Former-commit-id: 0437116819d26dce5a01e1304b4c62391d0a1a24 [formerly 6dd1289c31]
Former-commit-id: af44604e04
2014-05-12 15:16:38 -04:00
Kiran.Shrestha
532d416442 ASM #539 - Multiple flag functionality for textdb is not working properly
Change-Id: I6f48e877a356fa576e1311da769c90735e61877f

Former-commit-id: 90e1ca7e3d [formerly d4970b6f2f] [formerly e615e1efc5] [formerly 90e1ca7e3d [formerly d4970b6f2f] [formerly e615e1efc5] [formerly c162868850 [formerly e615e1efc5 [formerly 2e2de40d75c0ebc0af1b2d70806e834c7d5089f8]]]]
Former-commit-id: c162868850
Former-commit-id: 5b4bdf753e [formerly d0ed79310a] [formerly 8a5b8a227ba3ac536e32dcf3924c0c1a14daef85 [formerly 943efbc9d0]]
Former-commit-id: 0264965a43bc71a352cfa5e15c45e64da4fbe0f4 [formerly ce58e209b9]
Former-commit-id: 3173d32583
2014-05-12 15:16:14 -04:00
Juliya Dynina
ba181eea5c Merge "ASM #527 update revision and shef_qual_code" into asm_14.3.1
Former-commit-id: 2823c88634 [formerly 43b45e9f53] [formerly 107b64a544] [formerly 2823c88634 [formerly 43b45e9f53] [formerly 107b64a544] [formerly e33a27684c [formerly 107b64a544 [formerly 0c54c56efa1306d781d64621ccf7f62b3bf70997]]]]
Former-commit-id: e33a27684c
Former-commit-id: e8223877d3 [formerly ed4e911992] [formerly 0121968464af80dafc37b5848c20eb3b2a4d7f91 [formerly a0b2051e7e]]
Former-commit-id: 8987371d7a81205fd49a4ef37c8ee4ba21e50a83 [formerly ce9120be90]
Former-commit-id: 00bab1367a
2014-05-12 14:01:40 -05:00
Juliya Dynina
bdb5b6e82c Merge "ASM #526 - Duration menu disabled after creating text for a COR SVS." into asm_14.3.1
Former-commit-id: 597facb18f [formerly 6713e83ae6] [formerly d7bea845fe] [formerly 597facb18f [formerly 6713e83ae6] [formerly d7bea845fe] [formerly 4f7fa8a8de [formerly d7bea845fe [formerly 350448988d24fd2eb58812128b062e3a0f44b956]]]]
Former-commit-id: 4f7fa8a8de
Former-commit-id: 9b53347004 [formerly cd1f437163] [formerly ae4d0d175756595f51c68e474a9add2068adada2 [formerly 190bf23ba8]]
Former-commit-id: 4ce2923fd5b1179225894529a6804e9fc57728a4 [formerly b65a50fd3e]
Former-commit-id: 2e191584e6
2014-05-12 14:01:07 -05:00
Matthew Howard
27fade89bb Merge "ASM #537 AvnFPS: Syntax failed to flag format error" into asm_14.3.1
Former-commit-id: 312833c363 [formerly e64f60ba98] [formerly b807c877f4] [formerly 312833c363 [formerly e64f60ba98] [formerly b807c877f4] [formerly 0dc1db0072 [formerly b807c877f4 [formerly 5afd4dab62eb48b65bb3f5b49d59444f1d52a23f]]]]
Former-commit-id: 0dc1db0072
Former-commit-id: 8e2d2b7ad8 [formerly 9593ff9ed5] [formerly e7c8279195dcaa2a2f22c354ec5670074da6bbe7 [formerly da9b3dd158]]
Former-commit-id: 9d9cd6d2483bf78d30d97f6c23b6e52f15dfafb0 [formerly db59b081af]
Former-commit-id: edb7266206
2014-05-12 13:52:12 -05:00
Loubna.Bousaidi
1f2320d5d6 ASM #527 update revision and shef_qual_code
Change-Id: I36fa41796350e8fcae6bcc0101120331188bbeff

Former-commit-id: 6b73f20d22 [formerly e634d0cdcf] [formerly ec5bd7a2bb] [formerly 6b73f20d22 [formerly e634d0cdcf] [formerly ec5bd7a2bb] [formerly d3be6d0476 [formerly ec5bd7a2bb [formerly 860ea4b3644a526ac10b4366f158824fe6cbdcb0]]]]
Former-commit-id: d3be6d0476
Former-commit-id: 9f56cbd9a7 [formerly ebd5400a4f] [formerly d6b2cbcc10eab994e4dfdf7ba3d542d553356f2a [formerly 6f335c71fe]]
Former-commit-id: a5cd2d12d0a8364ff16208daa4b14624864b7d46 [formerly c9d2ccb5ff]
Former-commit-id: 6e8a4ec60d
2014-05-12 18:42:12 +00:00
Zhidong.Hao
36267a0e9a ASM #537 AvnFPS: Syntax failed to flag format error
Change-Id: Ib7127a83f98a6978d7fc099cdc4fdc4fd8a0fe2b

Former-commit-id: e8abed29cb [formerly 29e7d7e888] [formerly 8d560036b1] [formerly e8abed29cb [formerly 29e7d7e888] [formerly 8d560036b1] [formerly 074713bb4a [formerly 8d560036b1 [formerly 62f8c0ab0e046fd4365bd37394f93e8bca4e642d]]]]
Former-commit-id: 074713bb4a
Former-commit-id: 6f2039bc59 [formerly f03c0c46d5] [formerly 025b97a94ef4343ad6ec6a2dbf9893ebc3ddd8a2 [formerly 51680a6d04]]
Former-commit-id: 8e1fe73a0716e63e0e1f9f82e747fb8ff4e93c6d [formerly b1c20f92c1]
Former-commit-id: f06165d783
2014-05-12 14:33:25 -04:00
Matthew Howard
985b85e4cb Merge "ASM #508 - Fix DialogAreaComposite for sizing and accessibility of controls" into asm_14.3.1
Former-commit-id: 77e1dcc78c [formerly f1dfdd2878] [formerly d40d9931db] [formerly 77e1dcc78c [formerly f1dfdd2878] [formerly d40d9931db] [formerly 42cce01396 [formerly d40d9931db [formerly 59fb75bdc025a3b2feb95d20d263060b55e87b28]]]]
Former-commit-id: 42cce01396
Former-commit-id: 8604d85c75 [formerly 6106a76640] [formerly c4a4f05239d4bff1a56e6b98b3f2d7e2182d674a [formerly a4827323e6]]
Former-commit-id: 70aca55019ae02403a30b04b83a51d8fb9e7b1d7 [formerly aeef207dff]
Former-commit-id: 6a44f74885
2014-05-12 13:00:55 -05:00
Rici.Yu
c101147b8c ASM #508 - Fix DialogAreaComposite for sizing and accessibility of controls
Change-Id: I53291acaa40c5bba926b31937674b1ece5864127

Former-commit-id: c9e0740060 [formerly 34069a96be] [formerly 2ea1c1fa60] [formerly c9e0740060 [formerly 34069a96be] [formerly 2ea1c1fa60] [formerly 96d1555012 [formerly 2ea1c1fa60 [formerly df46f9fc541a47e5f31210663ef69c4c5863fa28]]]]
Former-commit-id: 96d1555012
Former-commit-id: 237d3d1249 [formerly 0ba9da16b0] [formerly 1917255ce7d9dff6758c55dc0869f28d43c5070c [formerly 473496b99a]]
Former-commit-id: 33b42e5229aac92fa57d985e21bd931b43ad96bd [formerly be10c8d49c]
Former-commit-id: 120a23223b
2014-05-12 13:38:04 -04:00
Juliya Dynina
899a35f1fc Merge "ASM #551 - EDEX can decode some METAR peak wind fields as 6 hour min/max temperature" into asm_14.3.1
Former-commit-id: d63bd649af [formerly 72c7889020] [formerly ae025b5ef5] [formerly d63bd649af [formerly 72c7889020] [formerly ae025b5ef5] [formerly a6dfa2ce46 [formerly ae025b5ef5 [formerly 7f7a086a5cb6ad94aac34973b028150021a616f0]]]]
Former-commit-id: a6dfa2ce46
Former-commit-id: 73f1ab4879 [formerly 2bdc898a1d] [formerly dd8a96d4abee5ed9810e2ebcd47e45ab10bab339 [formerly 9acf0d8379]]
Former-commit-id: 8b58ca97c3e0127f758154f43b75e71288073c5c [formerly 5126d52f5f]
Former-commit-id: b05e24f04d
2014-05-12 09:58:14 -05:00
Juliya Dynina
7216688248 Merge "ASM #515 - WarnGen product QC incorrectly reports UGC/area mismatch" into asm_14.3.1
Former-commit-id: 55810ba130 [formerly 93834dac3e] [formerly f9c2ef56a9] [formerly 55810ba130 [formerly 93834dac3e] [formerly f9c2ef56a9] [formerly 8bea01aa09 [formerly f9c2ef56a9 [formerly b8412f03c381032f90240af18f8175ab9b3a5a26]]]]
Former-commit-id: 8bea01aa09
Former-commit-id: 2ba691e436 [formerly acfca250d0] [formerly 5cd09f9b645be5243348e3904928e0eea58c45b1 [formerly 8b2558f383]]
Former-commit-id: 789ce2227490b03f08194e67b2486f658fb23837 [formerly 36968a957d]
Former-commit-id: 3e6b57b785
2014-05-12 09:57:38 -05:00
Juliya Dynina
389c882522 Merge "ASM #510 - textdb -pil -a command fails to add scripts with option arguments." into asm_14.3.1
Former-commit-id: d5ae23956f [formerly ec518fe1d4] [formerly 6d55ccd32c] [formerly d5ae23956f [formerly ec518fe1d4] [formerly 6d55ccd32c] [formerly 1f1b831e79 [formerly 6d55ccd32c [formerly 64a4a9a489b2313230f4675bc84a3a39b8667603]]]]
Former-commit-id: 1f1b831e79
Former-commit-id: 1b7a59dbac [formerly bcd10c5a0e] [formerly f45e5cbec5a52d65b311bd4c6492e7d230a23a23 [formerly f8e237a9bc]]
Former-commit-id: b2ea35493f8a2b80cde126bc992a8c31ccad21cb [formerly f44dad79e4]
Former-commit-id: 6e6cdd9202
2014-05-12 09:42:07 -05:00
David Friedman
558bfbf161 ASM #551 - EDEX can decode some METAR peak wind fields as 6 hour min/max temperature
Change-Id: I1bf62b197f65073dc26356e9eb67d32f7f8ee45c

Former-commit-id: a9a6f2fa3d [formerly ad99a4f615] [formerly 3be74c3664] [formerly a9a6f2fa3d [formerly ad99a4f615] [formerly 3be74c3664] [formerly 20c7e2f29d [formerly 3be74c3664 [formerly 8d9e72c309cbcef7b0cd8656333e05202e0a290b]]]]
Former-commit-id: 20c7e2f29d
Former-commit-id: c34a585def [formerly 6384ea3833] [formerly 2133d63ea4890b88c626b163d6eee1a66dbfc553 [formerly 61b7c09d14]]
Former-commit-id: 265bcaeadb6236f4b7ef48a546f2b5e80ae5ee8d [formerly 0275aa3f77]
Former-commit-id: 5bd3b8d47a
2014-05-12 13:18:50 +00:00
Michael Gamazaychikov
ce8c015507 ASM #526 - Duration menu disabled after creating text for a COR SVS.
Change-Id: I360935bb87b5b95e9814f0f70da7cfe2d70d958c

Former-commit-id: 23e7c1c5b1 [formerly 65353b595e] [formerly 4f541a5460] [formerly 23e7c1c5b1 [formerly 65353b595e] [formerly 4f541a5460] [formerly 8a9c7ecb11 [formerly 4f541a5460 [formerly 988d5f26d3bd3e42397f62288a8c9b10e341495b]]]]
Former-commit-id: 8a9c7ecb11
Former-commit-id: 1c57fda24f [formerly eb159fb31f] [formerly 7e7e2bbb892cb1304346735acab7aa0cc43d14fb [formerly 447eca7802]]
Former-commit-id: 88ca1768847b3f7c443a193ac79d18ff9957ea43 [formerly 14440818e7]
Former-commit-id: ce40c60dd3
2014-05-12 13:33:58 +01:00
Juliya Dynina
b690ccc904 Merge "ASM #526 - Duration menu disabled after creating text for a COR SVS." into asm_14.3.1
Former-commit-id: 1a1069494b [formerly 448dfef9e7] [formerly dd13f453e6] [formerly 1a1069494b [formerly 448dfef9e7] [formerly dd13f453e6] [formerly 963a58ebba [formerly dd13f453e6 [formerly 789fffccf3389143a1660a477301cfcb43a82890]]]]
Former-commit-id: 963a58ebba
Former-commit-id: 5c991f4111 [formerly ad2be95671] [formerly 5a77021e0ee1bea21e68943f7e96b55e8b7f0e08 [formerly 267244d378]]
Former-commit-id: d62aca4c29b5125e55cdfd999d16ee2ded34cf99 [formerly 8c0412111a]
Former-commit-id: f31ab03907
2014-05-09 11:08:12 -05:00
Qinglu.Lin
a50dede9ac ASM #515 - WarnGen product QC incorrectly reports UGC/area mismatch
Change-Id: I5ef8e83c826d3fb1d5ef72d5866f882d9c97e1f5

Former-commit-id: 0e38232721 [formerly 58c036c80d] [formerly 50967b199d] [formerly 0e38232721 [formerly 58c036c80d] [formerly 50967b199d] [formerly 9b49cc2464 [formerly 50967b199d [formerly 04597aac301d0001143f3f5ad3bcf5d128d33b86]]]]
Former-commit-id: 9b49cc2464
Former-commit-id: f7d2712a00 [formerly 053e00ad25] [formerly 6128064b8e711611935d677f9bd109d23e7dbe8f [formerly 73300bc083]]
Former-commit-id: b2e819bbb26fb9c6c875a060ba6095d501be4da4 [formerly 2313472d4a]
Former-commit-id: 3ecdb059bc
2014-05-09 10:45:28 -04:00
Michael Gamazaychikov
e4010e09f7 ASM #510 - textdb -pil -a command fails to add scripts with option
arguments.

Change-Id: I3f6c1c334db1100af0cb137f2f0a1a856564aaf4

Former-commit-id: a7c824d033 [formerly 6497950f3d] [formerly 97ec336416] [formerly a7c824d033 [formerly 6497950f3d] [formerly 97ec336416] [formerly c9df02db64 [formerly 97ec336416 [formerly 77b054caca0aa54d51fa947a4a8aa041ef0cdcab]]]]
Former-commit-id: c9df02db64
Former-commit-id: 0c3cd163c1 [formerly 34c44b6b8f] [formerly 58d367c533c90ec1898692e7eb5fc6f86e82211e [formerly f253b0ca13]]
Former-commit-id: 4098585a2fd555d3c648c02168d3e684776a0d7f [formerly 02d0503b16]
Former-commit-id: 7e5adc3edb
2014-05-09 14:45:27 +01:00
Kiran.Shrestha
f974704a79 ASM #506 - TextWS: Unable to save unofficial text products from text editor.
Change-Id: I27aab39c7af355f660d873b1a17b7d94209fb13b

Former-commit-id: adc166fdd7 [formerly c1d2c93db3] [formerly f013b49282] [formerly adc166fdd7 [formerly c1d2c93db3] [formerly f013b49282] [formerly f1a707cf64 [formerly f013b49282 [formerly 1ac375914b05ea937439b6c0802291f49ff38938]]]]
Former-commit-id: f1a707cf64
Former-commit-id: fff35bee81 [formerly 94be466b40] [formerly 4455a205a685f2c677dcfc230b56be780f554368 [formerly 6d19b6efd7]]
Former-commit-id: 8ab7608f3d9f86c691d45e0baa591665df44516f [formerly 074c4725b7]
Former-commit-id: 412ee7d428
2014-05-08 15:07:42 -04:00
Michael Gamazaychikov
6b302cac99 ASM #526 - Duration menu disabled after creating text for a COR SVS.
Change-Id: I23135a56247ba75c7ce980b5eddcf4e7dd30aebf

Former-commit-id: 3be98fa48b [formerly 4a7d050dd4] [formerly e7341afe4d] [formerly 3be98fa48b [formerly 4a7d050dd4] [formerly e7341afe4d] [formerly 588cfd0608 [formerly e7341afe4d [formerly f934537da168238e76f0be04fc518f6ad315637e]]]]
Former-commit-id: 588cfd0608
Former-commit-id: 9ba9f271ff [formerly 5c73491447] [formerly 3b43cbd66916a44017d57b01ad9b609c49dcbe38 [formerly 31c221bc37]]
Former-commit-id: fffd9a480021cc7ecd6925b8e701113be6a1d6c2 [formerly 7b5e8942cf]
Former-commit-id: b9d57aa0b4
2014-05-08 14:02:21 +01:00
Juliya Dynina
bf57514103 Merge "ASM #514 - Line of Storms functionality behaving oddly in WarnGen" into asm_14.3.1
Former-commit-id: 3221cafbd0 [formerly 2f3f953823] [formerly d6a796c476] [formerly 3221cafbd0 [formerly 2f3f953823] [formerly d6a796c476] [formerly 92202928c9 [formerly d6a796c476 [formerly 433a3be9362e151d8da6af2d69cdcd50f4a87b93]]]]
Former-commit-id: 92202928c9
Former-commit-id: 543420355d [formerly 87433219cc] [formerly acef0f12f1f38e3055ddbcdafdb49593f1e3cb18 [formerly 3be2acf831]]
Former-commit-id: 01a88ea7476c1556297c710bb3cca25cb5ce999b [formerly 5e9af9b47d]
Former-commit-id: 547c86f36f
2014-05-07 14:18:01 -05:00
Melissa Porricel
0678c85947 ASM #481 - Add Guam GFSDNG to AWIPS
Change-Id: Iebf45e4b94fcf25aa32554f4363d0dc25f3e47ca

Former-commit-id: 1adfd7ea51 [formerly a91a4ed137] [formerly 42c36a5e80] [formerly 1adfd7ea51 [formerly a91a4ed137] [formerly 42c36a5e80] [formerly 92231e051d [formerly 42c36a5e80 [formerly 012fa438f085498027402c1cd0897dd13c0d4edc]]]]
Former-commit-id: 92231e051d
Former-commit-id: eeb31d1636 [formerly 6749967b5b] [formerly 3eb2c812bd96739a3f5c7610a50ce9d54f6fbfea [formerly 1e32d583b4]]
Former-commit-id: 347d2a66398e5c4e2b41700fd9b630796b72dd10 [formerly 38539cc805]
Former-commit-id: 9b7d84bfc4
2014-05-05 14:56:58 -04:00
Qinglu.Lin
db716647bb ASM #514 - Line of Storms functionality behaving oddly in WarnGen
Change-Id: I0bd2b9e4200b5acbb19a06caa45f18d36346de39

Former-commit-id: d3220c8e71 [formerly 5f0e0bda69] [formerly 18e92f03c1] [formerly d3220c8e71 [formerly 5f0e0bda69] [formerly 18e92f03c1] [formerly d8753a4145 [formerly 18e92f03c1 [formerly 66a6c50cd501358e0c8c993631b288aa78dfdc97]]]]
Former-commit-id: d8753a4145
Former-commit-id: 153128e11e [formerly 580d7e3ba7] [formerly de233bb13dc17298e3aa8b3e59813a4bc72ebe5a [formerly 8de2d2f718]]
Former-commit-id: 27cacced16ec33e1bb5c01e87c75e6050fffec36 [formerly 6ba15bd00c]
Former-commit-id: 03f7862321
2014-05-05 11:54:56 -04:00
Xuezhi.Wei
c70c41fdc6 ASM #579 Shef Ingest ProcessUtil configuration update
Change-Id: Idc121a2b4b303e53ac2f9a7fc0dc2cb045b08150

Former-commit-id: 338d479d1e [formerly b017e1c390] [formerly fb359316c8] [formerly 338d479d1e [formerly b017e1c390] [formerly fb359316c8] [formerly e3b1ee759d [formerly fb359316c8 [formerly ddda775e85dd8cba5f4342de330d1446647c621c]]]]
Former-commit-id: e3b1ee759d
Former-commit-id: b250428a49 [formerly 4fcbc99209] [formerly 9b1d5614cb01cca6b64d696c45d7f314497c1df3 [formerly 454b3acb5c]]
Former-commit-id: e6cdb81973bddc003734b92eeb9ba9d4cc07951a [formerly 627a1aa6d8]
Former-commit-id: 02e31e37f6
2014-05-02 19:48:55 +00:00
Juliya Dynina
495a5aba83 Merge "ASM #545 Hydrobase IngestFilter GUI fixes" into asm_14.3.1
Former-commit-id: f0dca1136d [formerly 1d2297e489] [formerly cf742e4dc0] [formerly f0dca1136d [formerly 1d2297e489] [formerly cf742e4dc0] [formerly 9da4eaaad5 [formerly cf742e4dc0 [formerly b2e7c4aa26c341caae58f9007d070c873c2d94ab]]]]
Former-commit-id: 9da4eaaad5
Former-commit-id: 27643bb676 [formerly 2611615ee3] [formerly 72abdd52d78f63467512c2edc40c1f3f84c4e41b [formerly a9556d4d2e]]
Former-commit-id: 5746cc0265406a93f4423d92c08bd2a630f9b046 [formerly a7e8e4a9c4]
Former-commit-id: 35bbea77af
2014-05-02 12:37:00 -05:00
Xuezhi.Wei
597e063345 ASM #545 Hydrobase IngestFilter GUI fixes
Change-Id: I368113a8ccb0356198a52a9d5c8a39247dce68e8

Former-commit-id: ab05520404 [formerly a647b1ddf3] [formerly c4fc2f169b] [formerly ab05520404 [formerly a647b1ddf3] [formerly c4fc2f169b] [formerly 071a1ae06a [formerly c4fc2f169b [formerly a8710a68e4aa28861c03c5d988bc36a553704c31]]]]
Former-commit-id: 071a1ae06a
Former-commit-id: 06926b7c25 [formerly f31f39a875] [formerly 9e48bdb73545c966a93dc52009a8423194d23422 [formerly 1ce32e2be1]]
Former-commit-id: 875d3ff6127f8752173708987096137934c964fd [formerly 57a6bcfca6]
Former-commit-id: 2bc8a6c5fd
2014-05-02 16:55:36 +00:00
steve.naples
35892201f7 ASM #253 Update MPE Bias Table to allow reverting modified bias, back to original value.
Change-Id: I1f84133404e14f7debb66e66735aa0d96a92b316

Former-commit-id: b98b7f41b1 [formerly a7092ac01d] [formerly b58b7d3d5a] [formerly b98b7f41b1 [formerly a7092ac01d] [formerly b58b7d3d5a] [formerly 8a00348730 [formerly b58b7d3d5a [formerly 2f608451c941efcc5372f0d0870ac72409f518e3]]]]
Former-commit-id: 8a00348730
Former-commit-id: 2e4c970c7e [formerly 452cbdcc4e] [formerly de0df693196948010bbaef0c68d804b1c4c124ab [formerly d079dbcb7c]]
Former-commit-id: 7f5d427e0c981b86285f86654e23425e7a531526 [formerly 39437970c7]
Former-commit-id: 18c51dac23
2014-05-02 16:15:04 +00:00
Matthew Howard
8f6fef07e5 Merge "ASM #507 - Fix incorrect FFMP gap calculation" into asm_14.3.1
Former-commit-id: b03716c137 [formerly 3b48dcc680] [formerly 55b1198186] [formerly b03716c137 [formerly 3b48dcc680] [formerly 55b1198186] [formerly 9e7a0e0a61 [formerly 55b1198186 [formerly ef1c0313455700304e9dc8e130f2b8658fdd1ed7]]]]
Former-commit-id: 9e7a0e0a61
Former-commit-id: caaa1e3179 [formerly fce48ae3fd] [formerly f0b223b6a3e2818c3a0bd8fa2540dddad84108ab [formerly 571a45c6ea]]
Former-commit-id: e70fd6f4b6e109a36e0723b181152dca0ceeab94 [formerly 4f5e129201]
Former-commit-id: f99bcfc97f
2014-05-01 16:07:11 -05:00
brian.dyke
712d1b9db9 Merge branch 'master_14.3.1-3' into asm_14.3.1
Former-commit-id: 736a317b34 [formerly 2a934def82] [formerly 5d7b8eca6a] [formerly 736a317b34 [formerly 2a934def82] [formerly 5d7b8eca6a] [formerly d5c3f112c1 [formerly 5d7b8eca6a [formerly c31c7837568ec4a8fd1516a9e9cd115df30cee40]]]]
Former-commit-id: d5c3f112c1
Former-commit-id: ded87f9537 [formerly b68c49053a] [formerly 29fdef242de9cb97b25d730746a098343381a227 [formerly 302366dac1]]
Former-commit-id: 005a04e739173bb2f83a46a6250ff350f3ea2e3d [formerly b72e2d4289]
Former-commit-id: 22ffaef982
2014-05-01 15:20:36 -04:00
Gang.Zhang
7b7da76736 ASM #507 - Fix incorrect FFMP gap calculation
Change-Id: Iecfdcaa07aca79b0e17396a794851cec0e6cba25

Former-commit-id: 12c35396a0 [formerly 7d2b256ba9] [formerly 74dc7a5d7c] [formerly 12c35396a0 [formerly 7d2b256ba9] [formerly 74dc7a5d7c] [formerly 090ed29386 [formerly 74dc7a5d7c [formerly 9b33d5187b4535d5500762e15e35e89ccbf5f5da]]]]
Former-commit-id: 090ed29386
Former-commit-id: 33a90ae4c7 [formerly 3131e25e69] [formerly d4a69ce734b225aa7656a40a997cd81b9f326650 [formerly 7c7adbd77d]]
Former-commit-id: 899c9d1d8f87cbdd6308b497bb254f9b31aba862 [formerly 2b25e8c401]
Former-commit-id: d4b87f3bad
2014-05-01 15:49:48 +01:00
Juliya Dynina
b05cc1e515 Merge "ASM #525 - Text Workstation expiration pop-up inconsistent" into asm_14.3.1
Former-commit-id: 187c57e8b5 [formerly 308e775017] [formerly d804167bb2] [formerly 187c57e8b5 [formerly 308e775017] [formerly d804167bb2] [formerly 4ef3cfa9c3 [formerly d804167bb2 [formerly ceb84b3c7de12a1c64f389a800125443920fbf41]]]]
Former-commit-id: 4ef3cfa9c3
Former-commit-id: 932b3b4336 [formerly cc93e11ce8] [formerly 7709abd8f509777e3646b26debdf7c3f338e3f89 [formerly 6282dd45cb]]
Former-commit-id: c04b6cf2887eef173b84370b58a5611d32aa81f8 [formerly 80e6ae71d0]
Former-commit-id: bac2c83f58
2014-04-30 14:53:36 -05:00
Brian.Dyke
f4856aae4d Merge branch 'master_14.2.2-6' into master_14.3.1 (at 14.3.1-2)
Conflicts:
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/SubscriptionManagerDlg.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/SubscriptionTableComp.java
	cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/approve/SubscriptionApprovalDlg.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/BandwidthManager.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/EdexBandwidthManager.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/util/BandwidthDaoUtil.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.registry/src/com/raytheon/uf/edex/datadelivery/registry/web/RegistryDataAccessService.java
	edexOsgi/com.raytheon.uf.edex.ogc.registry/src/com/raytheon/uf/edex/ogc/registry/RegistryCollectorAddon.java

Former-commit-id: 2e687fbfb7 [formerly e56bd61ee6] [formerly 278aab6b6f] [formerly 2e687fbfb7 [formerly e56bd61ee6] [formerly 278aab6b6f] [formerly 63137ed69c [formerly 278aab6b6f [formerly 64c3766ed570885a796f846b889d40413e8250c6]]]]
Former-commit-id: 63137ed69c
Former-commit-id: 624606c9dd [formerly fcf13ae9f7] [formerly 07e5d6948695c16b1561033e2f9374a9e992b03e [formerly 8160209e52]]
Former-commit-id: ff65ed48a968bb0c306792bbf8ffaff1d87d8edf [formerly 5d31c9ec9a]
Former-commit-id: f16c305ae4
2014-04-30 12:57:09 -04:00
Juliya Dynina
a6c74661f5 Merge "ASM #511 changes to transmit_rfc_bias calls from MPE" into asm_14.3.1
Former-commit-id: a24fdff32a [formerly 00bbbf32c1] [formerly d37490acb1] [formerly a24fdff32a [formerly 00bbbf32c1] [formerly d37490acb1] [formerly 78bb549533 [formerly d37490acb1 [formerly a129795302a562e68638bb5e5764f54a8dcc331e]]]]
Former-commit-id: 78bb549533
Former-commit-id: c6a70b3861 [formerly b28bb8e3ac] [formerly 071d4ac50b89f4e83a804c1af344b81cb9e7d0b6 [formerly d5290b8bbf]]
Former-commit-id: 9ffe106387d69b1e2f9cecf166f5c44aac674106 [formerly a4073b805e]
Former-commit-id: 18c84c47bc
2014-04-30 07:41:27 -05:00
Loubna.Bousaidi
a141c9fa13 ASM #511 changes to transmit_rfc_bias calls from MPE
Change-Id: I40c582b8d2c97e16593b8abbf8a8051e21c93004

Former-commit-id: c064fb3ae4 [formerly 1b5bccc451] [formerly 760ee964d6] [formerly c064fb3ae4 [formerly 1b5bccc451] [formerly 760ee964d6] [formerly 6d526cb1ff [formerly 760ee964d6 [formerly a6033a982c80e822d9f4cb62a70b9722d79432c6]]]]
Former-commit-id: 6d526cb1ff
Former-commit-id: 967156413e [formerly 93a6523f46] [formerly 51be7984ec7ff512df21cbd1bc4ce90ccce8b1b9 [formerly e28ec3469d]]
Former-commit-id: 88fa747f996318dc9368525454f7865cc4cee512 [formerly 84640a8936]
Former-commit-id: ecbad2efac
2014-04-29 21:09:34 +00:00
Brian.Dyke
2e187af9e4 Merge branch 'master_14.2.1' into master_14.2.2
Merge (14.2.1-21 into 14.2.2-5)


Former-commit-id: 7364553aea [formerly c5e29cc46a] [formerly 35b637c3e2] [formerly 7364553aea [formerly c5e29cc46a] [formerly 35b637c3e2] [formerly bdda2e9a7a [formerly 35b637c3e2 [formerly 9a017e543fc6be9fd0d7b9361bd2226bf2af6211]]]]
Former-commit-id: bdda2e9a7a
Former-commit-id: fba8753c81 [formerly f8c3dca497] [formerly 864697ab3fb4d67896d81f6bc98951da3ad837df [formerly 59f34e3108]]
Former-commit-id: 756d936948a5f4a794262ababc0423b3b1e3dbfe [formerly 85bf52ef22]
Former-commit-id: 1aec51b7c4
2014-04-29 12:07:21 -04:00
brian.dyke
787c64e3cb Merge branch 'master_14.3.1' into asm_14.3.1
Merge 14.3.1-2 into ASM


Former-commit-id: a43a0922ba [formerly ffad42f2ef] [formerly 8bda882ed0] [formerly a43a0922ba [formerly ffad42f2ef] [formerly 8bda882ed0] [formerly 4621d66089 [formerly 8bda882ed0 [formerly 29bcb6987ee371f128b75eee84b65574d799135f]]]]
Former-commit-id: 4621d66089
Former-commit-id: 7d7d638f9c [formerly c27ffd0678] [formerly cfcdab0b566c6bf67c3201f0f09f89c9ab3941f8 [formerly 1939a06ced]]
Former-commit-id: 02c7199221f6c6eb86a0cbe2356c6c3d5d27bbe8 [formerly d6287274b2]
Former-commit-id: 864e83994e
2014-04-28 13:25:41 -04:00
Juliya Dynina
97712cd256 Merge "ASM #528 Updated DrawPolygonDlg to remember location when opened and closed." into asm_14.3.1
Former-commit-id: b02be32252 [formerly 6e0844240b] [formerly 1c6d9ca844] [formerly b02be32252 [formerly 6e0844240b] [formerly 1c6d9ca844] [formerly 489a9789c1 [formerly 1c6d9ca844 [formerly 06f3392fb1e1352cc626a334bb4a140447b3cd88]]]]
Former-commit-id: 489a9789c1
Former-commit-id: 22bd52fb1c [formerly a87734333f] [formerly f22128174fe75d4cd74ec2a7649adae339a9d8a4 [formerly eee061db3d]]
Former-commit-id: 7ff10b8f519c80854b5f5e9926712c811d4b9f8a [formerly 0546dabf2c]
Former-commit-id: 849045445d
2014-04-28 10:46:04 -05:00
Loubna.Bousaidi
d20e9eed3e ASM #578 apply gross range check to the adjusted value
Change-Id: Ia90bc10e6e1e1baa8f3842ade56d7551ca405e34

Former-commit-id: 639b9fb9af [formerly 0cf63a9711] [formerly 9585fc8077] [formerly 639b9fb9af [formerly 0cf63a9711] [formerly 9585fc8077] [formerly 26daea0e30 [formerly 9585fc8077 [formerly 598700ad6ca6cb7881d68f8e7703327f7c58c19c]]]]
Former-commit-id: 26daea0e30
Former-commit-id: f9d78bdb60 [formerly 2d2493dc93] [formerly ba777b51ebaa466f3b99083e95b1929d7003c0f5 [formerly 39b11467cf]]
Former-commit-id: 1893746a974b3a6c3932c11677eff5fbc33b16a3 [formerly 896be043c8]
Former-commit-id: 5afa75d122
2014-04-28 14:16:50 +00:00
steve.naples
138ea72d59 ASM #528 Updated DrawPolygonDlg to remember location when opened and closed.
Change-Id: I19ec2f2e1898506387d053b8ada80d2d2d67cf7c

Former-commit-id: 00c78e9047 [formerly 58b091e37b] [formerly e0b6f674f3] [formerly 00c78e9047 [formerly 58b091e37b] [formerly e0b6f674f3] [formerly 760fc00028 [formerly e0b6f674f3 [formerly ae0616b0b71e0d1952f2c3e8f461a4d8e79e934f]]]]
Former-commit-id: 760fc00028
Former-commit-id: 047e7fd5d6 [formerly 399702b22b] [formerly 92c6781705a8d544fcaa7d76ffd5e620a3a07d1e [formerly bed2334f57]]
Former-commit-id: 7b6047f57b006f1ebce3b43d85627ebf7101bed9 [formerly 26da8e332a]
Former-commit-id: b5e6653935
2014-04-28 13:55:21 +00:00
David Friedman
0fdea21e93 ASM #525 - Text Workstation expiration pop-up inconsistent
Change-Id: I3867a0050962d97125ca6612fcded2fe62b48619

Former-commit-id: 95b64ed535 [formerly 01b0960ac9] [formerly 8b595435e2] [formerly 95b64ed535 [formerly 01b0960ac9] [formerly 8b595435e2] [formerly ae90da3011 [formerly 8b595435e2 [formerly f7bfa197b1b61b69029efd8e225ba5dea22c17f2]]]]
Former-commit-id: ae90da3011
Former-commit-id: 9678d0479a [formerly 2a2cfa122a] [formerly ee39db287c1593b48b521bdd2dd248b58759c1a0 [formerly 4f54767780]]
Former-commit-id: 9224e8f5f80baa5ccbc7e3fef34caf3d63d7eeff [formerly 3742b82fc1]
Former-commit-id: eed80b716a
2014-04-25 19:32:47 +00:00
Brian.Dyke
19b4bb7dcc Merge branch 'master_14.2.2' into master_14.3.1
Merge (14.2.2-5 into 14.3.1-1)

Conflicts:
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/GFESpatialDisplayManager.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.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscMosaic.py
	edexOsgi/com.raytheon.uf.common.archive/src/com/raytheon/uf/common/archive/config/ArchiveConfigManager.java
	edexOsgi/com.raytheon.uf.common.python/utility/common_static/base/python/MasterInterface.py
	edexOsgi/com.raytheon.uf.edex.datadelivery.registry/src/com/raytheon/uf/edex/datadelivery/registry/federation/RegistryFederationManager.java
	edexOsgi/com.raytheon.uf.edex.registry.ebxml/src/com/raytheon/uf/edex/registry/ebxml/services/lifecycle/LifecycleManagerImpl.java

Former-commit-id: 362d882b40 [formerly f0b8ea5822] [formerly fb1f5aa593] [formerly 362d882b40 [formerly f0b8ea5822] [formerly fb1f5aa593] [formerly 3524838f9f [formerly fb1f5aa593 [formerly f54d2c639a915db14f01f56a7fcc5841b60e1509]]]]
Former-commit-id: 3524838f9f
Former-commit-id: 14a63a19e1 [formerly bf3758efa3] [formerly bb5a7e713dac6962660d9c769971464b6792cb76 [formerly 029f5753ad]]
Former-commit-id: 4f6c777830575250a298510d89cfba1ef9df9753 [formerly c6d3fe6952]
Former-commit-id: f31d8cc8cf
2014-04-25 11:06:11 -04:00
Brian.Dyke
2d59b52ed1 Merge branch 'omaha_14.2.1' of cm2:/home/slharris/repos/AWIPS2_baseline-14.2.1 into master_14.2.1
Former-commit-id: ba9db6701e [formerly a5c9321a8d] [formerly a61af3e6d3] [formerly ba9db6701e [formerly a5c9321a8d] [formerly a61af3e6d3] [formerly ac74878ae2 [formerly a61af3e6d3 [formerly 48184880ce65a4899a4ed989f2d3f8082771047f]]]]
Former-commit-id: ac74878ae2
Former-commit-id: 4c6965a7b7 [formerly ae4aea9abf] [formerly 5d8cf396e99529f083d1d1c43f5d3d81d3281d10 [formerly c21644c87f]]
Former-commit-id: 5524fa83a931031b720fb2e7782ca93e2b562dc8 [formerly b3a733036c]
Former-commit-id: d6e931dd87
2014-04-24 13:28:31 -04:00
Brian.Dyke
83dce492e5 Merge branch 'master_14.2.1' into master_14.2.2
Former-commit-id: 4938304674 [formerly 88d44a3129] [formerly 2a4fe3dbae] [formerly 4938304674 [formerly 88d44a3129] [formerly 2a4fe3dbae] [formerly a7c9ddc05e [formerly 2a4fe3dbae [formerly 64ca88d2ed7de18f9ed1f57edd2286bbc552135f]]]]
Former-commit-id: a7c9ddc05e
Former-commit-id: 05c0e1ad1c [formerly 953236aad8] [formerly cccb3fd90675126650244cd85cd8a3341749bad8 [formerly 911c0c6c17]]
Former-commit-id: 76c73f256e229c073a4ca79c01bc6c9e1abe965a [formerly 26cb172a04]
Former-commit-id: 2161c569ea
2014-04-23 14:05:50 -04:00
brian.dyke
93c677488b Merge branch 'master_14.3.1' into asm_14.3.1
Conflicts:
	cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/dialogs/colordialog/ColorBar.java

Former-commit-id: 56e873a473 [formerly c7d785d503] [formerly 805af72ef8] [formerly 56e873a473 [formerly c7d785d503] [formerly 805af72ef8] [formerly 24316a7f66 [formerly 805af72ef8 [formerly 3f3c0a55218af9f27abce65c0ec3e8704485c36e]]]]
Former-commit-id: 24316a7f66
Former-commit-id: 3d55adfd1c [formerly ab43d20b28] [formerly 0b012bbb946ffb11870bdbee5be08b818370fb8d [formerly acc904e4e8]]
Former-commit-id: c8f54e9bb8e3675ae4d1d787d35d558ec45db359 [formerly 8540e0de6f]
Former-commit-id: 8f28d7213d
2014-04-22 16:50:57 -04:00
Ron Anderson
860054697f Issue #3050 Fix SaveAsciiGridsHandler to get IFPServer instance based on site in the ParmID
Change-Id: Id2146e07f4e6103c9c96f2b09f0bae5980747052

Former-commit-id: 6d77ebe181 [formerly db978fff9a] [formerly b12a6cd828] [formerly 6d77ebe181 [formerly db978fff9a] [formerly b12a6cd828] [formerly 859d709a03 [formerly b12a6cd828 [formerly 6f141288cae462aac8c1ea8c77dd7f88a33c382a]]]]
Former-commit-id: 859d709a03
Former-commit-id: a6c8d0ceb2 [formerly 57e277dc69] [formerly ffdd8311439ceb4450211a9ab4304f0740a99b18 [formerly e8a07a2ebe]]
Former-commit-id: 9462575e90ac1b1dd9fd8b65be06f381662f260a [formerly 51bb78561c]
Former-commit-id: 0c7c52095e
2014-04-22 14:38:54 -05:00
Zhidong.Hao
593de6544a ASM #473 - GFE ISC: Log directory creation problem results in missing ISC grids
Change-Id: I6176b14c5451ebd4ee520c2e5a13157457009303

Former-commit-id: f32bb4e4f4 [formerly f16936223a] [formerly e1d5aa284d] [formerly f32bb4e4f4 [formerly f16936223a] [formerly e1d5aa284d] [formerly 0177756f97 [formerly e1d5aa284d [formerly 4e7edc8ebbd79c16d6eb725c8d11d05f20424ed4]]]]
Former-commit-id: 0177756f97
Former-commit-id: 5d43f374e6 [formerly d6edd56d34] [formerly 9f33fbaadba8e0a9341c8ae8af0ac30d2dc2b193 [formerly 358e7b2b54]]
Former-commit-id: d70b4f5ba087dbb9db3d7fe268b68edcd8be7c2f [formerly 7d00166b10]
Former-commit-id: 914803ff7a
2014-04-22 14:31:14 -04:00
Dave Hladky
13137a0a9a Issue #3012 Various fixes.
Change-Id: I3c71c6aefede685438e55e5aceb8cae6ffb7dded

Former-commit-id: 7295635379 [formerly 91bd735d47] [formerly 61fc2fea51] [formerly 7295635379 [formerly 91bd735d47] [formerly 61fc2fea51] [formerly 45059e722a [formerly 61fc2fea51 [formerly 212e15c397fe22c3bc074e054d608c0094ce8dad]]]]
Former-commit-id: 45059e722a
Former-commit-id: 883febe498 [formerly 117a3953af] [formerly 28cb7341b151f55976a91b298b2eaf8e4e117a17 [formerly ae84d2991e]]
Former-commit-id: 5061f97fcc5146801882be2758be31c8f5835bed [formerly 6c83fd0929]
Former-commit-id: 4ce5dfcd92
2014-04-21 12:26:47 -05:00