Ana Rivera
171a38175c
Merge branch 'emc_14.4.1' of gerrit:AWIPS2_Dev_Baseline into emc_14.4.1
...
Former-commit-id: 6c72e1864ad5843c4ac42a558b589777af047c77
2015-01-26 19:04:54 +00:00
Ana Rivera
98ac97e397
Merge branch 'master_14.4.1' into emc_14.4.1
...
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/grid/dataset/alias/gfeParamInfo.xml
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
Change-Id: I3a9565d5861f431bd8ac74f8e20e5e79bbbdbad1
Former-commit-id: 51ef304bd94fd003a1e7349a22c41e21b340ac8a
2015-01-26 18:45:26 +00:00
Shawn.Hooper
568b7c801a
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
63189329a1
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
steve.naples
6488242165
ASM #17051 MPE: Daily QC will not display Points+Grids together.
...
Change-Id: Ic74de62f60769456e7fd2762690e539cc553062a
Former-commit-id: 8db85622ff4d0f7202c4d2c2e6eefeefe2ef39c3
2015-01-23 20:40:48 +00:00
Nate Jensen
415e2d4035
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
158fa16376
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
Ana Rivera
705f02f2be
VLab Issue #5945 - Update NWPS: Run_NWPS.py; fixes #5945
...
Change-Id: Ib0d4356bd5d2c99f33204bf88bf65fe9a7db3278
Former-commit-id: 653472d785f4af6fef8f2edd93c2e538806096ab
2015-01-23 14:21:22 +00:00
Mark Peters
db69f5a0bc
Omaha #3768 Add localization to build.properties
...
Change-Id: I5f807ed34cf55868a9cf0883d9896cfaa5508b30
Former-commit-id: a6cafa7a07d33376cda3cc3a69437e45b6e0330f
2015-01-22 18:05:40 -06:00
Shawn.Hooper
0bc501bd4c
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
Shawn.Hooper
bd5dfed072
ASM #17054 - Disable MRMS Menu in 14.3.1
...
Change-Id: I071606c7c14ed0332b3c714a67cebab29bfc67f0
Former-commit-id: 7f6638dd595b99d6592c58af42f898e0f1b2a02a
2015-01-21 12:44:47 -05:00
Nate Jensen
bfcb36eeac
ensure PGEN appears in thinclient D2D Tools menu
...
Change-Id: Ib02d9f5f3c63edd963129e742da9c3b3e09e89fa
Former-commit-id: 173c250aa3fd9d3e5b35283b10eb5f37a4732a3a
2015-01-20 11:52:37 -06:00
Michael Gamazaychikov
a0ad2f7136
ASM #17035 - TextWS locks up when running spell checker.
...
Change-Id: I7dd263367723f37e0ff3d368edcaca11d982a6b3
Former-commit-id: 1843d3a64ff42d0533016fd4bb126dd0c86f3f22
2015-01-15 16:18:10 -05:00
Nate Jensen
16d862700a
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
1c2d8e01d0
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
Fay.Liang
deb2adb1fc
Merge branch 'master_14.3.1' into asm_14.3.1
...
Former-commit-id: e64a61bb41b43b995a6b6e3b3c468aa0fa3c84ed
2015-01-14 12:01:19 -05:00
Ben Steffensmeier
22f13c9f08
Omaha #3966 Limit the number of flags on wind barbs.
...
Former-commit-id: 8b0ce01043b4ba2858dacb5ceeb41299f5c2044d
2015-01-13 17:21:43 -06:00
Nate Jensen
05307be9d0
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
Fay.Liang
5582b8e999
Merge branch 'master_14.3.1' into master_14.3.2
...
Former-commit-id: 35b63703798294e9c28c6aa1d5884a41c0538e09
2015-01-13 11:41:48 -05:00
Nate Jensen
65a0433605
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
Fay.Liang
d193ca5eb6
Merge branch 'tcv_14.3.2' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.2
...
Former-commit-id: f0c6dcb30718baede5c31bcb267d3b4524252ab8
2015-01-12 14:55:55 -05:00
Slav Korolev
9c57dab437
Omaha #3220 - Replaced MonitoringArea class with individual area configuration managers.
...
Former-commit-id: 00fd20d76a4ea46e9806bad11b1bc5a2acc42d6e
2015-01-12 14:32:31 -05:00
steve.naples
ac7d038488
ASM #16993 - Restored code to DrawPolygonDlg to use Combo box for fields.
...
Change-Id: I736af4ac43de16c3978c462fca22bb147846d81b
Former-commit-id: 3a8aaf4ab99e8ae93dd9f074c5671cc8f3dc5f8d
2015-01-12 19:08:06 +00:00
Fay.Liang
c6bd5d7675
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
3d33ce1341
Omaha #3709 reworked custom user color configuration
...
Change-Id: I8b69dc378976684e989cae883e99ade9553c04d3
Former-commit-id: 18825c076fe273c9ae2e8040ccea2de0698b2877
2015-01-12 11:06:57 -06:00
Sarah Pontius
c31b766be6
VLab Issue #5879 - HLS/TCV Post-SwIT Changes; fixes #5879
...
Change-Id: I248822f54d31eb5e0a7312171acf1d59dde7c73d
Former-commit-id: 9cf4ca3c746accf745172bd7dc85e851da95ab6f
2015-01-09 15:13:45 -07:00
Fay.Liang
2f2992f519
Merge branch 'omaha_14.3.1' of ssh://awips2omaha.com:29418/AWIPS2_baseline into master_14.3.1
...
Former-commit-id: 1684997e12b53709c6c7226077f48043d0f99d07
2015-01-09 09:47:03 -05:00
Juliya Dynina
0113c27937
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
4a769ef560
ASM #14246 - Implemented MPE Transmit Best Estimate option
...
Change-Id: If6dc3df81ecfee998ebcc4de8ee47ddc2466868e
Former-commit-id: 212076c520952d0327591b79449ae09ad063adf1
2015-01-08 15:31:58 +00:00
Chip Gobs
4376118942
VLab Issue #5831 - MPE: Fix broken cv_use for DualPol functionality; fixes #5831
...
Change-Id: I98bb54b48910dbf818daeb0312815dab1a99a4bc
Former-commit-id: 85491d6fc3bf8aa53e62d5cb139918166d48bdde
2015-01-07 12:32:50 -05:00
Slav Korolev
c215b4c91b
Omaha #3937 - Removed UELE - Index out of bounds.
...
Former-commit-id: 039a382cf7a891cecdc7bbb1b0b5d83e02a7df13
2015-01-07 12:20:08 -05:00
Mike Duff
7830409745
Issue #3026 - Add bias hpe to hpe test
...
Former-commit-id: fd4f8b2ef5ab128e396f4fa82c0d8f5721f9d298
2015-01-06 14:50:20 -06:00
Nate Jensen
33229e2871
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
530b52d7db
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
757a3f72e8
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
d6db8867e9
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
Fay.Liang
06061eee19
Merge branch 'master_14.3.1' into master_14.3.2
...
Former-commit-id: 0edb5ba1c9cad9e2933ab86d57ec5e4f355d244d
2014-12-22 14:43:32 -05:00
Fay.Liang
641f5714eb
Merge branch 'omaha_14.3.1' of ssh://awips2omaha.com:29418/AWIPS2_baseline into master_14.3.1
...
Former-commit-id: 63cb45303d0afb6923e0065164022eac2fdb1053
2014-12-19 14:03:59 -05:00
Slav Korolev
24322ed6ca
Omaha #3841 - Corrected updateZones method.
...
Former-commit-id: 4d133cc367ab016b378ada534cff0fcda579e323
2014-12-19 13:27:07 -05:00
Jordan Gerth
e575fd6eb9
VLab Issue #5720 - Import certain packages to support frame capture enhancement following merge
...
Change-Id: I3da055aee568a4ec762b2a5e58e199cb14853995
Former-commit-id: f28c4cbbd3d4a8af650e5376356e8a66a588dfab
2014-12-18 19:07:58 -06:00
Juliya Dynina
7ecba9e0fa
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
Kenneth Sperow
5aacf4945a
VLab Issue #5657 -- Fix MRMS menu to only display in D2D perspective; fixes #5657 . Fix originally checked in by Darrel Kingfield as commit 8ff98671. Somehow 14.4.1 code got pulled into the mdl_14.3.1 branch so it was deleted and this commit was pushed.
...
Former-commit-id: 53ac049c9794cbcbf88707db04186f6d272ac850
2014-12-17 16:04:54 -08:00
Qinglu.Lin
3b3780fd13
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
8216ea6b6b
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
7f731a767f
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
Joshua Watson
3f2f7f2f3a
VLab Issue #5238 DR_14024 Code changes for gridded LAMP modifications; fixes #5238
...
Change-Id: I9e13afd8f7736f71fe8d584b1ff9a5b1ec943667
Former-commit-id: 5f730d514fd3e4b6780d7a3d60dcb08b102ecd29
2014-12-17 08:38:27 -05:00
Ana Rivera
043bc3a8b7
Merge branch 'omaha_14.4.1' into field_14.4.1. Conflicts resolved: VLab Issue #4129 , #5421 , #5345 .
...
Conflicts:
cave/com.raytheon.uf.viz.image.export/src/com/raytheon/uf/viz/image/export/dialog/ImageExportDialog.java
cave/com.raytheon.uf.viz.image.export/src/com/raytheon/uf/viz/image/export/options/ImageExportOptions.java
cave/com.raytheon.viz.feature.awips.developer/feature.xml
edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/grid/dataset/alias/gfeParamInfo.xml
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
Change-Id: Ic838b8b0499b1022a555915c7264b414d6948895
Former-commit-id: 111ae763e6becb944e34e262e1d87d2d344236e4
2014-12-16 23:39:02 +00:00
Rici.Yu
cd7212c689
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
Mike Duff
b98cc4c385
Issue #3026 - Implement last minute requirement change, change location of text on screen
...
Change-Id: I2f8fb480a3259bae71f7c09e46e393a413972378
Former-commit-id: 773590a3936ca34be68cb5b19ae8fbf027085926
2014-12-16 13:13:37 -06:00
Evan Polster
1fc65c2b68
Merge "VLab Issue #5056 . Ensemble Tool Feature; fixes #5056 Change-Id: I4333c27b7b10bf3fb5a78509a9f8cf752519083b" into gsd_14.4.1
...
Former-commit-id: 8bc4f7551242372adca29b0a3837b63d9e76050b
2014-12-16 17:25:15 +00:00