Brian Clements
|
48e634b14a
|
Issue #2903 prevent shared display crash from missing point style enum value
Change-Id: I9d3faccba56c2832c5dcc185c6c20bcce396b173
Former-commit-id: 9946f78241 [formerly 9946f78241 [formerly 5d298b39786d37aa365ccfe2c337214d1e46f1a9]]
Former-commit-id: 5d03048fff
Former-commit-id: 59d92634b0
|
2014-06-17 17:01:23 -05:00 |
|
Nate Jensen
|
48496aeb9b
|
Merge "Issue #2903 changed collaboration jaxb xml to be base64 encoded" into omaha_14.3.1
Former-commit-id: c2aa87470d [formerly c2aa87470d [formerly 93f63c0d42941001e4d59a4840df5e5b525592bf]]
Former-commit-id: ed36453f09
Former-commit-id: ef61539a8a
|
2014-06-16 08:31:30 -05:00 |
|
Brian Clements
|
649d0cf43f
|
Issue #2903 changed collaboration jaxb xml to be base64 encoded
Change-Id: I0de0db3bf455a14d747520f34ef66d986815e42c
Former-commit-id: 5424eb0258 [formerly 5424eb0258 [formerly afcfdf1ed08cd64deb085b909f0965e4ab68d92d]]
Former-commit-id: ef0ecfd1d4
Former-commit-id: 9e39c19a7d
|
2014-06-12 13:40:33 -05:00 |
|
Brian.Dyke
|
75c6886f61
|
Merge branch 'asm_14.3.1' of /data/integration-asm-gerrit/update-latest/AWIPS2_baseline into master_14.3.1
Former-commit-id: 61b206be0b [formerly 61b206be0b [formerly 36fa86071fa492bd1d135b3ded6cde54d0567474]]
Former-commit-id: 3919c9ec2f
Former-commit-id: 244467210c
|
2014-06-04 07:46:16 -04:00 |
|
Kenneth Sperow
|
3e94502542
|
Merge remote branch 'origin/master_14.3.1' into field_14.3.1. Merge up to dec7b6fa
Conflicts:
edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_NCEP-7.xml
Change-Id: I9d39ab71514eaf81d6c841dc7358bcc92f46ddd8
Former-commit-id: c302ef8967 [formerly c302ef8967 [formerly b0e1387ccf5f7b12b83c3adbb6c873cca9a7d2a5]]
Former-commit-id: f2a738cc25
Former-commit-id: ca913b6159
|
2014-06-03 20:55:29 -07:00 |
|
brian.dyke
|
21721fd935
|
Merge branch 'master_14.3.1' into asm_14.3.1
Former-commit-id: 79f866fb17 [formerly 79f866fb17 [formerly 2d4751c000176447d28b284337fb23a60cb19cd1]]
Former-commit-id: b3d95ca18d
Former-commit-id: 76cbdf64ff
|
2014-06-03 16:14:16 -04:00 |
|
Steve Harris
|
46b7122d56
|
Merge branch 'master_14.3.1' (14.3.1-8) into omaha_14.3.1
Former-commit-id: 65a3390a6a [formerly 65a3390a6a [formerly ee696cb24c8d72f0562126a131824e958b88f090]]
Former-commit-id: 3bde6b3e41
Former-commit-id: c3deafc840
|
2014-06-02 07:31:14 -05:00 |
|
Brian.Dyke
|
45deec5df6
|
Merge branch 'omaha_14.3.1' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.3.1
Former-commit-id: b8ba378862 [formerly b8ba378862 [formerly dec7b6fa091cab098b89a51551fa46b9f28b959b]]
Former-commit-id: c6244e1950
Former-commit-id: 6edbd149a5
|
2014-06-02 07:01:37 -04:00 |
|
Brian.Dyke
|
a23d371522
|
Merge branch 'ohd_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
VLab Issue #3454 - HPE dual-polarization upgrade
Conflicts:
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/RadarBiasTableDialog.java
edexOsgi/com.raytheon.uf.common.ohd/utility/common_static/base/hydro/Apps_defaults
Former-commit-id: a8737e18f0 [formerly a8737e18f0 [formerly 9d7a819489480e119b65cb5643520818adeb1ebf]]
Former-commit-id: 3f1e12effc
Former-commit-id: 66aacd6578
|
2014-05-30 10:46:25 -04:00 |
|
brian.dyke
|
3f9ac5ba24
|
Merge branch 'master_14.3.1' into asm_14.3.1
Former-commit-id: 95c5dc49c1 [formerly 95c5dc49c1 [formerly 2e170e3e328804a56f65de7cec0f0e89d3f1aba4]]
Former-commit-id: 03cc2fbbfb
Former-commit-id: e09bd1d283
|
2014-05-30 10:09:00 -04:00 |
|
Steve Harris
|
95462b4f80
|
Merge branch 'master_14.3.1' (14.3.1-7) into omaha_14.3.1
Conflicts:
edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/db/objects/GridLocation.java
Former-commit-id: 2c49d14c12 [formerly 2c49d14c12 [formerly 70398b6d6c43e8931d4d88660af2ba7a8b2668e2]]
Former-commit-id: 048d3748b7
Former-commit-id: 4ed44b6e72
|
2014-05-28 07:41:42 -05:00 |
|
Steve Harris
|
144354c369
|
Merge branch master_14.2.2-10 into master_14.3.1-6 CM-MERGE:OB14.2.2-7,-8,-9,-10 into 14.3.1
Conflicts:
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG518E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG549E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG579E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_122E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_152E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_183E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_20.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_213E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_244E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_274E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_30.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_305E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_335E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_366E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_396E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_40.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_427E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_457E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_488E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_50.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_610E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_61E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_640E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_671E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_701E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_732E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_762E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/TPCSG_91E2.xml
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_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_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_91E2.xml
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/Wind.xml
cave/com.raytheon.uf.viz.derivparam/src/com/raytheon/uf/viz/derivparam/library/DerivedParameterGenerator.java
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPResource.java
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
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/planesMenusPlanView.xml
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/Area.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/Wx.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/text/AbstractLockingBehavior.java
cave/com.raytheon.viz.warnings/src/com/raytheon/viz/warnings/rsc/WarningsResource.java
edexOsgi/build.edex/esb/conf/spring/64-bit/architecture.properties
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java
edexOsgi/com.raytheon.edex.plugin.warning/src/com/raytheon/edex/plugin/warning/gis/GeospatialDataGenerator.java
edexOsgi/com.raytheon.uf.common.dataplugin.ffmp/src/com/raytheon/uf/common/dataplugin/ffmp/FFMPUtils.java
edexOsgi/com.raytheon.uf.common.dataplugin.gfe/src/com/raytheon/uf/common/dataplugin/gfe/db/objects/GridLocation.java
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG518E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG549E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG579E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_122E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_152E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_183E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_20.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_213E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_244E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_274E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_30.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_305E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_335E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_366E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_396E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_40.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_427E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_457E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_488E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_50.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_610E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_61E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_640E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_671E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_701E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_732E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_762E2.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/TPCSG_91E2.xml
edexOsgi/com.raytheon.uf.edex.plugin.datadelivery.retrieval/res/spring/retrieval-common.xml
Change-Id: Id84acd273efd3da66b423533cac93bf445fabb66
Former-commit-id: 99bc6f990c [formerly 99bc6f990c [formerly 117fa26f537131552bbe51b2c5fe12405a26db32]]
Former-commit-id: 3b16bbafb1
Former-commit-id: 9b98b41cd4
|
2014-05-27 14:48:24 -04:00 |
|
Kenneth Sperow
|
51b0b4e566
|
Merge remote branch 'origin/master_14.3.1' into field_14.3.1_merge Merge up to b803dd72d5fdfacc2e43bec18b5e83d6208a667d [formerly 342398e6a3] [formerly 189e3cc1f2 [formerly 189e3cc1f2 [formerly ddeadcf968d945a322e8a9c8a8d25753782887f0]]]
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
edexOsgi/com.raytheon.uf.edex.plugin.grid/utility/common_static/base/purge/gridPurgeRules.xml
Change-Id: I2005791595cbb8303d385ed4c397e1997e7ce38f
Former-commit-id: 8490f7ea33 [formerly 8490f7ea33 [formerly 41ee30cbe04bb6cba695f7480d6b1492aec4219c]]
Former-commit-id: 9fa9425aea
Former-commit-id: 846395fd42
|
2014-05-22 14:16:49 -07:00 |
|
Steve Harris
|
e7e48b2abb
|
Merge branch 'master_14.3.1' (14.3.1-5) into omaha_14.3.1
Former-commit-id: 4899c4f56a [formerly 4899c4f56a [formerly eae5c3e75061566e40194730c2cfb2003d952e62]]
Former-commit-id: 2059fc9c0e
Former-commit-id: 0df4af413b
|
2014-05-22 14:05:06 -05:00 |
|
Ron Anderson
|
0d54a37b6c
|
Issue #3194 Fix GeoTIFF import
Change-Id: I465296c8a67a49f8f0680b34025b71ae4986c84a
Former-commit-id: 52931af5ce [formerly 52931af5ce [formerly 8082b27e6e7e0a0be372abb40b62c0a0224ee49c]]
Former-commit-id: 2a680b73ea
Former-commit-id: b7338080e2
|
2014-05-22 09:53:47 -05:00 |
|
Matthew Howard
|
eb700ea256
|
Merge "ASM #256 Can't see model data for neighboring sites in ISC mode w/o toggling button" into asm_14.3.1
Former-commit-id: 95b9746871 [formerly 95b9746871 [formerly 5893d06b990cec295338595b006a45bb762b4b73]]
Former-commit-id: e17f8a0082
Former-commit-id: 725fff1b13
|
2014-05-22 07:50:50 -05:00 |
|
Zhidong.Hao
|
17a525443c
|
ASM #256 Can't see model data for neighboring sites in ISC mode w/o toggling button
Change-Id: I764436168339ce46ab01b27c9078455e6a543176
Former-commit-id: bcdb0dba95 [formerly bcdb0dba95 [formerly d4be1e866c561717a9a7697b3ff451efdd184fe6]]
Former-commit-id: 77ac5458d0
Former-commit-id: a65061a58f
|
2014-05-21 09:15:41 -04:00 |
|
Brian.Dyke
|
f42d40c3a3
|
Merge branch 'master_14.2.1' into master_14.2.2 CM-MERGE:OB14.2.1-25,-26,-27,-28 into 14.2.2
Conflicts:
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/PolygonUtil.java
Former-commit-id: 2fd18d14d6 [formerly 2fd18d14d6 [formerly ed430b59789d9a00e20bdaadc8d55b92a4a4064b]]
Former-commit-id: db68b80bbd
Former-commit-id: ebcaebb28d
|
2014-05-20 14:35:34 -04:00 |
|
Ron Anderson
|
3f20fc86df
|
Issue #3069 Fix contour tool issues caused by GeoTools 10.5 update
Change-Id: I4d1bedc67059f0c9fdec3f7a5d2938869c12c465
Former-commit-id: 3b404f4083 [formerly 3b404f4083 [formerly b10be8ae235c4528c4ce83088daeccf8a0928933]]
Former-commit-id: 809548b283
Former-commit-id: 029201d4b9
|
2014-05-20 11:10:26 -05:00 |
|
Brian.Dyke
|
39d8bd9004
|
Merge branch 'master_14.1.2' into master_14.2.1 CM-MERGE:OB14.1.2-6,-7 into 14.2.1
Former-commit-id: dbd3bb54e8 [formerly dbd3bb54e8 [formerly 19032f03b1d2166f4afd936bb2b56e0b4851d9f4]]
Former-commit-id: d5a4669fc4
Former-commit-id: f30bd7d9ae
|
2014-05-19 14:07:04 -04:00 |
|
Brian.Dyke
|
c88e8d41b6
|
CM-MERGE:OB13.5.5-8 into 14.1.2
Former-commit-id: b29db01a59 [formerly b29db01a59 [formerly 8d67230c49c6a7a1aa9a1f94996de8b6c0c01470]]
Former-commit-id: 06c2478539
Former-commit-id: 9baa09f4bc
|
2014-05-19 13:26:45 -04:00 |
|
Gang.Zhang
|
b82d8bf6fb
|
ASM #95 - Fix 0.0 for NO DATA Issue caused failed back.
Change-Id: Ia27f4061f11c9d6ffe04b0c2888e429824427dac
Former-commit-id: 94fea6748f [formerly 94fea6748f [formerly 5880dcd0b727c3d473873b8382ace78955ab800b]]
Former-commit-id: 9c1587b92d
Former-commit-id: baa1546e39
|
2014-05-19 15:40:41 +01:00 |
|
brian.dyke
|
b42011fc76
|
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: 011d121e4b [formerly 011d121e4b [formerly 52358cb3e2ba2c7ff4ff9c9a5de03af50c3a1199]]
Former-commit-id: 58683ad040
Former-commit-id: bc4649765a
|
2014-05-19 09:45:37 -04:00 |
|
Brian.Dyke
|
acf4cbbd78
|
CM-MERGE:OB13.5.5-7 into 14.1.2
Former-commit-id: f8ed9c7944 [formerly f8ed9c7944 [formerly 3595e9c0962e9ef4ea987da3c52fdaf8b9b68114]]
Former-commit-id: e9bd17a21f
Former-commit-id: 409a48b907
|
2014-05-19 07:55:42 -04:00 |
|
Brian.Dyke
|
f87775928f
|
Merge branch 'master_14.2.1' into master_14.2.2 CM-MERGE:OB14.2.1-24 into 14.2.2
Conflicts:
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/text/AbstractLockingBehavior.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/text/ICommonPatterns.java
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java
edexOsgi/com.raytheon.edex.plugin.warning/src/com/raytheon/edex/plugin/warning/gis/GeospatialDataGenerator.java
rpms/awips2.core/Installer.ldm/component.spec
Former-commit-id: 627541512d [formerly 627541512d [formerly f7d6bee49c5777e5d63c724eba1242a1baf153ac]]
Former-commit-id: d3fa10028c
Former-commit-id: 68f3a0169e
|
2014-05-14 16:08:16 -04:00 |
|
Qinglu.Lin
|
42c5ce2aff
|
ASM #556 - WarnGen: use noon/midnight instead of 1200 PM/1200 AM
Change-Id: I31cc6fe46fff0f9246585ddbf84b2f94b3d8c22c
Former-commit-id: 75c4b15e8e [formerly 75c4b15e8e [formerly 763641d787f7f8c79bf28456314dcc16786702ed]]
Former-commit-id: c5097660c2
Former-commit-id: 89fa05128e
|
2014-05-14 15:30:16 -04:00 |
|
Bryan Kowal
|
4e3afb78fc
|
Issue #3159 - rebuild with newer gridslice source
Change-Id: I78c2337af37289b8e1190b142778006dfbdb6ebc
Former-commit-id: 3535340136 [formerly 3535340136 [formerly 2b13221d7c644147f6eda1acb8b126667be00926]]
Former-commit-id: 8d5326cc1b
Former-commit-id: 43eddea171
|
2014-05-13 14:43:04 -05:00 |
|
Brian.Dyke
|
3b7a2f1645
|
Merge branch 'merge_resolutions' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.2.1 CM-MERGE:OB14.1.2-4 into 14.2.1
Former-commit-id: e95bc87a19 [formerly e95bc87a19 [formerly 019c1405290753ed47cecd9a0bb26c220d78d010]]
Former-commit-id: fb4c7e55b3
Former-commit-id: 0311366ffb
|
2014-05-13 11:23:55 -04:00 |
|
Matthew Howard
|
56778b394b
|
Merge "ASM #509 GFE: Product editor still auto-wraps when the option is turned off" into asm_14.3.1
Former-commit-id: 5a20085f32 [formerly 5a20085f32 [formerly 2052df4ca5f68165b477994b21357c245ff73546]]
Former-commit-id: 576a2d63ec
Former-commit-id: 1026f04671
|
2014-05-13 07:49:18 -05:00 |
|
Steve Harris
|
74a325ce74
|
Merge branch 'master_14.1.2' (-4) into master_14.2.1 (-23)
Conflicts:
cave/com.raytheon.uf.viz.d2d.core/src/com/raytheon/uf/viz/d2d/core/time/D2DTimeMatcher.java
cave/com.raytheon.uf.viz.d2d.core/src/com/raytheon/uf/viz/d2d/core/time/TimeMatcher.java
edexOsgi/com.raytheon.edex.plugin.shef/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.edex.plugin.warning/src/com/raytheon/edex/plugin/warning/gis/GeospatialDataGenerator.java
edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/config/DialogConfiguration.java
edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/config/WarngenConfiguration.java
tests/.classpath
tests/unit/com/raytheon/edex/plugin/shef/TestM2SOptions.java
tests/unit/com/raytheon/edex/plugin/shef/TestMetarToShefTransformer.java
Former-commit-id: cf62cf4a6e [formerly cf62cf4a6e [formerly a830db2a282e6a29d119fc0d3357c2223c48d175]]
Former-commit-id: fc2bf6b45c
Former-commit-id: 233922471a
|
2014-05-12 16:13:19 -05:00 |
|
Zhidong.Hao
|
6dd1289c31
|
ASM #509 GFE: Product editor still auto-wraps when the option is turned off
Change-Id: Ibbd86588d2c7dd6a451803e03d6744c8471652f4
Former-commit-id: d6cae51207 [formerly d6cae51207 [formerly a48b81894fed165aba58a0097359bbd0f1931be5]]
Former-commit-id: 030b767299
Former-commit-id: 88c5e2d94c
|
2014-05-12 15:16:38 -04:00 |
|
Juliya Dynina
|
ce9120be90
|
Merge "ASM #527 update revision and shef_qual_code" into asm_14.3.1
Former-commit-id: 107b64a544 [formerly 107b64a544 [formerly 0c54c56efa1306d781d64621ccf7f62b3bf70997]]
Former-commit-id: e33a27684c
Former-commit-id: a0b2051e7e
|
2014-05-12 14:01:40 -05:00 |
|
Juliya Dynina
|
b65a50fd3e
|
Merge "ASM #526 - Duration menu disabled after creating text for a COR SVS." into asm_14.3.1
Former-commit-id: d7bea845fe [formerly d7bea845fe [formerly 350448988d24fd2eb58812128b062e3a0f44b956]]
Former-commit-id: 4f7fa8a8de
Former-commit-id: 190bf23ba8
|
2014-05-12 14:01:07 -05:00 |
|
Ana Rivera
|
8cb1bfc3b8
|
VLab Issue #3648 - DR_16999 Display ESTOFS Model Data; closes #3648
Change-Id: Ieea41d201e94b4486cce0c4ec70a2c02b65838f1
Former-commit-id: 91715e7a3f [formerly 91715e7a3f [formerly e71ef5db23122405fc6aab71526a9cc3ec3ad823]]
Former-commit-id: 81a9d4fa44
Former-commit-id: 88520fc206
|
2014-05-12 18:55:06 +00:00 |
|
Matthew Howard
|
db59b081af
|
Merge "ASM #537 AvnFPS: Syntax failed to flag format error" into asm_14.3.1
Former-commit-id: b807c877f4 [formerly b807c877f4 [formerly 5afd4dab62eb48b65bb3f5b49d59444f1d52a23f]]
Former-commit-id: 0dc1db0072
Former-commit-id: da9b3dd158
|
2014-05-12 13:52:12 -05:00 |
|
Loubna.Bousaidi
|
c9d2ccb5ff
|
ASM #527 update revision and shef_qual_code
Change-Id: I36fa41796350e8fcae6bcc0101120331188bbeff
Former-commit-id: ec5bd7a2bb [formerly ec5bd7a2bb [formerly 860ea4b3644a526ac10b4366f158824fe6cbdcb0]]
Former-commit-id: d3be6d0476
Former-commit-id: 6f335c71fe
|
2014-05-12 18:42:12 +00:00 |
|
Zhidong.Hao
|
b1c20f92c1
|
ASM #537 AvnFPS: Syntax failed to flag format error
Change-Id: Ib7127a83f98a6978d7fc099cdc4fdc4fd8a0fe2b
Former-commit-id: 8d560036b1 [formerly 8d560036b1 [formerly 62f8c0ab0e046fd4365bd37394f93e8bca4e642d]]
Former-commit-id: 074713bb4a
Former-commit-id: 51680a6d04
|
2014-05-12 14:33:25 -04:00 |
|
Brian.Dyke
|
82663c0ab6
|
CM-MERGE:OB13.5.5-5 into 14.1.2
Former-commit-id: 386ec058e1 [formerly 386ec058e1 [formerly 3b0df2482b87ba9d37dd32d50e8e1fc3b3ae55e3]]
Former-commit-id: 41ba5fc348
Former-commit-id: 2f704c898d
|
2014-05-12 14:07:11 -04:00 |
|
Matthew Howard
|
aeef207dff
|
Merge "ASM #508 - Fix DialogAreaComposite for sizing and accessibility of controls" into asm_14.3.1
Former-commit-id: d40d9931db [formerly d40d9931db [formerly 59fb75bdc025a3b2feb95d20d263060b55e87b28]]
Former-commit-id: 42cce01396
Former-commit-id: a4827323e6
|
2014-05-12 13:00:55 -05:00 |
|
Rici.Yu
|
be10c8d49c
|
ASM #508 - Fix DialogAreaComposite for sizing and accessibility of controls
Change-Id: I53291acaa40c5bba926b31937674b1ece5864127
Former-commit-id: 2ea1c1fa60 [formerly 2ea1c1fa60 [formerly df46f9fc541a47e5f31210663ef69c4c5863fa28]]
Former-commit-id: 96d1555012
Former-commit-id: 473496b99a
|
2014-05-12 13:38:04 -04:00 |
|
Bryan Kowal
|
31d2290415
|
Issue #3026 - remove unnecessary hpe ffmp dependency
Former-commit-id: 6e6a6a73ee [formerly 6e6a6a73ee [formerly c94c973ef6a663f93a6b1a6301f5553d4e88ac73]]
Former-commit-id: faa6b09ac9
Former-commit-id: 5f5987f57b
|
2014-05-12 11:46:35 -05:00 |
|
Michael Gamazaychikov
|
14440818e7
|
ASM #526 - Duration menu disabled after creating text for a COR SVS.
Change-Id: I360935bb87b5b95e9814f0f70da7cfe2d70d958c
Former-commit-id: 4f541a5460 [formerly 4f541a5460 [formerly 988d5f26d3bd3e42397f62288a8c9b10e341495b]]
Former-commit-id: 8a9c7ecb11
Former-commit-id: 447eca7802
|
2014-05-12 13:33:58 +01:00 |
|
Lee Venable
|
d23ba206c9
|
Merge "Issue #3145 - Fix Scan threat labels, dispose font" into omaha_14.3.1
Former-commit-id: 364f0d877a [formerly 364f0d877a [formerly 06b3cb4dd8f07600e6513a15a2495b485b0812b6]]
Former-commit-id: e3c6407be3
Former-commit-id: b06e8e6e3e
|
2014-05-09 11:14:51 -05:00 |
|
Juliya Dynina
|
8c0412111a
|
Merge "ASM #526 - Duration menu disabled after creating text for a COR SVS." into asm_14.3.1
Former-commit-id: dd13f453e6 [formerly dd13f453e6 [formerly 789fffccf3389143a1660a477301cfcb43a82890]]
Former-commit-id: 963a58ebba
Former-commit-id: 267244d378
|
2014-05-09 11:08:12 -05:00 |
|
Mike Duff
|
32f6ad40ec
|
Issue #3145 - Fix Scan threat labels, dispose font
Change-Id: I385e184d81a021a350c7df7ee4948ad7e407784d
Former-commit-id: 03356dd554 [formerly 03356dd554 [formerly 84bd0800b2652b31c06015fa49f816f1402f461d]]
Former-commit-id: a81569849b
Former-commit-id: 4ec26b6e31
|
2014-05-09 10:32:04 -05:00 |
|
Nate Jensen
|
191d3a0d06
|
Merge "Issue #3026 - feature.xml fix" into omaha_14.3.1
Former-commit-id: 575360192a [formerly 575360192a [formerly 25e500435693940e378df086739fce8eefdba3bb]]
Former-commit-id: e8c4279d10
Former-commit-id: 95ca77688a
|
2014-05-09 09:53:25 -05:00 |
|
Mike Duff
|
25638a5b40
|
Issue #3026 - feature.xml fix
Change-Id: I07d5043a8c968fa841f4e94eee47617e018ea794
Former-commit-id: 78f2a26903 [formerly 78f2a26903 [formerly a44e412190741fcb0a91dd451ae538277ae0d79f]]
Former-commit-id: 038b2b7500
Former-commit-id: c7f5379b78
|
2014-05-09 09:27:10 -05:00 |
|
Ben Steffensmeier
|
2b4d783fd7
|
Issue #2920 Fix default color of BOXED text.
Former-commit-id: 87ea43cf0d [formerly 87ea43cf0d [formerly 59f12cd4cc60f0908c106cbc0572d3f84d0d509b]]
Former-commit-id: 9d4c33ba91
Former-commit-id: 199a2df79e
|
2014-05-08 18:18:08 -05:00 |
|
Ana Rivera
|
c150a7c8e1
|
VLab Issue #3617 - DCS_266 Ingest & Display HRRR Model Data
Change-Id: Ic43d3a3f51d70cd41ef8e34ccde9d1f5aee3007b
Former-commit-id: aac45623bc [formerly aac45623bc [formerly c5a4f22a24b6c1eced689c6ae437558a9a6cbc9e]]
Former-commit-id: 1b4450ec5f
Former-commit-id: 6a4fb7f0a3
|
2014-05-08 20:10:24 +00:00 |
|
Mike Duff
|
1dc95cf8de
|
Issue #3026 - NullPointer fix, test classpath fix
Change-Id: Iabc347e51a276fd4c8beb3fd512d928f184767f1
Former-commit-id: b23473ee8a [formerly b23473ee8a [formerly 8e70b7ae1eef7a18ddffa6d6c88d10bdd0043bcc]]
Former-commit-id: 335c02d2c6
Former-commit-id: 16a973372e
|
2014-05-08 15:02:54 -05:00 |
|