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

3457 commits

Author SHA1 Message Date
Mike Duff
c1bea3b41f Issue #3026 - Fix for HPE displays is volume browser 
Change-Id: I1ef2766e9bf74e7ad82cc36cd4e4a35659aacf39

Former-commit-id: a375e64e7ee3276be47b26f4386e7bc6491bc740
 2014-11-21 13:56:46 -06:00
Roger Ferrel
b88300a5fc Issue #3439 Replaced GFS213 with GFS229. 
Change-Id: I6cd7774c4897273944c56c39d087bb5cf98f4b15

Former-commit-id: 6cb88075375e3703b5ffe559ebd5e4f57d016880
 2014-11-18 17:42:39 -06:00
Fay.Liang
d666aca2b4 Merge branch 'asm_14.3.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.3.1 
Former-commit-id: 3b21d69375ceb9c07377082c5e46a094742406a0
 2014-11-14 16:24:25 -05:00
Dave Hladky
39db26fb1d Issue #3026 Fixed null metaData lookups in resource. 
Change-Id: I29d17ea990ac5516b67ac18fadf4267663a23efb

Former-commit-id: 3f6bba1fda61fe283be47af1a4245d196f94f998
 2014-11-11 10:18:47 -06:00
Brian.Dyke
7e87bf7ac4 Merge branch 'master_14.3.1' into asm_14.3.1 
Former-commit-id: b683c7776ef1fad2702fca82aed1abb4873e433b
 2014-11-07 12:55:38 -05:00
Brian.Dyke
1e7d47d2aa Merge branch 'omaha_14.3.1' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.3.1 
Conflicts:
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/ParmManager.java

Former-commit-id: b9d6c75a5c5f4cbe6b1e32f37e044989edf7c39f
 2014-11-06 13:14:24 -05:00
Brian.Dyke
acf00264f4 Merge branch 'master_14.2.4' into master_14.3.1 
Conflicts:
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/ParmManager.java
	cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-common.xml
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/config/GFESiteActivation.java
	edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/MessageProducer.java
	rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template

Former-commit-id: 5c2079dd25181c68f872691e81842aff0f696f8d
 2014-11-06 12:55:21 -05:00
Steve Harris
2ed98bb227 Merge branch 'master_14.3.1' (14.3.1-31) into omaha_14.3.1 
Former-commit-id: b70eb5b35985453e77ef2337728c65161ba60422
 2014-11-04 13:05:36 -06:00
Matthew Howard
afc51d425d Merge changes I8e97aec2,Ib6df55db into asm_14.3.1 
* changes:
  ASM #16693 changed swear words to all upper case
  ASM #16693 fixed typo in the filter


Former-commit-id: 0c3de224e672ea5259eaa395672efdf8982a1d45
 2014-11-04 13:11:10 -05:00
Ron Anderson
dd230d9f01 Issue #3775 Fix db does not exist for getParmList() error when runProcedure creates new mutable db. 
Change-Id: I28eef61e4eea77278efe3cbf8828c3357c856785

Former-commit-id: de45da45f39169e3924122a7baf68ab6762e74e2
 2014-11-04 11:03:42 -06:00
Ying-Lian.Shi
da58db313c ASM #16693 changed swear words to all upper case 
Change-Id: I8e97aec281a3e2c307355a2138bde605de41f446

Former-commit-id: ae186e99c22beeda347561fe24dc38a61a699c25
 2014-11-04 14:13:29 +00:00
Brian.Dyke
327491a3a8 Merge branch 'omaha_14.3.1' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.3.1 
Former-commit-id: 4be7b001bc98e6fe81b3e66940d025fd7511060b
 2014-11-03 14:45:24 -05:00
Matthew Howard
39ed75df43 Merge "ASM #16693 handles more swear words" into asm_14.3.1 
Former-commit-id: a6ed07b8c01df8576cc54f88dc52d2110d211707
 2014-11-03 09:56:09 -05:00
Ying-Lian.Shi
004b6fb906 ASM #16693 fixed typo in the filter 
Change-Id: Ib6df55dbaabdbebe8bb670fbffd9c4c901e31857

Former-commit-id: 29f50282d5e2415f1d9a876c5515be0c04e27015
 2014-10-31 10:57:55 +00:00
Brian.Dyke
0f8e11aad4 Merge branch 'master_14.2.3' into master_14.2.4 
Former-commit-id: 78923886791099b8e4564dd780d8ed64db16a5c1
 2014-10-30 15:03:19 -04:00
Ying-Lian.Shi
3d9fa4e763 ASM #16693 handles more swear words 
Change-Id: I0b892e3e6748919a206597106604a50f108b1bf7

Former-commit-id: 6133c233bd3e02b0a8e1540dd6c496997184f11d
 2014-10-30 18:22:34 +00:00
Ron Anderson
53144f55f0 Issue #3776 Cache SWT fill patterns used in history mode. 
Change-Id: Ibb48a997fd0b9c2308ae9f492c7837a10db7285d

Former-commit-id: baefc78796f3d4826d32e5324dd88fa01d242ed5
 2014-10-29 15:20:18 -05:00
Steve Harris
15d91d4b2d Merge branch 'master_14.3.1' (14.3.1-29) into omaha_14.3.1 
Former-commit-id: 9d95570c1686978a5c84a21af29dbc84e53355a3
 2014-10-29 08:21:13 -05:00
Ben Steffensmeier
80c209fef7 Issue #3767 Change default image export name to screenCapture.png. 
Former-commit-id: 021367d3212e185a2d8d4e5970fc268204bf070b
 2014-10-28 14:18:02 -05:00
Matthew Howard
4b542e6e5b Merge "ASM #16863 - GFE: Check in version 2.12 of the Objective Analysis utility" into asm_14.3.1 
Former-commit-id: aa43d958820f8873a982d24d9c73760eb430ddc7
 2014-10-24 10:06:56 -05:00
Rici.Yu
b9269162a6 ASM #16863 - GFE: Check in version 2.12 of the Objective Analysis utility 
Change-Id: Ia377d571db68d0078399460ad1d434ba4dad510b

Former-commit-id: 902d1b1e4fed90ff216eab2ee5fc3f198bf7fc6d
 2014-10-24 10:54:37 -04:00
Shawn.Hooper
f5b9798c3d ASM #16871 - Checkin: MPE Gage Table: columns do not sort in descending order 
Change-Id: I197c3049e39ad0c5f5edca8926ff1afdaca20e2f

Former-commit-id: ce7ade3d25263f5af09073e4877b018a84f195a3
 2014-10-24 09:47:54 -04:00
Rici.Yu
6958f11ea7 ASM #16858 - Check in SerpISC tool. 
Change-Id: I4c15360c377370bd757ed2eaad7aeade49412fd6

Former-commit-id: 1e8961e4f4a8168b667ce4b689efd88157dfb61c
 2014-10-20 14:39:46 -04:00
Brian.Dyke
e6ac4980b9 Merge branch 'master_14.3.1' into asm_14.3.1 
Former-commit-id: b0fef17ac648ed5d13d6125fa600c915b131147d
 2014-10-15 13:55:32 -04:00
David Friedman
68f985d668 ASM #16844 - WarnGen can become disabled when moving storm track 
Change-Id: Ic54b4f10eea64db40ce7f9c5a787fe344a8d916a

Former-commit-id: f4000b425b8da6bb16fe124c0e5eaaab78a6b3b2
 2014-10-10 19:33:21 +00:00
Brian.Dyke
6ae3795b7c Merge branch 'asm_14.3.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.3.1 
Former-commit-id: 344f436cfabfa5c1d0aa552467be7a6f9656a1ec
 2014-10-10 11:01:01 -04:00
Ron Anderson
5368107615 Issue #3684 Fix GFE notification sending 
Change-Id: I3b2ab7f454cb9454a9827ef994002d1b2348f462

Former-commit-id: b538cd55c0662d3d593522817986109c7e03625a
 2014-10-09 09:21:29 -05:00
Nate Jensen
b2dcfdf572 Merge "Issue #3686 fix kml export when maps are the only thing loaded" into omaha_14.3.1 
Former-commit-id: 03ed17c8994b00ea37c1c591760c9b7c452dfcde
 2014-10-06 15:53:19 -05:00
Nate Jensen
9025e166dd Issue #3686 fix kml export when maps are the only thing loaded 
Change-Id: I4741da935b0ef24bd8d0d0d114151404038828a0

Former-commit-id: 9dac0fcf997feeecdd8c581ae8fd72581c32d095
 2014-10-06 15:41:42 -05:00
Michael Gamazaychikov
e6d3baaa9c ASM #513 - Maps loaded before opening WarnGen not retained when WarnGen is closed. 
Change-Id: Iee5611826c4f26cec95daa6277c84a2e6a7ae410

Former-commit-id: dff1c1d6fcc5fd0572dd924cfdf7979fc2a18463
 2014-10-06 15:32:10 -04:00
Brian.Dyke
92762f46c7 Merge branch 'omaha_14.3.1' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.3.1 
Former-commit-id: 23d16004c389f0ef708bee2a8bfb84d465b7b36b
 2014-10-03 14:04:46 -04:00
Brian.Dyke
20dd249d2c Merge branch 'asm_14.3.1' of winter:/data/gerrit2/git/AWIPS2_baseline into master_14.3.1 
Former-commit-id: 441fc7561a8526422f9b73b9c47cd220f0babb54
 2014-10-02 10:44:50 -04:00
Brian.Dyke
f3f95aabb0 Merge branch 'mdl_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1 
Former-commit-id: 8fa6749e28cb247ae63307f1423351c23ec0eb87
 2014-10-02 10:38:51 -04:00
Brian.Dyke
2ac30f6c22 Merge branch 'field_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1 
Former-commit-id: ece734cb6218a80fa2dda1b3c43673dc5a31bfbb
 2014-10-02 10:24:04 -04:00
Steve Harris
cc34483b0b Merge branch 'master_14.3.1' (14.3.1-23) into omaha_14.3.1 
Former-commit-id: ace8473f96c6151918ee8ecf61e3b8986d98a68a
 2014-10-02 08:09:02 -05:00
Slav Korolev
ad4bae10c9 Issue #3659 - Enabled to display HFR-EAST_6KM or HFR-WEST_6KM data as a Time Series 
Former-commit-id: 2a03c64bb098a141c82aac4bab42d7d9f4a6296f
 2014-10-01 16:45:33 -04:00
Brian.Dyke
a4bfbea3c2 Merge branch 'master_14.3.1' into asm_14.3.1 
Former-commit-id: 622e63224b6d6bf1d6ced874658bbd9db381799b
 2014-10-01 15:36:06 -04:00
Nate Jensen
f2633a56c0 Issue #3679 fix bug when performance pref page changes 
Change-Id: I15db22a05e5f50b2555c924f61cd52245963ef15

Former-commit-id: e2d5957c02ba210e1964d00f37a00455f3326b37
 2014-10-01 11:53:40 -05:00
dmsys
9f4560c480 Merge branch 'master_14.2.4' into master_14.3.1 CM-MERGE:14.2.4-13-14 into 14.3.1 
Conflicts:
	cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/StormTrackDisplay.java
	cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/IFPClient.java
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/specialWeatherStatement.vm

Former-commit-id: 0bf7ecb27d41f81f1d6727674fc1475eeaa8512c
 2014-09-30 13:45:54 -04:00
Nate Jensen
510d26050d Merge "Issue #3669 Ensure best res does not parse alert messages." into omaha_14.3.1 
Former-commit-id: 9e22fa02bb9f47d8332815059f2f5ae2d2ef6083
 2014-09-29 17:50:34 -05:00
Ben Steffensmeier
95b096192b Issue #3669 Ensure best res does not parse alert messages. 
Former-commit-id: e93157375f90c6cc2038db9a78346592e4d46b0e
 2014-09-29 11:20:33 -05:00
Steve Harris
c03bc273da Merge branch 'master_14.3.1' (14.3.1-21,22) into omaha_14.3.1 
Former-commit-id: 49ad8e0e780443a0439227694a92ec8ab683b125
 2014-09-29 11:14:32 -05:00
Brian.Dyke
46af1d0857 Merge branch 'master_14.2.3' into master_14.2.4 
Former-commit-id: 01cb1dc674ae1249d97dc10be5c068de0ed2a222
 2014-09-29 11:20:57 -04:00
Brian.Dyke
142432ba5e Merge branch 'asm_14.2.3' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.2.3 
Former-commit-id: 93ddf672c137c7221e9595e8b5c1b279084cb451
 2014-09-26 16:14:06 -04:00
David Friedman
05707d0f20 ASM #15658 - WarnGen: inclusion of watch information in marine products 
Change-Id: I13d9e58b1df3dd434cdea66060dbc5886c0e27f2

Former-commit-id: 78cc67f9d2f86c2088ffc5695c4dea879a9e2ebb
 2014-09-26 20:05:46 +00:00
Brian.Dyke
f26fe97ec4 Merge branch 'field_14.2.4' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.2.4 
Former-commit-id: 5b570e5229628de88068edee1c70c26eec13f71a
 2014-09-26 14:19:03 -04:00
Brian.Dyke
a4f68caac6 Merge branch 'master_14.3.1' into asm_14.3.1 
Former-commit-id: 6ed90023551e25216c10d05f2568593992326900
 2014-09-26 13:02:49 -04:00
Brian.Dyke
bd983e1932 Merge branch 'omaha_14.2.3' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.2.3 
Former-commit-id: d6369c8346d1ed4d86ed3eb7adc47de0891c7fd7
 2014-09-26 11:47:38 -04:00
David Friedman
db29ec9dec ASM #15551 - WarnGen: only WCN should be used while including TOR/SVR watches in WarnGen products 
Change-Id: I8b8e9ae40596e5a3d5f0aa44d2e946aa7a68a1ae

Former-commit-id: c8aa2fbfc35c872e2d50de2212eaf16db9b5483d
 2014-09-26 15:13:56 +00:00
David Friedman
c85b0d1cfd ASM #15551 - WarnGen: only WCN should be used while including TOR/SVR watches in WarnGen products 
Change-Id: I1698025cad4310f8fc30938294c161c1f9797f03

Former-commit-id: 70b520c08670646047ffa753814f98c032938ff8
 2014-09-26 13:07:28 +00:00