Brian.Dyke
65f8fc89f0
Merge branch 'master_14.2.2' into master_14.2.3
...
Former-commit-id: b1dbaa0b50368f80f220
2014-09-02 15:09:06 -04:00
Qinglu.Lin
b32ea40289
ASM #15551 - WarnGen: only WCN should be used while including TOR/SVR watches in WarnGen products
...
Change-Id: I286bc4cc809fcc9257f72051f1bb74f8acc24c05
Former-commit-id: ae13ea419e2374673f8d
2014-09-02 14:37:19 -04:00
Ron Anderson
c7fbca0298
Issue #3572 Fixed getNumpy errors for Grid2DFloat
...
Change-Id: I6caf979c1d531a842f77d23dbd7f8e0865afecce
Former-commit-id: 434d41288246c62a1db6
2014-09-02 12:21:42 -05:00
Ron Anderson
8d9741bd83
Merge "Omaha #3527 Error occurs when attempting to reset or customize the Localization perspective" into omaha_14.4.1
...
Former-commit-id: aa6835147b6a5d4acf7c
2014-09-02 12:08:44 -05:00
Nate Jensen
3258b9a2b2
Merge "Omaha #3356 fix cave startup" into omaha_14.4.1
...
Former-commit-id: 653d5943825247f4833f
2014-09-02 10:14:08 -05:00
Nate Jensen
e673ed62bd
Merge "Omaha #3569 Split Volume Browser planes menus into multiple reusable components." into omaha_14.4.1
...
Former-commit-id: fe457e89a72c209af1fa
2014-09-02 09:53:25 -05:00
Nate Jensen
3efe4cf3b0
Merge "Omaha #3459 Ensure font is initialized before queryJob runs, Additional refactoring to someday allow ZoneSelectorResource to use more common code." into omaha_14.4.1
...
Former-commit-id: 13f1a5a8abc4333e030c
2014-09-02 09:52:38 -05:00
Nate Jensen
9bf9e3a658
Omaha #3356 fix cave startup
...
Change-Id: Id05d1439ba4f3b5064887b46256f4ade4523f595
Former-commit-id: ef99d434514395ab6f11
2014-09-02 09:50:08 -05:00
Richard Peter
5db143cd92
Merge "Omaha #3567 Merge conflict VbSources.xml changes placed in volume.xml." into omaha_14.4.1
...
Former-commit-id: 40917b61186f66071eca
2014-09-02 09:23:58 -05:00
Steve Harris
f7e39c9d6f
Merge branch 'master_14.2.4' (14.2.4-6) into omaha_14.2.4
...
Former-commit-id: e7705c328e3b6a003884
2014-09-02 08:12:49 -05:00
Mark Peters
966879b8a1
Omaha #3527 Error occurs when attempting to reset or customize the Localization perspective
...
Change-Id: Ie029b1aff905b57b5a353e0acf60c5137014c473
Former-commit-id: 045746ec21e35a7451c6
2014-08-29 16:17:22 -05:00
Ben Steffensmeier
9c2c00c71e
Issue #3543 Fix gl datamapping of data with NaN conversions.
...
Former-commit-id: 190893e80722f93b6905
2014-08-29 15:08:03 -05:00
Mark Peters
86b9016338
Omaha #3569 Split Volume Browser planes menus into multiple reusable components.
...
Change-Id: Idb7fa5d1b5cd5a53db38545c942c4c0bae19c3c9
Former-commit-id: 91f2b365a1097ce54969
2014-08-29 15:05:29 -05:00
Kiran.Shrestha
3abf28f856
ASM #506 - TextWS: Unable to save unofficial text products from text editor.
...
Change-Id: I969cd9ddaa9adc83d5e65571fbb4f45ea89002a6
Former-commit-id: d8bd6a9c70a285439c08
2014-08-29 13:50:55 -04:00
Ron Anderson
f3f2ec8843
Omaha #3459 Ensure font is initialized before queryJob runs,
...
Additional refactoring to someday allow ZoneSelectorResource to use more common code.
Change-Id: I87e4d1a16b6086f4241e67bb1058bb096eb5e062
Former-commit-id: de490ea5828583386e5f
2014-08-29 12:04:52 -05:00
Nate Jensen
47261a4ac4
Merge "Omaha #3561 Yet another attempt to fix combinations file updating" into omaha_14.4.1
...
Former-commit-id: c60dfb889c16191b10ab
2014-08-29 11:16:16 -05:00
Steve Harris
f51ceee718
Omaha #3132 - removing duplicated com.raytheon.uf.viz.core
...
Former-commit-id: c49eabbb45aedf89c00b
2014-08-29 11:05:34 -05:00
Ron Anderson
89cde78ea6
Omaha #3561 Yet another attempt to fix combinations file updating
...
Change-Id: I4131ed6043e4bbfa2955024b5e3ce4508734585f
Former-commit-id: 9f37d7914abd52b5a924
2014-08-29 10:45:54 -05:00
Steve Harris
bddf9c0f27
Merge branch 'master_14.3.1' (14.3.1-16) into omaha_14.4.1
...
Conflicts:
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/reflect/BundleReflections.java
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/reflect/BundleRepositoryGetter.java
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/reflect/SubClassLocator.java
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/StormTrackDisplay.java
cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java
cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
edexOsgi/com.raytheon.edex.plugin.binlightning/src/com/raytheon/edex/plugin/binlightning/BinLightningDecoder.java
edexOsgi/com.raytheon.uf.common.comm/src/com/raytheon/uf/common/comm/HttpClient.java
edexOsgi/com.raytheon.uf.tools.cli/impl/capture
ldm/src/pqact/pqact.c
Former-commit-id: 5d58625abc793064063b
2014-08-29 10:17:52 -05:00
Brian.Dyke
cbe59aded5
Merge branch 'master_14.3.1' into asm_14.3.1
...
Former-commit-id: 2c25f684376f3d0508e4
2014-08-29 10:19:02 -04:00
Brian.Dyke
a5519a28d9
Merge branch 'master_14.2.4' into asm_14.2.4
...
Former-commit-id: a2f66c8d9737c926973c
2014-08-29 10:07:14 -04:00
Brian Clements
981390eb22
Issue #3500 moved ProcedureXMLManager initialization to CAVE component subclass
...
Change-Id: Ie8a509a5f5b6b0a358460f0218925458106fd040
Former-commit-id: cfeb16eff8b352bd3944
2014-08-29 08:55:58 -05:00
Juliya Dynina
5f001b7ad7
Merge "ASM #15682 - D-2D: SPC Watches display: Watches do not disappear when expired" into asm_14.2.3
...
Former-commit-id: 58a3df78a8169dc0ba43
2014-08-28 15:52:11 -05:00
Ana Rivera
e033ed5546
VLab Issue #3617 - RMDR_16720 Updates to HRRR DCS_266; fixes #3617
...
Change-Id: I159cbaed918fc48c31d115314e29ad9c2128a7f1
Former-commit-id: 9af77831a6160dabc4d1
2014-08-28 18:38:26 +00:00
Roger Ferrel
15c73be56c
Issue #3553 - Force redisplay of data set table after all labels are generated.
...
Change-Id: Ie8c0195414102d046e5348e778ba8d5e1053e5ec
Former-commit-id: ef5dfb1f936f8c6d6aa1
2014-08-28 13:10:11 -05:00
David Friedman
9c2545ed64
ASM #15682 - D-2D: SPC Watches display: Watches do not disappear when expired
...
Change-Id: I3a29b5b0bb5c75dd5ac5f508391f5806cabf47fa
Former-commit-id: d5c086a022de6e79f9e3
2014-08-28 18:08:23 +00:00
Daniel.Huffman
c3731d5622
ASM #16715 - Reverted and augmented Airports.xml and Fix.xml
...
Change-Id: Icd15e1947ec7d71b22d621b452d9e1c74767898e
Former-commit-id: ca2aa8811bc89a7169b0
2014-08-28 17:20:30 +00:00
steve.naples
4205d83452
ASM #14578 - Added Hydrologic date field ti Choose Hour dialog for Daily QC
...
Change-Id: I954833e37c579ab1eaddf95347ba53d73909b138
Former-commit-id: ff52f1dc0a1856a05319
2014-08-28 16:08:17 +00:00
Ron Anderson
dc185b8dd1
Omaha #3563 Fixed GFE site activation to not regenerate edit areas unnecessarily
...
Change-Id: Ifaa654758e51c64cec552e3c76ee0e3c660a4a34
Former-commit-id: 2b88ade974bb1e80b844
2014-08-28 10:43:54 -05:00
David Friedman
ea1e9feb1d
ASM #15658 - WarnGen: inclusion of watch information in marine products
...
Change-Id: I9f99e6136027f1a6419800f87e5a5709fe5be6b9
Former-commit-id: ea9230b37ca2dfe8e8f6
2014-08-28 15:43:32 +00:00
Brian.Dyke
76bd6575b6
Merge branch 'field_14.2.4' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.2.4
...
Former-commit-id: a24794ca7b47ae6015e5
2014-08-28 11:39:48 -04:00
Nate Jensen
7bf0d7cd2a
Merge "Omaha #3453 Added the spell check dictionary to site level localization." into omaha_14.4.1
...
Former-commit-id: 8536f6681a2710aed225
2014-08-27 16:27:40 -05:00
Roger Ferrel
0147449477
Omaha #3567 Merge conflict VbSources.xml changes placed in volume.xml.
...
Former-commit-id: 9154ef60bbfa42c4069a
2014-08-27 15:06:52 -05:00
Brian.Dyke
a08db8d73d
Merge branch 'master_14.2.4' into master_14.3.1 CM-MERGE:14.2.4-5 into 14.3.1
...
Conflicts:
cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/StormTrackDisplay.java
cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java
cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
edexOsgi/com.raytheon.uf.common.comm/src/com/raytheon/uf/common/comm/HttpClient.java
Former-commit-id: aa83bf804fe654318431
2014-08-27 11:19:19 -04:00
Steve Harris
20c01c75f9
Merge branch 'omaha_14.4.1' into omaha_pda
...
Former-commit-id: 178618e752c82bf0de9b
2014-08-27 09:57:52 -05:00
Nate Jensen
697e1c0b79
Merge "Omaha #3539 reworked link to editor action to avoid recursion warning" into omaha_14.4.1
...
Former-commit-id: 7acf4a04b26fca563d21
2014-08-27 09:54:49 -05:00
Nate Jensen
0edb5fc46c
Merge "Omaha #3356 configure path manager factory before spring initialization" into omaha_14.4.1
...
Former-commit-id: 1ad37de1ef2d1d18b2ff
2014-08-27 09:54:24 -05:00
Brian Clements
a39a997a8d
Omaha #3539 reworked link to editor action to avoid recursion warning
...
Change-Id: Iac2e6194a3ebd5b9c828555cdbd3dc98e0b66c01
Former-commit-id: f871058f67a609334abf
2014-08-26 17:22:20 -05:00
Nate Jensen
f84e89b694
Omaha #3356 configure path manager factory before spring initialization
...
Change-Id: I7a9a1b3aae5292129833b81b535f954cb0681e44
Former-commit-id: fdc4cc60b9dbbf012a34
2014-08-26 16:45:00 -05:00
Steve Harris
8c5026314c
Merge branch 'master_14.3.1' (14.3.1-15) into omaha_14.4.1
...
Conflicts:
cave/com.raytheon.viz.core.gl/src/com/raytheon/viz/core/gl/GLDisposalManager.java
cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java
cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/actions/LoadSerializedXml.java
cave/com.raytheon.viz.ui/src/com/raytheon/viz/ui/perspectives/VizPerspectiveListener.java
cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
edexOsgi/com.raytheon.edex.feature.uframe/feature.xml
edexOsgi/com.raytheon.uf.common.status/src/com/raytheon/uf/common/status/logback/ThreadBasedAppender.java
Former-commit-id: 038b28406699ae9bdc10
2014-08-26 16:25:21 -05:00
Brian.Dyke
3459e1fcbc
Merge branch 'master_14.3.1' into asm_14.3.1
...
Former-commit-id: 175f4e67c1d168e371aa
2014-08-26 15:00:55 -04:00
Nate Jensen
41e6446b49
Merge "Omaha #3368 - removing cave/hydro" into omaha_14.4.1
...
Former-commit-id: b92d94d19d704ebac10a
2014-08-26 13:42:13 -05:00
Brian.Dyke
489fec4b25
Merge branch 'omaha_14.3.1' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.3.1
...
Former-commit-id: b3767167c786f0ed23c1
2014-08-26 13:31:34 -04:00
Daniel.Huffman
e2e132e7a5
ASM #16715 - Reverted and augmented Cities.xml
...
Change-Id: Ib83fab6854b68f11b72ef41104805b3f1431b8f0
Former-commit-id: d1cd90b4878962a069be
2014-08-26 13:30:09 +00:00
Ron Anderson
3ffadac038
Merge "Omaha #3459 Restructured Map resource class hierarchy so DataStoreResource could use common query job" into omaha_14.4.1
...
Former-commit-id: 73fec5c36a753b715493
2014-08-25 16:18:58 -05:00
Nate Jensen
76ca1815ad
Merge "Omaha #3506 Split the VBSources.xml file into multiple files and allow incremental override" into omaha_14.4.1
...
Former-commit-id: 1a48a8190f2516c869d2
2014-08-25 14:14:47 -05:00
Ron Anderson
03173a9fe7
Merge "Issue #3500 back port of loadConfig.py to fix gfe starup issue" into omaha_14.2.4
...
Former-commit-id: 4285719a084e6bbb4be4
2014-08-25 14:04:41 -05:00
Mark Peters
c7486f3952
Omaha #3506 Split the VBSources.xml file into multiple files and allow incremental override
...
Change-Id: Ic4a3a517327944f6c6ef7b20bc1774bca6c39d0e
Former-commit-id: 6634a2df017b37c4d188
2014-08-25 13:50:27 -05:00
Brian Clements
960eb2dc29
Issue #3500 back port of loadConfig.py to fix gfe starup issue
...
Change-Id: I841af0ac81b86e499c0b52dedab64431e7f1ecd7
Former-commit-id: cf671dcda84314f71387
2014-08-25 13:34:36 -05:00
Nate Jensen
0852d804ba
Merge "Issue #3500 remove locking on osgi internals, rework gfe client startup" into omaha_14.2.4
...
Former-commit-id: d66ac296405e46c55a76
2014-08-25 13:12:46 -05:00
