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

1960 commits

Author SHA1 Message Date
Ron Anderson
40b8d1ed3c Issue #2028 Fixed date line issue in MakeHazardDialog 
Change-Id: I033642a36bc601e74e37e091dc703dcb06e0f287

Former-commit-id: 165bc6c409 [formerly 6557515f64] [formerly 165bc6c409 [formerly 6557515f64] [formerly 08e09382db [formerly 168dcc10eaf0102cc1e04a74db5ca7e2afa4be4f]]]
Former-commit-id: 08e09382db
Former-commit-id: 3f9cb35feb [formerly c3363d43fa]
Former-commit-id: b04716dd2b
 2013-05-30 11:01:07 -05:00
Dustin Johnson
03cbf9a455 Issue #2038 Remove unused schemas from datadelivery spring files 
Change-Id: I65a53510e3e8f9aba3fc64f011dad0905cde8b26

Former-commit-id: 463bed7647 [formerly efc3c6a2f2] [formerly 463bed7647 [formerly efc3c6a2f2] [formerly b99a8bc4f9 [formerly 2c5b357da096c9c1e2cd76560d143b8009aaba0f]]]
Former-commit-id: b99a8bc4f9
Former-commit-id: 74d985af51 [formerly b1d66a0450]
Former-commit-id: 3dbb682493
 2013-05-30 09:49:09 -05:00
Steve Harris
86a4b2913f Merge branch 'master_13.4.1' into omaha_13.4.1 
Former-commit-id: 07bc6c83e9 [formerly 9d4577079d] [formerly 07bc6c83e9 [formerly 9d4577079d] [formerly 0a276d4954 [formerly f50ef3c44d1386dd4ec800fd65db7b0f2b4fe03f]]]
Former-commit-id: 0a276d4954
Former-commit-id: f72ba834dc [formerly f4d1b7c86c]
Former-commit-id: 9bf53663ae
 2013-05-30 07:26:30 -05:00
Nate Jensen
15894e477c Merge "Issue #1869 fix plot updates, broken by earlier commit." into development 
Former-commit-id: df5945a8e2 [formerly 4f3ea80cd9] [formerly df5945a8e2 [formerly 4f3ea80cd9] [formerly 532d3ee899 [formerly 534a1d6d9cb2366d875f5361c2a30fce54b7f786]]]
Former-commit-id: 532d3ee899
Former-commit-id: 545fe43c1e [formerly f95037a9bf]
Former-commit-id: d354b67dd3
 2013-05-29 16:20:17 -05:00
Steve Harris
176f4d392f 13.4.1-13 baseline 
Former-commit-id: e3b8086bd0 [formerly 87b9712009] [formerly e3b8086bd0 [formerly 87b9712009] [formerly de476791fb [formerly f79327d3865cb0fa7812d5fba896c1a46013badf]]]
Former-commit-id: de476791fb
Former-commit-id: 418f8aef56 [formerly b58cf237bf]
Former-commit-id: c9155c1631
 2013-05-29 16:30:09 -04:00
Ben Steffensmeier
75b800be90 Issue #1869 fix plot updates, broken by earlier commit. 
Former-commit-id: b32a5b1c00 [formerly d2e01ee1f2] [formerly b32a5b1c00 [formerly d2e01ee1f2] [formerly cbc3b0a9a4 [formerly a9240b60e4643b43880d2be76580dc85999eb897]]]
Former-commit-id: cbc3b0a9a4
Former-commit-id: 6b7958c834 [formerly d90ca1696e]
Former-commit-id: 47dba49e8d
 2013-05-29 15:00:04 -05:00
Nate Jensen
e4bbe70d57 Issue #1989 update spring xsd references to 3.1, fix ingestDat.sh 
Change-Id: I478c31b72267fe7fd3b7a6559de87e8600c3c0c3

Former-commit-id: 927da5cffb [formerly 99b4a21414] [formerly 927da5cffb [formerly 99b4a21414] [formerly 3f3e0a788d [formerly b7b619e1a3a85ac8c5f22a36317e22e15ad557a2]]]
Former-commit-id: 3f3e0a788d
Former-commit-id: b025262dc1 [formerly a1f314948f]
Former-commit-id: 4eb941dacb
 2013-05-29 14:49:43 -05:00
Dustin Johnson
233d827c9c Merge "Issue #2038 More information when bandwidth manager can't schedule a subscription" into development 
Former-commit-id: 7ca6f18405 [formerly 66c941fc3f] [formerly 7ca6f18405 [formerly 66c941fc3f] [formerly ac292f1242 [formerly 346f09f53275928fc43d86dd41d7edd519581caf]]]
Former-commit-id: ac292f1242
Former-commit-id: b6c87f42b1 [formerly ef43634c56]
Former-commit-id: bae8a2436d
 2013-05-29 09:27:30 -05:00
Mike Duff
4d43e81158 Issue #2016 - fix TS Trace toggle 
Change-Id: I740c75861ac81daaac69a0c70ff050079d3bbaf4

Former-commit-id: 51de726e49 [formerly afbe294f4a] [formerly 51de726e49 [formerly afbe294f4a] [formerly 5919687484 [formerly f51f36cfc63a8e75f8a72bb202d1389594865466]]]
Former-commit-id: 5919687484
Former-commit-id: d9fd9d297b [formerly 66f4e6fe87]
Former-commit-id: 5e3fa8852b
 2013-05-29 09:15:46 -05:00
Dustin Johnson
4ac1c2cbdb Issue #2038 More information when bandwidth manager can't schedule a subscription 
Amend: Peer review comments

Change-Id: If2ae3f98a3a04709c2cdc7632ca89f2ee6a5e08d

Former-commit-id: c76fa3bc2a [formerly 0a9e7ed740] [formerly c76fa3bc2a [formerly 0a9e7ed740] [formerly 31e01a9f9a [formerly b1414f6aebda59cb6d83d1f0d0154fa4cd850953]]]
Former-commit-id: 31e01a9f9a
Former-commit-id: fff0172786 [formerly 187a1e49ef]
Former-commit-id: 1fab733472
 2013-05-29 09:02:47 -05:00
Nate Jensen
4ac4250fe3 Merge "Issue #1967 fix annoying warnings, remove unused preferences page" into development 
Former-commit-id: ba5e69c7ff [formerly 7c1e6e8b09] [formerly ba5e69c7ff [formerly 7c1e6e8b09] [formerly 256a67a9f9 [formerly 8e487eda5b9c31bca2e03ee0d129d42fa38bf55e]]]
Former-commit-id: 256a67a9f9
Former-commit-id: ac838f62dd [formerly 2fe1960ebb]
Former-commit-id: 99a1938d36
 2013-05-28 15:43:31 -05:00
Nate Jensen
95ddeeb10a Merge "Issue #1638 Fixed text box drawn to be correct size with padding around text" into development 
Former-commit-id: cba08666e6 [formerly 053e37ee76] [formerly cba08666e6 [formerly 053e37ee76] [formerly e846e539fb [formerly e12bf41edb19fb38673057ea5a1633953e5ebdf3]]]
Former-commit-id: e846e539fb
Former-commit-id: 607e980d45 [formerly 5c60582df2]
Former-commit-id: f1b34d9fdd
 2013-05-28 15:43:23 -05:00
Max Schenkelberg
062c4e90cd Issue #1638 Fixed text box drawn to be correct size with padding around text 
Amend: Fixed format string issues with topo resource and colorbar labels

Change-Id: I978a5f518dbae50eeded25ad0deab6a067b28114

Former-commit-id: a88ca5e983 [formerly 13ff44fdee] [formerly a88ca5e983 [formerly 13ff44fdee] [formerly 3175563336 [formerly aa8c0a8573188f241575ac212a876eb3b630da9a]]]
Former-commit-id: 3175563336
Former-commit-id: 4e8d25b317 [formerly 9932114218]
Former-commit-id: b3bae339be
 2013-05-28 15:00:59 -05:00
Nate Jensen
4469346bc5 Issue #1967 fix annoying warnings, remove unused preferences page 
Change-Id: I9f7a5ef09f67165b4a3eca023f646f24efbe10e0

Former-commit-id: bd8431b986 [formerly ed7b0fc8c5] [formerly bd8431b986 [formerly ed7b0fc8c5] [formerly 3f85aeb00a [formerly e3acc289aa835326bac7af9d10b7b5909c7c07f6]]]
Former-commit-id: 3f85aeb00a
Former-commit-id: f7817d7c41 [formerly 0b48f54f47]
Former-commit-id: e7f6bee025
 2013-05-28 14:30:26 -05:00
Roger Ferrel
60820cf776 Issue #1966 Changes to CategoryConfig to make parsing more efficent. 
Change-Id: I3fc9bf03eccea8ae63cb37a4469e512c1fac9e87

Former-commit-id: 365af6b7ce [formerly cbee731447] [formerly 365af6b7ce [formerly cbee731447] [formerly 9263b54845 [formerly d8a510b87d026d57eb282583c4cf2f786749dc95]]]
Former-commit-id: 9263b54845
Former-commit-id: 838eacc802 [formerly fce5c2ca1e]
Former-commit-id: a5db5a53b3
 2013-05-28 13:21:08 -05:00
Nate Jensen
1ee22de2db Issue #2037 made imageMap concurrent to fix memory leak 
Change-Id: I97e7499135aa65f3406f5bc135892379eb34978f

Former-commit-id: 84444b6ba9 [formerly f77f350eb3] [formerly 84444b6ba9 [formerly f77f350eb3] [formerly 68eba61c28 [formerly 771e5d7b10533a172f6dc2d9473e30c422d93bf3]]]
Former-commit-id: 68eba61c28
Former-commit-id: 50d981285d [formerly af7fcf7e8e]
Former-commit-id: 95371e7ec0
 2013-05-28 09:21:57 -05:00
Dustin Johnson
834ffed160 Merge "Issue #2020 - Implement Shared Subscriptions Cave-side." into development 
Former-commit-id: f4ad0218f2 [formerly 2b1f75f702] [formerly f4ad0218f2 [formerly 2b1f75f702] [formerly 197a5cef1b [formerly 67d23eb0edb44363cebb6e30fa71873b788582b9]]]
Former-commit-id: 197a5cef1b
Former-commit-id: 8d00ba1978 [formerly a8fc7295ef]
Former-commit-id: 19274fb903
 2013-05-28 06:43:35 -05:00
Mike Duff
5b21a6cfa4 Issue #2020 - Implement Shared Subscriptions Cave-side. 
Change-Id: I96e156043ec34e7ec98c2d8c3aafb6916c31e7cf

Former-commit-id: 80b1f95f0c [formerly 192ce891d0] [formerly 80b1f95f0c [formerly 192ce891d0] [formerly b6b01c3e81 [formerly 1e00c7f935cf22ac5064060069164af6044f2150]]]
Former-commit-id: b6b01c3e81
Former-commit-id: 6ee0ef55ff [formerly a9004667b7]
Former-commit-id: 53ca005836
 2013-05-24 09:20:55 -05:00
Nate Jensen
afcf650681 Issue #2005 stop cave from starting if spring fails, prompt user if they want to restart 
Change-Id: I6b77e06c5737dab04c6c1a89cc2f5242a784bc53

Former-commit-id: 631567ced9 [formerly 7d1fc954f6] [formerly 631567ced9 [formerly 7d1fc954f6] [formerly 7d233ff590 [formerly ef313253ec669167b9e1deb2562170c117123937]]]
Former-commit-id: 7d233ff590
Former-commit-id: e976a4c94e [formerly 9e37d21dc6]
Former-commit-id: 543e0c7746
 2013-05-24 09:13:10 -05:00
Bryan Kowal
8998e5cb8f Issue #1927 - mimic the EDEX pde build capability for building features outside of the common baseline 
Amend: do not run the clean task after building any wa features

Change-Id: I0e6d72b82f4badf49d1d616519cf8d9fc8405f1a

Former-commit-id: b3d40951ba [formerly 8145305580] [formerly b3d40951ba [formerly 8145305580] [formerly a2148650b4 [formerly 3ef8fa1ce4634801435cc94b2372b736576aefd4]]]
Former-commit-id: a2148650b4
Former-commit-id: c658131c84 [formerly 66cf28ab84]
Former-commit-id: 9392da9041
 2013-05-23 23:52:35 -05:00
Lee Venable
9a6c295b62 Issue #1964 - inital GUI creation 
Change-Id: I47d58880066fa2ef284e8911390163624b873381

Former-commit-id: 4ecb65e4a2 [formerly ae020d3960] [formerly 4ecb65e4a2 [formerly ae020d3960] [formerly c3328077c8 [formerly 07b027704c069d95fcbdf58a70561618d2c52ec4]]]
Former-commit-id: c3328077c8
Former-commit-id: 041d612ea2 [formerly 9a72abf083]
Former-commit-id: eb7c8a4d93
 2013-05-23 17:16:31 -05:00
Roger Ferrel
a5378d6ba7 Issue #1966 Feature plugin for archive. 
Change-Id: Ie390f7c5dac80c1c2d04a7b57e66e5a8f1b73771

Former-commit-id: 75a2fc4723 [formerly 9533bb686d] [formerly 75a2fc4723 [formerly 9533bb686d] [formerly e5867cbb79 [formerly 4c305c58752e8b974b3f469f82432c92d5acb1f7]]]
Former-commit-id: e5867cbb79
Former-commit-id: ef14a57411 [formerly bdecc2f309]
Former-commit-id: 9b90237bcf
 2013-05-23 13:43:53 -05:00
Richard Peter
62191a8d82 Issue #1917: Update stat offline processing and add purge. Add batching of stat deleting and vacuum after every aggregation period. 
Change-Id: Ia92ea7dd37202cdf3806529661588b776e98c47c

Former-commit-id: d5c0b86b7a [formerly b599745012] [formerly d5c0b86b7a [formerly b599745012] [formerly 7349808131 [formerly a48084f6cd99a440fcaab025c0178cf1fa17c9bb]]]
Former-commit-id: 7349808131
Former-commit-id: 53190601f6 [formerly f3e0966966]
Former-commit-id: c51e6750b4
 2013-05-23 11:50:34 -05:00
Nate Jensen
eaaf8d1b8a Issue #1989 remove activemq references from spring xml, fix deprecated javadoc 
Change-Id: I7e076e0d31561e9a436f212c7a1d7f24d499ba61

Former-commit-id: b7cecb931e [formerly 1978133177] [formerly b7cecb931e [formerly 1978133177] [formerly 1fd2f8965f [formerly a9330ce9247b05a0044778aeea46e0e986f05f2d]]]
Former-commit-id: 1fd2f8965f
Former-commit-id: a84a6fe6ae [formerly 49b20e5d20]
Former-commit-id: 9689640192
 2013-05-23 11:20:40 -05:00
Mike Duff
12bad74ca8 Issue #1902 - fix to forced guidance 
Peer review comments

Change-Id: I5c42fad454e42e5697d32e183702de535ecc3e5e

Former-commit-id: b331a68a08 [formerly 11423a7465] [formerly b331a68a08 [formerly 11423a7465] [formerly 2a733fa5f8 [formerly ebd633109a62e7a2d8a0b8e3083aaf5680766739]]]
Former-commit-id: 2a733fa5f8
Former-commit-id: 2878cde676 [formerly 7d177607bf]
Former-commit-id: a1dd9d73ba
 2013-05-23 09:52:07 -05:00
Greg Armendariz
b0e11947dd Merge "Issue #1927 - patch ant includegen task" into development 
Former-commit-id: dc9623df11 [formerly 2fe2b0c5fb] [formerly dc9623df11 [formerly 2fe2b0c5fb] [formerly a4457f8c83 [formerly 16a342bd89e1d087603dfa4d03f45d22524e074a]]]
Former-commit-id: a4457f8c83
Former-commit-id: 7c97422501 [formerly 270269219c]
Former-commit-id: 28475200b6
 2013-05-23 09:10:11 -05:00
Roger Ferrel
3ac1658261 Issue #1966 Feature place holders for the dialogs. 
Change-Id: I7d4574297874c85ba0ba215ded84e822d83bf66f

Former-commit-id: d7e7a56b84 [formerly e55f73b4f7] [formerly d7e7a56b84 [formerly e55f73b4f7] [formerly d35424df4f [formerly 04684460d021089818509726b1dd23d53fb90440]]]
Former-commit-id: d35424df4f
Former-commit-id: 760b0f3366 [formerly 2d4434119d]
Former-commit-id: 6d3604e629
 2013-05-23 07:36:15 -05:00
Bryan Kowal
58b7ec2195 Issue #1927 - patch ant includegen task 
Former-commit-id: 575944f70d [formerly 40e8f544ea] [formerly 575944f70d [formerly 40e8f544ea] [formerly 24c0728db9 [formerly 912ec4daa384140f583d05d650734a9871ae1735]]]
Former-commit-id: 24c0728db9
Former-commit-id: e6cfad1759 [formerly 2a17b35e83]
Former-commit-id: 897c70d90c
 2013-05-22 18:00:43 -05:00
Steve Harris
61debd93bf Merge branch 'omaha_13.4.1' into development 
Former-commit-id: 570128b986 [formerly 8496832064] [formerly 570128b986 [formerly 8496832064] [formerly 3590310f17 [formerly 702d49b30f4b86a120dd032394c314f5db6c985c]]]
Former-commit-id: 3590310f17
Former-commit-id: 389eefd1f9 [formerly 0f9e0b343d]
Former-commit-id: c184d31779
 2013-05-22 16:13:08 -05:00
Steve Harris
6dbe80b1af Merge branch 'master_13.4.1' into omaha_13.4.1 
Former-commit-id: dce0dc3692 [formerly 097617fa26] [formerly dce0dc3692 [formerly 097617fa26] [formerly 462652e31e [formerly eef8340cb8e904e4469e9c99271a34268ca2ce23]]]
Former-commit-id: 462652e31e
Former-commit-id: 026674d0b2 [formerly 299690a202]
Former-commit-id: bd9b2e493e
 2013-05-22 16:10:04 -05:00
Steve Harris
71e13c4d4d 13.4.1-12 baseline 
Former-commit-id: 397bbf674a [formerly 6a97b4325a] [formerly 397bbf674a [formerly 6a97b4325a] [formerly e53ada66b8 [formerly 398b25dee65cd6154c467b657ced5c9d2bada11a]]]
Former-commit-id: e53ada66b8
Former-commit-id: b745b332ae [formerly bd4f93e859]
Former-commit-id: 0d9e71aee2
 2013-05-22 16:42:39 -04:00
Richard Peter
7d73a32b0a Merge "Issue #1869 Rewrite dataURI property mappings. Change-Id: I1aa45aa5214c3d080766129a470903f2fc2e49b9" into development 
Former-commit-id: 62c8176486 [formerly c9c1570960] [formerly 62c8176486 [formerly c9c1570960] [formerly b4344d3c04 [formerly 6c7371738300221d0d861ef10bb904a483d0655c]]]
Former-commit-id: b4344d3c04
Former-commit-id: 1bbddf8fdf [formerly 489fdf49b1]
Former-commit-id: b3688d78d1
 2013-05-21 13:07:51 -05:00
Richard Peter
7966576f23 Merge branch 'omaha_13.4.1' (13.4.1-11) into development 
Conflicts:
	ncep/gov.noaa.nws.ncep.common.dataplugin.ntrans/src/gov/noaa/nws/ncep/common/dataplugin/ntrans/NtransRecord.java
	ncep/gov.noaa.nws.ncep.viz.resources/src/gov/noaa/nws/ncep/viz/resources/manager/RscBundleDisplayMngr.java
	ncep/gov.noaa.nws.ncep.viz.rsc.ncgrid/src/gov/noaa/nws/ncep/viz/rsc/ncgrid/contours/ContourSupport.java
	ncep/gov.noaa.nws.ncep.viz.rsc.solarimage/src/gov/noaa/nws/ncep/viz/rsc/solarimage/rsc/SolarImageDisplay.java
	ncep/gov.noaa.nws.ncep.viz.rsc.solarimage/src/gov/noaa/nws/ncep/viz/rsc/solarimage/rsc/SolarImageResource.java
	ncep/gov.noaa.nws.ncep.viz.tools/src/gov/noaa/nws/ncep/viz/tools/imageProperties/ImagingDialog.java
	ncep/gov.noaa.nws.ncep.viz.ui.display/META-INF/MANIFEST.MF
	ncep/gov.noaa.nws.ncep.viz.ui.display/src/gov/noaa/nws/ncep/viz/ui/display/NCDisplayPane.java

Former-commit-id: 3d84e1dd53 [formerly 8aa4b0025c] [formerly 3d84e1dd53 [formerly 8aa4b0025c] [formerly 930ff50fb8 [formerly 8a78f99345016db3d38c0b846a8a6ccf77fb3e89]]]
Former-commit-id: 930ff50fb8
Former-commit-id: 76f11f00ae [formerly 81ae3ea8bf]
Former-commit-id: 046de916fd
 2013-05-21 12:11:21 -05:00
Richard Peter
2a8115770f Merge branch 'master_13.4.1' into omaha_13.4.1 
Former-commit-id: 4809b3c15b [formerly 73372622f7] [formerly 4809b3c15b [formerly 73372622f7] [formerly 77a08ebd31 [formerly 306527aa5e90782da8232acdce39b56358d10dd0]]]
Former-commit-id: 77a08ebd31
Former-commit-id: 21b87e9ea7 [formerly 427f54a878]
Former-commit-id: 69e6ea4847
 2013-05-21 10:35:00 -05:00
Nate Jensen
c183650ebd Issue #2001 fix message handling 
Change-Id: I17ee277950f9776e197b3c247aae34e33f53c55b

Former-commit-id: 56309efafe [formerly 1ab118958f] [formerly 56309efafe [formerly 1ab118958f] [formerly 960bc6db69 [formerly 2863f68dd5da6ca323c9cd84dfc06a589524e176]]]
Former-commit-id: 960bc6db69
Former-commit-id: a06bb176ba [formerly e575c19ab6]
Former-commit-id: 942855e9f8
 2013-05-21 10:26:18 -05:00
Dustin Johnson
2cf8ffac1a Merge "Issue #2000 Subscription overlap configuration GUI" into development 
Former-commit-id: fef73ac960 [formerly 195cd5f210] [formerly fef73ac960 [formerly 195cd5f210] [formerly 8fcc958d84 [formerly 9a475b865a49ce636746583dec45a3f2a683afe9]]]
Former-commit-id: 8fcc958d84
Former-commit-id: bd65447c9f [formerly 5695c4f967]
Former-commit-id: 566273cf69
 2013-05-21 08:19:34 -05:00
Steve Harris
d9f967c811 13.4.1-11 baseline 
Former-commit-id: d6319a2ca6 [formerly 2edee36158] [formerly d6319a2ca6 [formerly 2edee36158] [formerly c0376ce9ed [formerly e414ae01ab52b3940647e46e22bba3b89790c142]]]
Former-commit-id: c0376ce9ed
Former-commit-id: 4d88863515 [formerly 6df093ef48]
Former-commit-id: 2767fd893c
 2013-05-21 09:19:25 -04:00
Ben Steffensmeier
4687ddcd62 Issue #1869 Rewrite dataURI property mappings. 
Change-Id: I1aa45aa5214c3d080766129a470903f2fc2e49b9

Former-commit-id: c11631c7da [formerly 1a31aa2211] [formerly c11631c7da [formerly 1a31aa2211] [formerly 931e76ae59 [formerly 9c3af2ce1f086bb15fa1f4e261a4d7a1a65bd956]]]
Former-commit-id: 931e76ae59
Former-commit-id: 30eb486e45 [formerly 5147eb18d4]
Former-commit-id: 9bac8c566c
 2013-05-20 18:00:32 -05:00
Richard Peter
a664883d97 Merge "Issue #1869 Remove DataURI column from sat plot types. Change-Id: I77d6a746e1cf49719eb53598cd75607ba77911cb" into development 
Former-commit-id: 8b2ecd5771 [formerly e0740990ce] [formerly 8b2ecd5771 [formerly e0740990ce] [formerly 59c38fdb78 [formerly 4e30da9f358aa552733e97328e8ff866bf49df33]]]
Former-commit-id: 59c38fdb78
Former-commit-id: 72206676ee [formerly 8b7cf1beb8]
Former-commit-id: 1418dbf556
 2013-05-20 17:49:22 -05:00
Roger Ferrel
84b75ff489 Issue #1966 Interim changes Brad needs for his work. 
Change-Id: If0e1c5d3eec25a42d4dcd31fe324de07d45276ac

Former-commit-id: e3c06b643b [formerly 16c7de874a] [formerly e3c06b643b [formerly 16c7de874a] [formerly dfd586fca6 [formerly 57a43dfefb79d49895beace44930db630cd502be]]]
Former-commit-id: dfd586fca6
Former-commit-id: 4a5073902f [formerly c9e6e367fe]
Former-commit-id: 7bf7c508b0
 2013-05-20 17:43:47 -05:00
Ben Steffensmeier
4f575058e0 Issue #1869 Remove DataURI column from sat plot types. 
Change-Id: I77d6a746e1cf49719eb53598cd75607ba77911cb

Former-commit-id: aa3b8c80f4 [formerly 26e80bbd18] [formerly aa3b8c80f4 [formerly 26e80bbd18] [formerly 885b106652 [formerly 0acecd7e4397543ca31c1bca719831fef8e65d95]]]
Former-commit-id: 885b106652
Former-commit-id: a03dbd284b [formerly 13b2b4afef]
Former-commit-id: 8c9db38335
 2013-05-20 17:27:15 -05:00
Dustin Johnson
a314bd8f4a Issue #2000 Subscription overlap configuration GUI 
Amend:
  Peer review comments.

Change-Id: Ie951ca4ce61099d0e25ed4938fc71981f34833d6

Former-commit-id: 554347f17c [formerly 5b62669f8e] [formerly 554347f17c [formerly 5b62669f8e] [formerly 38249cd7b9 [formerly c7ad25ab90220a2aa25e704b10c9a7a96af2a8a8]]]
Former-commit-id: 38249cd7b9
Former-commit-id: 3a504d1e7b [formerly 7858a3b57f]
Former-commit-id: d12b26ac1d
 2013-05-20 17:12:47 -05:00
Richard Peter
6a6b25ebda Merge "Issue #1869 Remove DataURI column from qc." into development 
Former-commit-id: 8079561032 [formerly 30a61c3e17] [formerly 8079561032 [formerly 30a61c3e17] [formerly 3d861eca69 [formerly 279038141fd88cdb1ccdd9a570d89eb6c651cd45]]]
Former-commit-id: 3d861eca69
Former-commit-id: e03cf56895 [formerly 0ced8c87e4]
Former-commit-id: b032b405ed
 2013-05-20 14:48:47 -05:00
Steve Harris
b41118326c 13.4.1-10 baseline 
Former-commit-id: 68fe2134b8 [formerly 9a403b3615] [formerly 68fe2134b8 [formerly 9a403b3615] [formerly 92152778b9 [formerly bed40bd4ff0cc20bdbc63f97f4d68d11dc1fa3f4]]]
Former-commit-id: 92152778b9
Former-commit-id: 7e04d8cd13 [formerly b1fc4e625b]
Former-commit-id: 322036ea82
 2013-05-20 10:52:47 -04:00
Richard Peter
fb910196c0 Merge branch 'omaha_13.4.1' (13.4.1-9) into development 
Conflicts:
	cave/com.raytheon.uf.viz.common.core.feature/feature.xml
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/util/CurrentWarnings.java
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/PracticeWarningRecord.java
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/WarningRecord.java
	rpms/awips2.qpid/0.18/SPECS/qpid-java.spec.patch0
	rpms/legal/FOSS_licenses/werkzeug/LICENSE.txt

Change-Id: Icc296cedd6d190d1743727c228e540036f9b6d8c

Former-commit-id: 648a1b25ae [formerly a33ddbd1a6] [formerly 648a1b25ae [formerly a33ddbd1a6] [formerly a9869f07ba [formerly d8543a8dc09565c12c3aebc21466ed43108a9c85]]]
Former-commit-id: a9869f07ba
Former-commit-id: aff520d61b [formerly c47eb36e43]
Former-commit-id: 969fa704e5
 2013-05-17 10:33:18 -05:00
Max Schenkelberg
9921ea5cb1 Issue #1638 Fixed updates for resource datas that override update without checking update object 
Change-Id: I5cbe78c39e4f80b705ae17ad22ebbacdb06fb99f

Former-commit-id: 4d435d3dd5 [formerly c421240835] [formerly 4d435d3dd5 [formerly c421240835] [formerly d07de0870f [formerly 2ba9b44a98a7692a6d7a7e35d2b316db88fd62c8]]]
Former-commit-id: d07de0870f
Former-commit-id: 7ce0b7ef13 [formerly a94469df82]
Former-commit-id: 6adbb139ab
 2013-05-16 18:04:26 -05:00
Nate Jensen
779a299440 Merge "Issue #1638 Fixed localization feature dependencies. Updated plugin data object resource to be thread safe. Moved common legend operations to DefaultLegendResource." into development 
Former-commit-id: 9a3f855a1a [formerly 39543d7ee0] [formerly 9a3f855a1a [formerly 39543d7ee0] [formerly 6ef214f1b8 [formerly 75de1f5405d24d0eb63d366c4da73a56f4c9d947]]]
Former-commit-id: 6ef214f1b8
Former-commit-id: 7f58e8a568 [formerly ffa74c3bdb]
Former-commit-id: 3f2bb17ce4
 2013-05-16 18:02:20 -05:00
Ben Steffensmeier
ea3d3660f3 Issue #1869 Remove DataURI column from qc. 
Former-commit-id: 89b4bd571a [formerly c0d8dad8ae] [formerly 89b4bd571a [formerly c0d8dad8ae] [formerly f2b11b8a49 [formerly e54b02e75b3534f829f0cc4be2639ae5ed26663e]]]
Former-commit-id: f2b11b8a49
Former-commit-id: 777f12fbad [formerly 6353b7e04b]
Former-commit-id: 998330955a
 2013-05-16 17:48:37 -05:00
Steve Harris
34145afafe Merge branch 'master_13.4.1' (13.4.1-9) into omaha_13.4.1 
Conflicts:
	cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPDataGenerator.java
	rpms/awips2.qpid/0.18/SPECS/qpid-java.spec.patch0

Former-commit-id: 87a31f9990 [formerly 16ba74496d] [formerly 87a31f9990 [formerly 16ba74496d] [formerly b76d359695 [formerly 27dff26c47d68e83682e4ac3c61898378838bc5b]]]
Former-commit-id: b76d359695
Former-commit-id: b5d3ff1867 [formerly 26664e6615]
Former-commit-id: 4827d8f1d9
 2013-05-16 13:45:58 -05:00
Bryan Kowal
7446376b42 Issue #1987 - updates to support Eclipse 3.8 Windows 32-bit builds 
- The new p2 director is not able to install zipped repositories; so, each repository
  is now unzipped before installation during the CAVE Assembly phase of the Windows
  32-bit build
- Adjusted the order of the p2 repositories are built so Windows will install them
  in the correct order during the CAVE Assembly phase of the Windows 32-bit build


Former-commit-id: dccc6e4a96 [formerly 7e849f0af3] [formerly dccc6e4a96 [formerly 7e849f0af3] [formerly 22d4494918 [formerly eb3a64c073ce95be0993b5aff1bd057b6d42f015]]]
Former-commit-id: 22d4494918
Former-commit-id: 88cc3a6011 [formerly 560fb81038]
Former-commit-id: e95c2d36b4
 2013-05-16 11:01:40 -05:00