Commit graph

4031 commits

Author SHA1 Message Date
Steve Harris
82f2a146da Merge branch 'master_14.4.1' (14.4.1-4) into omaha_14.4.1
Former-commit-id: cfd0a31a17fc4a92af6db3f034d46b01996d2cc0
2015-01-27 11:34:06 -06:00
Shawn.Hooper
e84a037b2e Merge branch 'omaha_14.4.1' of ssh://awips2omaha.com:29418/AWIPS2_baseline into master_14.4.1
Former-commit-id: 95cdc2d817eac840017fc14746c2ada498f1a716
2015-01-26 11:22:49 -05:00
Nate Jensen
c4598baf19 Omaha #3952 remove custom gzip handling since it is by default enabled
by apache httpclient

Change-Id: I4a1f05c11228139c8df1d2883b951c8d876f3802

Former-commit-id: 4f67ebeb092d182ec0a4e5078e668313d8cc6a57
2015-01-26 09:10:36 -06:00
Nate Jensen
7c7c2e3a38 Omaha #3952 disable cairo in alertviz for safety
Change-Id: If22ae5eee564dd19ae61211ad043d349f06e217f

Former-commit-id: 640cf4816e4c0cdd0e39b374b8ed02669e8170be
2015-01-23 12:57:24 -06:00
Steve Harris
0f05c53a53 Merge branch 'master_14.4.1' (OB_14.4.1-2m) into omaha_14.4.1
Conflicts:
	rpms/awips2.qpid/0.18/SPECS/qpid-java.spec.patch0
	rpms/awips2.qpid/0.18/SPECS/qpid-lib.spec

Former-commit-id: 75c2b6304f398eeb8d508ee67d0c6a7c7bf26f79
2015-01-23 09:08:06 -06:00
Mark Peters
7a69f354d9 Omaha #3768 Add localization to build.properties
Change-Id: I5f807ed34cf55868a9cf0883d9896cfaa5508b30

Former-commit-id: a6cafa7a07d33376cda3cc3a69437e45b6e0330f
2015-01-22 18:05:40 -06:00
Shawn.Hooper
a757b55446 Merge branch 'ohd_14.4.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.4.1
Former-commit-id: d53c809149da23fcae51138cc45c57aecd641794
2015-01-22 16:05:41 -05:00
Nate Jensen
865852c20c Merge "Omaha #3993 ensure important dataplugin utility folders are included in viz builds" into omaha_14.4.1
Former-commit-id: 6557237cd4cea3300292e1612622547c23bdde2c
2015-01-15 13:07:10 -06:00
Brian Clements
8cc1aa9f33 Omaha #3709 unify collaboration color management
group chat session colors controlled by session color manager
color config persistence moved to utility
shared display uses same action to change colors as other sessions

Change-Id: I8ba4a3fb4842e3f96f05ee6d16b7e81e9567f6d7

Former-commit-id: c0cd560fb1b6e8c04047c0d7b7d407e9072f0cec
2015-01-14 13:00:25 -06:00
Ben Steffensmeier
3a6bce1100 Omaha #3966 Limit the number of flags on wind barbs.
Former-commit-id: 8b0ce01043b4ba2858dacb5ceeb41299f5c2044d
2015-01-13 17:21:43 -06:00
Nate Jensen
b434ae1343 Omaha #3993 ensure important dataplugin utility folders are included in
viz builds

Change-Id: I3bb2a464f482995943e3729e439c3f0c8fbfe747

Former-commit-id: 9f30c7195d6a62206bae05d6e17df4a8e068255e
2015-01-13 16:47:04 -06:00
Nate Jensen
511ba87c5c Merge "Omaha #3709 reworked custom user color configuration" into omaha_14.4.1
Former-commit-id: d7cc45aa26f71ad81d82dc1dfa2541e105b4c76c
2015-01-12 13:59:25 -06:00
Slav Korolev
b8ab18d3e1 Omaha #3220 - Replaced MonitoringArea class with individual area configuration managers.
Former-commit-id: 00fd20d76a4ea46e9806bad11b1bc5a2acc42d6e
2015-01-12 14:32:31 -05:00
Fay.Liang
eed6737801 ASM #15311 - Merge and Build Support - Merge ASM delivery into 14.4.1-1m.
Merge branch 'asm_14.4.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.4.1

Conflicts:
	cave/com.raytheon.viz.gfe/localization/gfe/userPython/utilities/SmartScript.py
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/ChooseDataPeriodDialog.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
	edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/ActiveTable.java
	rpms/awips2.core/Installer.postgres/component.spec
	rpms/awips2.core/Installer.python/component.spec
	rpms/awips2.core/Installer.tools/component.spec
	rpms/python.site-packages/Installer.h5py/component.spec
	rpms/python.site-packages/Installer.matplotlib/component.spec
	rpms/python.site-packages/Installer.nose/component.spec
	rpms/python.site-packages/Installer.pupynere/component.spec
	rpms/python.site-packages/Installer.qpid/component.spec
	rpms/python.site-packages/Installer.scientific/component.spec
	rpms/python.site-packages/Installer.scipy/component.spec
	rpms/python.site-packages/Installer.shapely/component.spec
	rpms/python.site-packages/Installer.tables/component.spec

Former-commit-id: 1f331890b8fc38b4f8ed3a3debc66b8fedba4fdd
2015-01-12 13:03:31 -05:00
Brian Clements
46c0d7d42c Omaha #3709 reworked custom user color configuration
Change-Id: I8b69dc378976684e989cae883e99ade9553c04d3

Former-commit-id: 18825c076fe273c9ae2e8040ccea2de0698b2877
2015-01-12 11:06:57 -06:00
Juliya Dynina
3bf0aebf64 Merge "ASM #14246 - Implemented MPE Transmit Best Estimate option" into asm_14.4.1
Former-commit-id: d0f721f3fe93b87ca3670264a2abdf9b3b64bff8
2015-01-08 11:49:18 -05:00
Loubna.Bousaidi
f2476cae94 ASM #14246 - Implemented MPE Transmit Best Estimate option
Change-Id: If6dc3df81ecfee998ebcc4de8ee47ddc2466868e

Former-commit-id: 212076c520952d0327591b79449ae09ad063adf1
2015-01-08 15:31:58 +00:00
Slav Korolev
da0d46ad81 Omaha #3937 - Removed UELE - Index out of bounds.
Former-commit-id: 039a382cf7a891cecdc7bbb1b0b5d83e02a7df13
2015-01-07 12:20:08 -05:00
Nate Jensen
b8f1475a3c Merge "Omaha #3709 Fix some minor issues with collaboration colors." into omaha_14.4.1
Former-commit-id: d617935ead64cdaf51481aa46fc0bf2e07215696
2015-01-05 13:06:21 -06:00
Mark Peters
7cc21da419 Omaha #3709 Fix some minor issues with collaboration colors.
Change-Id: I07fbcd6db21c3ee3b5fa404ad1c004af7e3ac057

Former-commit-id: f028c5040e50d3a2c96294d5c4d7ddd0e360defb
2015-01-05 12:57:42 -06:00
Juliya Dynina
807ac7dfbc Merge "ASM #16952 - Fixed the bug in the estimated precip values algorithm." into asm_14.4.1
Former-commit-id: f177c49913decebd60106cd380616c4aba24c62c
2014-12-24 07:57:10 -05:00
Loubna.Bousaidi
fac9ebed4a ASM #16952 - Fixed the bug in the estimated precip values algorithm.
Change-Id: I065fc7744747e52c7f10c499f5b100ef60e25e44

Former-commit-id: 33872d6facbcb1da29847f1edfd7e29c65621b8e
2014-12-23 14:48:29 +00:00
Slav Korolev
6ebe11d430 Omaha #3841 - Corrected updateZones method.
Former-commit-id: 4d133cc367ab016b378ada534cff0fcda579e323
2014-12-19 13:27:07 -05:00
Juliya Dynina
e838915565 Merge "ASM #637 - Create a base level map bundle for the WarnGenLoc shape file" into asm_14.4.1
Former-commit-id: 358291b0b1df060b95b0a3e399d8d606d005adc4
2014-12-18 08:23:08 -05:00
Qinglu.Lin
baa96590f1 ASM #637 - Create a base level map bundle for the WarnGenLoc shape file
Change-Id: Id3285b04a2ae8e07acfe33d2f1f57a11b34c9f25

Former-commit-id: 06fdefbc5b528ddfb0bb8baddd85fe75e4d07864
2014-12-17 16:53:31 -05:00
Kiran.Shrestha
991f4c22c8 ASM #622 Total Precipitable Water (TPW) satellite field should be displayed in inches
Change-Id: Ia7aba807682f559f11522491f7d64280eef9eac0

Former-commit-id: 039ccf8cf811b9e4f868138da8074df3ea4a862a
2014-12-17 21:20:57 +00:00
Kiran.Shrestha
10de233231 ASM #14130 Satellite: Derived Products Plots problems for SSM/I Point Data
Change-Id: Id3c2189c017bf6341bc09236dbd39aaff937e2c8

Former-commit-id: 56ff684e6425b43883603f46ef16127e8356450a
2014-12-17 21:03:18 +00:00
Rici.Yu
5b5d6fd5cd ASM #14946 - GFE: ZFP displaying time for office timezone for zones in different timezone
Change-Id: I082b26ffea4b228baf4f40afb019994d5fe1e7dd

Former-commit-id: 18ab87670fbdd007e5027553d4ee58262ae54f22
2014-12-16 15:34:35 -05:00
Lee Venable
6812dc291c Merge "Omaha #3709 Add icon that displays text colors next to color change menu items" into omaha_14.4.1
Former-commit-id: 2baba567db90a6f3fe4f9cbf440798454d88fbaf
2014-12-12 14:00:43 -06:00
Mark Peters
05eabb4a91 Omaha #3709 Add icon that displays text colors next to color change menu items
Change-Id: I5a8fe5cc5679381587cb7b13cfa5984bf796ee42

Former-commit-id: ca40c8637ae75b25119864f0182cb25471d52219
2014-12-12 13:09:14 -06:00
Chip Gobs
3645172fef VLab Issue #5616 MPE:Gage Color by Value does not display correctly; fixes #5616
Former-commit-id: 41c962fd89f3b9998599f8a246967cb47888ffe3
2014-12-12 13:24:47 -05:00
Slav Korolev
ed97d72dcb Omaha #3888 - Fixed NPE error in the process() method.Corrected
Former-commit-id: 3193057c916ee8cc6f99c8d0ecc69d067fb68c16
2014-12-12 12:29:03 -05:00
Lee Venable
2bc4cfdaae Merge "Omaha #3888 - Fixed NPE error in the process() method." into omaha_14.4.1
Former-commit-id: 04284dafa2f563224067e6a3312d69cc942e1d7d
2014-12-12 11:20:19 -06:00
Richard Peter
5ce93f49eb Merge branch 'omaha_14.4.1' of ssh://lightning.omaha.us.ray.com:29418/AWIPS2_baseline into omaha_14.4.1
Former-commit-id: 5b26ce7815295057f79a114de83e4443a5464ae4
2014-12-12 10:57:15 -06:00
Slav Korolev
9cf99b9e88 Omaha #3888 - Fixed NPE error in the process() method.
Former-commit-id: 93aa24fb9f41e7bd17d9ee8594e0d0a9905e91be
2014-12-12 11:53:59 -05:00
Richard Peter
8de1ebcb65 Merge tag 'OB_14.3.2-8m' into omaha_14.4.1
Conflicts:
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/PointFreezePlotResource.java
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/PointPrecipPlotResource.java
	cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/PointTempPlotResource.java
	edexOsgi/com.raytheon.edex.common/src/com/raytheon/edex/utility/EDEXLocalizationAdapter.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/textproducts/AreaDictionaryMaker.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/textproducts/Configurator.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/AbstractWatchNotifierSrv.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/SPCWatchSrv.java
	edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/TPCWatchSrv.java
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
	edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/textproducts/Generator.py
	edexOsgi/com.raytheon.edex.plugin.warning/res/spring/warning-ingest.xml
	edexOsgi/com.raytheon.uf.edex.activetable/META-INF/MANIFEST.MF
	edexOsgi/com.raytheon.uf.edex.activetable/res/spring/activetable-ingest.xml
	edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/decoder/PracticeVtecDecoder.java
	edexOsgi/com.raytheon.uf.edex.activetable/src/com/raytheon/uf/edex/activetable/handler/SendPracticeProductHandler.java

Change-Id: Ibd2a1524e6b4169679be97de2dcfe83e6a819df5

Former-commit-id: e190a710b1b9506c99120fdaa1ebfdb144fcbf6f
2014-12-12 10:36:04 -06:00
Juliya Dynina
a62ee436c2 Merge "ASM #638 - Inconsistent Type for scale widget value accessed through the varDict." into asm_14.4.1
Former-commit-id: 63036a13a555c9a1e7fab05dd48a369221fc27b9
2014-12-12 11:05:02 -05:00
Michael Gamazaychikov
40f0e77f30 ASM #638 - Inconsistent Type for scale widget value accessed through the varDict.
Change-Id: If81102e5a3b70e224f88a351277e9c29e9f9cc91

Former-commit-id: 3c1ce33424799b39db14f909d8de2946e5aca1bc
2014-12-11 19:37:00 -05:00
Slav Korolev
fd3a6ea199 Omaha #3220 - Moved refreshing of table in the UI thread.
Former-commit-id: 7454b39e71eeca348f4f167b8aa70d6ce5253004
2014-12-11 15:38:47 -05:00
Richard Peter
08734bb4e1 Merge "Omaha #3757 Added HTTPS flag" into omaha_14.4.1
Former-commit-id: dd6f035e86bbd4f9e86ce3b19b7b61c0b3947737
2014-12-10 17:54:33 -06:00
Dave Hladky
337f67b136 Omaha #3757 Added HTTPS flag
Former-commit-id: 7848dc4df9ef8faafdce556836bc71c789b74ee4
2014-12-10 17:17:12 -06:00
Juliya Dynina
ac47f1ca21 Merge "ASM #628 - Fixed Crest time" into asm_14.4.1
Former-commit-id: 909dba375f65ef5d1a9b984758f049728e1d4700
2014-12-10 15:13:54 -05:00
Loubna Bousaidi
2facd8c547 ASM #628 - Fixed Crest time
Change-Id: I5f9f58cfdb1689f331628498a781bb60f5549ac5

Former-commit-id: cddb0ff5626f25dd3555853d578928d7b93dcacb
2014-12-10 20:01:42 +00:00
David Friedman
91bc857ffc ASM #11982 - Print Icon in CAVE does not print (Actually fix print-to-file)
Change-Id: I89c581065424da5dbe5108e98fcc76f7381c911c

Former-commit-id: d3b32c796f36148386120cfe46fb9b098d66a643
2014-12-09 21:57:21 +00:00
Juliya Dynina
25a4e0f868 Merge "ASM #16829 - TextWS: Problem with AlarmAlertFunctions static class initialization" into asm_14.4.1
Former-commit-id: 6ec74c43a16cd6dade550b4bfc0c4163ce0f7454
2014-12-09 14:13:30 -05:00
Mark Peters
1880d72b9d Omaha #3709 New color dialog, move P2P color actions to menu bar, add actions to contact list
Change-Id: Ie03659376d3a035bb2acbd98b2e34a91e6b5ad57

Former-commit-id: 447437edc9b14412615ff691784fa7545146a596
2014-12-09 11:47:22 -06:00
Juliya Dynina
b70186d356 Merge "ASM #634 - Missing Data not getting into HML file" into asm_14.4.1
Former-commit-id: 08bac3a76f734a7acc543069bcc73969e2c02ccd
2014-12-09 08:04:00 -05:00
Xuezhi.Wei
e40018f2e1 ASM #634 - Missing Data not getting into HML file
Change-Id: I4f2358f28ef7d7945813cbffa6d36517e162e40b

Former-commit-id: 947f9dd3435219ff32890cc4a26d8ae5e43686cf
2014-12-08 20:48:40 +00:00
Nathan Bowler
06c94a25b7 Omaha #1231 Fix selecting AWIPS ID
Change-Id: I657d723b45b9374523307a8fdbdfc21f2f31f35e

Former-commit-id: 68e6a2fd48a062e0ca66b52098f2781a30926a80
2014-12-08 13:07:14 -05:00
Nathan Bowler
18e1ede6a1 Omaha #3801 Fix closing cave with new/edit dialogs open, description menu when nothing is selected, and when edit/delete buttons are enabled
Change-Id: I982e959f2c4ebe7b26ee1aa615953228b9781474

Former-commit-id: 32621b600176a3afff5ee42228eb8cee2417c9c6
2014-12-05 15:31:46 -05:00