Rici.Yu
5470139b42
ASM #17039 - Remove HighlightFramingCodes feature
...
Change-Id: I7ee07ef64b1a16cdeb0b6af48ccaf3c228357891
Former-commit-id: cb047745b4a5c523bd1ca26692c758d3e72d8ddc
2015-02-04 10:23:30 -05:00
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
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
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
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
Richard Peter
2457d0e6f7
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
ecaaa1f9fd
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
94f06ccbc9
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
Ron Anderson
d7e0d21d27
Merge "Omaha #3885 : Merge VTEC route and request changes from VLab." into omaha_14.4.1
...
Former-commit-id: 401356d7917aaf84c5ea5c8f92ca32c270d5790a
2014-12-04 15:44:46 -06:00
Fay.Liang
028d6bdc33
Merge branch 'tcv_14.3.2' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.2
...
Former-commit-id: ad2451c4d92ef4dcb35f6a0a4ef6ef9403886963
2014-12-04 13:47:03 -05:00
Fay.Liang
83a4987188
Merge branch 'master_14.3.1' into master_14.3.2
...
Former-commit-id: 1fcac564095b86cd4c6103a6484b25bbff2339b2
2014-12-04 13:46:31 -05:00
Ron Anderson
5169e7181f
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: 16e32018de233fb128a7518415b84e032074932f
2014-12-04 10:01:18 -06:00
Bruce.Hundermark
6f73b491f8
ASM #645 - GFE: CarSnowAmt smart tool can return incorrect amount
...
Change-Id: I8aea3ab2ccfec7e411e605ddfdfeef0a823687c2
Former-commit-id: 25f4c8acdd8975d3001528212cbc7617cfd39500
2014-12-04 15:56:01 +00:00
Sarah Pontius
171a802190
VLab Issue #5492 - Dec 2nd HLS/TCV Code Check-in for 14.3.2 SwIT; fixes #5492
...
Change-Id: I2d0b6fbe44cb2931fc0cd74a9361cf886b0c9565
Former-commit-id: 24c01f47449607347812e0e676f1d14849d3b47e
2014-12-03 11:19:06 -07:00
Rici.Yu
fb347e4a93
ASM #625 - modify checkGroup() to display models in multiple columns if needed
...
Change-Id: I94c5400d21b10b57cf08f4767a5160bfcc554eb9
Former-commit-id: 07c826efbcfe30dc3fc178601e550a6dbd31eb0b
2014-12-02 17:05:56 -05:00
Ron Anderson
4efd17db74
Omaha #3875 Fixed SmartScript.createTimeRange(). Added API to better deal with local time.
...
Change-Id: I8e6f79bf6b7754924480a39f1631ba10a12bdcae
Former-commit-id: e656ec3ccf20ae4a9eae23040e1a08d7032ee42a
2014-12-02 11:45:05 -06:00
Ana Rivera
709d571947
VLab Issue #5194 - Ingest and Display NWPS data; fixes #5194
...
Change-Id: Ib617760363c10e72ee54fd9ca30656fd0b7bd02f
Former-commit-id: 6866439b0a7075f04146af4b4bdce59477269f4d
2014-12-02 15:44:07 +00:00
Ana Rivera
0e8473e91e
VLab Issue #5472 - Revert VLab Issue #5034 (first NWPS code merge); fixes #5472
...
This reverts commit c245f3a3c4
2014-12-02 13:43:03 +00:00
Zhidong.Hao
5fd962449b
ASM #624 GFE: default file save directory different from AWIPS 1
...
Change-Id: I71a9cc3f284ce1c05c3729afc4444362bd0ccd28
Former-commit-id: e6d7e8b2bec9c7cebdf25618897443cff909879d
2014-12-01 14:39:07 -05:00
Zhidong.Hao
cfe7f318d8
ASM #649 BOIVerifySumTemps crashes on dbName
...
Change-Id: Iaf05fcbae36ca0afe4c7350b4acf512f8b25111c
Former-commit-id: 164a7a624780596376b68b7488257b94d4661e80
2014-11-26 14:10:27 -05:00
Zhidong.Hao
a7019b2c0c
ASM #633 GFE: SmartScript method loadParm() exception handler broken
...
Change-Id: Ic7bef317b06dd695889bcc72cceee4ef41b147bc
Former-commit-id: 12ed9574fa7f62d200d50419f88b8ab773930e7a
2014-11-26 13:52:01 -05:00
Fay.Liang
744fc3f9d7
Merge branch 'tcv_14.3.2' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.2
...
Former-commit-id: 21e36577299266c03c8d860afa844cae29538b0f
2014-11-21 13:48:43 -05:00
Ying-Lian.Shi
89fca6f761
ASM #646 GFE: Event end time cannot be set beyond 96 hours on the MakeHazard GUI
...
Change-Id: I83e1701be2417e7ee6c0223e192cb9e0731c761b
Former-commit-id: 6341d72f458c62756f27c851f0db654ab901b7af
2014-11-21 14:32:17 +00:00
Fay.Liang
00a63ad80c
Merge branch 'tcv_14.3.2' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.2
...
Former-commit-id: 9daaa34c341929f784628782c98d5edcf9944ed2
2014-11-21 09:31:58 -05:00
Ana Rivera
1645ccd9ca
Merge branch 'master_14.4.1' into emc_14.4.1
...
Change-Id: I4984b06810f3484e919a4a4a5853435ca34167bb
Former-commit-id: c69e94f227cb908a9af2e1cd2db35b25bef28701
2014-11-21 14:23:49 +00:00
Ana Rivera
250ba9f14c
VLab Issue #5408 - TCV Update: TCVDictionary.py (O&M RM14468); fixes #5408
...
Change-Id: If7b45b6415653efe11485956755cd7aaeb49356b
Former-commit-id: 82e3e8e69e7ebe738a84603c6f901d619004fe8a
2014-11-21 13:19:59 +00:00
Ron Anderson
9485f33476
VLab Issue #4953 Build fix and another cleanup item.
...
Change-Id: I5d92df3f452259c93784cd19e75cc7efd8e04dc4
Former-commit-id: 7a33861e7ac4475855778f50e0a5fca5227e5f97
2014-11-20 17:07:58 -06:00
Shawn Hooper
31d8337c56
VLab Issue #5395 - Update gfeConfig.py based on Pablo's email
...
Change-Id: I100a8d2bb79092bca2157bba018566a650c55f4a
Former-commit-id: c5278c1a2d81d995ae9df252c461123bcc870320
2014-11-20 17:11:42 -05:00
Fay.Liang
99263f79e1
Merge branch 'tcv_14.3.2' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.2
...
Former-commit-id: 9dd4c18d8a4d2f8741ff7e79c2018bbe6cd10fe9
2014-11-20 13:32:25 -05:00
Shawn Hooper
b7369c5eef
VLab Issue #5395 - Build fixes and gfeConfig.py update
...
Change-Id: I94c02a82c7305dc9eb7d31bc941e6e7b0e4a7ba1
Former-commit-id: 94093accc4b2adc4c12cea0a3af0e037c1be52d8
2014-11-20 13:12:16 -05:00
Ana Rivera
29ff0e472b
VLab Issue #5388 - HTI Update: replace 'MFL' references with SITE in HTI.xml (O&M RM16791); fixes #5388
...
Change-Id: I69ead4e0ed1103ca21728e46fa654ebaa85258a0
Former-commit-id: 27d2c6133b5563614b88fa03e3e706c6da2070a4
2014-11-20 13:57:19 +00:00
Fay.Liang
29561d5324
Merge branch 'tcv_14.3.2' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.2
...
Former-commit-id: 28c3dbd91c1e89ffffd19afa811a08e228a995dd
2014-11-19 22:07:54 -05:00
Ana Rivera
7dacc070d2
Merge "VLab Issue #4953 Added support for managing JSON files in practice mode." into tcv_14.3.2
...
Former-commit-id: a0946643e3dab3f54c9d1d7a48dbb06b82207b55
2014-11-19 16:27:03 -05:00
Ana Rivera
2c388bd379
VLab Issue #5382 - HTI Update: add GFE templates (O&M RM16791); fixes #5382
...
Change-Id: I1a37fafbb9c2846749a33dd85772f53ccfb514df
Former-commit-id: 7d9cf7bfb3f513314608b6269f437061fc36d090
2014-11-19 20:29:42 +00:00
Ron Anderson
bb451e58c3
VLab Issue #4953 Added support for managing JSON files in practice mode.
...
Change-Id: I081a11bd2ed9370c32354a0c5728400561f3d7f8
Former-commit-id: e8ac81c5850b8565ea1e375857cf9dfe531848a0
2014-11-19 11:31:49 -06:00
Ana Rivera
ac523f4a45
VLab Issue #5355 - HTI Update: TCFloodingRainThreat.py (O&M RM16791); fixes #5355
...
Change-Id: I6461bf9294f037a361f02d3a0de83bf41147e819
Former-commit-id: 682cf4e6376265d0e590cfd1c05f7591204d0e0a
2014-11-18 16:06:22 +00:00
Fay.Liang
766685c4ec
Merge branch 'tcv_14.3.2' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.2
...
Former-commit-id: 7fd3b02016b0d9eed7ecca9c2fd70c3f83695abc
2014-11-14 12:47:46 -05:00
Ana Rivera
061fd0af28
VLab Issue #5318 - Baseline Hurricane Threats and Impacts (O&M RM16791); fixes #5318
...
Change-Id: Ibbc9e39a294417524c57c86e68e92644433ba847
Former-commit-id: 8a4e53a23a222dc88e3db8cc053fc31c33d3ed42
2014-11-14 16:58:11 +00:00
Fay.Liang
3ed251486c
Merge branch 'tcv_14.3.2' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.2
...
Former-commit-id: 3f94c7f0ddbf580576b435a715366e3b9f3d9a53
2014-11-13 11:50:16 -05:00
Ron Anderson
04b8ffbcd2
VLab Issue #4953 Added support for writing Python and/or Java objects to JSON localization files.
...
Change-Id: Ie25fce637e4294dd20bcfa3933d29b7bf6cc1f30
Former-commit-id: c9d45db2fe6d4693c02b8788d0c7d44b21f5359f
2014-11-12 14:50:21 -06:00
Fay.Liang
74d7123627
Merge branch 'tcv_14.3.2' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.2
...
Former-commit-id: a141921090ecec459e99d448025f58ca6a957fa6
2014-11-10 14:08:25 -05:00
Sarah Pontius
1ae8fe99aa
VLab Issue #5277 - HLS/TCV code for OPG 11-17-2014; fixes #5277
...
Change-Id: I258b2f8c8ddb7f45b02b1035f6fa5006b9fabe1b
Former-commit-id: 0db3944372ecc381df4e8a918829530391d598db
2014-11-10 11:20:09 -07:00
Steve Harris
a16abe1b8b
Merge tag 'OB_14.3.1-32m' into omaha_14.4.1
...
Conflicts:
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/ParmManager.java
cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
edexOsgi/build.edex/esb/conf/logback-ingest.xml
edexOsgi/com.raytheon.uf.edex.core/src/com/raytheon/uf/edex/core/IMessageProducer.java
edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/MessageProducer.java
Former-commit-id: 565efec2ebe5a3a1a009d213a77617f4a593aa6b
2014-11-10 08:42:01 -06:00
Brian.Dyke
1cd471ed72
Merge branch 'omaha_14.3.1' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.3.1
...
Conflicts:
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/ParmManager.java
Former-commit-id: b9d6c75a5c5f4cbe6b1e32f37e044989edf7c39f
2014-11-06 13:14:24 -05:00
Brian.Dyke
aae68215c8
Merge branch 'master_14.2.4' into master_14.3.1
...
Conflicts:
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/ParmManager.java
cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-common.xml
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/config/GFESiteActivation.java
edexOsgi/com.raytheon.uf.edex.esb.camel/src/com/raytheon/uf/edex/esb/camel/MessageProducer.java
rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
Former-commit-id: 5c2079dd25181c68f872691e81842aff0f696f8d
2014-11-06 12:55:21 -05:00
Ron Anderson
f0b58e1daa
Omaha #3557 Fixed NPE when parm is removed from display
...
Change-Id: I14a82967256a788c25d049a4fd119289c909ad91
Former-commit-id: 4ba96e15f55e276cf78b06f71d3e5d6c98bcab8b
2014-11-04 17:41:19 -06:00
Ron Anderson
b508a7134c
Issue #3775 Fix db does not exist for getParmList() error when runProcedure creates new mutable db.
...
Change-Id: I28eef61e4eea77278efe3cbf8828c3357c856785
Former-commit-id: de45da45f39169e3924122a7baf68ab6762e74e2
2014-11-04 11:03:42 -06:00
Brian.Dyke
5e04756c0c
Merge branch 'master_14.2.3' into master_14.2.4
...
Former-commit-id: 78923886791099b8e4564dd780d8ed64db16a5c1
2014-10-30 15:03:19 -04:00
Brian.Dyke
a6f8a3b109
Merge branch 'tcv_14.3.2' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.2
...
Former-commit-id: bc44629025f7070a97fcff4a00939e509e6987b1
2014-10-29 16:39:06 -04:00
