brian.dyke
|
9626317825
|
Merge branch 'master_14.3.1-4' into asm_14.3.1
Conflicts:
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPResource.java
edexOsgi/com.raytheon.uf.edex.grid.staticdata/src/com/raytheon/uf/edex/grid/staticdata/StaticDataGenerator.java
edexOsgi/com.raytheon.uf.edex.plugin.grid/utility/common_static/base/purge/gridPurgeRules.xml
Former-commit-id: 58683ad040 [formerly 52358cb3e2ba2c7ff4ff9c9a5de03af50c3a1199]
Former-commit-id: 011d121e4b
|
2014-05-19 09:45:37 -04:00 |
|
Qinglu.Lin
|
b7d276d00f
|
ASM #556 - WarnGen: use noon/midnight instead of 1200 PM/1200 AM
Change-Id: I31cc6fe46fff0f9246585ddbf84b2f94b3d8c22c
Former-commit-id: c5097660c2 [formerly 763641d787f7f8c79bf28456314dcc16786702ed]
Former-commit-id: 75c4b15e8e
|
2014-05-14 15:30:16 -04:00 |
|
Bryan Kowal
|
a352aadc90
|
Issue #3159 - rebuild with newer gridslice source
Change-Id: I78c2337af37289b8e1190b142778006dfbdb6ebc
Former-commit-id: 8d5326cc1b [formerly 2b13221d7c644147f6eda1acb8b126667be00926]
Former-commit-id: 3535340136
|
2014-05-13 14:43:04 -05:00 |
|
Matthew Howard
|
7b087f422d
|
Merge "ASM #509 GFE: Product editor still auto-wraps when the option is turned off" into asm_14.3.1
Former-commit-id: 576a2d63ec [formerly 2052df4ca5f68165b477994b21357c245ff73546]
Former-commit-id: 5a20085f32
|
2014-05-13 07:49:18 -05:00 |
|
Zhidong.Hao
|
30b42030dd
|
ASM #509 GFE: Product editor still auto-wraps when the option is turned off
Change-Id: Ibbd86588d2c7dd6a451803e03d6744c8471652f4
Former-commit-id: 030b767299 [formerly a48b81894fed165aba58a0097359bbd0f1931be5]
Former-commit-id: d6cae51207
|
2014-05-12 15:16:38 -04:00 |
|
Juliya Dynina
|
43b45e9f53
|
Merge "ASM #527 update revision and shef_qual_code" into asm_14.3.1
Former-commit-id: e33a27684c [formerly 0c54c56efa1306d781d64621ccf7f62b3bf70997]
Former-commit-id: 107b64a544
|
2014-05-12 14:01:40 -05:00 |
|
Juliya Dynina
|
6713e83ae6
|
Merge "ASM #526 - Duration menu disabled after creating text for a COR SVS." into asm_14.3.1
Former-commit-id: 4f7fa8a8de [formerly 350448988d24fd2eb58812128b062e3a0f44b956]
Former-commit-id: d7bea845fe
|
2014-05-12 14:01:07 -05:00 |
|
Matthew Howard
|
e64f60ba98
|
Merge "ASM #537 AvnFPS: Syntax failed to flag format error" into asm_14.3.1
Former-commit-id: 0dc1db0072 [formerly 5afd4dab62eb48b65bb3f5b49d59444f1d52a23f]
Former-commit-id: b807c877f4
|
2014-05-12 13:52:12 -05:00 |
|
Loubna.Bousaidi
|
e634d0cdcf
|
ASM #527 update revision and shef_qual_code
Change-Id: I36fa41796350e8fcae6bcc0101120331188bbeff
Former-commit-id: d3be6d0476 [formerly 860ea4b3644a526ac10b4366f158824fe6cbdcb0]
Former-commit-id: ec5bd7a2bb
|
2014-05-12 18:42:12 +00:00 |
|
Zhidong.Hao
|
29e7d7e888
|
ASM #537 AvnFPS: Syntax failed to flag format error
Change-Id: Ib7127a83f98a6978d7fc099cdc4fdc4fd8a0fe2b
Former-commit-id: 074713bb4a [formerly 62f8c0ab0e046fd4365bd37394f93e8bca4e642d]
Former-commit-id: 8d560036b1
|
2014-05-12 14:33:25 -04:00 |
|
Matthew Howard
|
f1dfdd2878
|
Merge "ASM #508 - Fix DialogAreaComposite for sizing and accessibility of controls" into asm_14.3.1
Former-commit-id: 42cce01396 [formerly 59fb75bdc025a3b2feb95d20d263060b55e87b28]
Former-commit-id: d40d9931db
|
2014-05-12 13:00:55 -05:00 |
|
Rici.Yu
|
34069a96be
|
ASM #508 - Fix DialogAreaComposite for sizing and accessibility of controls
Change-Id: I53291acaa40c5bba926b31937674b1ece5864127
Former-commit-id: 96d1555012 [formerly df46f9fc541a47e5f31210663ef69c4c5863fa28]
Former-commit-id: 2ea1c1fa60
|
2014-05-12 13:38:04 -04:00 |
|
Bryan Kowal
|
8f16f25cd7
|
Issue #3026 - remove unnecessary hpe ffmp dependency
Former-commit-id: faa6b09ac9 [formerly c94c973ef6a663f93a6b1a6301f5553d4e88ac73]
Former-commit-id: 6e6a6a73ee
|
2014-05-12 11:46:35 -05:00 |
|
Michael Gamazaychikov
|
65353b595e
|
ASM #526 - Duration menu disabled after creating text for a COR SVS.
Change-Id: I360935bb87b5b95e9814f0f70da7cfe2d70d958c
Former-commit-id: 8a9c7ecb11 [formerly 988d5f26d3bd3e42397f62288a8c9b10e341495b]
Former-commit-id: 4f541a5460
|
2014-05-12 13:33:58 +01:00 |
|
Lee Venable
|
cd5956d21a
|
Merge "Issue #3145 - Fix Scan threat labels, dispose font" into omaha_14.3.1
Former-commit-id: e3c6407be3 [formerly 06b3cb4dd8f07600e6513a15a2495b485b0812b6]
Former-commit-id: 364f0d877a
|
2014-05-09 11:14:51 -05:00 |
|
Juliya Dynina
|
448dfef9e7
|
Merge "ASM #526 - Duration menu disabled after creating text for a COR SVS." into asm_14.3.1
Former-commit-id: 963a58ebba [formerly 789fffccf3389143a1660a477301cfcb43a82890]
Former-commit-id: dd13f453e6
|
2014-05-09 11:08:12 -05:00 |
|
Mike Duff
|
158fb46b9f
|
Issue #3145 - Fix Scan threat labels, dispose font
Change-Id: I385e184d81a021a350c7df7ee4948ad7e407784d
Former-commit-id: a81569849b [formerly 84bd0800b2652b31c06015fa49f816f1402f461d]
Former-commit-id: 03356dd554
|
2014-05-09 10:32:04 -05:00 |
|
Nate Jensen
|
d0d20849b6
|
Merge "Issue #3026 - feature.xml fix" into omaha_14.3.1
Former-commit-id: e8c4279d10 [formerly 25e500435693940e378df086739fce8eefdba3bb]
Former-commit-id: 575360192a
|
2014-05-09 09:53:25 -05:00 |
|
Mike Duff
|
7e996909d1
|
Issue #3026 - feature.xml fix
Change-Id: I07d5043a8c968fa841f4e94eee47617e018ea794
Former-commit-id: 038b2b7500 [formerly a44e412190741fcb0a91dd451ae538277ae0d79f]
Former-commit-id: 78f2a26903
|
2014-05-09 09:27:10 -05:00 |
|
Ben Steffensmeier
|
60479824d1
|
Issue #2920 Fix default color of BOXED text.
Former-commit-id: 9d4c33ba91 [formerly 59f12cd4cc60f0908c106cbc0572d3f84d0d509b]
Former-commit-id: 87ea43cf0d
|
2014-05-08 18:18:08 -05:00 |
|
Mike Duff
|
a6e0ed67d1
|
Issue #3026 - NullPointer fix, test classpath fix
Change-Id: Iabc347e51a276fd4c8beb3fd512d928f184767f1
Former-commit-id: 335c02d2c6 [formerly 8e70b7ae1eef7a18ddffa6d6c88d10bdd0043bcc]
Former-commit-id: b23473ee8a
|
2014-05-08 15:02:54 -05:00 |
|
Lee Venable
|
319073a795
|
Merge "Issue #2060 fix auto-update errors with grids in non-map displays" into omaha_14.3.1
Former-commit-id: 1496955e44 [formerly a47409fd1673c9584c46aba496be1b7203d9c45d]
Former-commit-id: 92517d3ca2
|
2014-05-08 14:47:03 -05:00 |
|
Mike Duff
|
0456fd0597
|
Issue #3026 - Implement HPE bias source labels on FFMP and volume browser displays
Change-Id: Ib17ff7cfcb5efcb1737804800a93ec4f82bc6f13
Former-commit-id: 6a67638a94 [formerly 57755db0d6d77f32d64b4b569bb0af88002a23da]
Former-commit-id: 8498235fd8
|
2014-05-08 14:36:54 -05:00 |
|
Nate Jensen
|
84f9cd1dc8
|
Issue #2060 fix auto-update errors with grids in non-map displays
Change-Id: Id99693f6fd54d56a4a1255f7ee5e2308e2f5d9de
Former-commit-id: ecc5c5849f [formerly a139113883f69be89a0e0a771f8d6f48d3948686]
Former-commit-id: 3e3035b6f1
|
2014-05-08 14:08:06 -05:00 |
|
Kiran.Shrestha
|
c1d2c93db3
|
ASM #506 - TextWS: Unable to save unofficial text products from text editor.
Change-Id: I27aab39c7af355f660d873b1a17b7d94209fb13b
Former-commit-id: f1a707cf64 [formerly 1ac375914b05ea937439b6c0802291f49ff38938]
Former-commit-id: f013b49282
|
2014-05-08 15:07:42 -04:00 |
|
Michael Gamazaychikov
|
4a7d050dd4
|
ASM #526 - Duration menu disabled after creating text for a COR SVS.
Change-Id: I23135a56247ba75c7ce980b5eddcf4e7dd30aebf
Former-commit-id: 588cfd0608 [formerly f934537da168238e76f0be04fc518f6ad315637e]
Former-commit-id: e7341afe4d
|
2014-05-08 14:02:21 +01:00 |
|
Juliya Dynina
|
2f3f953823
|
Merge "ASM #514 - Line of Storms functionality behaving oddly in WarnGen" into asm_14.3.1
Former-commit-id: 92202928c9 [formerly 433a3be9362e151d8da6af2d69cdcd50f4a87b93]
Former-commit-id: d6a796c476
|
2014-05-07 14:18:01 -05:00 |
|
Nate Jensen
|
daac0701fc
|
Merge "Issue #3117 update satellite inventory for new sectors or elements." into omaha_14.3.1
Former-commit-id: 0f1cab916a [formerly 37c2d25d9ff0076d1cab4f818e45c6ccead82105]
Former-commit-id: d271dfb1a5
|
2014-05-06 17:09:56 -05:00 |
|
Ben Steffensmeier
|
e70a6999b7
|
Issue #3117 update satellite inventory for new sectors or elements.
Former-commit-id: 70df0ee87e [formerly 35845fa63be35661893d31510f83e2d9ab6f60af]
Former-commit-id: bbbf957ba8
|
2014-05-06 16:19:58 -05:00 |
|
Nate Jensen
|
26f47e3b00
|
Merge "Issue #3076 added clear all to shared display sessions" into omaha_14.3.1
Former-commit-id: 8f8ea5d014 [formerly 26eb2500104f7afe3fb07ddd66299aa1486375d2]
Former-commit-id: a583493711
|
2014-05-06 16:15:41 -05:00 |
|
Nate Jensen
|
3719c41d2b
|
Issue #2060 fill in units on GridRecords created from URIs
Change-Id: Ic7c1594c1442d8463c5050bdefb434995ffc7f8a
Former-commit-id: 7cea97ab15 [formerly 949d132cf3260db5f75ea665f21601ab91440958]
Former-commit-id: 71b4227061
|
2014-05-06 12:26:21 -05:00 |
|
Brian Clements
|
729e717be1
|
Issue #3076 added clear all to shared display sessions
Former-commit-id: 1432aa1302 [formerly 9e4a518f2ecbe86fed87fbb6dac7fad08ffb33eb]
Former-commit-id: f545c548cc
|
2014-05-06 09:30:07 -05:00 |
|
Lee Venable
|
550668cbf7
|
Issue #3109 - removed code that sets the Cave cursor.
Change-Id: I1d6d640c5abafffdea29f1e2e835142fe6598470
Former-commit-id: b0a251f4e3 [formerly d875f73ff44986b2c7862f0dee06504d576fd96b]
Former-commit-id: a6c2260dd1
|
2014-05-05 16:13:31 -05:00 |
|
Melissa Porricel
|
a91a4ed137
|
ASM #481 - Add Guam GFSDNG to AWIPS
Change-Id: Iebf45e4b94fcf25aa32554f4363d0dc25f3e47ca
Former-commit-id: 92231e051d [formerly 012fa438f085498027402c1cd0897dd13c0d4edc]
Former-commit-id: 42c36a5e80
|
2014-05-05 14:56:58 -04:00 |
|
Dave Hladky
|
0ac4de6ad0
|
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: ccaaa1cfea [formerly 2e5ee5565d1847490e46c59866b14f77555e2a7e]
Former-commit-id: 333bf8b36d
|
2014-05-05 12:15:14 -05:00 |
|
Qinglu.Lin
|
5f0e0bda69
|
ASM #514 - Line of Storms functionality behaving oddly in WarnGen
Change-Id: I0bd2b9e4200b5acbb19a06caa45f18d36346de39
Former-commit-id: d8753a4145 [formerly 66a6c50cd501358e0c8c993631b288aa78dfdc97]
Former-commit-id: 18e92f03c1
|
2014-05-05 11:54:56 -04:00 |
|
Nate Jensen
|
f233d104d7
|
Merge "Issue #2956 more safety checks" into omaha_14.3.1
Former-commit-id: d6518bede1 [formerly c4d06eea732629d5fac66593269ec82b9ee6463d]
Former-commit-id: e9b3041170
|
2014-05-05 09:45:11 -05:00 |
|
Juliya Dynina
|
1d2297e489
|
Merge "ASM #545 Hydrobase IngestFilter GUI fixes" into asm_14.3.1
Former-commit-id: 9da4eaaad5 [formerly b2e7c4aa26c341caae58f9007d070c873c2d94ab]
Former-commit-id: cf742e4dc0
|
2014-05-02 12:37:00 -05:00 |
|
Xuezhi.Wei
|
a647b1ddf3
|
ASM #545 Hydrobase IngestFilter GUI fixes
Change-Id: I368113a8ccb0356198a52a9d5c8a39247dce68e8
Former-commit-id: 071a1ae06a [formerly a8710a68e4aa28861c03c5d988bc36a553704c31]
Former-commit-id: c4fc2f169b
|
2014-05-02 16:55:36 +00:00 |
|
steve.naples
|
a7092ac01d
|
ASM #253 Update MPE Bias Table to allow reverting modified bias, back to original value.
Change-Id: I1f84133404e14f7debb66e66735aa0d96a92b316
Former-commit-id: 8a00348730 [formerly 2f608451c941efcc5372f0d0870ac72409f518e3]
Former-commit-id: b58b7d3d5a
|
2014-05-02 16:15:04 +00:00 |
|
Richard Peter
|
4e1bc16d70
|
Merge "Issue #2956 remove unsafe glMultiDrawArrays(), undo previous change" into omaha_14.3.1
Former-commit-id: d4a138c534 [formerly f124cee1070a3dd0e09cb54f773f63095f18bd16]
Former-commit-id: 478cedd3a3
|
2014-05-02 09:50:40 -05:00 |
|
Richard Peter
|
1738b065b8
|
Issue #2854: Pack commons.lang for alertviz
Change-Id: Ib6eb59c6cbdb5b52acc051aec4339445fdc14166
Former-commit-id: bcd87195ee [formerly 7d69b9fdc60b0c07121eab0119cf45b1624653cd]
Former-commit-id: a9b088146c
|
2014-05-01 16:30:21 -05:00 |
|
Nate Jensen
|
d759efcaa8
|
Issue #2956 more safety checks
Change-Id: I3984fa2b534b16b2e4485e1f66d65f8df48b2e4e
Former-commit-id: 7d142d9d9d [formerly a24190f35b87351a5f699ac05041bec7a13a1cdb]
Former-commit-id: f4d20c41f4
|
2014-05-01 16:28:16 -05:00 |
|
Nate Jensen
|
3222914fde
|
Issue #2956 remove unsafe glMultiDrawArrays(), undo previous change
Change-Id: I25bd1305568d26940b69565f53a06661955f240b
Former-commit-id: a73a310709 [formerly 6f8ef50f7cf8f245f749bf8ff9dbcc33a1d64d64]
Former-commit-id: 137818d03a
|
2014-05-01 16:20:35 -05:00 |
|
Matthew Howard
|
3b48dcc680
|
Merge "ASM #507 - Fix incorrect FFMP gap calculation" into asm_14.3.1
Former-commit-id: 9e7a0e0a61 [formerly ef1c0313455700304e9dc8e130f2b8658fdd1ed7]
Former-commit-id: 55b1198186
|
2014-05-01 16:07:11 -05:00 |
|
Richard Peter
|
25fd0e03f4
|
Issue #2854: Fix features.
Change-Id: Iab5371d51b5a582387bfd9a8ef8bdd595d1dd0fe
Former-commit-id: a4fb460e17 [formerly 0d675fd5b0fdb0adceef0052adaf31c1c9a7911b]
Former-commit-id: 4056f53fa2
|
2014-05-01 14:47:41 -05:00 |
|
brian.dyke
|
2a934def82
|
Merge branch 'master_14.3.1-3' into asm_14.3.1
Former-commit-id: d5c3f112c1 [formerly c31c7837568ec4a8fd1516a9e9cd115df30cee40]
Former-commit-id: 5d7b8eca6a
|
2014-05-01 15:20:36 -04:00 |
|
Steve Harris
|
9ecd871825
|
Merge branch 'omaha_14.3.1-NHDA' into omaha_14.3.1
Former-commit-id: 779e85cc77 [formerly 36d5942b4a7f1df9b69388b40d0f6c866d9d30b8]
Former-commit-id: c8ba70a146
|
2014-05-01 13:25:15 -05:00 |
|
Brian Clements
|
93912625ea
|
Issue #2903 changed commons.lang to match other unpacking foss
Former-commit-id: dd5412e119 [formerly ee24eaf54704dcfdf698089a8269e055f7856c80]
Former-commit-id: 3ca4f8cc52
|
2014-05-01 12:34:09 -05:00 |
|
Gang.Zhang
|
7d2b256ba9
|
ASM #507 - Fix incorrect FFMP gap calculation
Change-Id: Iecfdcaa07aca79b0e17396a794851cec0e6cba25
Former-commit-id: 090ed29386 [formerly 9b33d5187b4535d5500762e15e35e89ccbf5f5da]
Former-commit-id: 74dc7a5d7c
|
2014-05-01 15:49:48 +01:00 |
|