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

4393 commits

Author SHA1 Message Date
Ana Rivera
12f8c4cf81 Merge branch 'master_14.4.1'(OB_14.4.1-36) into field_15.1.1 
Conflicts:
	cave/com.raytheon.viz.gfe/localization/gfe/userPython/textUtilities/headline/FormatterRunner.py
	rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template

Change-Id: I33c3dd2cc2b8be8a8ca9370839f07512b12d8e6d

Former-commit-id: 8608cf4250be497aa20d13088a20bece02befd92
 2015-05-11 20:21:13 +00:00
Ron Anderson
c8be7b62d7 Omaha #4467 Add support for mixedCase to runIFPText. 
Change-Id: I69c063596d175ea89a2b4537722bdb1ff399cb55

Former-commit-id: 3cc39323a55aaec6b38356724d2949605d4fde37
 2015-05-06 13:17:08 -05:00
Fay.Liang
8ecc73d1f7 Merge branch 'asm_15.1.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_15.1.1 
Former-commit-id: 483383876bfe73eb58ec0eb314106288dab4d172
 2015-04-27 14:08:47 -04:00
Fay.Liang
f06ed6190e Merge branch 'omaha_15.1.1' of ssh://awips2omaha.com:29418/AWIPS2_baseline into master_15.1.1 
Former-commit-id: 0c4b131c1dce6a545d83ca244848bf2ad887217c
 2015-04-27 14:07:29 -04:00
Shawn.Hooper
a50dd728b0 Merge branch 'asm_15.1.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into asm_15.1.1 
Former-commit-id: c3077a2d3db848cc4d26d969ab20b517d4e461b7
 2015-04-24 16:03:07 -04:00
David Friedman
7d64814a37 ASM #17394 - WarnGen geometry generation can generate invalid geometry data 
Change-Id: I811a9a0b26a8454aeead4a99056ddd58bfdc7bd1

Former-commit-id: fe5319f182be968f6757b5bd78e8e8b9198b145d
 2015-04-24 19:58:37 +00:00
Shawn.Hooper
eb14ea888c Merge branch 'master_15.1.1' into asm_15.1.1 
Former-commit-id: a11fce758ca741e4f300444f08c609875f722264
 2015-04-24 15:57:40 -04:00
Shawn.Hooper
c03499c025 Merge branch 'master_15.1.1' into asm_15.1.1 
Merges up to 15.1.1-7 back into the asm_15.1.1 branch.

Conflicts:
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java

Change-Id: Ica098ffb233837e4fcb718e9c75a78de443eb267

Former-commit-id: 78b3f7a15c5d2ab60235f40f5236bbbbe58d28ce
 2015-04-24 15:44:14 -04:00
Matthew Howard
225c2436ff Merge "ASM #17340 - Fix clipping zone selector map to domain issue" into asm_15.1.1 
Former-commit-id: 3a05211a3cdac07c214612a679763acefb4ab723
 2015-04-23 10:10:32 -05:00
David Lovely
812dcfba57 Omaha #4382 Removed quotes from batch files 
Former-commit-id: 9d8c4774d1834205ad825a27fef10e8ec6a48334
 2015-04-23 10:07:42 -05:00
Rici.Yu
220331599f ASM #17340 - Fix clipping zone selector map to domain issue 
Change-Id: Ie59580f02a6f145a5c23cb431ce042f2e25ac5a5

Former-commit-id: 5d7d7e956ce69945c5226dccca18942ba2052a80
 2015-04-23 10:46:26 -04:00
Ron Anderson
b34c50594f Merge "Omaha #4027 More GFE changes for Mixed Case WA" into omaha_15.1.1 
Former-commit-id: 8c02aa8eba027eedb9ec8994f520c315c57ed150
 2015-04-21 08:30:03 -05:00
Ron Anderson
0edd237aa7 Omaha #4027 More GFE changes for Mixed Case WA 
Change-Id: Ia1b65979d442246984b1e281c902c9f078fa4848

Former-commit-id: 0eef8697e269644ec36c1c7f7b09610778beb4a1
 2015-04-20 17:17:08 -05:00
Fay.Liang
ff11d4f55a Merge branch 'asm_15.1.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_15.1.1 
Conflicts:
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java

Former-commit-id: efff4511cb01552b757678fb2ac64dca2da6f9c0
 2015-04-20 15:38:33 -04:00
Fay.Liang
d1e206bf2e Merge branch 'ohd_15.1.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_15.1.1 
Former-commit-id: a05d428aac35687a34c7fcaefbd1665488f9ec53
 2015-04-20 15:29:13 -04:00
Ana Rivera
0f2e031c70 Merge branch 'master_15.1.1' into field_15.1.1 
cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/other.xml was removed.
"Visibility Anl Uncertainty" entry in .../fields/planview-timeseries/other.xml was added to cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/ensemble/sref/aviation.xml

Conflicts:
	cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/misc.xml
	cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/other.xml
	cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/wind.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/styleRules/d2dContourStyleRules.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/styleRules/gridImageryStyleRules.xml

Change-Id: I4cac5e1ee29119569cb19c235ec5d1664eb08b8c

Former-commit-id: 4dad0cb77e2101fc8ec2d46924b6c64dcc0d12cb
 2015-04-20 19:14:43 +00:00
Nate Jensen
ee3f787ceb Merge "Omaha #4388 Support signed/unsigned conversion of fill value." into omaha_15.1.1 
Former-commit-id: 3f1b69372ece35cc2ea543a60334fb8dbe584e9b
 2015-04-20 11:44:13 -05:00
Ben Steffensmeier
5fd74b67ea Omaha #4388 Support signed/unsigned conversion of fill value. 
Former-commit-id: 75959a30f26ea8f323d232d3b118e93539904ad1
 2015-04-20 11:08:03 -05:00
Steve Harris
4055d9135b Merge tag 'OB_15.1.1-6' into omaha_15.1.1 
15.1.1-5

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


Former-commit-id: 830ba31d4a66ea4e3994ba136b5bed0f03a9d246
 2015-04-20 08:00:07 -05:00
Steve Harris
1d71dee037 Merge tag 'OB_14.4.1-26' into omaha_14.4.1 
14.4.1-26


Former-commit-id: b6156ab57179bb4af118912960cf402d459ba779
 2015-04-20 07:36:26 -05:00
Fay.Liang
6dd4acc2c2 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: 03e663afae6eb0998892e2921566652f42196e1f
 2015-04-16 23:06:25 -04:00
Rici.Yu
03034f57c8 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
c9337caeb2 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
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