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

4823 commits

This branch
This branch
All branches
Author SHA1 Message Date
steve.naples
f6636a3dd7 ASM #471 Updated Radar Bias Table Dialog to pass other office id and bias properly. 
Change-Id: I3566b9e6bb5f29000beded0b6912b6771ebc85f5

Former-commit-id: 1c71a34944c7d823742b98dc65e19fe1f478eef0
 2014-04-04 15:30:18 +00:00
David Friedman
fd900e38c2 Merge branch 'master_14.2.2' into asm_14.2.2 
Remove unintentional changes from cd136c3.
Fix problem in warning-request.xml from 3c9c34c.

Conflicts:
	cave/build/static/linux/cave/cave.sh
	cave/build/static/linux/cave/caveUtil.sh
	cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/PolygonUtil.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
	edexOsgi/com.raytheon.edex.plugin.warning/res/spring/warning-request.xml
	edexOsgi/com.raytheon.uf.common.ohd/utility/common_static/base/hydro/Apps_defaults
	edexOsgi/com.raytheon.uf.edex.plugin.manualIngest/res/spring/manualIngest-spring.xml

Change-Id: I814b0ae3c464bbb21b609870b3dca7d575ed948d

Former-commit-id: cf35c1870fc4b6b3c2ceaf038274c4701f8046b1
 2014-03-27 19:17:03 +00:00
Brian.Dyke
7cc471a9c9 Fixed comment merge conflicts added .gitignore 
Former-commit-id: 6093428342170b9fd8deb741a5721375e80bc955
 2014-03-25 15:41:58 -04:00
Brian.Dyke
c67833407c OB_14.1.1-25 baseline 
Former-commit-id: dd2417b58b33005985f80cc83b45134132b3e5a1
 2014-03-25 13:55:54 -04:00
Brian.Dyke
06ee9a6384 Merge branch 'master_14.1.1' into master_14.2.1 
Former-commit-id: 34f830b4933bd6c7149757ce34136c7a18d030bf
 2014-03-24 07:01:29 -04:00
Brian.Dyke
37b6368268 OB_14.1.1-24 baseline 
Former-commit-id: 8b1e7457fc58021208e4233502f118cf34df7534
 2014-03-21 12:43:50 -04:00
steve.naples
d0f4df4ad9 ASM #428 Updated SATPRE file header to correct reftime. 
Change-Id: I1ed89cd9010af085a0e3a9725af182c0cd1b5204

Former-commit-id: e51a12ae977528eb85d2c59505ac5be92d945cfe
 2014-03-19 18:16:41 +00:00
Juliya Dynina
9aa170ca5f Merge "ASM #338 Updated HRAPCoordinates to not parse whitespace" into asm_14.2.2 
Former-commit-id: 8f842b0defba552ebbbe980b42dfb7618a2a7ccd
 2014-03-18 13:52:48 -05:00
steve.naples
309ff4e7f7 ASM #338 Updated HRAPCoordinates to not parse whitespace 
Change-Id: I353e8a07927f3e36aa8905506f63b0e50f2179a6

Former-commit-id: 220ef7b1195366834c9f85b828862f128dd3fea1
 2014-03-18 15:40:13 +00:00
Juliya Dynina
85fd3b3888 Merge "ASM #330 - Fix reloading of TextDB static files" into asm_14.2.2 
Former-commit-id: 0d338537015e8e8a98fa67bc658fa3a4ed0f15f0
 2014-03-18 08:47:22 -05:00
Juliya Dynina
c735051e00 Merge "ASM #335 - Watch wording not being inserted for SMW and SMW followup" into asm_14.2.2 
Former-commit-id: 669d66d3b8279833df4a361c961c113e653a542d
 2014-03-18 08:13:51 -05:00
David Friedman
15ca9f4dcc ASM #330 - Fix reloading of TextDB static files 
Change-Id: I23c6f2883c5ce645854283996fd391f805b2b4f5

Former-commit-id: 0a94094f0f140de68da634cbc6c79039507712ca
 2014-03-18 13:12:40 +00:00
Qinglu.Lin
4b3c821ce0 ASM #335 - Watch wording not being inserted for SMW and SMW followup 
Change-Id: Ic2ab65e3690dccad47b87f99dd4fb9d801742e05

Former-commit-id: f114aa5e7348f0feb5d9da66b5cd389dfb21275a
 2014-03-17 18:17:49 -04:00
Matthew Howard
c1433db0fb Merge "ASM #84 - fix default time range for smart tools" into asm_14.2.2 
Former-commit-id: 1b46d5c169709a9498a5eb9963286a6223089af4
 2014-03-14 19:47:32 -05:00
Rici.Yu
74b1c827ee ASM #84 - fix default time range for smart tools 
Change-Id: Ia9460e2ad78b66681d63240a3ee5ec79e2bbdd99

Former-commit-id: cfb3459d6314afa396c89b90bf42ab539fd15d8c
 2014-03-14 14:39:56 -04:00
Brian.Dyke
d23acbdd48 Merge remote branch 'remotes/origin/master_14.1.1' at 14.1.1-23 into master_14.2.1 
Conflicts:
	edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTable.java

Former-commit-id: 0ea874227f20f9f7fe19fc8371e10711023c3f53
 2014-03-14 11:13:30 -04:00
Brian.Dyke
030a18f804 Merge branch 'asm_14.2.1' of /data/integration-asm-gerrit/update-latest/AWIPS2_baseline into master_14.2.1 
Former-commit-id: 39f4506422c590b7520957923a5b00fd16aa19d0
 2014-03-14 10:15:53 -04:00
Brian.Dyke
d4b6d22ae2 Merge branch 'omaha_14.2.1' of cm2:/home/garmenda/deliveries/14.2.1/AWIPS2_baseline.14.2.1 into master_14.2.1 
Former-commit-id: 3605f0373a6ce7b417d942991e50029c2d0c964b
 2014-03-14 08:44:39 -04:00
Brian.Dyke
dcc2e4fd61 OB_14.1.1-23 baseline 
Former-commit-id: b3292d88eee345fca27d9ca645ec2686d0114e5c
 2014-03-14 08:18:16 -04:00
Kevin P. Johnson
b2797a0788 ASM #245 logs in caveData need to be purged. Added function to caveUtil, added BASE_LOGDIR in cave.sh and added function call 
Change-Id: I41e5e11254fc52e49c4668b2797624c599130c67

Former-commit-id: fad7cf2e6661aa0bcc9c37499e0560b708f192f0
 2014-03-13 20:42:12 +00:00
Ben Steffensmeier
77041e5b17 Issue #2528 Fix satellite units/style. 
Former-commit-id: 7e38454a31aa55c606c155a108253c0433ecb517
 2014-03-12 14:19:49 -05:00
Juliya Dynina
6ac6f6f1fc Merge "ASM #380 - Hydro--TimeSeries:error thrown when click Table button" into asm_14.2.2 
Former-commit-id: f28ab35657154bb028f3ca710ccc0b42d7c04b70
 2014-03-12 11:36:38 -05:00
Richard Peter
18234c5d73 Merge "Issue #2678 end retrieval double clutching Change-Id: I34b68b94f5cbb921a3ea3cfeaefb9155adeab0dc" into omaha_14.2.1 
Former-commit-id: 555358125bfb925a2c8ed0d393911b4d045d18b1
 2014-03-11 16:43:37 -05:00
Dave Hladky
3500ad262a Issue #2678 end retrieval double clutching 
Change-Id: I34b68b94f5cbb921a3ea3cfeaefb9155adeab0dc

Former-commit-id: 31a35e35b75bc9e6efc43af1da0b184c1828ff45
 2014-03-11 15:53:59 -05:00
Loubna.Bousaidi
123007b18d ASM #380 - Hydro--TimeSeries:error thrown when click Table button 
Change-Id: Ifca1581cbcf48346082a6afb976a927a3d878b09

Former-commit-id: d2161a0fdd0bad7f8266a8b30659021edecaa549
 2014-03-11 18:58:26 +00:00
Nate Jensen
85f5821a6f Merge "Issue #2896 Fix sat best res on weird projections" into omaha_14.2.1 
Former-commit-id: d463531d4cf3bce8862ce1c29b12e9a594d8c63b
 2014-03-11 12:35:44 -05:00
David Gillingham
b0783b64ce Issue #2509: Fix static topo generation break caused by baseline merge. 
Change-Id: I4300af81de44639a6ac55b968f18730f698e3b68

Former-commit-id: 09a2f9e3ccabc82cbea9556351bdc02bb1c350c7
 2014-03-11 11:54:25 -05:00
Ben Steffensmeier
8bb517836a Issue #2896 Fix sat best res on weird projections 
Former-commit-id: 029b8b30365fd3ec2cb9f5139dec02cc918a0dbb
 2014-03-11 11:07:43 -05:00
Nate Jensen
ccb06db199 Issue #2779 update memory settings for renamed NC perspective 
Former-commit-id: bc1c10ee0039906ec0b48e834e533332611ac0d3
 2014-03-11 10:28:01 -05:00
Brian.Dyke
552490206f Merge branch 'asm_14.2.1' of /data/gerrit2/git/AWIPS2_baseline into master_14.2.1 
Former-commit-id: eaa41b4f2dd9fce2d957a2311ee3f4f04f220365
 2014-03-11 10:44:03 -04:00
Juliya Dynina
6bbd88e62c Merge "ASM #349 - Workaround for QPID-5569" into asm_14.2.1 
Former-commit-id: a167748b77baad66784893304a18e8866f5471f1
 2014-03-11 09:24:12 -05:00
Brian.Dyke
c6f2010ce6 Merge branch 'asm_14.2.1' of /data/gerrit2/git/AWIPS2_baseline into master_14.2.1 
Former-commit-id: 0e02910adc2ef73df2eff5b41c1e9945a5536a0a
 2014-03-10 15:42:38 -04:00
brian.dyke
654778bb0d Merge branch 'master_14.2.1' at 14.2.1-11 into asm_14.2.1 
Former-commit-id: 9dba33a7122e20c0502b2bf8036ec875e957798b
 2014-03-10 15:36:56 -04:00
Brian.Dyke
d710aec521 Merge branch 'ncep_14.2.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.2.1 
Former-commit-id: ac54324fb0eff1483dd2c3aa8d94273760451dab
 2014-03-10 15:14:59 -04:00
steve.naples
212677f94b ASM #337 MeanMonthlyPrecip updated to handle precip values from PRISM data less than 1 inch. 
Change-Id: Iffa8644f68df362d4f988fa3d1a9bd16acd4be97

Former-commit-id: cd7d6876338b98c320a8d7559c518e32e90e3000
 2014-03-10 17:47:25 +00:00
steve.naples
915e3c2c66 ASM #336 MPEFieldResource updated to add case for PRISM data unit conversion. 
Change-Id: I8f129902079c051ca4fb508e43b8bf892cb19e0e

Former-commit-id: 482547a4f4eaff0fc24b6d3f1103a38a9f3aa314
 2014-03-10 17:40:35 +00:00
Nate Jensen
6a75fe686a Issue #2779 add .ini generation of memory settings for other components 
Former-commit-id: 71a7f485c5a32caeabc98f23164c9fc87cfa1787
 2014-03-10 10:03:02 -05:00
Stephen Gilbert
65dd8b4c3c VLab Issue #3224 - NSHARP: Fix erroneous mixing heights 
Change-Id: Ib27352c1f0e5f2ee860577e5b3e96be5252902f2

Former-commit-id: 459cd2e6772efa05a683073798a1d4424aa2facf
 2014-03-07 19:10:08 -05:00
Stephen Gilbert
9a457213bb VLab Issue #3223 - NSHARP: Improve selection operation 
Change-Id: I4d0e92d1db24b3136f60fa224c908dfc020afa1d

Former-commit-id: 16fcc171c65d79d5698feeb3ff0ace49c31d976f
 2014-03-07 19:07:28 -05:00
Stephen Gilbert
1632166902 VLab Issue #3222 - Fix for Plotmodel CAVE hangs in NCP 
Change-Id: I825c3b0af5177258f531b625f2cc66761e932d57

Former-commit-id: 24e07a3215a7879e459afc74e020eab0a8e1c646
 2014-03-07 18:49:21 -05:00
Stephen Gilbert
625fcb0064 VLab Issue #3221 - Fix XML serialization problems 
A few problems reading/writing XML files were noticed after upgrading to
14.2.1.  This commit fixes the saving of SPFs, reading of image style
rules, and the location of lockedColorMap file.

Change-Id: I8aad4197029c70f72612299a25329687892884af

Former-commit-id: 4f58998c899e28521658bf17dee852592c534713
 2014-03-07 18:36:42 -05:00
Steve Harris
92232fa063 Merge branch 'master_14.2.1' into omaha_14.2.1 
Former-commit-id: 81f446dbc2ae8f8c54cba5b29ed57f113d318160
 2014-03-07 15:16:18 -06:00
Shawn.Hooper
41a4905f9f ASM #224 - WarnGen: OB13.5.2 Template Errors 
Change-Id: I68e8942e90fb62388b2c400f6a54f3de1a3f1c28

Former-commit-id: b18b8f64040b1c41810f391b8ed785327b6e5d59
 2014-03-07 14:53:54 -05:00
Shawn.Hooper
670da1895b ASM #377 - Baseline National River Location Database fails 
Change-Id: Idbad0e02ca895b7e649c9d3e7165673fbd1cbaae

Former-commit-id: 5dcb5b019f389e64435b0283d95fe477032d88cc
 2014-03-07 13:12:11 -05:00
Shawn.Hooper
8c9f9b3ae0 ASM #378 - MPE gages are not listed/available in gage table 
Change-Id: I1a061e6cf8a6364e4401ea4524e3fc0c8cad9b6a

Former-commit-id: 55b1066b8674a044602297e64cb557ced5faf92a
 2014-03-07 12:57:36 -05:00
Brian.Dyke
3ac2a61218 Merge branch 'ncep_14.2.1' of /data/Integration/winterfell-build/vlab/AWIPS2_Dev_Baseline into master_14.2.1 
Former-commit-id: 8b6d5b889e652cbf82c66ae831c9c116626c1494
 2014-03-07 11:50:06 -05:00
David Friedman
2c1a3442d6 ASM #349 - Workaround for QPID-5569 
Change-Id: I1f39f73b899dadc04e9c592de8b087a5545da9ce

Former-commit-id: 18d692c17ea11537d0eb832fbe63a04b59b0040c
 2014-03-07 14:58:09 +00:00
Brian.Dyke
394076196b Merge branch 'master_14.1.1' into master_14.2.1 
Former-commit-id: 4385b291d04f60f3d5b3f00b1411ab1cd8c89ba7
 2014-03-07 09:01:09 -05:00
Brian.Dyke
312cd8a3e8 Merge branch 'fun_merge' into master_14.2.1 
Former-commit-id: bb169bc0992f28fe1527cb0106771c35415cea24
 2014-03-07 08:57:07 -05:00
Brian.Dyke
21f17d4f9b 14.1.1-22 baseline 
Former-commit-id: ae37ad5bac445251d1456f37588819fccfede061
 2014-03-07 08:49:00 -05:00