Steve Harris
99bc6f990c
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: 117fa26f537131552bbe51b2c5fe12405a26db32
2014-05-27 14:48:24 -04:00
Slav Korolev
e3fe3c9736
Omaha #3086 - Replaced three separate area configuration managers with one FSSObsMonitorConfigurationManager.
...
Former-commit-id: 14ff7a84235ed8cc95aca488910e7f975a5bd41e
2014-05-27 12:24:50 -04:00
Brian Clements
6f76a9a328
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: d0c7c0ce2bb4a7f7436a7aac1e4c87f7d5af40f2
2014-05-23 17:04:49 -05:00
Nate Jensen
8f6dcfaa1b
Merge "Omaha #3206 edex changes related to new javax.serlvet FOSS project" into omaha_14.4.1
...
Former-commit-id: 34ef84d848c75826d5d8e8dd39316a6f6dcb1a4d
2014-05-22 16:46:50 -05:00
Kenneth Sperow
8490f7ea33
Merge remote branch 'origin/master_14.3.1' into field_14.3.1_merge Merge up to 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: 41ee30cbe04bb6cba695f7480d6b1492aec4219c
2014-05-22 14:16:49 -07:00
Steve Harris
518822ed83
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: f8cb49d46f88b801a682a34a3b7056bde1ab2569
2014-05-22 14:31:06 -05:00
Brian Clements
f9de79465a
Omaha #3206 edex changes related to new javax.serlvet FOSS project
...
Former-commit-id: c042671ecf12a6fa46e35d4954d23492f35b7c76
2014-05-22 14:09:07 -05:00
Steve Harris
4899c4f56a
Merge branch 'master_14.3.1' (14.3.1-5) into omaha_14.3.1
...
Former-commit-id: eae5c3e75061566e40194730c2cfb2003d952e62
2014-05-22 14:05:06 -05:00
brian.dyke
562f53874a
Merge branch 'master_14.2.2' into asm_14.2.2
...
Former-commit-id: 59ff65f9d31cef6549ea8912adceb9ed4c7d11f6
2014-05-22 12:46:56 -04:00
Ron Anderson
52931af5ce
Issue #3194 Fix GeoTIFF import
...
Change-Id: I465296c8a67a49f8f0680b34025b71ae4986c84a
Former-commit-id: 8082b27e6e7e0a0be372abb40b62c0a0224ee49c
2014-05-22 09:53:47 -05:00
Matthew Howard
95b9746871
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: 5893d06b990cec295338595b006a45bb762b4b73
2014-05-22 07:50:50 -05:00
Michael Gamazaychikov
63409ef272
ASM #114 - Problem with Distance Speed Tool (merge with 13.5.4 changes).
...
Change-Id: Ic4d6f50c28d0aba440a02010b09b2e3b3117fe85
Former-commit-id: f3ee76edfd95e9c25eff89d1ecbff9e466b3ca75
2014-05-21 15:12:08 +01:00
Zhidong.Hao
bcdb0dba95
ASM #256 Can't see model data for neighboring sites in ISC mode w/o toggling button
...
Change-Id: I764436168339ce46ab01b27c9078455e6a543176
Former-commit-id: d4be1e866c561717a9a7697b3ff451efdd184fe6
2014-05-21 09:15:41 -04:00
Richard Peter
db4c6c8c22
Merge "Omaha #2536 merged edex.textdb into text plugins" into omaha_14.4.1
...
Former-commit-id: 052144dd9929d852543f4eaf959ca3ccce50c5a2
2014-05-20 17:14:29 -05:00
Brian Clements
5b5295e5ad
Omaha #2536 merged edex.textdb into text plugins
...
Former-commit-id: 5a3e156e6c3307e5e631fd54c86bd1ae337c2f7c
2014-05-20 16:07:20 -05:00
Richard Peter
13ac6e8337
Merge "Omaha #3002 Moved common taf code to com.raytheon.uf.common.dataplugin.taf." into omaha_14.4.1
...
Former-commit-id: 62674d17c73d8fdbbe26916aba7ecac572eca2eb
2014-05-20 14:56:44 -05:00
Nate Jensen
1e408e7017
Merge "Omaha #3172 fixed ui filtering for contacts and sessions" into omaha_14.4.1
...
Former-commit-id: 62054f8f2552058b0b53b79b077a4d7699cb41e9
2014-05-20 14:51:05 -05:00
Brad Gonzales
6b0e578fc1
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: f73ed1c8ee81f3ae1ffdf44ba4726453e7e0b9d2
2014-05-20 14:13:18 -05:00
Ben Steffensmeier
d5d3f5605a
Omaha #2913 Remove dead code using JAI
...
Former-commit-id: 767fc083618827ad06beff9f6728ea9dd42528f6
2014-05-20 13:36:15 -05:00
Brian.Dyke
2fd18d14d6
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: ed430b59789d9a00e20bdaadc8d55b92a4a4064b
2014-05-20 14:35:34 -04:00
Ron Anderson
3b404f4083
Issue #3069 Fix contour tool issues caused by GeoTools 10.5 update
...
Change-Id: I4d1bedc67059f0c9fdec3f7a5d2938869c12c465
Former-commit-id: b10be8ae235c4528c4ce83088daeccf8a0928933
2014-05-20 11:10:26 -05:00
Brian Clements
b774503931
Omaha #3172 fixed ui filtering for contacts and sessions
...
Former-commit-id: 4e6f168df1f957c5eed73a281441a0d4d0d76cdb
2014-05-20 11:04:57 -05:00
Nate Jensen
8d7125544b
Merge "Omaha #3180 fixed inviting strangers and multiple users in collaboration" into omaha_14.4.1
...
Former-commit-id: 3c5d7d4f0cecf0ff0ab17a97a3bff5342bfb9569
2014-05-19 16:21:37 -05:00
Richard Peter
40b7623c87
Merge "Omaha #3091 Remove the use of aviationForecastConfig.xml file and only using OUP." into omaha_14.4.1
...
Former-commit-id: 1f786fd25cab2956c2cc3318a7adbabf6e8c306d
2014-05-19 16:07:51 -05:00
Brian Clements
0e18d45bdf
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: 2509bb6d8c28cb78adc8fd4380d16a0f8f0d8acb
2014-05-19 15:54:36 -05:00
Ben Steffensmeier
24b879764f
Omaha #3133 remove topo from alertviz feature.
...
Former-commit-id: d9ce5c7b78bc3483cd17e8896b9260e2c4f0a807
2014-05-19 14:21:23 -05:00
Nate Jensen
76bfba5945
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: 353d0ddca384a33fe529c0b920595a99c0f40548
2014-05-19 13:36:26 -05:00
Brian.Dyke
dbd3bb54e8
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: 19032f03b1d2166f4afd936bb2b56e0b4851d9f4
2014-05-19 14:07:04 -04:00
Brian.Dyke
b29db01a59
CM-MERGE:OB13.5.5-8 into 14.1.2
...
Former-commit-id: 8d67230c49c6a7a1aa9a1f94996de8b6c0c01470
2014-05-19 13:26:45 -04:00
Richard Peter
0f9015e824
Merge "Omaha #2536 merged uf.edex.textdbsrv into text plugins" into omaha_14.4.1
...
Former-commit-id: 4ca4b10fe7331282d32f0a21549f5e6eadc7e16c
2014-05-19 12:12:05 -05:00
Nate Jensen
cb6ef0e9a3
Merge "Omaha #3163 Add support for reading colored text styles from future versions of collaboration." into omaha_14.4.1
...
Former-commit-id: 6f3d40c96cafe8f0f05d539534607067a2a37776
2014-05-19 11:46:10 -05:00
Brian Clements
a06d332ff4
Omaha #2536 merged uf.edex.textdbsrv into text plugins
...
split into uf.common.dataplugin.text and uf.edex.plugin.text
Former-commit-id: 5f238c51d856984808dee0d2ba62b6a8fbdbd6a1
2014-05-19 10:53:37 -05:00
Ben Steffensmeier
ccf53a4c99
Omaha #3164 Disable thin client request compression when it doesn't work.
...
Former-commit-id: ce132a929437f18f531503701bb09e33261ae4c4
2014-05-19 10:40:50 -05:00
Gang.Zhang
94fea6748f
ASM #95 - Fix 0.0 for NO DATA Issue caused failed back.
...
Change-Id: Ia27f4061f11c9d6ffe04b0c2888e429824427dac
Former-commit-id: 5880dcd0b727c3d473873b8382ace78955ab800b
2014-05-19 15:40:41 +01:00
brian.dyke
011d121e4b
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: 52358cb3e2ba2c7ff4ff9c9a5de03af50c3a1199
2014-05-19 09:45:37 -04:00
Brian.Dyke
f8ed9c7944
CM-MERGE:OB13.5.5-7 into 14.1.2
...
Former-commit-id: 3595e9c0962e9ef4ea987da3c52fdaf8b9b68114
2014-05-19 07:55:42 -04:00
Ben Steffensmeier
885448b04d
Omaha #3163 Remove all references to WORD_WRAP in A2 plugins.
...
Former-commit-id: 8e7fa0cdb864d95c70fe1859d9ef9a1851c0b123
2014-05-16 14:40:50 -05:00
Ben Steffensmeier
748ecc5fac
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: bb8c1130a9da5cdb06590b20d7f5bde9e1d7c812
2014-05-16 13:36:31 -05:00
Ben Steffensmeier
67e68732d6
Omaha #3163 Add support for reading colored text styles from future versions of collaboration.
...
Former-commit-id: 63d4e9f1e2bf95792fa82d101ce59f23e2cbdaf9
2014-05-16 12:50:48 -05:00
Nate Jensen
6240667b0f
Omaha #3133 attempt to fix build
...
Change-Id: Ib6668229987cb136c16fb57128becb1624e0b212
Former-commit-id: 661a24eafe2374970982a137146c77d9ec1a1406
2014-05-15 17:02:27 -05:00
Nate Jensen
3db92e6c0b
Omaha #3133 remove unused dependencies
...
Change-Id: I9a0ac7d0b15f266ea8818ac0db82067887e59ec6
Former-commit-id: 5a00869db4e7467e49e9a632150a8135ea32b569
2014-05-15 13:57:55 -05:00
Nate Jensen
198a63cef8
Merge "Omaha #3061 added better checks for when to send invite/session payloads" into omaha_14.4.1
...
Former-commit-id: b65ddc7f6f3831117ad3c0d517335289cba8ede0
2014-05-15 08:36:51 -05:00
Steve Harris
1a06d18686
Merge branch 'omaha_14.3.1' into omaha_14.4.1
...
Former-commit-id: 5c1f5dbf543c9cd27cf83158308a9ce34d057201
2014-05-15 08:31:27 -05:00
Brian Clements
a698d81571
Omaha #3061 added better checks for when to send invite/session payloads
...
Former-commit-id: 073d3c10ac7c5e9cd6f5e34864ec0261219cbfd5
2014-05-14 17:00:09 -05:00
Richard Peter
7ae2b1299f
Merge "Omaha #2536 moved WMO Header into new common plugin" into omaha_14.4.1
...
Former-commit-id: 1844df3fb769bccb3e5b19722e2fdeaec9c6bbe0
2014-05-14 16:25:16 -05:00
Brian.Dyke
627541512d
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: f7d6bee49c5777e5d63c724eba1242a1baf153ac
2014-05-14 16:08:16 -04:00
Qinglu.Lin
75c4b15e8e
ASM #556 - WarnGen: use noon/midnight instead of 1200 PM/1200 AM
...
Change-Id: I31cc6fe46fff0f9246585ddbf84b2f94b3d8c22c
Former-commit-id: 763641d787f7f8c79bf28456314dcc16786702ed
2014-05-14 15:30:16 -04:00
Ben Steffensmeier
3e23857dcc
Omaha #2697 Collaboration will no longer use local maps.
...
Former-commit-id: 7e10b6d308a3bb17692abaefd9a8e84cc5016621
2014-05-14 13:53:29 -05:00
Brian Clements
2b1c7eaa37
Omaha #2536 moved WMO Header into new common plugin
...
moved WMO time parsing code from TimeTools to WMOTimeParser
Former-commit-id: c2e57be98850284cb01ba921b9dddcadbe66b311
2014-05-14 13:45:09 -05:00
Nate Jensen
68c8238275
Omaha #3133 remove unused uf.common.cache from alertviz feature
...
Change-Id: Ib4a36a727e8b26a708f247e6263518786cc60832
Former-commit-id: e659b393f23e5e999c2b03ddad648f2748ee97e9
2014-05-13 17:52:12 -05:00
