Commit graph

4470 commits

Author SHA1 Message Date
Ben Steffensmeier
bc1f20c899 Merge "Omaha #4388 Use the record fill value in satellite resource." into omaha_15.1.1
Former-commit-id: de2a2619072395bc71d6cac779d9dc6a97f51815
2015-04-15 14:46:02 -05:00
Ben Steffensmeier
60c93552a3 Omaha #4388 Use the record fill value in satellite resource.
Former-commit-id: d13b4cfda688ecec9dfa0563787ff6370c980443
2015-04-15 14:44:49 -05:00
Ben Steffensmeier
c6295db321 Omaha #4399 Update viirs to handle NCC.
Former-commit-id: ccc2036b1671cecc74a8d74b2b916c2ba1ddcb83
2015-04-15 10:54:17 -05:00
Steve Harris
0db5e1ec86 Merge tag 'OB_15.1.1-4' into omaha_15.1.1
15.1.1-4

 Conflicts:
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py


Former-commit-id: 8e57da4bb70fda78c3aaa91add874cd403286939
2015-04-13 12:13:02 -05:00
Fay.Liang
6cd66bff93 Merge tag 'OB_14.4.1-25' into master_15.1.1
This merge includes all changes in 14.4.1-22, -23, -24, and -25

Conflicts:
	cave/com.raytheon.uf.viz.localization.perspective/src/com/raytheon/uf/viz/localization/perspective/view/FileTreeView.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
	edexOsgi/com.raytheon.uf.common.dataplugin.text/utility/common_static/base/mixedCase/mixedCaseProductIds.txt

Former-commit-id: 857d0d89ae214ccf53713f74ef6778ba80c637fe
2015-04-13 13:02:24 -04:00
Jingtao Deng
74d8aa9c25 VLab Issue #7440 - DR17338 Apostrophe in the Hydrobase textfields are not saved; fixes #7440
Change-Id: Ifa008dc2cbdb77a60230a66724dd1a5d56a7c696

Former-commit-id: 6cdfbaba29b9ed4b4130218d765dc59919c1a513
2015-04-13 11:12:46 -04:00
Greg Armendariz
d0711fbd8b Merge "Omaha #4382 Removed use of reg.exe" into omaha_14.4.1
Former-commit-id: 5efaa466dde39e9ac7d29a7a8a1ed3825774bd9d
2015-04-13 09:27:26 -05:00
Steve Harris
b78afa0e72 Merge tag 'OB_14.4.1-24' into omaha_14.4.1
14.4.4-24


Former-commit-id: 11b32bb99084a6162cd0d463800281c7115aef85
2015-04-13 08:56:12 -05:00
David Lovely
3254d34c04 Omaha #4382 Removed use of reg.exe
Former-commit-id: 7138fb04f19bd48cdcd23785f524a52db0e8fdd6
2015-04-13 07:44:16 -05:00
Fay.Liang
88d6e796f5 Merge tag 'OB_14.3.3-5' into master_14.4.1
Merges 14.3.3-3, 14.3.3-4, and 14.3.3-5


Former-commit-id: 66eb429aee1d602cf216f1509e780afdbd1cbd23
2015-04-10 13:49:22 -04:00
Shawn.Hooper
4cf9697067 ASM #17222 - Redbook – SPC 4-8 Day Convective Outlook products display on menu but do not update in redbookFcstMap.xml"
Change-Id: Iac21d5f7a3595f95058a05d2c9c9f5b5a77170be

Former-commit-id: d76e74e667e7847a57c9100cc4007dfc6d22ba06
2015-04-10 13:20:35 -04:00
Fay.Liang
6a9a1daef6 Merge branch 'omaha_14.4.1' of ssh://awips2omaha.com:29418/AWIPS2_baseline into master_14.4.1
Former-commit-id: a9ee3ef4fb625850df26a5a9e9f83e1c24f892d9
2015-04-10 12:13:31 -04:00
Fay.Liang
9a6d44aec1 Merge branch 'asm_14.4.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.4.1
Former-commit-id: c83d031df8ff4087dc62c66026de39220f439dc9
2015-04-10 12:06:08 -04:00
Juliya Dynina
b9a8b432ba Merge "ASM #17215 - CAVE can lockup when volume browser is loaded but no element is selected" into asm_14.4.1
Former-commit-id: 0fc80ad597575a3c43402a347c3260e6ad44e963
2015-04-10 08:46:57 -05:00
David Gillingham
1d2fb3c135 Omaha #4385: add nwpsCG1 model to Volume Browser.
Change-Id: Id069d07c5dfffaf1952042611f35a2221d8d639b

Former-commit-id: 20d76ae4ed226d19ea6ddbb408224ace8519787b
2015-04-09 15:13:48 -05:00
Ron Anderson
404782166f Merge "Omaha #4384: Create Wave and Period derived parameters for nwpsTrkngCG0 model, add them to Volume Browser." into omaha_14.4.1
Former-commit-id: 73f7967f208ba6d9ff40866e6c7b585411bf5385
2015-04-09 15:11:44 -05:00
Matthew Foster
8d56aabf36 VLab Issue #6688 - Baumgardt VB Modifications - Deleted numerous unused files. Added DGEX and HiResW models back to baseFamilies.xml; fixes #6688
Change-Id: Iea8f52d8ba1cf78848dc95bf0792f0f220d4dd08

Former-commit-id: 382e01a6b5b93697efa2016a21cc2cdd1ececc5f
2015-04-09 13:53:58 -05:00
David Gillingham
c01694607f Omaha #4384: Create Wave and Period derived parameters for nwpsTrkngCG0 model, add them to Volume Browser.
Change-Id: I17ebbd913a17e158898a27b83e342f08ade610d6

Former-commit-id: 09d7c45466f2fad8df8142bcbf0ded2e3757ffcb
2015-04-09 13:26:52 -05:00
Brian Clements
cbe0a699fb Omaha #4386 lightning resource updates frames asynchronously
Change-Id: If0b43cb4d53e16d7cec4b4193da8437338957379

Former-commit-id: 9c82bcc5c93dcd30e3c645f673611ac6710c8fab
2015-04-09 10:25:28 -05:00
Ana Rivera
388e4a3d8c Merge branch 'master_15.1.1'(master_15.1.1-2m) into field_15.1.1
Change-Id: If8fdc78136ac00065a7c1f9a3b45e814a58c815e

Former-commit-id: 87043a26d3e1aa32f693ff0f48d4357ac416e6d9
2015-04-09 15:13:54 +00:00
Fay.Liang
3462cc40ea Merge branch 'asm_14.4.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.4.1
Former-commit-id: 2f43c804ce6113b74ea72857fea0c6694ad626fe
2015-04-09 10:43:35 -04:00
Roger Ferrel
e5d09b40ec Omaha #4346 Merge base xml files into base configuration.
Change-Id: I056a4e04cb20625408a7a3e117e0cb0babad4a0d

Former-commit-id: ed292bad0ffffd57fecae3e8d80f125fd948f903
2015-04-09 07:58:33 -05:00
Fay.Liang
5accdbf2e7 Merge branch 'field_15.1.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_15.1.1
Former-commit-id: 3c4a22bf33c9f1147c6ebb263e6102294b33f65f
2015-04-08 12:27:57 -04:00
Fay.Liang
69587e6392 Merge branch 'ohd_15.1.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_15.1.1
Former-commit-id: d7c9aeecd43125529303f37560b9ae76b2934817
2015-04-08 12:26:50 -04:00
Fay.Liang
1579e023ea Merge branch 'asm_15.1.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_15.1.1
Conflicts:
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py

Former-commit-id: 6608975224ad22f454a243c919d498a5a2369e32
2015-04-08 12:24:58 -04:00
Fay.Liang
7349df3d27 Merge branch 'omaha_15.1.1' of ssh://awips2omaha.com:29418/AWIPS2_baseline into master_15.1.1
Conflicts:
	edexOsgi/com.raytheon.uf.edex.archive/utility/common_static/base/archiver/purger/RAW_DATA.xml
	edexOsgi/com.raytheon.uf.tools.gfesuite.servicebackup/svcBackup/ServiceBackup/scripts/export_configuration
	edexOsgi/com.raytheon.uf.tools.gfesuite.servicebackup/svcBackup/ServiceBackup/scripts/proc_receive_config

Former-commit-id: 9742125df2b54fe54e1e06dba554de21db52f5a0
2015-04-08 12:22:27 -04:00
Chip Gobs
5377c9db38 Merge remote branch 'remotes/origin/ohd_15.1.1' into ohd_15.1.1
Former-commit-id: 2438b5702f8fdcd52d79dce64613b8b394d32b16
2015-04-07 15:07:44 -04:00
Zhidong.Hao
f44e6c7deb ASM #17332 AvnFPS: Error message is displayed when cancel the TAF from 'Restore From....' option
Change-Id: I9ae9bf9b725db77e025b1b1bb508ddcc163a6c06

Former-commit-id: d7d664dce1959257676755bb0632e904c05593a6
2015-04-07 14:37:56 -04:00
Nate Jensen
78cc9fd16c Omaha #4204 keep renamed parts on 4 panel action
Change-Id: I76dcfa52bc79bd9274c11912e889728486d3ca4f

Former-commit-id: 12207dc69597a229ca732b7dc90e2d75ebbc988b
2015-04-07 11:15:13 -05:00
Fay.Liang
c681804958 Merge branch 'omaha_14.4.1' of ssh://awips2omaha.com:29418/AWIPS2_baseline into master_14.4.1
Former-commit-id: 690e16f2101481202c67622cc745079465261ae9
2015-04-06 15:42:01 -04:00
Fay.Liang
618781f10c Merge tag 'OB_14.3.3-2' into master_14.4.1
14.3.3-2

Conflicts:
	cave/com.raytheon.uf.viz.spellchecker/META-INF/MANIFEST.MF
	cave/com.raytheon.uf.viz.spellchecker/src/com/raytheon/uf/viz/spellchecker/dialogs/SpellCheckDlg.java

Former-commit-id: f5fad51061f568aea4ea581a099ef8353758add6
2015-04-06 15:40:31 -04:00
David Friedman
97c938cb25 ASM #17215 - CAVE can lockup when volume browser is loaded but no element is selected
Change-Id: Ia672d2a4f5e38dcd3b1c43373993779557e86309

Former-commit-id: 87ceca157b69dd6301f2ee0d6d9cee9aa7bb8bc8
2015-04-06 19:38:33 +00:00
Michael Gamazaychikov
06506f01c4 ASM #14968 - TextWS: Problems inserting text into pathcast section.
Change-Id: I9a9bc6c91b6d15087acf0e08c9168211745dfa88

Former-commit-id: 9f42d943954adc1f3e9c365381f46d4c5a375d71
2015-04-06 10:08:28 -04:00
Kiran.Shrestha
8f981c5fa4 ASM #15025 WRK product changes header to alternate- long-line pil in header block.
Change-Id: If5776bbddbf8b5eddf8dff85d913ce8a4862bd12

Former-commit-id: 3ab4df17a7fd40f93de6cb32798ee5a2385f4814
2015-04-03 18:43:24 +00:00
Ron Anderson
4132bbf6cf Merge "Omaha #4027 Convert all GFE text products to mixed case" into omaha_15.1.1
Former-commit-id: 67762d2b731cba6e8846ff04609454b354fa89a6
2015-04-02 17:05:47 -05:00
Fay.Liang
368369872b Merge branch 'omaha_14.3.3' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.3.3
Former-commit-id: 39be5eb857ab247a1116a145aee274d25e993368
2015-04-02 14:51:06 -04:00
Nate Jensen
18f76ae519 Omaha #4204 retain part names when 4-panel swapped
Change-Id: I86b364dfe879100fa81991ab31c0e8e1122d3862

Former-commit-id: b9c5c03f403d00b7fbf0ff5d9c8ed34c82556abd
2015-04-02 12:06:10 -05:00
Rici.Yu
0492e66d87 ASM #17194 - convert SerpConfig.py from smart tool to utility
Change-Id: I8007ca1676de148aa42c5b15c8e3366bbe8c8e5d

Former-commit-id: 6968986c535bbadee8436cca5cfcc329d47c606b
2015-04-02 10:48:25 -04:00
Ron Anderson
240027df68 Omaha #4288 Fixed widget is dispose error in FileTreeView
Change-Id: I38b8af21ee8a6ce22bd67eee1abb8e51dc7fb1b9

Former-commit-id: 8791485de7c0885f33d03ed67cf0352406caf1a6
2015-04-02 09:26:13 -05:00
David Gillingham
bfbad2a22d Issue #4344: Update build.properties for spellchecker plugin to include plugin.xml.
Change-Id: I1a9009ed0d165ed48c81dfd088bf6652ae68110e

Former-commit-id: e4860cdd30d96bf7fc4347a3c92712e5350adf25
2015-04-01 15:43:42 -05:00
Jingtao Deng
47e6761918 VLab Issue #6751 - DR16848 MPE color scale merge problem; fixes #6751
Change-Id: Ib85e9943c93f89b74d8f1530a99f7e819c63e7e6

Former-commit-id: 1324a6ebb687b9af972562c7b1adca402b799ced
2015-04-01 13:50:45 -04:00
Fay.Liang
a204a6210e Merge branch 'asm_15.1.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_15.1.1
Former-commit-id: 5e481a056337b7f502921886725382258c6e29d1
2015-04-01 13:04:48 -04:00
Fay.Liang
77002144a1 Merge tag 'OB_14.4.1-21' into master_15.1.1
14.4.1-21


Former-commit-id: f13fe9af9cb5278362da4b3c67c5997b8ecedd1a
2015-04-01 10:27:48 -04:00
Fay.Liang
133a603566 Merge tag 'OB_14.4.1-20m' into master_15.1.1
14.4.1-20m

Conflicts:
	cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/MonitoringAreaConfigDlg.java
	edexOsgi/build.edex/esb/conf/logback.xml
	edexOsgi/com.raytheon.uf.edex.archive/utility/common_static/base/archiver/purger/RAW_DATA.xml
	rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template

Former-commit-id: 1d282a64da2998d91040a7c97f2e81beea0a8da4
2015-03-30 14:28:30 -04:00
David Gillingham
2e460f4700 Issue #4344: Make suggestion blacklist for spellchecker configurable via localization.
Change-Id: I1e73afcc2433329bb6b3c3200d776711dc1d7600

Former-commit-id: 44e092d35e214c8f11fedb1c4aee0f78e4f82acc
2015-03-30 11:57:33 -05:00
Steve Harris
7375074ed8 Merge tag 'OB_15.1.1-2m' into omaha_15.1.1
15.1.1-2m

 Conflicts:
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
	edexOsgi/com.raytheon.edex.plugin.radar/src/com/raytheon/edex/plugin/radar/RadarDecoder.java
	rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template


Former-commit-id: 7cad81591e22bc1a46f54982f0cd0ca647208290
2015-03-30 11:07:52 -05:00
Ana Rivera
3791f15203 Merge "VLab Issue #7249 - Removed extra dashes from baseTDLSurface.xml commented code; fixes #7249" into field_15.1.1
Former-commit-id: aabaec95f61e69d40604b1e1a0c69d83de4a901a
2015-03-27 18:03:19 +00:00
Joshua Watson
216de7743b VLab Issue #7249 - Removed extra dashes from baseTDLSurface.xml commented code; fixes #7249
Change-Id: Ifda3cd240b123f2f82b67e7978d2abfee12b247d

Former-commit-id: d5225988678e3bd26470ceb40a24bb7dc6a58af0
2015-03-27 11:53:52 -04:00
Ron Anderson
ea0b02bedd Omaha #4027 Convert all GFE text products to mixed case
Change-Id: I94275b65e8733d5bed1242f78503f1613b2e0aff

Former-commit-id: 07088e71d78d6302da23683894d96d72e4f69a96
2015-03-26 18:30:39 -05:00
Steve Harris
165971a4f6 Merge tag 'OB_14.4.1-20m' into omaha_15.1.1
14.4.1-20m

 Conflicts:
	cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/MonitoringAreaConfigDlg.java
	edexOsgi/build.edex/esb/conf/logback.xml (moved to build/deploy.edex.awips2/esb/conf/logback.xml; also removed edexOsgi/build.edex/esb/conf)
	rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template


Former-commit-id: 0db97a3cefc6f709d336883202e51f1d5255ad75
2015-03-26 09:57:17 -05:00