Steve Harris
1f24080b8e
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: a4825f4b272c49d14c12a4825f4b272c49d14c12048d3748b7048d3748b7005e5b4ee24ed44b6e7295462b4f80
2014-05-28 07:41:42 -05:00
Nate Jensen
caf433d525
Omaha #3133 Removed dead hydro code and related dependencies
...
Change-Id: I15daffddd4219541cac44b2d5930a69e1e864e6a
Former-commit-id: a984e7ac9a514c9d3a0ca984e7ac9a514c9d3a0c67ac5fa24267ac5fa242a25a8b69ebc2f78a688811899e65e2
2014-05-27 18:23:38 -05:00
Steve Harris
172cca39d9
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: 3de24b7b0799bc6f990c3de24b7b0799bc6f990c3b16bbafb13b16bbafb1bfa4255eea9b98b41cd4144354c369
2014-05-27 14:48:24 -04:00
Slav Korolev
bcc5a458b3
Omaha #3086 - Replaced three separate area configuration managers with one FSSObsMonitorConfigurationManager.
...
Former-commit-id: adba0cd20ae3fe3c9736adba0cd20ae3fe3c973681033087ea81033087ea55b01dce6d4a8e7fc38eced313a7f1
2014-05-27 12:24:50 -04:00
Brian Clements
d75008101f
Omaha #3206 added version to servlet api in cave feature
...
without this, the build prefers the javax.servlet in the target platform
Change-Id: Ic98a49f8a0dff09d0af42da1e69dd650f4fd9a80
Former-commit-id: f0e8bf76a96f76a9a328f0e8bf76a96f76a9a3282fd2b5aa162fd2b5aa16170e3644f2af8a6806f0e88d9a2e8c
2014-05-23 17:04:49 -05:00
Nate Jensen
25e4982cb3
Merge "Omaha #3206 edex changes related to new javax.serlvet FOSS project" into omaha_14.4.1
...
Former-commit-id: 730831d4658f6dcfaa1b730831d4658f6dcfaa1bb67bf1e492b67bf1e49276a2766ed4935086d60edcfd7a07eb
2014-05-22 16:46:50 -05:00
Kenneth Sperow
386365e3cb
Merge remote branch 'origin/master_14.3.1' into field_14.3.1_merge Merge up to b803dd72d5fdfacc2e43bec18b5e83d6208a667d [formerly 342398e6a3] [formerly 476c78a2d7 [formerly 189e3cc1f2] [formerly 476c78a2d7 [formerly 189e3cc1f2] [formerly 342398e6a3 [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: 6f8b069dbe8490f7ea336f8b069dbe8490f7ea339fa9425aea9fa9425aea7302462544846395fd4251b0b4e566
2014-05-22 14:16:49 -07:00
Steve Harris
e30dfd21ee
Merge branch 'omaha_14.3.1' into omaha_14.4.1
...
Conflicts:
cave/com.raytheon.viz.core.gl/META-INF/MANIFEST.MF
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/dialogs/colordialog/ColorBar.java
cots/org.geotools/.classpath
cots/org.geotools/META-INF/MANIFEST.MF
cots/org.geotools/build.properties
edexOsgi/com.raytheon.edex.common/META-INF/MANIFEST.MF
edexOsgi/com.raytheon.edex.plugin.obs/src/com/raytheon/edex/plugin/obs/metar/MetarDecoder.java
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/GH.xml
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/RH.xml
edexOsgi/com.raytheon.uf.common.style/src/com/raytheon/uf/common/style/level/Level.java
edexOsgi/com.raytheon.uf.common.topo/src/com/raytheon/uf/common/topo/TopoQuery.java
edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/context/ContextManager.java
Former-commit-id: 376482d3b1518822ed83376482d3b1518822ed83b6af2db9f5b6af2db9f51dfc15a77e14b1ea307fd226dfb021
2014-05-22 14:31:06 -05:00
Brian Clements
67376b444a
Omaha #3206 edex changes related to new javax.serlvet FOSS project
...
Former-commit-id: 0a2ddfbc79f9de79465a0a2ddfbc79f9de79465ac875f17719c875f1771953de96dd53fd9f98b2bae7730e2219
2014-05-22 14:09:07 -05:00
Steve Harris
5aca60f422
Merge branch 'master_14.3.1' (14.3.1-5) into omaha_14.3.1
...
Former-commit-id: 0a3b23d0554899c4f56a0a3b23d0554899c4f56a2059fc9c0e2059fc9c0e805aae1a700df4af413be7e48b2abb
2014-05-22 14:05:06 -05:00
brian.dyke
974b796441
Merge branch 'master_14.2.2' into asm_14.2.2
...
Former-commit-id: f405e8c89c562f53874af405e8c89c562f53874af74b1707f9f74b1707f9ab985767bd69a4d1e3b940660547cf
2014-05-22 12:46:56 -04:00
Ron Anderson
307f61e609
Issue #3194 Fix GeoTIFF import
...
Change-Id: I465296c8a67a49f8f0680b34025b71ae4986c84a
Former-commit-id: a8ba16fc9352931af5cea8ba16fc9352931af5ce2a680b73ea2a680b73ea8f0eb1fd10b7338080e20d54a37b6c
2014-05-22 09:53:47 -05:00
Matthew Howard
bcae526dc8
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: 00e44aada995b974687100e44aada995b9746871e17f8a0082e17f8a008256a231e0b0725fff1b13eb700ea256
2014-05-22 07:50:50 -05:00
Michael Gamazaychikov
0217549622
ASM #114 - Problem with Distance Speed Tool (merge with 13.5.4 changes).
...
Change-Id: Ic4d6f50c28d0aba440a02010b09b2e3b3117fe85
Former-commit-id: 8ae5d535de63409ef2728ae5d535de63409ef2725bff9f2ac85bff9f2ac80d38d04dad134f48606955d44735ef
2014-05-21 15:12:08 +01:00
Zhidong.Hao
1b25474707
ASM #256 Can't see model data for neighboring sites in ISC mode w/o toggling button
...
Change-Id: I764436168339ce46ab01b27c9078455e6a543176
Former-commit-id: 2773af6884bcdb0dba952773af6884bcdb0dba9577ac5458d077ac5458d0b529afd928a65061a58f17a525443c
2014-05-21 09:15:41 -04:00
Richard Peter
680a584473
Merge "Omaha #2536 merged edex.textdb into text plugins" into omaha_14.4.1
...
Former-commit-id: dcaedf5d43db4c6c8c22dcaedf5d43db4c6c8c22f19fda01adf19fda01ad9faf57cf6802b136759b79a88d24ef
2014-05-20 17:14:29 -05:00
Brian Clements
ebc9bfa351
Omaha #2536 merged edex.textdb into text plugins
...
Former-commit-id: c55124bcc75b5295e5adc55124bcc75b5295e5adda7d5888b0da7d5888b0e4bb70cbe9003917f0ed30fb567666
2014-05-20 16:07:20 -05:00
Richard Peter
6bccbaccd1
Merge "Omaha #3002 Moved common taf code to com.raytheon.uf.common.dataplugin.taf." into omaha_14.4.1
...
Former-commit-id: ab3a7a280413ac6e8337ab3a7a280413ac6e83372d4d89b3f02d4d89b3f03264e7bd930b8c3e67a1580dd1ed1d
2014-05-20 14:56:44 -05:00
Nate Jensen
9d1afa6876
Merge "Omaha #3172 fixed ui filtering for contacts and sessions" into omaha_14.4.1
...
Former-commit-id: 77c77c6b8f1e408e701777c77c6b8f1e408e7017966cf1f96f966cf1f96feb086ff46188aa9471e195ed06119c
2014-05-20 14:51:05 -05:00
Brad Gonzales
26953a7864
Omaha #3002 Moved common taf code to com.raytheon.uf.common.dataplugin.taf.
...
Amend: updated manifest.
Removed static imports.
Refactored String constants to Pattern constants in TafConstants.
Refactored com.raytheon.edex.plugin.taf to com.raytheon.uf.edex.taf.
Renamed com.raytheon.edex.plugin.taf project to com.raytheon.uf.edex.taf.
fixed .project. Updated yet more Patterns.
Change-Id: Ia5db9d185c6c32e6ce25748ae4b3b6fb389b2acc
Former-commit-id: c4890beb966b0e578fc1c4890beb966b0e578fc1e560ce4880e560ce48806825727400e2412ecb43fea1c9febe
2014-05-20 14:13:18 -05:00
Ben Steffensmeier
58e5704651
Omaha #2913 Remove dead code using JAI
...
Former-commit-id: 59a108822ed5d3f5605a59a108822ed5d3f5605ad48333444cd48333444ca56f47507698ad1b079e4b940cb599
2014-05-20 13:36:15 -05:00
Brian.Dyke
b0b377e811
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: 822ad181bf2fd18d14d6822ad181bf2fd18d14d6db68b80bbddb68b80bbd937b9bb9ceebcaebb28df42d40c3a3
2014-05-20 14:35:34 -04:00
Ron Anderson
31da20ef5b
Issue #3069 Fix contour tool issues caused by GeoTools 10.5 update
...
Change-Id: I4d1bedc67059f0c9fdec3f7a5d2938869c12c465
Former-commit-id: b794dd04e13b404f4083b794dd04e13b404f4083809548b283809548b283fd6e80dd27029201d4b93f20fc86df
2014-05-20 11:10:26 -05:00
Brian Clements
f0ce9a6ca8
Omaha #3172 fixed ui filtering for contacts and sessions
...
Former-commit-id: 455af3612fb774503931455af3612fb7745039318dce7e9b858dce7e9b85c4447fc6c44078bbaa63213aab834f
2014-05-20 11:04:57 -05:00
Nate Jensen
508d1a8224
Merge "Omaha #3180 fixed inviting strangers and multiple users in collaboration" into omaha_14.4.1
...
Former-commit-id: f3f64b1e5a8d7125544bf3f64b1e5a8d7125544beff69410ebeff69410ebcc8ba319817def9ead8e1b18fd4584
2014-05-19 16:21:37 -05:00
Richard Peter
69fea4c8b3
Merge "Omaha #3091 Remove the use of aviationForecastConfig.xml file and only using OUP." into omaha_14.4.1
...
Former-commit-id: 80a5f2fc1b40b7623c8780a5f2fc1b40b7623c8787da8bd95287da8bd952c799f78f5d8baf8972971776389eb7
2014-05-19 16:07:51 -05:00
Brian Clements
008c911f03
Omaha #3180 fixed inviting strangers and multiple users in collaboration
...
can now invite users to session from search dialog
fixed bug where only first person in selection would be invited
Former-commit-id: b5e961d6b40e18d45bdfb5e961d6b40e18d45bdf573ffcb0bf573ffcb0bf6769aff618e4433c5e103c6a10e154
2014-05-19 15:54:36 -05:00
Ben Steffensmeier
eeebf5ae7b
Omaha #3133 remove topo from alertviz feature.
...
Former-commit-id: c4f9bab99924b879764fc4f9bab99924b879764f31c323151c31c323151c87118964b168aba0cdd50e0229c560
2014-05-19 14:21:23 -05:00
Nate Jensen
80b9e5ee6b
Merge "Omaha #3163 Remove references to deprecated grpahics API from collaboration so it does not break if old API is removed from ufcore." into omaha_14.4.1
...
Former-commit-id: 9996d6731776bfba59459996d6731776bfba594594d032dbc494d032dbc46fb3e37a2965ecb7e926423bf2f21f
2014-05-19 13:36:26 -05:00
Brian.Dyke
3d35be33cb
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: c4b7b8dd74dbd3bb54e8c4b7b8dd74dbd3bb54e8d5a4669fc4d5a4669fc4f2885c9996f30bd7d9ae39d8bd9004
2014-05-19 14:07:04 -04:00
Brian.Dyke
b65a3a3214
CM-MERGE:OB13.5.5-8 into 14.1.2
...
Former-commit-id: 2eae2be646b29db01a592eae2be646b29db01a5906c247853906c24785393558d8f1629baa09f4bcc88e8d41b6
2014-05-19 13:26:45 -04:00
Richard Peter
8a71079141
Merge "Omaha #2536 merged uf.edex.textdbsrv into text plugins" into omaha_14.4.1
...
Former-commit-id: 1e9c2b27b60f9015e8241e9c2b27b60f9015e8240480bfa4780480bfa478f3e7d16402802a043085fa926cd515
2014-05-19 12:12:05 -05:00
Nate Jensen
b7f846ac6d
Merge "Omaha #3163 Add support for reading colored text styles from future versions of collaboration." into omaha_14.4.1
...
Former-commit-id: b93e410f60cb6ef0e9a3b93e410f60cb6ef0e9a3d79ef53ad0d79ef53ad0c5d944c52f8a31eaf6e10bc127a4e9
2014-05-19 11:46:10 -05:00
Brian Clements
de232ae55c
Omaha #2536 merged uf.edex.textdbsrv into text plugins
...
split into uf.common.dataplugin.text and uf.edex.plugin.text
Former-commit-id: 4d40a98ad7a06d332ff44d40a98ad7a06d332ff42f5cffbe152f5cffbe157761b741128ddae2fc54f61d1ac976
2014-05-19 10:53:37 -05:00
Ben Steffensmeier
c85c8b6283
Omaha #3164 Disable thin client request compression when it doesn't work.
...
Former-commit-id: d697592de2ccf53a4c99d697592de2ccf53a4c9925f901a10225f901a1029ddc32ee057f46683fb092f4c86dac
2014-05-19 10:40:50 -05:00
Gang.Zhang
7cd2402325
ASM #95 - Fix 0.0 for NO DATA Issue caused failed back.
...
Change-Id: Ia27f4061f11c9d6ffe04b0c2888e429824427dac
Former-commit-id: 6e034005e094fea6748f6e034005e094fea6748f9c1587b92d9c1587b92dec6053c3f7baa1546e39b82d8bf6fb
2014-05-19 15:40:41 +01:00
brian.dyke
b2e3c50ec0
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: 9626317825011d121e4b9626317825011d121e4b58683ad04058683ad0402e105c1d5dbc4649765ab42011fc76
2014-05-19 09:45:37 -04:00
Brian.Dyke
eefa4dbf96
CM-MERGE:OB13.5.5-7 into 14.1.2
...
Former-commit-id: 509616ba6af8ed9c7944509616ba6af8ed9c7944e9bd17a21fe9bd17a21fe563eb3376409a48b907acf4cbbd78
2014-05-19 07:55:42 -04:00
Ben Steffensmeier
eabe045d36
Omaha #3163 Remove all references to WORD_WRAP in A2 plugins.
...
Former-commit-id: 6a3d5f869e885448b04d6a3d5f869e885448b04da52718783aa52718783a5607277ae268244ce2d7405e99e4ce
2014-05-16 14:40:50 -05:00
Ben Steffensmeier
c347188e0a
Omaha #3163 Remove references to deprecated grpahics API from collaboration so it does not break if old API is removed from ufcore.
...
Former-commit-id: 01379cd329748ecc5fac01379cd329748ecc5fac8446ace1498446ace1492e88a0b80082d9c403d2353b7c4090
2014-05-16 13:36:31 -05:00
Ben Steffensmeier
3ade0c85eb
Omaha #3163 Add support for reading colored text styles from future versions of collaboration.
...
Former-commit-id: 08f7d7b8dd67e68732d608f7d7b8dd67e68732d679ef4a530179ef4a5301fcbd4cc9ee126f47f725e38c19dd1d
2014-05-16 12:50:48 -05:00
Nate Jensen
126af61500
Omaha #3133 attempt to fix build
...
Change-Id: Ib6668229987cb136c16fb57128becb1624e0b212
Former-commit-id: 7cfbc3d06c6240667b0f7cfbc3d06c6240667b0f11c580549a11c580549ad0fc6945fd94c289f944cedb413487
2014-05-15 17:02:27 -05:00
Nate Jensen
f0b89d994f
Omaha #3133 remove unused dependencies
...
Change-Id: I9a0ac7d0b15f266ea8818ac0db82067887e59ec6
Former-commit-id: 63b925e17e3db92e6c0b63b925e17e3db92e6c0b1ae82b82db1ae82b82db3f73399ab84731b1057546767a2454
2014-05-15 13:57:55 -05:00
Nate Jensen
cbc5cbfb77
Merge "Omaha #3061 added better checks for when to send invite/session payloads" into omaha_14.4.1
...
Former-commit-id: 7ed74b7242198a63cef87ed74b7242198a63cef82cd5c8cca92cd5c8cca9e0387c077e01a5b4ba1444df43cfa0
2014-05-15 08:36:51 -05:00
Steve Harris
dfc96a2fae
Merge branch 'omaha_14.3.1' into omaha_14.4.1
...
Former-commit-id: 5e6b9943f11a06d186865e6b9943f11a06d18686c83753b4d3c83753b4d33337f2d6d11b709fb6c33e4e9365ca
2014-05-15 08:31:27 -05:00
Brian Clements
cac498a5d4
Omaha #3061 added better checks for when to send invite/session payloads
...
Former-commit-id: ee51a84f50a698d81571ee51a84f50a698d8157101269cd98901269cd989c71459d36e6bf803303e2da28330cb
2014-05-14 17:00:09 -05:00
Richard Peter
29a58d9c6a
Merge "Omaha #2536 moved WMO Header into new common plugin" into omaha_14.4.1
...
Former-commit-id: 02d94c61fb7ae2b1299f02d94c61fb7ae2b1299ff6d1e1012ef6d1e1012e72200f089256d0cd836fe7bc7051df
2014-05-14 16:25:16 -05:00
Brian.Dyke
1d53f6d304
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: f38d0138e6627541512df38d0138e6627541512dd3fa10028cd3fa10028cb0837b490568f3a0169ef87775928f
2014-05-14 16:08:16 -04:00
Qinglu.Lin
603c6a1843
ASM #556 - WarnGen: use noon/midnight instead of 1200 PM/1200 AM
...
Change-Id: I31cc6fe46fff0f9246585ddbf84b2f94b3d8c22c
Former-commit-id: b7d276d00f75c4b15e8eb7d276d00f75c4b15e8ec5097660c2c5097660c2bdae3cdfdf89fa05128e42c5ce2aff
2014-05-14 15:30:16 -04:00
Ben Steffensmeier
1ac0aeacc5
Omaha #2697 Collaboration will no longer use local maps.
...
Former-commit-id: 270e8805cc3e23857dcc270e8805cc3e23857dcc1db137a21e1db137a21efc54a7f697759b1460d4e8813c2f24
2014-05-14 13:53:29 -05:00
