Fay.Liang
6b77894bd0
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: eed6737801c6bd5d7675
2015-01-12 13:03:31 -05:00
Juliya Dynina
898380889c
Merge "ASM #14246 - Implemented MPE Transmit Best Estimate option" into asm_14.4.1
...
Former-commit-id: 3bf0aebf640113c27937
2015-01-08 11:49:18 -05:00
Loubna.Bousaidi
79ae030ca6
ASM #14246 - Implemented MPE Transmit Best Estimate option
...
Change-Id: If6dc3df81ecfee998ebcc4de8ee47ddc2466868e
Former-commit-id: f2476cae944a769ef560
2015-01-08 15:31:58 +00:00
Juliya Dynina
6884c46ee9
Merge "ASM #16952 - Fixed the bug in the estimated precip values algorithm." into asm_14.4.1
...
Former-commit-id: 807ac7dfbc757a3f72e8
2014-12-24 07:57:10 -05:00
Loubna.Bousaidi
90ce56daf2
ASM #16952 - Fixed the bug in the estimated precip values algorithm.
...
Change-Id: I065fc7744747e52c7f10c499f5b100ef60e25e44
Former-commit-id: fac9ebed4ad6db8867e9
2014-12-23 14:48:29 +00:00
Juliya Dynina
e55657db3b
Merge "ASM #637 - Create a base level map bundle for the WarnGenLoc shape file" into asm_14.4.1
...
Former-commit-id: e8389155657ecba9e0fa
2014-12-18 08:23:08 -05:00
Qinglu.Lin
2d4a045e3c
ASM #637 - Create a base level map bundle for the WarnGenLoc shape file
...
Change-Id: Id3285b04a2ae8e07acfe33d2f1f57a11b34c9f25
Former-commit-id: baa96590f13b3780fd13
2014-12-17 16:53:31 -05:00
Kiran.Shrestha
897ca1de81
ASM #622 Total Precipitable Water (TPW) satellite field should be displayed in inches
...
Change-Id: Ia7aba807682f559f11522491f7d64280eef9eac0
Former-commit-id: 991f4c22c88216ea6b6b
2014-12-17 21:20:57 +00:00
Kiran.Shrestha
5f7e529f37
ASM #14130 Satellite: Derived Products Plots problems for SSM/I Point Data
...
Change-Id: Id3c2189c017bf6341bc09236dbd39aaff937e2c8
Former-commit-id: 10de2332317f731a767f
2014-12-17 21:03:18 +00:00
Rici.Yu
eaf241a60a
ASM #14946 - GFE: ZFP displaying time for office timezone for zones in different timezone
...
Change-Id: I082b26ffea4b228baf4f40afb019994d5fe1e7dd
Former-commit-id: 5b5d6fd5cdcd7212c689
2014-12-16 15:34:35 -05:00
Lee Venable
24aa804855
Merge "Omaha #3709 Add icon that displays text colors next to color change menu items" into omaha_14.4.1
...
Former-commit-id: 6812dc291cb3b6b164ed
2014-12-12 14:00:43 -06:00
Mark Peters
5a19380c59
Omaha #3709 Add icon that displays text colors next to color change menu items
...
Change-Id: I5a8fe5cc5679381587cb7b13cfa5984bf796ee42
Former-commit-id: 05eabb4a917b591d8a68
2014-12-12 13:09:14 -06:00
Slav Korolev
c6dbb0aa95
Omaha #3888 - Fixed NPE error in the process() method.Corrected
...
Former-commit-id: ed97d72dcb63014f65c7
2014-12-12 12:29:03 -05:00
Lee Venable
793cf6d676
Merge "Omaha #3888 - Fixed NPE error in the process() method." into omaha_14.4.1
...
Former-commit-id: 2bc4cfdaaee036b3e70e
2014-12-12 11:20:19 -06:00
Richard Peter
286cf3e921
Merge branch 'omaha_14.4.1' of ssh://lightning.omaha.us.ray.com:29418/AWIPS2_baseline into omaha_14.4.1
...
Former-commit-id: 5ce93f49eb644a076c76
2014-12-12 10:57:15 -06:00
Slav Korolev
31ab89f85e
Omaha #3888 - Fixed NPE error in the process() method.
...
Former-commit-id: 9cf99b9e884abd2fc837
2014-12-12 11:53:59 -05:00
Richard Peter
23eafaba3d
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: 8de1ebcb652457d0e6f7
2014-12-12 10:36:04 -06:00
Juliya Dynina
790b5a47f2
Merge "ASM #638 - Inconsistent Type for scale widget value accessed through the varDict." into asm_14.4.1
...
Former-commit-id: a62ee436c2ecaaa1f9fd
2014-12-12 11:05:02 -05:00
Michael Gamazaychikov
6123ee67c1
ASM #638 - Inconsistent Type for scale widget value accessed through the varDict.
...
Change-Id: If81102e5a3b70e224f88a351277e9c29e9f9cc91
Former-commit-id: 40f0e77f3094f06ccbc9
2014-12-11 19:37:00 -05:00
Slav Korolev
974cc09ca5
Omaha #3220 - Moved refreshing of table in the UI thread.
...
Former-commit-id: fd3a6ea199d06882f4c9
2014-12-11 15:38:47 -05:00
Richard Peter
46611ec961
Merge "Omaha #3757 Added HTTPS flag" into omaha_14.4.1
...
Former-commit-id: 08734bb4e1f16173803c
2014-12-10 17:54:33 -06:00
Dave Hladky
a69c83e534
Omaha #3757 Added HTTPS flag
...
Former-commit-id: 337f67b13661d25613ab
2014-12-10 17:17:12 -06:00
Juliya Dynina
66961409ac
Merge "ASM #628 - Fixed Crest time" into asm_14.4.1
...
Former-commit-id: ac47f1ca2147ddfd8c69
2014-12-10 15:13:54 -05:00
Loubna Bousaidi
52364ff0eb
ASM #628 - Fixed Crest time
...
Change-Id: I5f9f58cfdb1689f331628498a781bb60f5549ac5
Former-commit-id: 2facd8c547fb5031e5b8
2014-12-10 20:01:42 +00:00
David Friedman
0f9d3f5f4f
ASM #11982 - Print Icon in CAVE does not print (Actually fix print-to-file)
...
Change-Id: I89c581065424da5dbe5108e98fcc76f7381c911c
Former-commit-id: 91bc857ffc851f67c5e7
2014-12-09 21:57:21 +00:00
Juliya Dynina
36b1144775
Merge "ASM #16829 - TextWS: Problem with AlarmAlertFunctions static class initialization" into asm_14.4.1
...
Former-commit-id: 25a4e0f8688e7811740e
2014-12-09 14:13:30 -05:00
Mark Peters
e1bf45baef
Omaha #3709 New color dialog, move P2P color actions to menu bar, add actions to contact list
...
Change-Id: Ie03659376d3a035bb2acbd98b2e34a91e6b5ad57
Former-commit-id: 1880d72b9da721ccbcac
2014-12-09 11:47:22 -06:00
Juliya Dynina
bc03e466ef
Merge "ASM #634 - Missing Data not getting into HML file" into asm_14.4.1
...
Former-commit-id: b70186d356669525e06d
2014-12-09 08:04:00 -05:00
Xuezhi.Wei
c0a72e92bf
ASM #634 - Missing Data not getting into HML file
...
Change-Id: I4f2358f28ef7d7945813cbffa6d36517e162e40b
Former-commit-id: e40018f2e1ac19b4b08d
2014-12-08 20:48:40 +00:00
Nathan Bowler
3baaa2ea5e
Omaha #1231 Fix selecting AWIPS ID
...
Change-Id: I657d723b45b9374523307a8fdbdfc21f2f31f35e
Former-commit-id: 06c94a25b7c07d774bd0
2014-12-08 13:07:14 -05:00
Nathan Bowler
907425cb04
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: 18e1ede6a159f4baa5fe
2014-12-05 15:31:46 -05:00
Ron Anderson
c4d27803cc
Merge "Omaha #3885 : Merge VTEC route and request changes from VLab." into omaha_14.4.1
...
Former-commit-id: e0b9900a50d7e0d21d27
2014-12-04 15:44:46 -06:00
Nate Jensen
8f0375f71e
Merge "Omaha #3848 Fix cancelling geotiff import." into omaha_14.4.1
...
Former-commit-id: 13bd91431947b8be5b09
2014-12-04 13:24:19 -06:00
Fay.Liang
6e9ff9e139
Merge branch 'tcv_14.3.2' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.2
...
Former-commit-id: f5095bed4e028d6bdc33
2014-12-04 13:47:03 -05:00
Fay.Liang
f327b9dd5a
Merge branch 'master_14.3.1' into master_14.3.2
...
Former-commit-id: 19194e0aa383a4987188
2014-12-04 13:46:31 -05:00
Nathan Bowler
a5bc553461
Omaha #3848 Fix cancelling geotiff import.
...
Change-Id: I1af55a1ba866fc08814fbb8362334a430b0f7463
Former-commit-id: e1af24d84e3e7a1993e3
2014-12-04 13:24:04 -05:00
Nate Jensen
7fe0fc4cb9
Merge "Omaha #3709 Support foreground/background colors by user for group chats without shared display" into omaha_14.4.1
...
Former-commit-id: d4ce4aab6bcc41245a73
2014-12-04 11:28:01 -06:00
Mark Peters
1b30658214
Omaha #3709 Support foreground/background colors by user for group chats without shared display
...
Change-Id: I6e9e25688f2477bcefbd1317d487421e7e0554aa
Former-commit-id: 7ae71cf1dcbd3ed3935c
2014-12-04 10:37:53 -06:00
Ron Anderson
fd25fe9efc
Omaha #3885 : Merge VTEC route and request changes from VLab.
...
Original Ticket: VLab Issue #4953 Added support for managing JSON files in practice mode.
Change-Id: I5ec7c695866554e6209b0c15f6dbe1a460d9d7d9
Former-commit-id: 2417d5a2a75169e7181f
2014-12-04 10:01:18 -06:00
Bruce.Hundermark
c4ca149d67
ASM #645 - GFE: CarSnowAmt smart tool can return incorrect amount
...
Change-Id: I8aea3ab2ccfec7e411e605ddfdfeef0a823687c2
Former-commit-id: c11898f30a6f73b491f8
2014-12-04 15:56:01 +00:00
Nate Jensen
c4ffdbc7e8
Merge "Omaha #3549 remove dead code" into omaha_14.4.1
...
Former-commit-id: 68973ea94c7fed5d8e25
2014-12-04 09:00:45 -06:00
Nate Jensen
cb745b34f3
Omaha #3549 remove dead code
...
Change-Id: I211a20875c93e678852c45a0e5be15b9980e78f2
Former-commit-id: 25e09348c019d14b6107
2014-12-03 17:35:08 -06:00
Ben Steffensmeier
8c69731c75
Merge "Omaha #3549 remove dead code" into omaha_14.4.1
...
Former-commit-id: 47d1ae982565431db2c9
2014-12-03 17:14:42 -06:00
Lee Venable
8cb91f471b
Merge "Omaha #3549 fix frozen time sizing" into omaha_14.4.1
...
Former-commit-id: 5ab799b56f3acfa2eda5
2014-12-03 16:49:48 -06:00
Nate Jensen
a651246f08
Omaha #3549 remove dead code
...
Change-Id: Ie49f09138eef978dedb4c5fae6bfead8189ddae6
Former-commit-id: 1b4db26cd8ac98f9730c
2014-12-03 16:21:10 -06:00
Nate Jensen
6c1391e938
Omaha #3549 remove jdt prefs for faster builds
...
Change-Id: I82156718a52c37adecc8260fa40a2b0d93453b29
Former-commit-id: 8dbe6abbe4ec28d2f1a0
2014-12-03 15:47:10 -06:00
Nate Jensen
5b7fd51d75
Omaha #3549 fix frozen time sizing
...
Change-Id: I5f17f3bb840d689e8bdba1b52971287cf7279141
Former-commit-id: d26ba30c88e78c319329
2014-12-03 14:29:52 -06:00
Juliya Dynina
d49e57a971
Merge "ASM #16889 - Fixed colorvalue_use warning and cleaned up some code." into asm_14.3.1
...
Former-commit-id: 354a421da7c431691d06
2014-12-03 14:40:12 -05:00
steve.naples
91c240f8bd
ASM #16889 - Fixed colorvalue_use warning and cleaned up some code.
...
Change-Id: Id9d52cdb328ed7f863f7e09c09ee3e7ef70bf8a4
Former-commit-id: b5389ced26c4fad58bd9
2014-12-03 18:35:19 +00:00
Sarah Pontius
2b37fe2994
VLab Issue #5492 - Dec 2nd HLS/TCV Code Check-in for 14.3.2 SwIT; fixes #5492
...
Change-Id: I2d0b6fbe44cb2931fc0cd74a9361cf886b0c9565
Former-commit-id: 5d696b412d171a802190
2014-12-03 11:19:06 -07:00
