Commit graph

9148 commits

Author SHA1 Message Date
Shawn.Hooper
6c30246931 ASM #17883 - Update mping feature.xml file
Change-Id: I44fb67d8d86c3eca661bcd09814b736794bacb47

Former-commit-id: 34c8d2ef320b0d8336f8ae3da9ba803f7ee66265
2015-08-11 16:17:31 -04:00
Shawn.Hooper
bbb48e8551 Merge branch 'master_16.1.1' into asm_16.1.1
Former-commit-id: 1d9f29deb012fb833757c3960e9c91fea6d2156d
2015-08-10 11:41:55 -04:00
Juliya Dynina
0109002f12 Merge "ASM #17843 - UHELE when closing Text WS while "No product..." banner is displayed" into asm_16.1.1
Former-commit-id: b60b829cecbc23847dbd0946da46357d0280f703
2015-08-07 09:50:52 -05:00
Juliya Dynina
bf518a28cf Merge "ASM #13849 - Use a unique Eclipse configuration directory for each CAVE/AlertViz instance" into asm_16.1.1
Former-commit-id: 771b4ceb398b4426b99a232a4369e87875940d4d
2015-08-07 09:50:20 -05:00
David Friedman
a0c82a85ae ASM #17843 - UHELE when closing Text WS while "No product..." banner is displayed
Change-Id: I50e45c01e3d454d2278248ba073bd09b39ad7f46

Former-commit-id: 90fddd16408d7e45850dad5c1f4c4d3a27d64ea0
2015-08-07 14:00:05 +00:00
David Friedman
be8070e543 ASM #13849 - Use a unique Eclipse configuration directory for each CAVE/AlertViz instance
Change-Id: I66cedc0301d8aac07fb57d4acf72ea61e0633cea

Former-commit-id: 416d74f3b06d4946ddccf670344573c47efd5b40
2015-08-07 13:55:03 +00:00
Qinglu.Lin
850c3ee7fc ASM #17865 - Mixed Case causing some counties to not be locked properly in WarnGen
Change-Id: Iefee989b42ac140c06909c8930a3d6e6c3e27199

Former-commit-id: a6cab1a374f4efc0a60fd04d8306fb2709caa086
2015-08-05 12:10:47 -04:00
Shawn.Hooper
cb3348102e Merge branch 'master_16.1.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_16.1.1
Former-commit-id: 3a7f2119bf29cc21044d9e07fe722bdcea16e419
2015-08-04 10:08:06 -04:00
Fay.Liang
5f4c5ed3e1 Merge branch 'master_16.1.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_16.1.1
Former-commit-id: fa4bd2389f17f1fc9c2da75dee936a27954b754b
2015-08-03 14:07:35 -04:00
Matthew Howard
3dd1dc8bc6 Merge "ASM #17540 AvnFPS: Unable to set TAF default issuance time" into asm_16.1.1
Former-commit-id: 1081501a23f7fd8717e8ec091bcea99d0ad8bed8
2015-08-03 10:11:57 -05:00
Zhidong.Hao
0205e50e16 ASM #17540 AvnFPS: Unable to set TAF default issuance time
Change-Id: I0722ce915e7f3d209875b173db6e6f8ff4af798b

Former-commit-id: 349591330b4804078afc46a92ca17576288ddc67
2015-08-03 10:09:01 -04:00
Fay.Liang
5c5bc3a5b5 Merge branch 'field_16.1.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_16.1.1
Former-commit-id: 061ce49506ae6b538dad609a3be711aec3efae80
2015-07-31 16:53:30 -04:00
Fay.Liang
b60abcd015 Merge branch 'ncep_16.1.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_16.1.1
Former-commit-id: e1a18a5546a67d11e9ba48a7a00646c1a0d08249
2015-07-31 16:12:28 -04:00
David Friedman
4bdfeb8da8 Merge remote-tracking branch 'origin/master_16.1.1' into asm_16.1.1
Conflicts:
	cave/build/static/linux/alertviz/alertviz.sh
	cave/build/static/linux/cave/cave.sh
	cave/com.raytheon.uf.viz.alertviz/src/com/raytheon/uf/viz/alertviz/AlertvizJob.java
	cave/com.raytheon.uf.viz.d2d.core/src/com/raytheon/uf/viz/d2d/core/time/D2DTimeMatcher.java
	cave/com.raytheon.viz.core.contours/src/com/raytheon/viz/core/contours/ContourRenderable.java
	cave/com.raytheon.viz.gfe/localization/gfe/userPython/utilities/SmartScript.py
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/BaseGfePyController.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/smarttool/SmartUtil.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/resource/MultiPointResource.java
	cave/com.raytheon.viz.hydrobase/src/com/raytheon/viz/hydrobase/dialogs/RiverGageDlg.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/text/AbstractLockingBehavior.java
	cave/com.raytheon.viz.xdat/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.common.dataplugin.shef/src/com/raytheon/uf/common/dataplugin/shef/tables/Riverstat.java
	edexOsgi/com.raytheon.uf.tools.gfesuite.servicebackup/svcBackup/ServiceBackup/scripts/process_configuration

Change-Id: I9acfead0148ca1df35b8f69cd556b40d8189c226

Former-commit-id: 33053b2a6b55dacfecb24d5cde2cd3068e999f2f
2015-07-30 20:53:19 +00:00
steve.naples
6b295a0981 ASM #17471 - MPE: Radar Bias Edit table showing incorrect data.
Change-Id: I4d07d6c602f3f20bec64c3241dbf66bce6da5e97

Former-commit-id: 17fb48e1d5e973cfe04697c7fa8d0a325710b224
2015-07-29 15:28:37 +00:00
Fay.Liang
2002605bf0 Merge branch 'omaha_16.1.1' of ssh://awips2omaha.com:29418/AWIPS2_baseline into master_16.1.1
Former-commit-id: e53d85aa872541d9542bd486e959384115d8f4d5
2015-07-28 16:27:03 -04:00
Yun.Teng
2a3badf998 ASM #17257 - Change CheckTandTd/CheckWindGust to use selected time range and improve efficiency, and combine to make procedure CheckTTdWind
Change-Id: Ide50e3cc57fac8e5d69b398441e1c43983616d30

Former-commit-id: 1e2508936f79544ec987b682d25d0362d487e2e3
2015-07-28 16:26:25 +01:00
Fay.Liang
60cc8c8f22 Merge branch 'omaha_16.1.1' of ssh://awips2omaha.com:29418/AWIPS2_baseline into master_16.1.1
Former-commit-id: e4af7e2ef3af5a32f2cc9e5a5c905d5d4c2a74c9
2015-07-27 17:08:46 -04:00
David Friedman
2121ce36d7 ASM #13849 - Use a unique Eclipse configuration directory for each CAVE/AlertViz instance
Change-Id: I98cd38b2ada1197511861841b07caf943438cfd3

Former-commit-id: 349b4665855bed697948aadb8fba23a2a761c83f
2015-07-23 21:03:06 +00:00
David Lovely
0216db5985 Omaha #4295 Cleaned up CAVE icon locations
Former-commit-id: e3f7c784ea0dab0bd38e5217a3291f558029e851
2015-07-23 06:50:16 -05:00
David Lovely
a56f97be01 Omaha #4295 Export icons for CAVE application window.
Former-commit-id: c516fedfd76cdb32f029b54ad25ed9097aaaf47a
2015-07-22 14:13:31 -05:00
Ying-Lian.Shi
4cf38a9488 ASM #13753 keep Issue time unchange while update other times
Change-Id: Id8d36e484c6cd2527d35039a6c0a02f474c440bc

Former-commit-id: 654f11435e1f4a0970ec2d6bf4a7f84da8dbce91
2015-07-22 18:03:16 +00:00
Ana Rivera
9bbcc395e3 Merge branch 'master_16.1.1' into field_16.1.1
Change-Id: I66f5310f5f2beed1ba411f9eef5a6b804f012fc9

Former-commit-id: 7f333fd2c06f96f685abd8c7a1717abeaeaabe37
2015-07-22 15:56:47 +00:00
David Friedman
876ed4837a ASM #17534 - TextWS "No product" message box prevents WarnGen scratch products from being edited
Change-Id: Id7ae458cb978f2e0cf644eca82fb17b65cf0eb38

Former-commit-id: f47ecc5c2f83f890431a70464ce08c8303c69033
2015-07-22 15:37:40 +00:00
Richard Peter
7a79834265 Omaha #4500 - Update hydro blind casts to use Number
Change-Id: Ide22b937047d254cb3fb003df630c936d601fe22

Former-commit-id: 877a65681207ae7d93ac385e88dbc213980a49de
2015-07-21 17:17:27 -05:00
Mark Peters
32b5f874cf Omaha #4512 Check for redbookMapping.xml in common_static.configured, then cave_static.base
Change-Id: I759571640d72ec72fc76afcccd20314dc106f559

Former-commit-id: d6f42a6947d49170ace6654f30ab93a5cba57d1c
2015-07-21 13:23:39 -05:00
Ron Anderson
44d41e6253 Merge "Omaha #4547 More warngen template fixes." into omaha_16.1.1
Former-commit-id: 46e816f07874bf972365c5c943277d5de114a744
2015-07-21 13:03:57 -05:00
Ron Anderson
64741d7a70 Omaha #4547 More warngen template fixes.
Change-Id: I9619681888bbebc681461f190231cebf325d405f

Former-commit-id: 66b051d8a7a791c8ffc2cf48e1f15f40d47ae71a
2015-07-21 12:56:12 -05:00
Richard Peter
c3bf9eb17c Omaha #4500 - Fix ZoneSelectorResource column mapping
Change-Id: I541f9e6003e5dcd0a29078df32677ccc5dcb8c68

Former-commit-id: b7a7761543d5dbdbf6288afc45bd01fea650cb96
2015-07-21 11:45:27 -05:00
Juliya Dynina
cf848b6ffd Merge "ASM #17584 SCAN: Problem with storm cell table display during data update" into asm_16.1.1
Former-commit-id: a54ea78a3373e2a32f3b2e5da37d17495ae13091
2015-07-20 14:50:44 -05:00
Ying-Lian.Shi
44d9356389 ASM #17584 SCAN: Problem with storm cell table display during data update
Change-Id: I6e38fcd8e6209d45f0826302d2d0b83b07afcbdc

Former-commit-id: 96d045d9c30e4f01a0a8ba3cd7a0a7ce233158f4
2015-07-20 17:46:45 +00:00
Nathan Bowler
8583f14fb2 Omaha #4343 Fix merge issues caused by Util->RcmUtil rename.
Change-Id: Id0d2778594875886ef13a4754786a3486051d3fa

Former-commit-id: 189311e801b8c507b5ccb1121da5511665d74d28
2015-07-20 13:35:04 -04:00
Ana Rivera
9a33597d6e Merge branch 'omaha_16.1.1' into field_16.1.1
Change-Id: I9da773e70da7bb8d62253093f20aebd8aea328f6

Former-commit-id: 0c909272ebdaf4ce94195b54a021a38c1e174ff3
2015-07-20 15:56:51 +00:00
Ana Rivera
d6196390e2 Merge branch 'master_15.1.1'(OB_15.1.1-24) into field_16.1.1
Change-Id: I859c9a2d9be2076e9eac89b4a5a877f37ca54074

Former-commit-id: d6f0e355d72c9be4d55c5e161331e55367bdb7b8
2015-07-20 15:46:28 +00:00
Fay.Liang
92654e8afe Merge branch 'omaha_15.1.1' of ssh://awips2omaha.com:29418/AWIPS2_baseline into master_15.1.1
Former-commit-id: bf3b5449b37dac2ff8c4d0763b0bd313ef0b4a4d
2015-07-20 11:38:13 -04:00
Fay.Liang
54c8991452 Merge branch 'asm_15.1.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_15.1.1
Former-commit-id: 1fd720950240b2d57c4689d1994ad68d51855017
2015-07-20 11:37:24 -04:00
Steve Harris
c9ca91f628 Merge tag 'OB_15.1.1-24' into omaha_16.1.1
15.1.1-24


Former-commit-id: 1d1041a38924d512d59ab98925b8114f4a657327
2015-07-20 09:05:30 -05:00
David Friedman
9db5891824 ASM #17314 - WarnGen: certain counties not locking in WarnGen
Change-Id: I756afe7cb6f590bb6f48c36a9bcf69fcac022e07

Former-commit-id: 8d5845c49eb706b28c85d836cbc35c7e20ea1adf
2015-07-17 20:05:26 +00:00
Fay.Liang
58cec41be1 Merge branch 'omaha_16.1.1' of ssh://awips2omaha.com:29418/AWIPS2_baseline into master_16.1.1
Former-commit-id: b03e417128f7a7f2e493b4b3b925641ee1aed94f
2015-07-17 14:45:32 -04:00
Richard Peter
dfc255531a Merge "Omaha #4500 - Fix SQL Injection Concerns." into omaha_16.1.1
Former-commit-id: 2b25be688266a27f564d5acff991d1e9a94dd081
2015-07-17 13:35:21 -05:00
Ron Anderson
df708de1e4 Omaha #4547 Fix some more issues with warngen templates
Change-Id: I4d7d2635def75a7262b2c70bd699ce37914cbe1f

Former-commit-id: 908dbaea4585226b8742f713dc2a7f20752cee2c
2015-07-17 10:09:57 -05:00
Nate Jensen
89bf57c0d1 Merge "Omaha #4658 Fixed expiration times in FFMP DAF access Change-Id: Iac02790c4d24efc220b9c0b5d488df403681b3be" into omaha_16.1.1
Former-commit-id: 14012632785578189b2c196eae493d59cd9a96f8
2015-07-16 16:57:57 -05:00
Dave Hladky
91aab92db5 Omaha #4658 Fixed expiration times in FFMP DAF access
Change-Id: Iac02790c4d24efc220b9c0b5d488df403681b3be

Former-commit-id: 94de80dd125cd4a004678e7d0c92fc8d0e99f70e
2015-07-16 16:15:10 -05:00
steve.naples
bdd9b93873 ASM #17561 - MPE: Daily QC disagg 6 hr values always zero.
Change-Id: I91ca25ae0afd442759315e0cd2d894ecc2001214

Former-commit-id: 450ff9256aa4ca845f3267e049153278bf350280
2015-07-16 17:23:27 +00:00
Juliya Dynina
71a18fe5df Merge "ASM #16769 - Warngen can include a city in the 4th bullet (locations impacted list) that is not officially in that county." into asm_16.1.1
Former-commit-id: e9dd4381ac017046db7f8413e2323f445dfe7edb
2015-07-16 10:16:16 -05:00
Michael Gamazaychikov
ff5198a58e ASM #16769 - Warngen can include a city in the 4th bullet (locations impacted list) that is not officially in that county.
Change-Id: I7d4ca4b5b50ea03cbd9f693a32b4cae8ce99b098

Former-commit-id: cef7dbe4975453510ae7a58bd7b58be7bebd3b9b
2015-07-16 10:40:17 -04:00
David Friedman
37082b074d ASM #17741 - Watches not showing up in Warning Products in 15.1.1
Change-Id: I0ecd8d7de532465ded64f67a20758cfdb7c2d7d1

Former-commit-id: 5e316fafdd46ab5fe30c24dd67ac86669cdb69ac
2015-07-16 14:12:24 +00:00
Fay.Liang
fca8f275b2 Merge branch 'asm_15.1.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_15.1.1
Former-commit-id: f8895b88d975a88553a494a7c616b4ecf702fa16
2015-07-15 14:37:27 -04:00
Fay.Liang
c97d6f5f37 Merge branch 'omaha_15.1.1' of ssh://awips2omaha.com:29418/AWIPS2_baseline into master_15.1.1
Former-commit-id: d17bfc702388ea2ed068852c08eff0c32eed62ff
2015-07-15 14:35:58 -04:00
Nate Jensen
0f9dc9a877 Merge "Omaha #4512 Add bundle files to Redbook menus XML" into omaha_16.1.1
Former-commit-id: 4e14cbf6926602d3966ce90f270d27232a2ddacd
2015-07-14 17:38:38 -05:00