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

8281 commits

This branch
This branch
All branches
Author SHA1 Message Date
Shawn.Hooper
0e6e87b762 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
Juliya Dynina
427242a092 Merge "ASM #16923 - Fix METAR decoder extra whitespace problem" into asm_15.1.1 
Former-commit-id: 7f97eebdc018f3f9876e0a48c7a9b911ba5f5f96
 2015-04-23 12:03:42 -05:00
Shawn.Hooper
d75b1be9c9 ASM #17024 - Update awips2-yajsw rpm name to include AWIPS2 release and build number 
Change-Id: I6135fb14ebdeda3f47878e386b188442794588ec

Former-commit-id: 401f5f5c7d0c46e97abd1d69fd0652fbe2ff8d8f
 2015-04-23 12:02:07 -04:00
Shawn.Hooper
8a163f48ec ASM #17024 - Update Java build script to include AWIPS2 release and build number in the rpm name 
Change-Id: I153f4787a67d07f2971f3ca007b94b798f4179b3

Former-commit-id: 44e26917444531b5587ddb528819d54d7d8fe09c
 2015-04-23 11:37:44 -04:00
Matthew Howard
bb2e003308 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
Rici.Yu
c89a5c5afc 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
Melissa Porricel
ebfafc7cbd ASM #16923 - Fix METAR decoder extra whitespace problem 
Change-Id: I55ca60148f4079237876c74279ef7cb528eb6c12

Former-commit-id: c4ce7f8bd1bbf8e971b80f8291f67f5f7af09d46
 2015-04-23 10:21:52 -04:00
Michael Gamazaychikov
3673c79061 ASM #17250 - EDEX scripts: import of A1 mile markers .id files to A2 database failed. 
Change-Id: Idca93f26c05d1d3fc73f0f4c7c3b24a736bc01c0

Former-commit-id: c815d87b1e4c30f9be0406c622c0df27f389a050
 2015-04-21 15:04:16 -04:00
Shawn.Hooper
8d8cab9a1a ASM #17024 - Remove spec files from AWIPS2_baseline repo since they are now in the AWIPS2_build repo 
Change-Id: I14b65414257dad225cb8393b23494f4ff21f5223

Former-commit-id: 6abf46819e7b592b34d7f48c9476653b7cfc7d86
 2015-04-20 16:09:02 -04:00
Juliya Dynina
6fd3d8fa52 Merge "ASM #17250 - EDEX scripts: import of A1 mile markers .id files to A2 database failed." into asm_15.1.1 
Former-commit-id: bf324b91d0d0e1d3d5056231304fec680280a689
 2015-04-17 13:36:44 -05:00
Juliya Dynina
a337340e50 Merge "ASM #14968 - TextWS: Problems inserting text into pathcast section." into asm_15.1.1 
Former-commit-id: 06d420fac801461d026f7cdb62b1ad023acc3784
 2015-04-17 13:35:48 -05:00
Michael Gamazaychikov
c77aa6aa8e ASM #17250 - EDEX scripts: import of A1 mile markers .id files to A2 database failed. 
Change-Id: I2f4b04804c65ed0de14957880b6f57d3308e5889

Former-commit-id: 52371f5e58004f059a4fdb569948c5320ad9d57c
 2015-04-17 07:42:02 -04: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
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
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
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
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
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
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
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
Steve Harris
f25960c030 Merge "Omaha #3299 - Master rights and foss for 14.4.1" into omaha_14.4.1 
Former-commit-id: 3e684fe9f4275979c4145994d58fc8113e750846
 2015-04-09 12:11:12 -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
Steve Harris
1d281377d5 Omaha #3299 - Master rights and foss for 14.4.1 
Former-commit-id: e9c9daec3e77c8f9af54afb06318f0dce9958b50
 2015-04-09 10:22:32 -05: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
1561ee6439 Merge branch 'omaha_14.4.1' of ssh://awips2omaha.com: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: ff79e4fdaf62c76f39b0e1948d33e0b84df77011
 2015-04-09 10:18:40 -04:00
Sean.Webb
d06ab7014d Merge "ASM #17189 - Removed rpm commands from profile scripts" into asm_15.1.1 
Former-commit-id: 2ea7877fa70890bb8936c0cbe445478470cfa7de
 2015-04-08 12:24:19 -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
Brian Graham
bd4404d946 ASM #14516 - changed handling of edexServiceList 
Id93c1b51f91ff24b8534f71e6a6773b8a56e345c

Change-Id: I5c0fa4164d53816eb21056b4f7b52d1a8f597e22

Former-commit-id: 7035c00bf1a8b91fafa55620d645a4dce966b325
 2015-04-08 11:22:20 -04:00
Fay.Liang
c1d84bf3b0 Merge branch 'field_14.3.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.3 
Conflicts:
	rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template

Former-commit-id: fea365e547f12a13a942594f8267b15a7895a102
 2015-04-07 15:38:18 -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
Ana Rivera
b5150e3d43 VLab Issue #7489 - Fix SFPA42 data_store entry in pqact.conf;fixes #7489 
Change-Id: Id7675169dc22035ea9640fdf07351f8667638dd6

Former-commit-id: 2b2b0b0387932888eaa6c8e5b86fc05d7254de3a
 2015-04-07 18:33:14 +00: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
c8962caee7 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
f8db9d993e 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
Greg Armendariz
e1c2587055 Omaha #4330 - Fix developer build 
Change-Id: Ic818ca89f44049a3d31583d0499d9e0756673eb2

Former-commit-id: d205922ba432e4f4b3c411ea798ee68c1563cd66
 2015-04-06 10:47:23 -05:00
Ron Anderson
7ec6496a0c Merge "Omaha #4367: Revert baseline time constraints for WindGust back to 1 hr." into omaha_14.4.1 
Former-commit-id: bc410201332feaced47f12645528fcb36c09adc6
 2015-04-06 09:39:38 -05:00
Michael Gamazaychikov
0d5b627a4c 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
74ea170409 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
David Gillingham
af9ed691fc Omaha #4366: Fix gfecron user id check in runManualNWPS_OutsideAWIPS.sh. 
Change-Id: I1738406430766fa01de31a40f8e66b0633ace74f

Former-commit-id: 3ee51663579734163b54b4997e8a3cb3e0727025
 2015-04-03 12:06:00 -05:00
David Gillingham
ccfda63e1d Omaha #4367: Revert baseline time constraints for WindGust back to 1 hr. 
Change-Id: I8ed3b075b4097d37926d67c616a451fee38b4358

Former-commit-id: b6660c446ee92a6bf82b935920ee1c6def7f7699
 2015-04-03 12:00:45 -05:00
Ron Anderson
c456aa2776 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
Ron Anderson
920bf05b11 Merge "Omaha #4103: Restore missing iscDataRec script, fix copy/paste errors in export_grids." into omaha_15.1.1 
Former-commit-id: e9b6afa1ab2662de6b42fa334e9b149c21cdfdde
 2015-04-02 16:30:00 -05:00
David Gillingham
cdb3cdcc7d Omaha #4103: Restore missing iscDataRec script, fix copy/paste errors in export_grids. 
Change-Id: I48de7074a034e1d1184e431f7f0e78221b96fad6

Former-commit-id: a108f2da18cd891db692c34d61f4281b815a8e09
 2015-04-02 16:24:44 -05:00
Fay.Liang
410d623afa 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