Commit graph

7253 commits

Author SHA1 Message Date
Steve Harris
42db241877 Merge tag 'OB_14.3.1-31m' into omaha_14.4.1
Conflicts:
	cave/com.raytheon.uf.viz.spellchecker/src/com/raytheon/uf/viz/spellchecker/dialogs/SpellCheckDlg.java

Former-commit-id: a5398d8035 [formerly 361f7bcf425edaf687cbfc63d4c165790b45a5bf]
Former-commit-id: e770670ebf
2014-11-04 13:17:44 -06:00
Nate Jensen
56224cc04b Merge "Omaha #3601 Update satellite inventory scripts to DAF" into omaha_14.4.1
Former-commit-id: 5e30cb57a8 [formerly 524272eee2b2b27d46452509e944522649456d84]
Former-commit-id: c1f2f79c24
2014-11-04 08:48:58 -06:00
Nate Jensen
c28bab2aa7 Merge "Omaha #3600 Update radar inventory scripts to DAF" into omaha_14.4.1
Former-commit-id: 4b0145a1c3 [formerly 742a15be8431165cd348c87674275d45da9b6949]
Former-commit-id: 93d8a31f41
2014-11-04 08:48:42 -06:00
Nate Jensen
35d7da3c25 Merge "Omaha #3599 Update grid inventory scirpts to DAF." into omaha_14.4.1
Former-commit-id: bcaaf60fd1 [formerly 2da2aa5af20a75edde85e566f680322106dd04ae]
Former-commit-id: e5ed793542
2014-11-04 08:48:32 -06:00
Brian.Dyke
196e5e37ac Merge branch 'omaha_14.3.1' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.3.1
Former-commit-id: f3b80f319d [formerly 4be7b001bc98e6fe81b3e66940d025fd7511060b]
Former-commit-id: 327491a3a8
2014-11-03 14:45:24 -05:00
Nathan Bowler
0d730c84a2 Omaha #3601 Update satellite inventory scripts to DAF
Change-Id: If12bae7fff302e3da02552fd8d6393db9cd75a9f

Former-commit-id: 9ce30740a7 [formerly 33b0fd4d0bc62e9dff1256edfe3f55a080b9efb9]
Former-commit-id: 9942aebf17
2014-11-03 14:03:51 -05:00
Nathan Bowler
d3f7d1216b Omaha #3600 Update radar inventory scripts to DAF
Change-Id: I9b410e61db6dc9edd60cd1c0ec225bf3aa0daf51

Former-commit-id: 6966d7d7c5 [formerly 1f780ff45f48936320853c793a4a5e85aa4ed588]
Former-commit-id: d93009bd8d
2014-11-03 13:14:28 -05:00
Nathan Bowler
08efd3fb84 Omaha #3599 Update grid inventory scirpts to DAF.
Change-Id: I0ede4fae07d4b393348bf636612df0f81eb80bef

Former-commit-id: 3adeed0277 [formerly 881f242499a9130dd21fba9e5f65788627a95180]
Former-commit-id: 79fea328f3
2014-11-03 12:40:05 -05:00
Nate Jensen
fcf278072c Merge "Omaha #3772 Separate Obs menu out of com.raytheon.uf.viz.d2d.ui plugin" into omaha_14.4.1
Former-commit-id: d5efa99fce [formerly afe1e532e582e442c556679adcba4e8388b98bbb]
Former-commit-id: 0c4be8f4cb
2014-11-03 09:59:06 -06:00
Shawn.Hooper
c4f4477a7c ASM #15033 - Allow generic warning types to show up continuously during Warning cycle
Change-Id: I6e0884b1bbc1e4bed3300bb9dc0f0b3f779aa212

Former-commit-id: 58db54ff05 [formerly 41e18e5104eac8ee3335a80d678d74c7a56b196a]
Former-commit-id: f8ee619f16
2014-11-03 10:30:05 -05:00
Matthew Howard
d90db01d4e Merge "ASM #16693 handles more swear words" into asm_14.3.1
Former-commit-id: 36e73a31df [formerly a6ed07b8c01df8576cc54f88dc52d2110d211707]
Former-commit-id: 39ed75df43
2014-11-03 09:56:09 -05:00
Mark Peters
64e9590b5b Omaha #3772 Separate Obs menu out of com.raytheon.uf.viz.d2d.ui plugin
Change-Id: I5e407aeff99d7dc9a393d713096971a7ed4c01a6

Former-commit-id: 88b07ddb46 [formerly d946679c5a9b383f689ac3acc66d4aae4ecc4bde]
Former-commit-id: bc9c564192
2014-10-31 13:32:42 -05:00
Mark Peters
d732bfe002 Omaha #3768 Pluginize the D2D Upper Air menu
Change-Id: I58f76a59a40170fefe93d779760b6581c3f8490a

Former-commit-id: 1c2e38dbd1 [formerly 4554ba073c7a97a335d8020f7068bc5521c0b47a]
Former-commit-id: c11bd6816b
2014-10-30 19:15:52 -05:00
Nate Jensen
958441ec3e Merge "Omaha #3601 Adding original, unaltered satellite inventory scripts" into omaha_14.4.1
Former-commit-id: 316052231f [formerly 2c413c430c662b74e5d06e372f6d9f9ae7f6177a]
Former-commit-id: dc13fce4dc
2014-10-30 15:05:13 -05:00
Nathan Bowler
e4d532d4dc Omaha #3601 Adding original, unaltered satellite inventory scripts
Change-Id: I32bccffb990baf6dc023c9fafe011aaa0dd4c893

Former-commit-id: 3bed545253 [formerly 9e244756aa82082784c7f228378bf5f024b32422]
Former-commit-id: de68023968
2014-10-30 15:46:09 -04:00
Nathan Bowler
b59d2d69cd Omaha #3600 Adding original, unaltered radar inventory scripts.
Change-Id: I2bd8de7b36aeba4cb5e58d6b153a249d72ac91bb

Former-commit-id: c84b7c3f0f [formerly 965405355e5f053266bd50977c59dff760ee4f0b]
Former-commit-id: 68c4943c27
2014-10-30 15:35:14 -04:00
Nate Jensen
23ed772042 Merge "Omaha #3599 Adding unaltered, original grid inventory scripts" into omaha_14.4.1
Former-commit-id: 94b267202e [formerly 9dd052b0cbe66ef388f0c435f32d7bc9a36b8545]
Former-commit-id: 592a8d0e83
2014-10-30 14:34:27 -05:00
Nathan Bowler
3ff8755679 Omaha #3599 Adding unaltered, original grid inventory scripts
Change-Id: If8702172dababa0acf73c1eead79769bde2f2469

Former-commit-id: f3be28a332 [formerly 0dbabf14124334a97f88040c0ffa77e10299cb5f]
Former-commit-id: b809f64cd4
2014-10-30 14:59:06 -04:00
Nate Jensen
0e82fa47c8 Merge "Omaha #3755 Update Grid and Radar information retrieval for msas/laps inventories." into omaha_14.4.1
Former-commit-id: fc9c89c426 [formerly e9780b64d0ce8c91f7c236067f5ab251bd874546]
Former-commit-id: fbaecfe578
2014-10-30 13:41:14 -05:00
Ying-Lian.Shi
c8cfe6a2a7 ASM #16693 handles more swear words
Change-Id: I0b892e3e6748919a206597106604a50f108b1bf7

Former-commit-id: ea9e231074 [formerly 6133c233bd3e02b0a8e1540dd6c496997184f11d]
Former-commit-id: 3d9fa4e763
2014-10-30 18:22:34 +00:00
Nathan Bowler
f76cd38a15 Omaha #3755 Update Grid and Radar information retrieval for msas/laps inventories.
Change-Id: I472c2948ada9357350138fe27f2588cce27e17ba

Former-commit-id: f714213db3 [formerly 2ec9a420268e41d8fdc35efe7feabfb12b7bee4c]
Former-commit-id: 9673a96e71
2014-10-30 13:18:14 -04:00
Steve Harris
be38ca97d4 Merge tag 'OB_14.3.1-30m' into omaha_14.4.1
Former-commit-id: 54c14a5f5b [formerly 9f4fc2a9cbff7f8555c7bf8326bb785f791e8b00]
Former-commit-id: 5efdd0d572
2014-10-30 09:40:20 -05:00
Nate Jensen
c004468689 Merge "Omaha #3668 Give grid a custom job pool." into omaha_14.4.1
Former-commit-id: 5e22943a26 [formerly b98016900319d31c23be96640aa97f7b2efcee5b]
Former-commit-id: e83c1f20bb
2014-10-30 09:32:12 -05:00
Shawn.Hooper
0b0b922968 ASM #16805 - Increment release number in the awips2-tools rpm spec file
Change-Id: I5ab390facd2343fdcbc9d2f374d275d9ef466aa4

Former-commit-id: 285e4baaec [formerly 80801f18a7106c3a7b0dca626fbaca4ec5a67f7f]
Former-commit-id: 9332029a6d
2014-10-30 09:58:02 -04:00
Brian.Dyke
e3ebd14d63 Merge branch 'master_14.3.1' into asm_14.3.1
Former-commit-id: 33522c2b74 [formerly 5d2ba108dfbe266edbaee8f5a03e81c02419997a]
Former-commit-id: bdd4f6b3cc
2014-10-30 09:38:07 -04:00
Steve Harris
8a6a57d9de Merge branch 'master_14.3.1' (14.3.1-30) into omaha_14.3.1
Former-commit-id: 8fd7a28033 [formerly ec350c044862fb51513ffa5246c47af33a6ceae5]
Former-commit-id: 8d1829bee7
2014-10-30 08:36:12 -05:00
Ben Steffensmeier
90e9458999 Omaha #3668 Give grid a custom job pool.
Former-commit-id: 596578281a [formerly 14e82b9f400b47b4f446bf1c5c5e729cf442b153]
Former-commit-id: b41b28ed57
2014-10-29 18:07:28 -05:00
Benjamin Phillippe
13b8859ee1 Omaha #3454 Fixed text archiver
Former-commit-id: fd16871b96 [formerly 61514bec505566ba434e3b9772e0aaf329b51cff]
Former-commit-id: 1fcb79c423
2014-10-29 16:09:35 -05:00
Steve Harris
0d2cbbfe4a Merge tag 'OB_14.3.1-29m' into omaha_14.4.1
Former-commit-id: 0322884798 [formerly e5cd617f80e90dcfba52058b2a439fade1cfe15e]
Former-commit-id: 0f40604bcb
2014-10-29 10:03:20 -05:00
Steve Harris
2a46e1a813 Merge branch 'master_14.3.1' (14.3.1-29) into omaha_14.3.1
Former-commit-id: 1753861b41 [formerly 9d95570c1686978a5c84a21af29dbc84e53355a3]
Former-commit-id: 15d91d4b2d
2014-10-29 08:21:13 -05:00
Nate Jensen
4b9b013b22 Merge "Omaha #2707 fixed LSR update script" into omaha_14.4.1
Former-commit-id: 18b160faac [formerly 828a103cf403430684f84f18dbfe0c044655e307]
Former-commit-id: e42bf53f7a
2014-10-28 18:03:13 -05:00
Brian Clements
682ad5d400 Omaha #2707 fixed LSR update script
Change-Id: I879d7d425f19113cae2c0bbc6f43df1edcf5594a

Former-commit-id: 3c0c33288a [formerly ee38c97013e2a0c83e555cbbe77a9978296e39f1]
Former-commit-id: 0f5d97c961
2014-10-28 17:57:38 -05:00
Benjamin Phillippe
73c1c816c0 Omaha #3454 Adding sequences to tables in events schema
Change-Id: I79d03c5f97eeecdb665fee624cdae377555fa373

Former-commit-id: 80879d9efa [formerly fa5ec2a1866784e8b0fc0f9a6c0d3a363cbcc22d]
Former-commit-id: a13c0a8b39
2014-10-28 15:56:47 -05:00
Richard Peter
be63cfd242 Merge "Omaha #3454 Adding sequences to tables in events schema" into omaha_14.4.1
Former-commit-id: 7c8a19d149 [formerly 3fb87f623c38b78c1d1046990fb05576851174d2]
Former-commit-id: 14a86f1063
2014-10-28 15:50:26 -05:00
Nate Jensen
751d88442c Merge "Omaha #3720 Remove dataURI column references from redbook" into omaha_14.4.1
Former-commit-id: 13096c2eaa [formerly add132c7f2baf5b421590827559b99954133be76]
Former-commit-id: 9fe7950e24
2014-10-28 15:32:55 -05:00
Nate Jensen
870fd8efd9 Merge "Omaha #3454 Fixing usage of getSession() to ensure proper session closure" into omaha_14.4.1
Former-commit-id: bf7d9b31b7 [formerly 7306aeaa7986aa69d2c18c00d940fb2eb0624612]
Former-commit-id: e54ebf94e5
2014-10-28 15:32:41 -05:00
Nate Jensen
5d3e3e58dd Merge "Omaha #3681 SatBlended implements Interrogatable" into omaha_14.4.1
Former-commit-id: 040f9f0877 [formerly 17861a7e752838399a918c3b09dcaba8095a6a18]
Former-commit-id: c89de11b63
2014-10-28 15:32:32 -05:00
Ron Anderson
d20a38f031 Merge "Omaha #3685 Fix spell checker to use mixed case. Fix bug in importShapefile" into omaha_14.4.1
Former-commit-id: ee12f5dc65 [formerly e076201872a69829228a6e78d632287839acf3d8]
Former-commit-id: 30d031989e
2014-10-28 15:15:26 -05:00
Ron Anderson
f448c493a8 Merge "Omaha #3685 Add support for sending specific products in mixed case" into omaha_14.4.1
Former-commit-id: 8b32ac8f54 [formerly 453e478604f048ae019eeee9bb8e46883b58254e]
Former-commit-id: 9bd76e678f
2014-10-28 15:15:16 -05:00
Brian.Dyke
b396cc467c Merge branch 'ops_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Former-commit-id: 9907c37a0e [formerly d12d6cf7e6862a87c00f833ee02e72e5c0ad8252]
Former-commit-id: 94ddd59bfc
2014-10-28 15:25:05 -04:00
Brian.Dyke
957781a1b2 Merge branch 'ops_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1
Conflicts:
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/VM_global_library.vm

Former-commit-id: f8ce701c85 [formerly 52ba693c7d77f4e29db6bc5202c9764509bce58d]
Former-commit-id: 765359aee6
2014-10-28 15:23:11 -04:00
Ben Steffensmeier
14dbd71e9d Issue #3767 Change default image export name to screenCapture.png.
Former-commit-id: 1591c9cbb8 [formerly 021367d3212e185a2d8d4e5970fc268204bf070b]
Former-commit-id: 80c209fef7
2014-10-28 14:18:02 -05:00
Steve Harris
bd4b324ebe Merge tag 'OB_14.3.1-28m' into omaha_14.4.1
Conflicts:
	edexOsgi/com.raytheon.uf.common.datadelivery.registry/src/com/raytheon/uf/common/datadelivery/registry/AdhocSubscription.java
	edexOsgi/com.raytheon.uf.common.datadelivery.registry/src/com/raytheon/uf/common/datadelivery/registry/SiteSubscription.java
	edexOsgi/com.raytheon.uf.common.monitor/src/com/raytheon/uf/common/monitor/MonitorAreaUtils.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/BandwidthManager.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/EdexBandwidthManager.java
	edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/src/com/raytheon/uf/edex/datadelivery/retrieval/db/RetrievalDao.java
	rpms/awips2.core/Installer.gfe.climo/component.spec

Former-commit-id: 1b83d045ea [formerly 353674cd0deec2dd86c38dc75c7593d1477a7e78]
Former-commit-id: 19527f50bb
2014-10-28 13:32:31 -05:00
Baoyu Yin
8f9c70f4f7 VLab Issue #4796 - AWIPS2_DR_17420 WarnGen templates and 14.2.1 template corrections UPDATE on Oct 28 fix for FFW error ; fixes #4796
Change-Id: I4f43f1365c3ad4d11314f199c4d896aa542a48c0

Former-commit-id: c9bc14a668 [formerly 54d2f956f53d2fe8a6fa0550a4236d95013b8ba8]
Former-commit-id: 4252ccfcb1
2014-10-28 14:32:31 -04:00
Mark Peters
76a2964c73 Omaha #3720 Remove dataURI column references from redbook
Change-Id: I81ba779e6e9ded93256c7ccd7b2932ceefbfd51d

Former-commit-id: d03a4bd3e7 [formerly 48160d952981b597634c941741e2bc370a5fdb5f]
Former-commit-id: c034d98ab9
2014-10-28 12:21:45 -05:00
Benjamin Phillippe
a9e2e96d76 Omaha #3454 Fixing usage of getSession() to ensure proper session closure
Former-commit-id: bbd2081844 [formerly fc36b84fa43c354b674f040ae5d2647df5b3122f]
Former-commit-id: 50f5c8d1e3
2014-10-28 11:30:25 -05:00
Benjamin Phillippe
acea99bb5e Omaha #3454 Adding sequences to tables in events schema
Former-commit-id: 39f00d60ae [formerly 9799cba1a2c525190d297f7e355cda29f1e98ee7]
Former-commit-id: 4af35d83f8
2014-10-28 10:30:47 -05:00
Ben Steffensmeier
2bca486744 Omaha #3681 SatBlended implements Interrogatable
Former-commit-id: 790dee3349 [formerly 10b1129bb8c938d99b9c74816927f3879a1ef6a2]
Former-commit-id: 5e63b30ab0
2014-10-27 18:16:49 -05:00
Brian.Dyke
34a01a98da Merge branch 'master_14.3.1' into asm_14.3.1
Former-commit-id: 34931f4cc5 [formerly cca25d0e29324cc883f177597e0975279b07c8ca]
Former-commit-id: 1ac5b6af5d
2014-10-27 15:51:57 -04:00
Nate Jensen
2626b9ff33 Merge "Omaha #3612 Fixed Thin client plugin blacklist" into omaha_14.4.1
Former-commit-id: 714c42a24d [formerly 370411bb2ca890457e0630804c3a6b0b46080c3a]
Former-commit-id: ced3e75600
2014-10-27 13:34:22 -05:00