Matthew Howard
|
edb7266206
|
Merge "ASM #537 AvnFPS: Syntax failed to flag format error" into asm_14.3.1
Former-commit-id: e64f60ba98 [formerly b807c877f4] [formerly e64f60ba98 [formerly b807c877f4] [formerly 0dc1db0072 [formerly 5afd4dab62eb48b65bb3f5b49d59444f1d52a23f]]]
Former-commit-id: 0dc1db0072
Former-commit-id: 9593ff9ed5 [formerly da9b3dd158]
Former-commit-id: db59b081af
|
2014-05-12 13:52:12 -05:00 |
|
Loubna.Bousaidi
|
6e8a4ec60d
|
ASM #527 update revision and shef_qual_code
Change-Id: I36fa41796350e8fcae6bcc0101120331188bbeff
Former-commit-id: e634d0cdcf [formerly ec5bd7a2bb] [formerly e634d0cdcf [formerly ec5bd7a2bb] [formerly d3be6d0476 [formerly 860ea4b3644a526ac10b4366f158824fe6cbdcb0]]]
Former-commit-id: d3be6d0476
Former-commit-id: ebd5400a4f [formerly 6f335c71fe]
Former-commit-id: c9d2ccb5ff
|
2014-05-12 18:42:12 +00:00 |
|
Zhidong.Hao
|
f06165d783
|
ASM #537 AvnFPS: Syntax failed to flag format error
Change-Id: Ib7127a83f98a6978d7fc099cdc4fdc4fd8a0fe2b
Former-commit-id: 29e7d7e888 [formerly 8d560036b1] [formerly 29e7d7e888 [formerly 8d560036b1] [formerly 074713bb4a [formerly 62f8c0ab0e046fd4365bd37394f93e8bca4e642d]]]
Former-commit-id: 074713bb4a
Former-commit-id: f03c0c46d5 [formerly 51680a6d04]
Former-commit-id: b1c20f92c1
|
2014-05-12 14:33:25 -04:00 |
|
Brian.Dyke
|
464cc1a479
|
CM-MERGE:OB13.5.5-5 into 14.1.2
Former-commit-id: 3aa2f7974b [formerly 386ec058e1] [formerly 3aa2f7974b [formerly 386ec058e1] [formerly 41ba5fc348 [formerly 3b0df2482b87ba9d37dd32d50e8e1fc3b3ae55e3]]]
Former-commit-id: 41ba5fc348
Former-commit-id: dc5bc1d2a4 [formerly 2f704c898d]
Former-commit-id: 82663c0ab6
|
2014-05-12 14:07:11 -04:00 |
|
Matthew Howard
|
6a44f74885
|
Merge "ASM #508 - Fix DialogAreaComposite for sizing and accessibility of controls" into asm_14.3.1
Former-commit-id: f1dfdd2878 [formerly d40d9931db] [formerly f1dfdd2878 [formerly d40d9931db] [formerly 42cce01396 [formerly 59fb75bdc025a3b2feb95d20d263060b55e87b28]]]
Former-commit-id: 42cce01396
Former-commit-id: 6106a76640 [formerly a4827323e6]
Former-commit-id: aeef207dff
|
2014-05-12 13:00:55 -05:00 |
|
Rici.Yu
|
120a23223b
|
ASM #508 - Fix DialogAreaComposite for sizing and accessibility of controls
Change-Id: I53291acaa40c5bba926b31937674b1ece5864127
Former-commit-id: 34069a96be [formerly 2ea1c1fa60] [formerly 34069a96be [formerly 2ea1c1fa60] [formerly 96d1555012 [formerly df46f9fc541a47e5f31210663ef69c4c5863fa28]]]
Former-commit-id: 96d1555012
Former-commit-id: 0ba9da16b0 [formerly 473496b99a]
Former-commit-id: be10c8d49c
|
2014-05-12 13:38:04 -04:00 |
|
Nate Jensen
|
8b8cb81410
|
Merge "Omaha #3075 updates for pydev 3.4.1" into omaha_14.4.1
Former-commit-id: 650edc41f3 [formerly eff5a8e32f] [formerly 650edc41f3 [formerly eff5a8e32f] [formerly ab064743f4 [formerly a213a01ac89bf84a6a0d4dfea44073cb0b2a7fce]]]
Former-commit-id: ab064743f4
Former-commit-id: c57623dc52 [formerly 7afd18662d]
Former-commit-id: 25216d1a2f
|
2014-05-12 11:56:34 -05:00 |
|
Bryan Kowal
|
1578a42992
|
Issue #3026 - remove unnecessary hpe ffmp dependency
Former-commit-id: 8f16f25cd7 [formerly 6e6a6a73ee] [formerly 8f16f25cd7 [formerly 6e6a6a73ee] [formerly faa6b09ac9 [formerly c94c973ef6a663f93a6b1a6301f5553d4e88ac73]]]
Former-commit-id: faa6b09ac9
Former-commit-id: 9153d61b90 [formerly 5f5987f57b]
Former-commit-id: 31d2290415
|
2014-05-12 11:46:35 -05:00 |
|
Michael Gamazaychikov
|
ce40c60dd3
|
ASM #526 - Duration menu disabled after creating text for a COR SVS.
Change-Id: I360935bb87b5b95e9814f0f70da7cfe2d70d958c
Former-commit-id: 65353b595e [formerly 4f541a5460] [formerly 65353b595e [formerly 4f541a5460] [formerly 8a9c7ecb11 [formerly 988d5f26d3bd3e42397f62288a8c9b10e341495b]]]
Former-commit-id: 8a9c7ecb11
Former-commit-id: eb159fb31f [formerly 447eca7802]
Former-commit-id: 14440818e7
|
2014-05-12 13:33:58 +01:00 |
|
Nate Jensen
|
064894fe59
|
Omaha #3075 updates for pydev 3.4.1
Change-Id: I2d7ed5e73f837f42dea3de35cdf79dd98c7586b1
Former-commit-id: 5fcc126e57 [formerly e6569b4a7d] [formerly 5fcc126e57 [formerly e6569b4a7d] [formerly bb32858c04 [formerly a038aea9bb25e31b29b054e8899c0b51bc183fef]]]
Former-commit-id: bb32858c04
Former-commit-id: 651ce74777 [formerly 5d08184312]
Former-commit-id: 9713ae6bf1
|
2014-05-09 16:45:39 -05:00 |
|
Brian Clements
|
415ff47d51
|
Omaha #3107 added timeout handling logic for leader transfer verification
Former-commit-id: 26d206f780 [formerly 08a406ff18] [formerly 26d206f780 [formerly 08a406ff18] [formerly 7b7bc5be97 [formerly 294a489ba547bf90df9d6b6a5107c8993c5b8333]]]
Former-commit-id: 7b7bc5be97
Former-commit-id: 98e74677fd [formerly 3d3d7f04bb]
Former-commit-id: 5e739b598c
|
2014-05-09 15:43:46 -05:00 |
|
Lee Venable
|
fb58021364
|
Merge "Issue #3145 - Fix Scan threat labels, dispose font" into omaha_14.3.1
Former-commit-id: cd5956d21a [formerly 364f0d877a] [formerly cd5956d21a [formerly 364f0d877a] [formerly e3c6407be3 [formerly 06b3cb4dd8f07600e6513a15a2495b485b0812b6]]]
Former-commit-id: e3c6407be3
Former-commit-id: a46987ef36 [formerly b06e8e6e3e]
Former-commit-id: d23ba206c9
|
2014-05-09 11:14:51 -05:00 |
|
Juliya Dynina
|
f31ab03907
|
Merge "ASM #526 - Duration menu disabled after creating text for a COR SVS." into asm_14.3.1
Former-commit-id: 448dfef9e7 [formerly dd13f453e6] [formerly 448dfef9e7 [formerly dd13f453e6] [formerly 963a58ebba [formerly 789fffccf3389143a1660a477301cfcb43a82890]]]
Former-commit-id: 963a58ebba
Former-commit-id: ad2be95671 [formerly 267244d378]
Former-commit-id: 8c0412111a
|
2014-05-09 11:08:12 -05:00 |
|
Mike Duff
|
e4e8e0fe8e
|
Issue #3145 - Fix Scan threat labels, dispose font
Change-Id: I385e184d81a021a350c7df7ee4948ad7e407784d
Former-commit-id: 158fb46b9f [formerly 03356dd554] [formerly 158fb46b9f [formerly 03356dd554] [formerly a81569849b [formerly 84bd0800b2652b31c06015fa49f816f1402f461d]]]
Former-commit-id: a81569849b
Former-commit-id: 456038d161 [formerly 4ec26b6e31]
Former-commit-id: 32f6ad40ec
|
2014-05-09 10:32:04 -05:00 |
|
Nate Jensen
|
db6d756ffd
|
Merge "Issue #3026 - feature.xml fix" into omaha_14.3.1
Former-commit-id: d0d20849b6 [formerly 575360192a] [formerly d0d20849b6 [formerly 575360192a] [formerly e8c4279d10 [formerly 25e500435693940e378df086739fce8eefdba3bb]]]
Former-commit-id: e8c4279d10
Former-commit-id: e0365dd4a3 [formerly 95ca77688a]
Former-commit-id: 191d3a0d06
|
2014-05-09 09:53:25 -05:00 |
|
Roger Ferrel
|
ea6ef4eb89
|
Omaha #3091 Remove the use of aviationForecastConfig.xml file and only using OUP.
Change-Id: Ibcd4c5389ba081b19a3134989c507b88b2d882b8
Former-commit-id: 6bfacf85ab [formerly 039f4826ea] [formerly 6bfacf85ab [formerly 039f4826ea] [formerly c226ef3596 [formerly 909a3f42bdb9d8149013056f9956bf0c38b764c5]]]
Former-commit-id: c226ef3596
Former-commit-id: 672875baf9 [formerly ce1ca8b4e3]
Former-commit-id: 940886ffae
|
2014-05-09 09:34:49 -05:00 |
|
Mike Duff
|
c984973464
|
Issue #3026 - feature.xml fix
Change-Id: I07d5043a8c968fa841f4e94eee47617e018ea794
Former-commit-id: 7e996909d1 [formerly 78f2a26903] [formerly 7e996909d1 [formerly 78f2a26903] [formerly 038b2b7500 [formerly a44e412190741fcb0a91dd451ae538277ae0d79f]]]
Former-commit-id: 038b2b7500
Former-commit-id: b73e635162 [formerly c7f5379b78]
Former-commit-id: 25638a5b40
|
2014-05-09 09:27:10 -05:00 |
|
Ben Steffensmeier
|
f0c4cc03a0
|
Issue #2920 Fix default color of BOXED text.
Former-commit-id: 60479824d1 [formerly 87ea43cf0d] [formerly 60479824d1 [formerly 87ea43cf0d] [formerly 9d4c33ba91 [formerly 59f12cd4cc60f0908c106cbc0572d3f84d0d509b]]]
Former-commit-id: 9d4c33ba91
Former-commit-id: 082a5c515d [formerly 199a2df79e]
Former-commit-id: 2b4d783fd7
|
2014-05-08 18:18:08 -05:00 |
|
Ana Rivera
|
d036ab76d7
|
VLab Issue #3617 - DCS_266 Ingest & Display HRRR Model Data
Change-Id: Ic43d3a3f51d70cd41ef8e34ccde9d1f5aee3007b
Former-commit-id: e7fbea035f [formerly aac45623bc] [formerly e7fbea035f [formerly aac45623bc] [formerly 1b4450ec5f [formerly c5a4f22a24b6c1eced689c6ae437558a9a6cbc9e]]]
Former-commit-id: 1b4450ec5f
Former-commit-id: ebd4358495 [formerly 6a4fb7f0a3]
Former-commit-id: c150a7c8e1
|
2014-05-08 20:10:24 +00:00 |
|
Mike Duff
|
718fc22e25
|
Issue #3026 - NullPointer fix, test classpath fix
Change-Id: Iabc347e51a276fd4c8beb3fd512d928f184767f1
Former-commit-id: a6e0ed67d1 [formerly b23473ee8a] [formerly a6e0ed67d1 [formerly b23473ee8a] [formerly 335c02d2c6 [formerly 8e70b7ae1eef7a18ddffa6d6c88d10bdd0043bcc]]]
Former-commit-id: 335c02d2c6
Former-commit-id: 0df3f51c87 [formerly 16a973372e]
Former-commit-id: 1dc95cf8de
|
2014-05-08 15:02:54 -05:00 |
|
Lee Venable
|
70e31865be
|
Merge "Issue #2060 fix auto-update errors with grids in non-map displays" into omaha_14.3.1
Former-commit-id: 319073a795 [formerly 92517d3ca2] [formerly 319073a795 [formerly 92517d3ca2] [formerly 1496955e44 [formerly a47409fd1673c9584c46aba496be1b7203d9c45d]]]
Former-commit-id: 1496955e44
Former-commit-id: 0a45b07910 [formerly 0b25428b04]
Former-commit-id: 0075d2a450
|
2014-05-08 14:47:03 -05:00 |
|
Mike Duff
|
4adf657556
|
Issue #3026 - Implement HPE bias source labels on FFMP and volume browser displays
Change-Id: Ib17ff7cfcb5efcb1737804800a93ec4f82bc6f13
Former-commit-id: 0456fd0597 [formerly 8498235fd8] [formerly 0456fd0597 [formerly 8498235fd8] [formerly 6a67638a94 [formerly 57755db0d6d77f32d64b4b569bb0af88002a23da]]]
Former-commit-id: 6a67638a94
Former-commit-id: f49192936a [formerly 70c8135fde]
Former-commit-id: 916d90ee64
|
2014-05-08 14:36:54 -05:00 |
|
Nate Jensen
|
1dc7cc875e
|
Issue #2060 fix auto-update errors with grids in non-map displays
Change-Id: Id99693f6fd54d56a4a1255f7ee5e2308e2f5d9de
Former-commit-id: 84f9cd1dc8 [formerly 3e3035b6f1] [formerly 84f9cd1dc8 [formerly 3e3035b6f1] [formerly ecc5c5849f [formerly a139113883f69be89a0e0a771f8d6f48d3948686]]]
Former-commit-id: ecc5c5849f
Former-commit-id: d2070f782b [formerly 6c55f4832c]
Former-commit-id: 93f71ec65c
|
2014-05-08 14:08:06 -05:00 |
|
Kiran.Shrestha
|
412ee7d428
|
ASM #506 - TextWS: Unable to save unofficial text products from text editor.
Change-Id: I27aab39c7af355f660d873b1a17b7d94209fb13b
Former-commit-id: c1d2c93db3 [formerly f013b49282] [formerly c1d2c93db3 [formerly f013b49282] [formerly f1a707cf64 [formerly 1ac375914b05ea937439b6c0802291f49ff38938]]]
Former-commit-id: f1a707cf64
Former-commit-id: 94be466b40 [formerly 6d19b6efd7]
Former-commit-id: 074c4725b7
|
2014-05-08 15:07:42 -04:00 |
|
Steve Harris
|
77030c2fc3
|
Omaha #3085 - re-deleted stuff that was re-added in a variety of ways.
Former-commit-id: a804a071c0 [formerly ce2b030743] [formerly a804a071c0 [formerly ce2b030743] [formerly ff4a6b8122 [formerly 241ca845ebcce8426bf61d730baa5e97a7762381]]]
Former-commit-id: ff4a6b8122
Former-commit-id: 532b861bce [formerly 988ad59a0d]
Former-commit-id: 47991060bb
|
2014-05-08 09:50:34 -05:00 |
|
Michael Gamazaychikov
|
b9d57aa0b4
|
ASM #526 - Duration menu disabled after creating text for a COR SVS.
Change-Id: I23135a56247ba75c7ce980b5eddcf4e7dd30aebf
Former-commit-id: 4a7d050dd4 [formerly e7341afe4d] [formerly 4a7d050dd4 [formerly e7341afe4d] [formerly 588cfd0608 [formerly f934537da168238e76f0be04fc518f6ad315637e]]]
Former-commit-id: 588cfd0608
Former-commit-id: 5c73491447 [formerly 31c221bc37]
Former-commit-id: 7b5e8942cf
|
2014-05-08 14:02:21 +01:00 |
|
Steve Harris
|
2b29fec8d6
|
Merge branch 'omaha_14.3.1' into omaha_14.4.1
Conflicts:
edexOsgi/com.raytheon.uf.common.dataplugin/src/com/raytheon/uf/common/dataplugin/annotations/DataURIFieldConverter.java
edexOsgi/com.raytheon.uf.common.derivparam.python/utility/common_static/base/derivedParameters/functions/Cape.py
edexOsgi/com.raytheon.uf.common.derivparam.python/utility/common_static/base/derivedParameters/functions/Dcape.py
edexOsgi/com.raytheon.uf.common.derivparam.python/utility/common_static/base/derivedParameters/functions/Filter.py
edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/context/ContextManager.java
edexOsgi/com.raytheon.uf.edex.ingest/res/spring/persist-ingest.xml
Former-commit-id: ddd6e35478 [formerly e37e40ed19] [formerly ddd6e35478 [formerly e37e40ed19] [formerly b7a1bda98c [formerly 396a7cbfefed07cd25e4f8b1f028c566a06e4065]]]
Former-commit-id: b7a1bda98c
Former-commit-id: 7a7c1167c2 [formerly 9591532ffd]
Former-commit-id: 049716e54d
|
2014-05-07 16:01:53 -05:00 |
|
Juliya Dynina
|
547c86f36f
|
Merge "ASM #514 - Line of Storms functionality behaving oddly in WarnGen" into asm_14.3.1
Former-commit-id: 2f3f953823 [formerly d6a796c476] [formerly 2f3f953823 [formerly d6a796c476] [formerly 92202928c9 [formerly 433a3be9362e151d8da6af2d69cdcd50f4a87b93]]]
Former-commit-id: 92202928c9
Former-commit-id: 87433219cc [formerly 3be2acf831]
Former-commit-id: 5e9af9b47d
|
2014-05-07 14:18:01 -05:00 |
|
Ben Steffensmeier
|
0d52351d27
|
Issue #3119 Optimize plot rendering.
Former-commit-id: a19a5bf986 [formerly d7cb05fd92] [formerly a19a5bf986 [formerly d7cb05fd92] [formerly 7274d01d64 [formerly 006df5b77f8f09e0b083b3c3e644744653f3d269]]]
Former-commit-id: 7274d01d64
Former-commit-id: bd08996223 [formerly 9701f68f40]
Former-commit-id: 9274027a7a
|
2014-05-07 13:27:48 -05:00 |
|
Brian.Dyke
|
0daec2c83b
|
Merged 13.5.5 -4 into 1412
Former-commit-id: 5a6425b6b0 [formerly f27d1b1efe] [formerly 5a6425b6b0 [formerly f27d1b1efe] [formerly 30bbd2d1cd [formerly 5644361dffaae25c63748a52c23506907210c741]]]
Former-commit-id: 30bbd2d1cd
Former-commit-id: 4155179c42 [formerly 8bf824a625]
Former-commit-id: e0cd200cee
|
2014-05-07 13:07:15 -04:00 |
|
Nate Jensen
|
76750c319a
|
Merge "Issue #3117 update satellite inventory for new sectors or elements." into omaha_14.3.1
Former-commit-id: daac0701fc [formerly d271dfb1a5] [formerly daac0701fc [formerly d271dfb1a5] [formerly 0f1cab916a [formerly 37c2d25d9ff0076d1cab4f818e45c6ccead82105]]]
Former-commit-id: 0f1cab916a
Former-commit-id: 89621db281 [formerly 70f70371b1]
Former-commit-id: 12f88d14bf
|
2014-05-06 17:09:56 -05:00 |
|
Ben Steffensmeier
|
b978e0fc1d
|
Issue #3117 update satellite inventory for new sectors or elements.
Former-commit-id: e70a6999b7 [formerly bbbf957ba8] [formerly e70a6999b7 [formerly bbbf957ba8] [formerly 70df0ee87e [formerly 35845fa63be35661893d31510f83e2d9ab6f60af]]]
Former-commit-id: 70df0ee87e
Former-commit-id: 81916ecdb6 [formerly 945fe1db2f]
Former-commit-id: a39b05ac71
|
2014-05-06 16:19:58 -05:00 |
|
Nate Jensen
|
3aa1481c98
|
Merge "Issue #3076 added clear all to shared display sessions" into omaha_14.3.1
Former-commit-id: 26f47e3b00 [formerly a583493711] [formerly 26f47e3b00 [formerly a583493711] [formerly 8f8ea5d014 [formerly 26eb2500104f7afe3fb07ddd66299aa1486375d2]]]
Former-commit-id: 8f8ea5d014
Former-commit-id: 4f3570324a [formerly f1c48f10b1]
Former-commit-id: a20245a64d
|
2014-05-06 16:15:41 -05:00 |
|
Nate Jensen
|
ad7a69f2e3
|
Issue #2060 fill in units on GridRecords created from URIs
Change-Id: Ic7c1594c1442d8463c5050bdefb434995ffc7f8a
Former-commit-id: 3719c41d2b [formerly 71b4227061] [formerly 3719c41d2b [formerly 71b4227061] [formerly 7cea97ab15 [formerly 949d132cf3260db5f75ea665f21601ab91440958]]]
Former-commit-id: 7cea97ab15
Former-commit-id: 5bf1554597 [formerly 6bdbfb7e1a]
Former-commit-id: 66cd43313a
|
2014-05-06 12:26:21 -05:00 |
|
Brian.Dyke
|
4f425f71e6
|
Merge branch 'asm_14.2.1' of /data/integration-asm-gerrit/update-latest/AWIPS2_baseline into master_14.2.1
Former-commit-id: 5461f75e41 [formerly 238e8f7ba1] [formerly 5461f75e41 [formerly 238e8f7ba1] [formerly e3b0b44b71 [formerly c6ba49e1206ed113b57a9fa39f5720ee9b3b979a]]]
Former-commit-id: e3b0b44b71
Former-commit-id: 430543e848 [formerly 43cc1d0b91]
Former-commit-id: fe9aeb1961
|
2014-05-06 11:34:46 -04:00 |
|
Brian.Dyke
|
9d60a1030a
|
Merge branch 'omaha_14.2.1' of cm2:/home/slharris/repos/AWIPS2_baseline-14.2.1 into master_14.2.1
Former-commit-id: 0253aa5d7f [formerly 90fecdc71e] [formerly 0253aa5d7f [formerly 90fecdc71e] [formerly 04b8da6f73 [formerly 9adc24725f9bd3499d8f498990413df7718de83e]]]
Former-commit-id: 04b8da6f73
Former-commit-id: 695bf96cef [formerly 884a1d2f2b]
Former-commit-id: 8f6a58d5c5
|
2014-05-06 11:25:15 -04:00 |
|
Chip Gobs
|
47068a7939
|
VLab Issue #3454 (OHD Dual-Pol enhancements for MPE and HPE/HPN (DCS #167,DCS #168) and PostAnalysis (DR #9784) )
Change-Id: Id96c25de545144d769309fef608c431d67d1bada
Former-commit-id: 4e4d00792d [formerly 65d2135ac2] [formerly 4e4d00792d [formerly 65d2135ac2] [formerly e42bef2a33 [formerly 1f43b57d7dffe0d1c4002ff9f1dd789a47b97734]]]
Former-commit-id: e42bef2a33
Former-commit-id: c075175e8e [formerly 593b36d722]
Former-commit-id: 1b7f762617
|
2014-05-06 10:48:35 -04:00 |
|
Brian Clements
|
89f3a0a1d2
|
Issue #3076 added clear all to shared display sessions
Former-commit-id: 729e717be1 [formerly f545c548cc] [formerly 729e717be1 [formerly f545c548cc] [formerly 1432aa1302 [formerly 9e4a518f2ecbe86fed87fbb6dac7fad08ffb33eb]]]
Former-commit-id: 1432aa1302
Former-commit-id: 8674841154 [formerly 5583c3903b]
Former-commit-id: 3a60b0db05
|
2014-05-06 09:30:07 -05:00 |
|
Nate Jensen
|
c32e1bb9fe
|
Merge "Omaha #3061 only shared display capable clients get payload in invite" into omaha_14.4.1
Former-commit-id: db4fc0c4d2 [formerly 7d11e31b06] [formerly db4fc0c4d2 [formerly 7d11e31b06] [formerly 596b5268d0 [formerly dee25d151cecf83f23d2ef9df20146c68069e957]]]
Former-commit-id: 596b5268d0
Former-commit-id: bff03681a4 [formerly bad26fdd7d]
Former-commit-id: 7e521c3e0b
|
2014-05-05 16:58:44 -05:00 |
|
Lee Venable
|
46eb74e982
|
Issue #3109 - removed code that sets the Cave cursor.
Change-Id: I1d6d640c5abafffdea29f1e2e835142fe6598470
Former-commit-id: 550668cbf7 [formerly a6c2260dd1] [formerly 550668cbf7 [formerly a6c2260dd1] [formerly b0a251f4e3 [formerly d875f73ff44986b2c7862f0dee06504d576fd96b]]]
Former-commit-id: b0a251f4e3
Former-commit-id: a092fd45dc [formerly 631a8d3cb1]
Former-commit-id: f48d571cb6
|
2014-05-05 16:13:31 -05:00 |
|
Steve Harris
|
b8b5300a9b
|
Merge branch 'omaha_14.3.1' into omaha_14.4.1
Conflicts (updated in ufcore):
cave/com.raytheon.uf.viz.application.feature/feature.xml
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/GLShadedShapeBase.java
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/internal/GLTarget.java
edexOsgi/com.raytheon.uf.common.base.feature/feature.xml
edexOsgi/com.raytheon.uf.common.derivparam.python/src/com/raytheon/uf/common/derivparam/python/MasterDerivScript.java
edexOsgi/com.raytheon.uf.common.time/utility/common_static/base/python/time/DataTime.py
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/dao/SessionManagedDao.java
edexOsgi/com.raytheon.uf.edex.database/src/com/raytheon/uf/edex/database/plugin/PluginDao.java
Former-commit-id: a8d3f4d885 [formerly 73ed3251bd] [formerly a8d3f4d885 [formerly 73ed3251bd] [formerly 83368e4b4e [formerly e26c8f0a5c62444d7ada1cfa7a15cb463a4b5285]]]
Former-commit-id: 83368e4b4e
Former-commit-id: ea24d1dadc [formerly caadbd3dd9]
Former-commit-id: 8cd5ed7a8e
|
2014-05-05 16:04:09 -05:00 |
|
Brian Clements
|
9c7f4cd887
|
Omaha #3061 only shared display capable clients get payload in invite
Former-commit-id: dec5159216 [formerly 1502354f87] [formerly dec5159216 [formerly 1502354f87] [formerly c61e30a422 [formerly 6595f5be37941f35c33b46231deef7d41e967380]]]
Former-commit-id: c61e30a422
Former-commit-id: 9d25e9dcb8 [formerly 58f45fa7d0]
Former-commit-id: 1e3d29a3f3
|
2014-05-05 15:29:06 -05:00 |
|
Melissa Porricel
|
9b7d84bfc4
|
ASM #481 - Add Guam GFSDNG to AWIPS
Change-Id: Iebf45e4b94fcf25aa32554f4363d0dc25f3e47ca
Former-commit-id: a91a4ed137 [formerly 42c36a5e80] [formerly a91a4ed137 [formerly 42c36a5e80] [formerly 92231e051d [formerly 012fa438f085498027402c1cd0897dd13c0d4edc]]]
Former-commit-id: 92231e051d
Former-commit-id: 6749967b5b [formerly 1e32d583b4]
Former-commit-id: 38539cc805
|
2014-05-05 14:56:58 -04:00 |
|
Dave Hladky
|
7e763a5a22
|
Merge branch 'master_14.3.1' (14.3.1-3) into omaha_14.3.1
Conflicts:
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.harvester/res/spring/harvester-datadelivery.xml
edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/src/com/raytheon/uf/edex/datadelivery/retrieval/util/RetrievalGeneratorUtilities.java
Former-commit-id: 0ac4de6ad0 [formerly 333bf8b36d] [formerly 0ac4de6ad0 [formerly 333bf8b36d] [formerly ccaaa1cfea [formerly 2e5ee5565d1847490e46c59866b14f77555e2a7e]]]
Former-commit-id: ccaaa1cfea
Former-commit-id: 93ca9cfe6a [formerly 7611339cd8]
Former-commit-id: cb94f9fc97
|
2014-05-05 12:15:14 -05:00 |
|
Qinglu.Lin
|
03f7862321
|
ASM #514 - Line of Storms functionality behaving oddly in WarnGen
Change-Id: I0bd2b9e4200b5acbb19a06caa45f18d36346de39
Former-commit-id: 5f0e0bda69 [formerly 18e92f03c1] [formerly 5f0e0bda69 [formerly 18e92f03c1] [formerly d8753a4145 [formerly 66a6c50cd501358e0c8c993631b288aa78dfdc97]]]
Former-commit-id: d8753a4145
Former-commit-id: 580d7e3ba7 [formerly 8de2d2f718]
Former-commit-id: 6ba15bd00c
|
2014-05-05 11:54:56 -04:00 |
|
Nate Jensen
|
3eaaf56f8e
|
Merge "Issue #2956 more safety checks" into omaha_14.3.1
Former-commit-id: f233d104d7 [formerly e9b3041170] [formerly f233d104d7 [formerly e9b3041170] [formerly d6518bede1 [formerly c4d06eea732629d5fac66593269ec82b9ee6463d]]]
Former-commit-id: d6518bede1
Former-commit-id: e8e971d434 [formerly 8ee8937daf]
Former-commit-id: e8b7cec960
|
2014-05-05 09:45:11 -05:00 |
|
Steve Harris
|
4fe84ba0fd
|
Merge branch 'master_14.1.2' (-2) into master_14.2.1 (-22)
Conflicts:
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge0ftIncr_PHISH.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge1ftIncr_PHISH.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge2ftIncr_PHISH.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/PSurge3ftIncr_PHISH.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_122E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_152E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_183E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_20.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_213E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_244E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_274E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_30.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_305E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_335E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_366E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_396E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_40.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_427E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_457E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_488E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_50.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_60.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_610E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_61E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_640E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_671E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_70.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_701E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_732E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_762E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_80.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_90.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSurgeProb/TPCSG_91E2.xml
cave/com.raytheon.uf.viz.derivparam/src/com/raytheon/uf/viz/derivparam/library/DerivedParameterGenerator.java
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/HeaderTextComp.java
cave/com.raytheon.viz.grid/localization/styleRules/gridImageryStyleRules.xml
cave/com.raytheon.viz.grid/localization/volumebrowser/FieldDisplayTypes.xml
cave/com.raytheon.viz.grid/src/com/raytheon/viz/grid/rsc/general/D2DGridResource.java
cave/com.raytheon.viz.volumebrowser/localization/menus/xml/fieldsMenus.xml
edexOsgi/build.edex/esb/data/utility/edex_static/base/config/gfe/serverConfig.py
edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/parameter/alias/gfeParamName.xml
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/grid/parameterInfo/TPCSurgeProb.xml
edexOsgi/com.raytheon.edex.plugin.grib/GribDecoder.py
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/decoderpostprocessors/TPCSurgeProbPostProcessor.java
edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grid/master_grib2_lookup.txt
edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grid/parameterNameAlias.txt
edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/largeGribPatterns.xml
Former-commit-id: 9e149df799 [formerly 6ef3b9f1e5] [formerly 9e149df799 [formerly 6ef3b9f1e5] [formerly 1c8f2f6185 [formerly c782956ef32875130bd97a0bdbffdf005e1940e3]]]
Former-commit-id: 1c8f2f6185
Former-commit-id: 927a87b126 [formerly b797b4b1fa]
Former-commit-id: 17318b1870
|
2014-05-05 08:21:02 -05:00 |
|
Juliya Dynina
|
35bbea77af
|
Merge "ASM #545 Hydrobase IngestFilter GUI fixes" into asm_14.3.1
Former-commit-id: 1d2297e489 [formerly cf742e4dc0] [formerly 1d2297e489 [formerly cf742e4dc0] [formerly 9da4eaaad5 [formerly b2e7c4aa26c341caae58f9007d070c873c2d94ab]]]
Former-commit-id: 9da4eaaad5
Former-commit-id: 2611615ee3 [formerly a9556d4d2e]
Former-commit-id: a7e8e4a9c4
|
2014-05-02 12:37:00 -05:00 |
|
Xuezhi.Wei
|
2bc8a6c5fd
|
ASM #545 Hydrobase IngestFilter GUI fixes
Change-Id: I368113a8ccb0356198a52a9d5c8a39247dce68e8
Former-commit-id: a647b1ddf3 [formerly c4fc2f169b] [formerly a647b1ddf3 [formerly c4fc2f169b] [formerly 071a1ae06a [formerly a8710a68e4aa28861c03c5d988bc36a553704c31]]]
Former-commit-id: 071a1ae06a
Former-commit-id: f31f39a875 [formerly 1ce32e2be1]
Former-commit-id: 57a6bcfca6
|
2014-05-02 16:55:36 +00:00 |
|
steve.naples
|
18c51dac23
|
ASM #253 Update MPE Bias Table to allow reverting modified bias, back to original value.
Change-Id: I1f84133404e14f7debb66e66735aa0d96a92b316
Former-commit-id: a7092ac01d [formerly b58b7d3d5a] [formerly a7092ac01d [formerly b58b7d3d5a] [formerly 8a00348730 [formerly 2f608451c941efcc5372f0d0870ac72409f518e3]]]
Former-commit-id: 8a00348730
Former-commit-id: 452cbdcc4e [formerly d079dbcb7c]
Former-commit-id: 39437970c7
|
2014-05-02 16:15:04 +00:00 |
|