Matthew Howard
c0cce89287
Merge "ASM #17039 - Remove HighlightFramingCodes feature" into asm_14.4.1
...
Former-commit-id: b482802e1e4a46df6ed9b482802e1e4a46df6ed9cfc9629774cfc96297742731ac39dc7e18ae7ff6b43e16d769
2015-02-04 11:16:20 -05:00
Rici.Yu
520899992d
ASM #17039 - Remove HighlightFramingCodes feature
...
Change-Id: I7ee07ef64b1a16cdeb0b6af48ccaf3c228357891
Former-commit-id: 0a489fea9c5470139b420a489fea9c5470139b421188dab0f41188dab0f4e1762b3ae9f41d5cffefff0177a6dd
2015-02-04 10:23:30 -05:00
Fay.Liang
7f3a53beaf
Merge branch 'gsd_14.4.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.4.1
...
Former-commit-id: 5550322f62ae85ade54d5550322f62ae85ade54df1c34884a5f1c34884a57ac4ff3f4882b363759837f830c123
2015-02-03 11:24:57 -05:00
Ana Rivera
7cea67cfc6
Merge branch 'master_14.4.1' into gsd_14.4.1
...
Change-Id: I5b7c7e17031ec4d081c03e3c4378faf6122849d5
Former-commit-id: ccd0a40621ea92049aacccd0a40621ea92049aac070f0136ec070f0136ece358377ca71bbb9bad780715e923df
2015-01-30 19:29:29 +00:00
Ana Rivera
cf29758096
Merge branch 'master_14.4.1' into field_14.4.1
...
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
Change-Id: I1f3f22ff1e9dfa32f971136479bb312230c1fc40
Former-commit-id: 4071b58b858bfa7c40874071b58b858bfa7c408720ad0a65f320ad0a65f3de74e8a90d3696a3a1d10af5d55eb6
2015-01-27 22:05:59 +00:00
Fay.Liang
5ef24fe432
Merge branch 'emc_14.4.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.4.1
...
Former-commit-id: 65d91d9113d29d86ad0565d91d9113d29d86ad057bc10075e57bc10075e586a40666bd5e75c0c5aaf0713c1934
2015-01-27 12:08:28 -05:00
Ana Rivera
d4e36fe496
Merge branch 'master_14.4.1' into field_14.4.1
...
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
Change-Id: Ia5c04c409d08280ae09f9999b2c6883fc0b47e18
Former-commit-id: 62094315d27c5fc2653762094315d27c5fc26537327945af8b327945af8ba84f43a8c65e97e24201ef4ca10b8a
2015-01-27 16:28:42 +00:00
Ana Rivera
be37ebdc3e
Merge branch 'emc_14.4.1' of gerrit:AWIPS2_Dev_Baseline into emc_14.4.1
...
Former-commit-id: f565ef4315171a38175cf565ef4315171a38175cdee10b3f6fdee10b3f6f0b7f2e3dd77f3230cab24b2580bacc
2015-01-26 19:04:54 +00:00
Ana Rivera
aa04bff454
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: 654d08a58898ac97e397654d08a58898ac97e3977c25945fd97c25945fd9d6630d8f35eae1bd317dcd2841195b
2015-01-26 18:45:26 +00:00
Shawn.Hooper
a5b70920fd
Merge branch 'omaha_14.4.1' of ssh://awips2omaha.com:29418/AWIPS2_baseline into master_14.4.1
...
Former-commit-id: e6c4f29036568b7c801ae6c4f29036568b7c801ae84a037b2ee84a037b2e9cc09ab18e735893aab0bbaebe4fc0
2015-01-26 11:22:49 -05:00
Steve Harris
fcdd2faaf1
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: 8cd9e2e92f158fa163768cd9e2e92f158fa163760f05c53a530f05c53a535fda208a17033d0fc742c3d3d5f424
2015-01-23 09:08:06 -06:00
Ana Rivera
c3ce42f75b
VLab Issue #5945 - Update NWPS: Run_NWPS.py; fixes #5945
...
Change-Id: Ib0d4356bd5d2c99f33204bf88bf65fe9a7db3278
Former-commit-id: de1b989253705f02f2bede1b989253705f02f2be44fa40c0cc44fa40c0cc87f986052ed8f7ae400cf254d7d626
2015-01-23 14:21:22 +00:00
Mark Peters
841bf0150c
Omaha #3768 Add localization to build.properties
...
Change-Id: I5f807ed34cf55868a9cf0883d9896cfaa5508b30
Former-commit-id: 30229a25f2db69f5a0bc30229a25f2db69f5a0bc7a69f354d97a69f354d9a176434c4132dbdc345fc6fd704642
2015-01-22 18:05:40 -06:00
Shawn.Hooper
c1555d3133
Merge branch 'ohd_14.4.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.4.1
...
Former-commit-id: 7839dab5e60bc501bd4c7839dab5e60bc501bd4ca757b55446a757b55446e110ee143a6cf71bae0e953b71a3f8
2015-01-22 16:05:41 -05:00
Nate Jensen
84379b24e2
Merge "Omaha #3993 ensure important dataplugin utility folders are included in viz builds" into omaha_14.4.1
...
Former-commit-id: 0d1414e56b16d862700a0d1414e56b16d862700a865852c20c865852c20c99dae46c58c06e1c0adb95bdbef8c4
2015-01-15 13:07:10 -06:00
Brian Clements
0f521bee60
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: 17ccb3ab661c2d8e01d017ccb3ab661c2d8e01d08cc1aa9f338cc1aa9f33ba13ccb6f09a87cf77c561b3b6389e
2015-01-14 13:00:25 -06:00
Ben Steffensmeier
79d0ce0b70
Omaha #3966 Limit the number of flags on wind barbs.
...
Former-commit-id: dad3e9ed8c22f13c9f08dad3e9ed8c22f13c9f083a6bce11003a6bce1100f7d8dae6b97d9ff47dfa4b253097a1
2015-01-13 17:21:43 -06:00
Nate Jensen
7a14b2de0c
Omaha #3993 ensure important dataplugin utility folders are included in
...
viz builds
Change-Id: I3bb2a464f482995943e3729e439c3f0c8fbfe747
Former-commit-id: f88f62191f05307be9d0f88f62191f05307be9d0b434ae1343b434ae13439df5c9249b39ab8668fa69d8073d94
2015-01-13 16:47:04 -06:00
Nate Jensen
2ab1455029
Merge "Omaha #3709 reworked custom user color configuration" into omaha_14.4.1
...
Former-commit-id: bb5b975ae065a0433605bb5b975ae065a0433605511ba87c5c511ba87c5c7d2f617c95a9e4546f6ae75e025fe4
2015-01-12 13:59:25 -06:00
Slav Korolev
7c7c14b192
Omaha #3220 - Replaced MonitoringArea class with individual area configuration managers.
...
Former-commit-id: f08d184cfc9c57dab437f08d184cfc9c57dab437b8ab18d3e1b8ab18d3e16c73aca047790a79e752a6e0502c58
2015-01-12 14:32:31 -05:00
Fay.Liang
1e9024ede9
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: 6b77894bd0c6bd5d76756b77894bd0c6bd5d7675eed6737801eed6737801f3ecae85735cc8e5b4af06ac6b396e
2015-01-12 13:03:31 -05:00
Brian Clements
d577a1d181
Omaha #3709 reworked custom user color configuration
...
Change-Id: I8b69dc378976684e989cae883e99ade9553c04d3
Former-commit-id: 911b007d953d33ce1341911b007d953d33ce134146c0d7d42c46c0d7d42c42d54b3dacc354fa93db29ec52418c
2015-01-12 11:06:57 -06:00
Juliya Dynina
84032a4d9b
Merge "ASM #14246 - Implemented MPE Transmit Best Estimate option" into asm_14.4.1
...
Former-commit-id: 898380889c0113c27937898380889c0113c279373bf0aebf643bf0aebf649ebfcec33f6a4f936e9b5bd95b83c7
2015-01-08 11:49:18 -05:00
Loubna.Bousaidi
c83ade000b
ASM #14246 - Implemented MPE Transmit Best Estimate option
...
Change-Id: If6dc3df81ecfee998ebcc4de8ee47ddc2466868e
Former-commit-id: 79ae030ca64a769ef56079ae030ca64a769ef560f2476cae94f2476cae947aa40a06541e849a4bba7226e889f8
2015-01-08 15:31:58 +00:00
Slav Korolev
cb5037ba90
Omaha #3937 - Removed UELE - Index out of bounds.
...
Former-commit-id: 13ef257a0dc215b4c91b13ef257a0dc215b4c91bda0d46ad81da0d46ad81a9f642af5b32b5dc892844a4f7220d
2015-01-07 12:20:08 -05:00
Nate Jensen
fb038b5f9e
Merge "Omaha #3709 Fix some minor issues with collaboration colors." into omaha_14.4.1
...
Former-commit-id: 5ea76c4f3d33229e28715ea76c4f3d33229e2871b8f1475a3cb8f1475a3cfae5ed4e5f4a547884b5f5db894b86
2015-01-05 13:06:21 -06:00
Mark Peters
aa4db73f94
Omaha #3709 Fix some minor issues with collaboration colors.
...
Change-Id: I07fbcd6db21c3ee3b5fa404ad1c004af7e3ac057
Former-commit-id: 6df0145869530b52d7db6df0145869530b52d7db7cc21da4197cc21da4193ff2238ced75bc5c4ed9308d4aa4a5
2015-01-05 12:57:42 -06:00
Juliya Dynina
33641f8869
Merge "ASM #16952 - Fixed the bug in the estimated precip values algorithm." into asm_14.4.1
...
Former-commit-id: 6884c46ee9757a3f72e86884c46ee9757a3f72e8807ac7dfbc807ac7dfbcbdca475dae568a214ec49795afeefd
2014-12-24 07:57:10 -05:00
Loubna.Bousaidi
96f0329ad5
ASM #16952 - Fixed the bug in the estimated precip values algorithm.
...
Change-Id: I065fc7744747e52c7f10c499f5b100ef60e25e44
Former-commit-id: 90ce56daf2d6db8867e990ce56daf2d6db8867e9fac9ebed4afac9ebed4a18dbe4b7811d6a5291ee2b4245fe02
2014-12-23 14:48:29 +00:00
Slav Korolev
6da982ef53
Omaha #3841 - Corrected updateZones method.
...
Former-commit-id: 01d004673d24322ed6ca01d004673d24322ed6ca6ebe11d4306ebe11d430551c21697ba44448789933ac001044
2014-12-19 13:27:07 -05:00
Jordan Gerth
623f1b73ce
VLab Issue #5720 - Import certain packages to support frame capture enhancement following merge
...
Change-Id: I3da055aee568a4ec762b2a5e58e199cb14853995
Former-commit-id: a1467a8fbee575fd6eb9a1467a8fbee575fd6eb9c3fd773e12c3fd773e127bd5ac2331982492e73b92aff92d87
2014-12-18 19:07:58 -06:00
Juliya Dynina
73803413e5
Merge "ASM #637 - Create a base level map bundle for the WarnGenLoc shape file" into asm_14.4.1
...
Former-commit-id: e55657db3b7ecba9e0fae55657db3b7ecba9e0fae838915565e8389155658aafc396004844ddd48b93fd371f42
2014-12-18 08:23:08 -05:00
Qinglu.Lin
4caef3c695
ASM #637 - Create a base level map bundle for the WarnGenLoc shape file
...
Change-Id: Id3285b04a2ae8e07acfe33d2f1f57a11b34c9f25
Former-commit-id: 2d4a045e3c3b3780fd132d4a045e3c3b3780fd13baa96590f1baa96590f1f4d78ec480cae57983d8484799b7f5
2014-12-17 16:53:31 -05:00
Kiran.Shrestha
d39deb8ea3
ASM #622 Total Precipitable Water (TPW) satellite field should be displayed in inches
...
Change-Id: Ia7aba807682f559f11522491f7d64280eef9eac0
Former-commit-id: 897ca1de818216ea6b6b897ca1de818216ea6b6b991f4c22c8991f4c22c82f498d1e9bdff62cf9d373f4fe509d
2014-12-17 21:20:57 +00:00
Kiran.Shrestha
f1d6cff7a5
ASM #14130 Satellite: Derived Products Plots problems for SSM/I Point Data
...
Change-Id: Id3c2189c017bf6341bc09236dbd39aaff937e2c8
Former-commit-id: 5f7e529f377f731a767f5f7e529f377f731a767f10de23323110de233231dbf9c9fc4c90614060686586802ea5
2014-12-17 21:03:18 +00:00
Joshua Watson
8dd62191ae
VLab Issue #5238 DR_14024 Code changes for gridded LAMP modifications; fixes #5238
...
Change-Id: I9e13afd8f7736f71fe8d584b1ff9a5b1ec943667
Former-commit-id: 0c375981e73f2f7f2f3a0c375981e73f2f7f2f3a5aa47485695aa47485691040be8594094e8048e9eb68dac32d
2014-12-17 08:38:27 -05:00
Ana Rivera
40df82b005
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: 214be0a93b043bc3a8b7214be0a93b043bc3a8b71823ed35961823ed3596ef35771bfad2d8127363f7c0319ee4
2014-12-16 23:39:02 +00:00
Rici.Yu
95dcd60bf1
ASM #14946 - GFE: ZFP displaying time for office timezone for zones in different timezone
...
Change-Id: I082b26ffea4b228baf4f40afb019994d5fe1e7dd
Former-commit-id: eaf241a60acd7212c689eaf241a60acd7212c6895b5d6fd5cd5b5d6fd5cdeeba904e687f2b2cbac4570135e84e
2014-12-16 15:34:35 -05:00
Evan Polster
d963018d04
Merge "VLab Issue #5056 . Ensemble Tool Feature; fixes #5056 Change-Id: I4333c27b7b10bf3fb5a78509a9f8cf752519083b" into gsd_14.4.1
...
Former-commit-id: 2a989cb8111fc65c2b682a989cb8111fc65c2b688aa34f82a68aa34f82a67daf4d07bed394921d514d380104fd
2014-12-16 17:25:15 +00:00
Evan Polster
6f0683449a
VLab Issue #5056 . Ensemble Tool Feature; fixes #5056
...
Change-Id: I4333c27b7b10bf3fb5a78509a9f8cf752519083b
Former-commit-id: 4ebed922bdf5dd6a6d934ebed922bdf5dd6a6d93992cb6506f992cb6506fb4b407f9e7e1cb0fc2dae7ca46c58a
2014-12-15 21:31:58 +00:00
Jordan Gerth
e925d559e2
VLab Issue #5345 - Ingest, Load, Display severe probability for a storm cell
...
Change-Id: I032b0db29ed8947df3fe630336bb01083dbfecd0
Former-commit-id: 4003c09e47784c43ee334003c09e47784c43ee33e0fd068337e0fd068337e730a2d3811ac7dcdc149896e639bb
2014-12-14 15:40:19 -06:00
Ana Rivera
5499ad5c14
Merge "VLab Issue #5421 - Capture frames with date and time in file name" into field_14.4.1
...
Former-commit-id: 11f5ee56bea2bf9ed47411f5ee56bea2bf9ed474703b8197de703b8197dea27c906150562795da1c23c6657af5
2014-12-12 20:41:08 +00:00
Lee Venable
1078fa6bdc
Merge "Omaha #3709 Add icon that displays text colors next to color change menu items" into omaha_14.4.1
...
Former-commit-id: 24aa804855b3b6b164ed24aa804855b3b6b164ed6812dc291c6812dc291cf8d0f8f0c2a9e77a8ee9be99576093
2014-12-12 14:00:43 -06:00
Jordan Gerth
0baa87f221
VLab Issue #5421 - Capture frames with date and time in file name
...
Change-Id: Ie20956810b46abd3d74a93b993d1a4e134785d29
Former-commit-id: 4a62915f975b9602defb4a62915f975b9602defb786afd6b76786afd6b76a4ffb67c1ca6e007e1c748e193ac1d
2014-12-12 13:39:01 -06:00
Mark Peters
845245f1ee
Omaha #3709 Add icon that displays text colors next to color change menu items
...
Change-Id: I5a8fe5cc5679381587cb7b13cfa5984bf796ee42
Former-commit-id: 5a19380c597b591d8a685a19380c597b591d8a6805eabb4a9105eabb4a9128218a264b1332b58355dad6f8b068
2014-12-12 13:09:14 -06:00
Chip Gobs
02be03bd51
VLab Issue #5616 MPE:Gage Color by Value does not display correctly; fixes #5616
...
Former-commit-id: 1d6c968fa605327145041d6c968fa605327145043645172fef3645172feff8d9c7b5b98f3a824080dbe91796c6
2014-12-12 13:24:47 -05:00
Slav Korolev
c37b73f316
Omaha #3888 - Fixed NPE error in the process() method.Corrected
...
Former-commit-id: c6dbb0aa9563014f65c7c6dbb0aa9563014f65c7ed97d72dcbed97d72dcb3c4f538aa22c423adede432fb0db63
2014-12-12 12:29:03 -05:00
Lee Venable
d535422219
Merge "Omaha #3888 - Fixed NPE error in the process() method." into omaha_14.4.1
...
Former-commit-id: 793cf6d676e036b3e70e793cf6d676e036b3e70e2bc4cfdaae2bc4cfdaae899a19bbe9219c69093142d70d1af6
2014-12-12 11:20:19 -06:00
Richard Peter
087ce6633b
Merge branch 'omaha_14.4.1' of ssh://lightning.omaha.us.ray.com:29418/AWIPS2_baseline into omaha_14.4.1
...
Former-commit-id: 286cf3e921644a076c76286cf3e921644a076c765ce93f49eb5ce93f49eb58d80d455acc41ebd2e0f2babdc51a
2014-12-12 10:57:15 -06:00
Slav Korolev
f72d5f0465
Omaha #3888 - Fixed NPE error in the process() method.
...
Former-commit-id: 31ab89f85e4abd2fc83731ab89f85e4abd2fc8379cf99b9e889cf99b9e8853cd8f73f61b5bbd269efc8c0afbba
2014-12-12 11:53:59 -05:00
