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
Juliya Dynina
c431691d06
Merge "ASM #16889 - Fixed colorvalue_use warning and cleaned up some code." into asm_14.3.1
...
Former-commit-id: 2ebcc016732b0405b183b0e4e56d528a24e9cbdf
2014-12-03 14:40:12 -05:00
steve.naples
c4fad58bd9
ASM #16889 - Fixed colorvalue_use warning and cleaned up some code.
...
Change-Id: Id9d52cdb328ed7f863f7e09c09ee3e7ef70bf8a4
Former-commit-id: 862cb7c4d789915067558c4508cf5f1e45a2cdf2
2014-12-03 18:35:19 +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
Brian.Dyke
6777dfad30
Merge branch 'asm_14.3.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.3.1
...
Former-commit-id: 5972d08bfe8bc836a3437251bcf9f5e68e14b6a1
2014-12-02 12:17:32 -05:00
Paul.Grell
63ae1fe88c
ASM #16911 HydroDate set to next day if hour is 18Z or later
...
Change-Id: Ied55660cb81e3fdf2e87295fe22eb0915f7b4764
Former-commit-id: 38d9bc8c4e385e339df5bdd010160728730bed8d
2014-12-02 11:35:28 -05:00
steve.naples
ec656123f2
ASM #16889 - Daily QC does not display SNOTEL data.
...
Change-Id: I42035d5d4d856a395400a1be1d0c6a24bc64b0d8
Former-commit-id: 01735909fffdc9b5ef14ed072253eed6deaecad9
2014-11-26 18:24:53 +00:00
Nate Jensen
b46b4b51a8
Merge "Issue #3026 - Fix for HPE displays is volume browser" into omaha_14.3.1
...
Former-commit-id: 1cf731bc43346810f1976650ad509ee538cf3067
2014-11-21 15:46:16 -06:00
Mike Duff
67f3b00beb
Issue #3026 - Fix for HPE displays is volume browser
...
Change-Id: I1ef2766e9bf74e7ad82cc36cd4e4a35659aacf39
Former-commit-id: a375e64e7ee3276be47b26f4386e7bc6491bc740
2014-11-21 13:56:46 -06: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
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
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
Roger Ferrel
4d06812d30
Issue #3439 Changed id=gfs90 to id=gfs to avoid confusion in these xml files.
...
Change-Id: I55b44a25196e9dcbc0a5e1417da1c39e5b978f3e
Former-commit-id: a9ce685c99dbdc1442f022cda7af09af5bdabf87
2014-11-20 12:25:00 -06: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
Roger Ferrel
90a8b262f3
Issue #3439 Replaced GFS213 with GFS229.
...
Change-Id: I6cd7774c4897273944c56c39d087bb5cf98f4b15
Former-commit-id: 6cb88075375e3703b5ffe559ebd5e4f57d016880
2014-11-18 17:42:39 -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
82f427924a
Merge branch 'asm_14.3.1' of ssh://10.201.30.8:29418/AWIPS2_baseline into master_14.3.1
...
Former-commit-id: 3b21d69375ceb9c07377082c5e46a094742406a0
2014-11-14 16:24:25 -05: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
Dave Hladky
3052a38081
Issue #3026 Fixed null metaData lookups in resource.
...
Change-Id: I29d17ea990ac5516b67ac18fadf4267663a23efb
Former-commit-id: 3f6bba1fda61fe283be47af1a4245d196f94f998
2014-11-11 10:18:47 -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
Brian.Dyke
3dff476497
Merge branch 'master_14.3.1' into asm_14.3.1
...
Former-commit-id: b683c7776ef1fad2702fca82aed1abb4873e433b
2014-11-07 12:55:38 -05: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
Steve Harris
98f2a877f6
Merge branch 'master_14.3.1' (14.3.1-31) into omaha_14.3.1
...
Former-commit-id: b70eb5b35985453e77ef2337728c65161ba60422
2014-11-04 13:05:36 -06:00
Matthew Howard
c2226a2817
Merge changes I8e97aec2,Ib6df55db into asm_14.3.1
...
* changes:
ASM #16693 changed swear words to all upper case
ASM #16693 fixed typo in the filter
Former-commit-id: 0c3de224e672ea5259eaa395672efdf8982a1d45
2014-11-04 13:11:10 -05: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
Ying-Lian.Shi
2c2662c191
ASM #16693 changed swear words to all upper case
...
Change-Id: I8e97aec281a3e2c307355a2138bde605de41f446
Former-commit-id: ae186e99c22beeda347561fe24dc38a61a699c25
2014-11-04 14:13:29 +00:00
Brian.Dyke
f3b80f319d
Merge branch 'omaha_14.3.1' of ssh://www.awips2omaha.com:29418/AWIPS2_baseline into master_14.3.1
...
Former-commit-id: 4be7b001bc98e6fe81b3e66940d025fd7511060b
2014-11-03 14:45:24 -05:00
Matthew Howard
36e73a31df
Merge "ASM #16693 handles more swear words" into asm_14.3.1
...
Former-commit-id: a6ed07b8c01df8576cc54f88dc52d2110d211707
2014-11-03 09:56:09 -05:00
Ying-Lian.Shi
12ccfcfa11
ASM #16693 fixed typo in the filter
...
Change-Id: Ib6df55dbaabdbebe8bb670fbffd9c4c901e31857
Former-commit-id: 29f50282d5e2415f1d9a876c5515be0c04e27015
2014-10-31 10:57:55 +00: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
Ying-Lian.Shi
ea9e231074
ASM #16693 handles more swear words
...
Change-Id: I0b892e3e6748919a206597106604a50f108b1bf7
Former-commit-id: 6133c233bd3e02b0a8e1540dd6c496997184f11d
2014-10-30 18:22:34 +00: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
Ron Anderson
0c3e19449f
Issue #3776 Cache SWT fill patterns used in history mode.
...
Change-Id: Ibb48a997fd0b9c2308ae9f492c7837a10db7285d
Former-commit-id: baefc78796f3d4826d32e5324dd88fa01d242ed5
2014-10-29 15:20:18 -05:00
Sarah Pontius
d7e8bc97b6
VLab Issue #5129 - Merging code from tropical_hazard_formatters to tcv_14.3.2; fixes #5129
...
Change-Id: Ia7365620c5cc803faa25af4d6c32d3e394497626
Former-commit-id: eee97946890b5b0df941e2665a4a183eece14598
2014-10-29 13:33:24 -06:00
Steve Harris
1753861b41
Merge branch 'master_14.3.1' (14.3.1-29) into omaha_14.3.1
...
Former-commit-id: 9d95570c1686978a5c84a21af29dbc84e53355a3
2014-10-29 08:21:13 -05:00
Ben Steffensmeier
1591c9cbb8
Issue #3767 Change default image export name to screenCapture.png.
...
Former-commit-id: 021367d3212e185a2d8d4e5970fc268204bf070b
2014-10-28 14:18:02 -05:00
