Juliya Dynina
|
4f7fa8a8de
|
Merge "ASM #526 - Duration menu disabled after creating text for a COR SVS." into asm_14.3.1
Former-commit-id: 350448988d24fd2eb58812128b062e3a0f44b956
|
2014-05-12 14:01:07 -05:00 |
|
Ana Rivera
|
81a9d4fa44
|
VLab Issue #3648 - DR_16999 Display ESTOFS Model Data; closes #3648
Change-Id: Ieea41d201e94b4486cce0c4ec70a2c02b65838f1
Former-commit-id: e71ef5db23122405fc6aab71526a9cc3ec3ad823
|
2014-05-12 18:55:06 +00:00 |
|
Matthew Howard
|
0dc1db0072
|
Merge "ASM #537 AvnFPS: Syntax failed to flag format error" into asm_14.3.1
Former-commit-id: 5afd4dab62eb48b65bb3f5b49d59444f1d52a23f
|
2014-05-12 13:52:12 -05:00 |
|
Loubna.Bousaidi
|
d3be6d0476
|
ASM #527 update revision and shef_qual_code
Change-Id: I36fa41796350e8fcae6bcc0101120331188bbeff
Former-commit-id: 860ea4b3644a526ac10b4366f158824fe6cbdcb0
|
2014-05-12 18:42:12 +00:00 |
|
Zhidong.Hao
|
074713bb4a
|
ASM #537 AvnFPS: Syntax failed to flag format error
Change-Id: Ib7127a83f98a6978d7fc099cdc4fdc4fd8a0fe2b
Former-commit-id: 62f8c0ab0e046fd4365bd37394f93e8bca4e642d
|
2014-05-12 14:33:25 -04:00 |
|
Brian.Dyke
|
41ba5fc348
|
CM-MERGE:OB13.5.5-5 into 14.1.2
Former-commit-id: 3b0df2482b87ba9d37dd32d50e8e1fc3b3ae55e3
|
2014-05-12 14:07:11 -04:00 |
|
Matthew Howard
|
42cce01396
|
Merge "ASM #508 - Fix DialogAreaComposite for sizing and accessibility of controls" into asm_14.3.1
Former-commit-id: 59fb75bdc025a3b2feb95d20d263060b55e87b28
|
2014-05-12 13:00:55 -05:00 |
|
Rici.Yu
|
96d1555012
|
ASM #508 - Fix DialogAreaComposite for sizing and accessibility of controls
Change-Id: I53291acaa40c5bba926b31937674b1ece5864127
Former-commit-id: df46f9fc541a47e5f31210663ef69c4c5863fa28
|
2014-05-12 13:38:04 -04:00 |
|
Nate Jensen
|
ab064743f4
|
Merge "Omaha #3075 updates for pydev 3.4.1" into omaha_14.4.1
Former-commit-id: a213a01ac89bf84a6a0d4dfea44073cb0b2a7fce
|
2014-05-12 11:56:34 -05:00 |
|
Bryan Kowal
|
faa6b09ac9
|
Issue #3026 - remove unnecessary hpe ffmp dependency
Former-commit-id: c94c973ef6a663f93a6b1a6301f5553d4e88ac73
|
2014-05-12 11:46:35 -05:00 |
|
Michael Gamazaychikov
|
8a9c7ecb11
|
ASM #526 - Duration menu disabled after creating text for a COR SVS.
Change-Id: I360935bb87b5b95e9814f0f70da7cfe2d70d958c
Former-commit-id: 988d5f26d3bd3e42397f62288a8c9b10e341495b
|
2014-05-12 13:33:58 +01:00 |
|
Nate Jensen
|
bb32858c04
|
Omaha #3075 updates for pydev 3.4.1
Change-Id: I2d7ed5e73f837f42dea3de35cdf79dd98c7586b1
Former-commit-id: a038aea9bb25e31b29b054e8899c0b51bc183fef
|
2014-05-09 16:45:39 -05:00 |
|
Brian Clements
|
7b7bc5be97
|
Omaha #3107 added timeout handling logic for leader transfer verification
Former-commit-id: 294a489ba547bf90df9d6b6a5107c8993c5b8333
|
2014-05-09 15:43:46 -05:00 |
|
Lee Venable
|
e3c6407be3
|
Merge "Issue #3145 - Fix Scan threat labels, dispose font" into omaha_14.3.1
Former-commit-id: 06b3cb4dd8f07600e6513a15a2495b485b0812b6
|
2014-05-09 11:14:51 -05:00 |
|
Juliya Dynina
|
963a58ebba
|
Merge "ASM #526 - Duration menu disabled after creating text for a COR SVS." into asm_14.3.1
Former-commit-id: 789fffccf3389143a1660a477301cfcb43a82890
|
2014-05-09 11:08:12 -05:00 |
|
Mike Duff
|
a81569849b
|
Issue #3145 - Fix Scan threat labels, dispose font
Change-Id: I385e184d81a021a350c7df7ee4948ad7e407784d
Former-commit-id: 84bd0800b2652b31c06015fa49f816f1402f461d
|
2014-05-09 10:32:04 -05:00 |
|
Nate Jensen
|
e8c4279d10
|
Merge "Issue #3026 - feature.xml fix" into omaha_14.3.1
Former-commit-id: 25e500435693940e378df086739fce8eefdba3bb
|
2014-05-09 09:53:25 -05:00 |
|
Roger Ferrel
|
c226ef3596
|
Omaha #3091 Remove the use of aviationForecastConfig.xml file and only using OUP.
Change-Id: Ibcd4c5389ba081b19a3134989c507b88b2d882b8
Former-commit-id: 909a3f42bdb9d8149013056f9956bf0c38b764c5
|
2014-05-09 09:34:49 -05:00 |
|
Mike Duff
|
038b2b7500
|
Issue #3026 - feature.xml fix
Change-Id: I07d5043a8c968fa841f4e94eee47617e018ea794
Former-commit-id: a44e412190741fcb0a91dd451ae538277ae0d79f
|
2014-05-09 09:27:10 -05:00 |
|
Ben Steffensmeier
|
9d4c33ba91
|
Issue #2920 Fix default color of BOXED text.
Former-commit-id: 59f12cd4cc60f0908c106cbc0572d3f84d0d509b
|
2014-05-08 18:18:08 -05:00 |
|
Ana Rivera
|
1b4450ec5f
|
VLab Issue #3617 - DCS_266 Ingest & Display HRRR Model Data
Change-Id: Ic43d3a3f51d70cd41ef8e34ccde9d1f5aee3007b
Former-commit-id: c5a4f22a24b6c1eced689c6ae437558a9a6cbc9e
|
2014-05-08 20:10:24 +00:00 |
|
Mike Duff
|
335c02d2c6
|
Issue #3026 - NullPointer fix, test classpath fix
Change-Id: Iabc347e51a276fd4c8beb3fd512d928f184767f1
Former-commit-id: 8e70b7ae1eef7a18ddffa6d6c88d10bdd0043bcc
|
2014-05-08 15:02:54 -05:00 |
|
Lee Venable
|
1496955e44
|
Merge "Issue #2060 fix auto-update errors with grids in non-map displays" into omaha_14.3.1
Former-commit-id: a47409fd1673c9584c46aba496be1b7203d9c45d
|
2014-05-08 14:47:03 -05:00 |
|
Mike Duff
|
6a67638a94
|
Issue #3026 - Implement HPE bias source labels on FFMP and volume browser displays
Change-Id: Ib17ff7cfcb5efcb1737804800a93ec4f82bc6f13
Former-commit-id: 57755db0d6d77f32d64b4b569bb0af88002a23da
|
2014-05-08 14:36:54 -05:00 |
|
Nate Jensen
|
ecc5c5849f
|
Issue #2060 fix auto-update errors with grids in non-map displays
Change-Id: Id99693f6fd54d56a4a1255f7ee5e2308e2f5d9de
Former-commit-id: a139113883f69be89a0e0a771f8d6f48d3948686
|
2014-05-08 14:08:06 -05:00 |
|
Kiran.Shrestha
|
f1a707cf64
|
ASM #506 - TextWS: Unable to save unofficial text products from text editor.
Change-Id: I27aab39c7af355f660d873b1a17b7d94209fb13b
Former-commit-id: 1ac375914b05ea937439b6c0802291f49ff38938
|
2014-05-08 15:07:42 -04:00 |
|
Steve Harris
|
ff4a6b8122
|
Omaha #3085 - re-deleted stuff that was re-added in a variety of ways.
Former-commit-id: 241ca845ebcce8426bf61d730baa5e97a7762381
|
2014-05-08 09:50:34 -05:00 |
|
Michael Gamazaychikov
|
588cfd0608
|
ASM #526 - Duration menu disabled after creating text for a COR SVS.
Change-Id: I23135a56247ba75c7ce980b5eddcf4e7dd30aebf
Former-commit-id: f934537da168238e76f0be04fc518f6ad315637e
|
2014-05-08 14:02:21 +01:00 |
|
Steve Harris
|
b7a1bda98c
|
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: 396a7cbfefed07cd25e4f8b1f028c566a06e4065
|
2014-05-07 16:01:53 -05:00 |
|
Juliya Dynina
|
92202928c9
|
Merge "ASM #514 - Line of Storms functionality behaving oddly in WarnGen" into asm_14.3.1
Former-commit-id: 433a3be9362e151d8da6af2d69cdcd50f4a87b93
|
2014-05-07 14:18:01 -05:00 |
|
Ben Steffensmeier
|
7274d01d64
|
Issue #3119 Optimize plot rendering.
Former-commit-id: 006df5b77f8f09e0b083b3c3e644744653f3d269
|
2014-05-07 13:27:48 -05:00 |
|
Brian.Dyke
|
30bbd2d1cd
|
Merged 13.5.5 -4 into 1412
Former-commit-id: 5644361dffaae25c63748a52c23506907210c741
|
2014-05-07 13:07:15 -04:00 |
|
Nate Jensen
|
0f1cab916a
|
Merge "Issue #3117 update satellite inventory for new sectors or elements." into omaha_14.3.1
Former-commit-id: 37c2d25d9ff0076d1cab4f818e45c6ccead82105
|
2014-05-06 17:09:56 -05:00 |
|
Ben Steffensmeier
|
70df0ee87e
|
Issue #3117 update satellite inventory for new sectors or elements.
Former-commit-id: 35845fa63be35661893d31510f83e2d9ab6f60af
|
2014-05-06 16:19:58 -05:00 |
|
Nate Jensen
|
8f8ea5d014
|
Merge "Issue #3076 added clear all to shared display sessions" into omaha_14.3.1
Former-commit-id: 26eb2500104f7afe3fb07ddd66299aa1486375d2
|
2014-05-06 16:15:41 -05:00 |
|
Nate Jensen
|
7cea97ab15
|
Issue #2060 fill in units on GridRecords created from URIs
Change-Id: Ic7c1594c1442d8463c5050bdefb434995ffc7f8a
Former-commit-id: 949d132cf3260db5f75ea665f21601ab91440958
|
2014-05-06 12:26:21 -05:00 |
|
Brian.Dyke
|
e3b0b44b71
|
Merge branch 'asm_14.2.1' of /data/integration-asm-gerrit/update-latest/AWIPS2_baseline into master_14.2.1
Former-commit-id: c6ba49e1206ed113b57a9fa39f5720ee9b3b979a
|
2014-05-06 11:34:46 -04:00 |
|
Brian.Dyke
|
04b8da6f73
|
Merge branch 'omaha_14.2.1' of cm2:/home/slharris/repos/AWIPS2_baseline-14.2.1 into master_14.2.1
Former-commit-id: 9adc24725f9bd3499d8f498990413df7718de83e
|
2014-05-06 11:25:15 -04:00 |
|
Chip Gobs
|
e42bef2a33
|
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: 1f43b57d7dffe0d1c4002ff9f1dd789a47b97734
|
2014-05-06 10:48:35 -04:00 |
|
Brian Clements
|
1432aa1302
|
Issue #3076 added clear all to shared display sessions
Former-commit-id: 9e4a518f2ecbe86fed87fbb6dac7fad08ffb33eb
|
2014-05-06 09:30:07 -05:00 |
|
Nate Jensen
|
596b5268d0
|
Merge "Omaha #3061 only shared display capable clients get payload in invite" into omaha_14.4.1
Former-commit-id: dee25d151cecf83f23d2ef9df20146c68069e957
|
2014-05-05 16:58:44 -05:00 |
|
Lee Venable
|
b0a251f4e3
|
Issue #3109 - removed code that sets the Cave cursor.
Change-Id: I1d6d640c5abafffdea29f1e2e835142fe6598470
Former-commit-id: d875f73ff44986b2c7862f0dee06504d576fd96b
|
2014-05-05 16:13:31 -05:00 |
|
Steve Harris
|
83368e4b4e
|
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: e26c8f0a5c62444d7ada1cfa7a15cb463a4b5285
|
2014-05-05 16:04:09 -05:00 |
|
Brian Clements
|
c61e30a422
|
Omaha #3061 only shared display capable clients get payload in invite
Former-commit-id: 6595f5be37941f35c33b46231deef7d41e967380
|
2014-05-05 15:29:06 -05:00 |
|
Melissa Porricel
|
92231e051d
|
ASM #481 - Add Guam GFSDNG to AWIPS
Change-Id: Iebf45e4b94fcf25aa32554f4363d0dc25f3e47ca
Former-commit-id: 012fa438f085498027402c1cd0897dd13c0d4edc
|
2014-05-05 14:56:58 -04:00 |
|
Dave Hladky
|
ccaaa1cfea
|
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: 2e5ee5565d1847490e46c59866b14f77555e2a7e
|
2014-05-05 12:15:14 -05:00 |
|
Qinglu.Lin
|
d8753a4145
|
ASM #514 - Line of Storms functionality behaving oddly in WarnGen
Change-Id: I0bd2b9e4200b5acbb19a06caa45f18d36346de39
Former-commit-id: 66a6c50cd501358e0c8c993631b288aa78dfdc97
|
2014-05-05 11:54:56 -04:00 |
|
Nate Jensen
|
d6518bede1
|
Merge "Issue #2956 more safety checks" into omaha_14.3.1
Former-commit-id: c4d06eea732629d5fac66593269ec82b9ee6463d
|
2014-05-05 09:45:11 -05:00 |
|
Steve Harris
|
1c8f2f6185
|
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: c782956ef32875130bd97a0bdbffdf005e1940e3
|
2014-05-05 08:21:02 -05:00 |
|
Juliya Dynina
|
9da4eaaad5
|
Merge "ASM #545 Hydrobase IngestFilter GUI fixes" into asm_14.3.1
Former-commit-id: b2e7c4aa26c341caae58f9007d070c873c2d94ab
|
2014-05-02 12:37:00 -05:00 |
|