xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
33073 commits 31 branches 40 tags 3.8 GiB
Commit graph

13036 commits

Author SHA1 Message Date
Fay.Liang
197a0d9316 Merge branch 'asm_14.4.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.4.1 
Conflicts:
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py

Former-commit-id: 6dd4acc2c2 [formerly 5606e3cfa0 [formerly 03e663afae6eb0998892e2921566652f42196e1f]]
Former-commit-id: 5606e3cfa0
Former-commit-id: f28633c1d4
 2015-04-16 23:06:25 -04:00
Rici.Yu
3b59050996 ASM #14946 - fix issue when timezone is not defined for any zone in a segment 
Change-Id: I252f78cb9f5bf1cf556788c79fe14ad338b546aa

Former-commit-id: ef4c5307d5693abd834f4210e081fb8e3a21f90b
 2015-04-16 13:24:29 -04:00
Rici.Yu
ac9c9f5aa9 ASM #14946 - fix issue when timezone is not defined for any zone in a segment 
Change-Id: I252f78cb9f5bf1cf556788c79fe14ad338b546aa

Former-commit-id: 03034f57c8 [formerly 3b59050996 [formerly ef4c5307d5693abd834f4210e081fb8e3a21f90b]]
Former-commit-id: 3b59050996
Former-commit-id: 524fa004d3
 2015-04-16 13:24:29 -04:00
Rici.Yu
c9955bce55 ASM #17390 - Fix string/int conversion issue preventing BOIVerify from launching 
Change-Id: I6c0a0ea22650a5b42b24b41e41e3ca0acabbf14b

Former-commit-id: c6888b4aa86ed3425b5a016d2fbe5664763b4682
 2015-04-16 10:51:23 -04:00
Rici.Yu
8fee3a32f7 ASM #17390 - Fix string/int conversion issue preventing BOIVerify from launching 
Change-Id: I6c0a0ea22650a5b42b24b41e41e3ca0acabbf14b

Former-commit-id: c9337caeb2 [formerly c9955bce55 [formerly c6888b4aa86ed3425b5a016d2fbe5664763b4682]]
Former-commit-id: c9955bce55
Former-commit-id: c1511407bc
 2015-04-16 10:51:23 -04:00
Ben Steffensmeier
817eb39949 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
e06fccfdfd Omaha #4388 Use the record fill value in satellite resource. 
Former-commit-id: d13b4cfda688ecec9dfa0563787ff6370c980443
 2015-04-15 14:44:49 -05:00
Ben Steffensmeier
27d7a2c416 Omaha #4399 Update viirs to handle NCC. 
Former-commit-id: ccc2036b1671cecc74a8d74b2b916c2ba1ddcb83
 2015-04-15 10:54:17 -05:00
Steve Harris
42f66043f1 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
c31d3f0910 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
8a24700ebb 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
5a63e4d605 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
Greg Armendariz
afda0eabb9 Merge "Omaha #4382 Removed use of reg.exe" into omaha_14.4.1 
Former-commit-id: d0711fbd8b [formerly 5a63e4d605 [formerly 5efaa466dde39e9ac7d29a7a8a1ed3825774bd9d]]
Former-commit-id: 5a63e4d605
Former-commit-id: a961e1edbb
 2015-04-13 09:27:26 -05:00
Steve Harris
50ea025340 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
Steve Harris
520ca14c21 Merge tag 'OB_14.4.1-24' into omaha_14.4.1 
14.4.4-24


Former-commit-id: b78afa0e72 [formerly 50ea025340 [formerly 11b32bb99084a6162cd0d463800281c7115aef85]]
Former-commit-id: 50ea025340
Former-commit-id: 7592f02576
 2015-04-13 08:56:12 -05:00
David Lovely
1d00661a47 Omaha #4382 Removed use of reg.exe 
Former-commit-id: 7138fb04f19bd48cdcd23785f524a52db0e8fdd6
 2015-04-13 07:44:16 -05:00
David Lovely
5180fac258 Omaha #4382 Removed use of reg.exe 
Former-commit-id: 3254d34c04 [formerly 1d00661a47 [formerly 7138fb04f19bd48cdcd23785f524a52db0e8fdd6]]
Former-commit-id: 1d00661a47
Former-commit-id: a7802e271c
 2015-04-13 07:44:16 -05:00
Fay.Liang
0a5f18487a 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
Fay.Liang
a2193b5b4b 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: 88d6e796f5 [formerly 0a5f18487a [formerly 66eb429aee1d602cf216f1509e780afdbd1cbd23]]
Former-commit-id: 0a5f18487a
Former-commit-id: 266161bf86
 2015-04-10 13:49:22 -04:00
Shawn.Hooper
2d831c871e 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: 4cf9697067 [formerly b11c4a3d9e [formerly d76e74e667e7847a57c9100cc4007dfc6d22ba06]]
Former-commit-id: b11c4a3d9e
Former-commit-id: b96813c962
 2015-04-10 13:20:35 -04:00
Shawn.Hooper
b11c4a3d9e 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
a4a2421296 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
abe7660994 Merge branch 'omaha_14.4.1' of ssh://awips2omaha.com:29418/AWIPS2_baseline into master_14.4.1 
Former-commit-id: 6a9a1daef6 [formerly a4a2421296 [formerly a9ee3ef4fb625850df26a5a9e9f83e1c24f892d9]]
Former-commit-id: a4a2421296
Former-commit-id: 3898abb1db
 2015-04-10 12:13:31 -04:00
Fay.Liang
e7af381368 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
Fay.Liang
3cdf97b865 Merge branch 'asm_14.4.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.4.1 
Former-commit-id: 9a6d44aec1 [formerly e7af381368 [formerly c83d031df8ff4087dc62c66026de39220f439dc9]]
Former-commit-id: e7af381368
Former-commit-id: cbc1e434b0
 2015-04-10 12:06:08 -04:00
Juliya Dynina
e7b4b76e27 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
Juliya Dynina
2f5676c2a0 Merge "ASM #17215 - CAVE can lockup when volume browser is loaded but no element is selected" into asm_14.4.1 
Former-commit-id: b9a8b432ba [formerly e7b4b76e27 [formerly 0fc80ad597575a3c43402a347c3260e6ad44e963]]
Former-commit-id: e7b4b76e27
Former-commit-id: 41a494c735
 2015-04-10 08:46:57 -05:00
David Gillingham
3594451824 Omaha #4385: add nwpsCG1 model to Volume Browser. 
Change-Id: Id069d07c5dfffaf1952042611f35a2221d8d639b

Former-commit-id: 20d76ae4ed226d19ea6ddbb408224ace8519787b
 2015-04-09 15:13:48 -05:00
David Gillingham
c454610ff7 Omaha #4385: add nwpsCG1 model to Volume Browser. 
Change-Id: Id069d07c5dfffaf1952042611f35a2221d8d639b

Former-commit-id: 1d2fb3c135 [formerly 3594451824 [formerly 20d76ae4ed226d19ea6ddbb408224ace8519787b]]
Former-commit-id: 3594451824
Former-commit-id: acb5b4f1af
 2015-04-09 15:13:48 -05:00
Ron Anderson
784f7b9433 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
Ron Anderson
d8aa339e56 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: 404782166f [formerly 784f7b9433 [formerly 73f7967f208ba6d9ff40866e6c7b585411bf5385]]
Former-commit-id: 784f7b9433
Former-commit-id: e7338f2ddd
 2015-04-09 15:11:44 -05:00
Matthew Foster
2f53fba60a 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
b13f8c7794 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
David Gillingham
7fe1a980ba Omaha #4384: Create Wave and Period derived parameters for nwpsTrkngCG0 model, add them to Volume Browser. 
Change-Id: I17ebbd913a17e158898a27b83e342f08ade610d6

Former-commit-id: c01694607f [formerly b13f8c7794 [formerly 09d7c45466f2fad8df8142bcbf0ded2e3757ffcb]]
Former-commit-id: b13f8c7794
Former-commit-id: 2e3b98f02f
 2015-04-09 13:26:52 -05:00
Brian Clements
cbb6c52f8c Omaha #4386 lightning resource updates frames asynchronously 
Change-Id: If0b43cb4d53e16d7cec4b4193da8437338957379

Former-commit-id: 9c82bcc5c93dcd30e3c645f673611ac6710c8fab
 2015-04-09 10:25:28 -05:00
Brian Clements
acbf97a041 Omaha #4386 lightning resource updates frames asynchronously 
Change-Id: If0b43cb4d53e16d7cec4b4193da8437338957379

Former-commit-id: cbe0a699fb [formerly cbb6c52f8c [formerly 9c82bcc5c93dcd30e3c645f673611ac6710c8fab]]
Former-commit-id: cbb6c52f8c
Former-commit-id: feb9518f03
 2015-04-09 10:25:28 -05:00
Ana Rivera
42e1d12ccf 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
696b8e4e88 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
Fay.Liang
d4e5cd10ad Merge branch 'asm_14.4.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.4.1 
Former-commit-id: 3462cc40ea [formerly 696b8e4e88 [formerly 2f43c804ce6113b74ea72857fea0c6694ad626fe]]
Former-commit-id: 696b8e4e88
Former-commit-id: 1a6f3f0dbc
 2015-04-09 10:43:35 -04:00
Roger Ferrel
a26076f47c 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
a2bb04d6b9 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
aeaca8ce50 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
27091192ef 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
b0d72bf798 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
07e07c3947 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
64044b1320 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
Zhidong.Hao
0319992a49 ASM #17332 AvnFPS: Error message is displayed when cancel the TAF from 'Restore From....' option 
Change-Id: I9ae9bf9b725db77e025b1b1bb508ddcc163a6c06

Former-commit-id: f44e6c7deb [formerly 64044b1320 [formerly d7d664dce1959257676755bb0632e904c05593a6]]
Former-commit-id: 64044b1320
Former-commit-id: aec5351938
 2015-04-07 14:37:56 -04:00
Nate Jensen
2c0ed92ce6 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
49108ab5f1 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
8004ba3123 Merge branch 'omaha_14.4.1' of ssh://awips2omaha.com:29418/AWIPS2_baseline into master_14.4.1 
Former-commit-id: c681804958 [formerly 49108ab5f1 [formerly 690e16f2101481202c67622cc745079465261ae9]]
Former-commit-id: 49108ab5f1
Former-commit-id: fbf1ab4e11
 2015-04-06 15:42:01 -04:00