Shawn.Hooper
449307b46c
Merge tag 'OB_16.2.1-22' into master_16.2.2
...
16.2.1-22
Former-commit-id: 102f706a27808f2627f3d9ed8c6be11e0dc978ee
2016-04-12 14:28:16 -04:00
Penghai Wang
1ff00e7088
Merge branch 'master_16.2.2' into asdt_16.2.2
...
Conflicts:
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TabularTimeSeriesDlg.java
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDisplayCanvas.java
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDlg.java
cave/com.raytheon.viz.hydrobase/src/com/raytheon/viz/hydrobase/dialogs/DataIngestFilterDlg.java
cave/com.raytheon.viz.hydrobase/src/com/raytheon/viz/hydrobase/dialogs/RiverGageDlg.java
cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/rsc/graphic/RadarGraphicFunctions.java
cave/com.raytheon.viz.radar/src/com/raytheon/viz/radar/rsc/graphic/RadarGraphicsPage.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/styleRules/gridImageryStyleRules.xml
Former-commit-id: 51bcd1df67c24bce021a89b8708e48306dd0691e
2016-04-12 16:45:34 +00:00
Shawn.Hooper
8a618519ec
Merge remote-tracking branch 'vlab/ohd_16.2.2' into master_16.2.2
...
Former-commit-id: c3a9e71a1dd7a971701ac3c157a8a7b2eb1f3182
2016-04-07 16:02:01 -04:00
Shawn.Hooper
563e2fbb4a
Merge remote-tracking branch 'vlab/mdl_16.2.2' into master_16.2.2
...
Former-commit-id: c849fcfe6bbb76fcf17632e9ae9539211766111d
2016-04-07 16:01:56 -04:00
Shawn.Hooper
0c2ce7faae
Merge remote-tracking branch 'vlab/field_16.2.2' into master_16.2.2
...
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
Change-Id: I0c91cd064aff06397abc6445837ef1be2610d740
Former-commit-id: 1f5a13ead40804f458617b9506236d819d97d54f
2016-04-07 16:01:19 -04:00
Rici.Yu
8c65f847d7
ASM #18777 - Remove IP addresses from serverConfig.py
...
Change-Id: I132b648afb3cef6dc0c26b1d4517c9835f4daf2c
Former-commit-id: 4c19cda4574f866285b659f7d4fbf8e41f2f5bd9
2016-04-01 10:19:22 -04:00
Shawn.Hooper
3e5559bf6d
Merge remote-tracking branch 'omaha/omaha_16.2.1' into master_16.2.1
...
Former-commit-id: 2d01487eb412cc66fdbd9b29dac7ce89d4152a84
2016-03-31 17:33:36 -04:00
Shawn.Hooper
3dfbcd2d48
Merge remote-tracking branch 'omaha/omaha_16.2.1' into master_16.2.1
...
Former-commit-id: 2bff69680159705f82c91292bc9a14a698b2edc1
2016-03-30 17:21:28 -04:00
Tim Jensen
d23b1f4f17
Omaha #5491 : Add additional special case for QPFSCAN
...
Change-Id: I9c4e84314054a6913f7b067eab3808e5acadab94
Former-commit-id: 375ce5c253a37d6b5fce19ce4802e0186a07282c
2016-03-29 15:47:37 -05:00
Shawn.Hooper
1cf2f19e65
Merge tag 'OB_16.2.1-17' into asm_16.2.2
...
16.2.1-17
Change-Id: I3cb4abf93fd7729ea54cbe4c8ecea781579c5db7
Former-commit-id: 17fb0b31a7377334925e852db6fabb7b223594dd
2016-03-29 16:43:12 -04:00
Steve Harris
68c9c4cbeb
Merge tag 'OB_16.2.1-17' into omaha_16.2.1
...
16.2.1-17
Former-commit-id: 941159f28d89ce6f37844f2183c29d1593797968
2016-03-28 16:58:04 -05:00
Shawn.Hooper
850ec358bf
ASM #18528 - "Merge tag 'OB_16.2.2-1' into DCS-18528"
...
16.2.2-1
Change-Id: I7ac65cae4efe4e38b2c059aec6d4808f97f1bf77
Former-commit-id: 8173420a5e472738d4c9255d2ed32e55927c8d07
2016-03-28 15:47:44 -04:00
Mark Ruebens
76b751e635
Merge "ASM #18719 - WarnGen Polygons: Look into ways to improve exclusions of zones close to coast" into asm_16.2.1
...
Former-commit-id: cb15e111553ca226e39208717c60f0c9e76873c3
2016-03-25 09:10:46 -05:00
David Friedman
e376a30501
ASM #18719 - WarnGen Polygons: Look into ways to improve exclusions of zones close to coast
...
Change-Id: Iaf30609cf792fe1c41eb4ac77104bfc965bd863c
Former-commit-id: ee7a0220729afdc12326c9944d16c99c2b1bc5d9
2016-03-24 20:24:06 +00:00
Mark Ruebens
b58640661d
Merge "ASM #18763 - WMOHeader class regular expression causing problem for binary bulletin messages." into asm_16.2.1
...
Former-commit-id: 236089d2e0bdea84d9e851f3f5ed49e761104599
2016-03-23 11:20:59 -05:00
Michael Gamazaychikov
1ae621d90e
ASM #18763 - WMOHeader class regular expression causing problem for binary bulletin messages.
...
Change-Id: I3f1297ad5123c0be881df69a55688a96cd8266ac
Former-commit-id: f79ed66d6d6ce7252887b9c28be178ed2fb94abe
2016-03-23 09:52:43 -04:00
Shawn.Hooper
90220c0fd7
ASM #18748 - Updates to allow for proper storage and display of some PQPF/PPQPF data
...
Change-Id: Ia566f84a2311ee54b06f1101ce2fb47dfc76c9d8
Former-commit-id: 4fb2feee8ca09f499fecf0df047c63a0ea280c92
2016-03-22 16:15:24 -04:00
Mark Ruebens
10761105ab
Merge "ASM #18509 - Make WarnGen polygon extension area display a separate map background" into asm_16.2.1
...
Former-commit-id: 7203429d17436b00b0f385fd0c1350d5e8f079e8
2016-03-18 06:49:26 -05:00
Steve Harris
a64c6ea625
Merge tag 'OB_16.2.1-16' into omaha_16.2.1
...
16.2.1-16
Former-commit-id: 1f3c73bb24316fb4b724e6364f2f536c119d561f
2016-03-16 08:40:46 -05:00
David Friedman
afe22917c6
ASM #18509 - Make WarnGen polygon extension area display a separate map background
...
Change-Id: I2a73e87c1398694e5c9c03590e481107a8143f1d
Former-commit-id: 79863e66545307875eb84b5359302c13f2af8e7d
2016-03-15 20:44:27 +00:00
Mark Ruebens
9a50012453
Merge "ASM #13302 - Green Times for upper air soundings do not show non-standard times" into asm_16.2.2
...
Former-commit-id: 7a4dafd2052697344b21790042be96b4ff91aa45
2016-03-15 07:27:54 -05:00
Kiran.Shrestha
08cd6a8fbd
ASM #13302 - Green Times for upper air soundings do not show non-standard times
...
Change-Id: Ifebf583404a712c904fdfdd416fcce2d5f54d2ac
Former-commit-id: 58fe55e47aad7683a05cf6198aef145ff88f8947
2016-03-11 20:21:48 +00:00
Ana Rivera
f67da9e1f6
Merge branch 'master_16.2.1' into field_16.2.1
...
Change-Id: I4651ab6c304a7e0d405e247ff7ba0223670230bb
Former-commit-id: 419efa9197bbc24bdf6b733eae32769649e4f749
2016-03-11 19:40:37 +00:00
Tom Gurney
9a4b684eab
Omaha #5454 Discard VAA "USER MESSAGE" products
...
Change-Id: I5eeba14588e4137ed62f9de98c37961103366e1e
Former-commit-id: be0eae16de08dd01d421c015c25cf15638842fe0
2016-03-11 10:14:05 -06:00
Melissa Porricel
67f37154e6
ASM #18446 - Fix image display for some winter params (Tdend,CritT,SnowT)
...
Change-Id: I113e455941f66297aced808a183011447925e779
Former-commit-id: 7cb9c32a79158d9a098b1ddaca91f98f7ffc468b
2016-03-10 16:13:58 -05:00
Tom Filiaggi
ce329fd5b1
VLab Issue #16465 - RipRisk in serverConfig.py; fixes #16465 .
...
Just a one-line fix.
Change-Id: I91db5378aff63a4b09ce91fa9440848fa642ba1c
Former-commit-id: 7c7162980b2174255569d11e042a20fea13ae936
2016-03-10 10:31:59 -07:00
Shawn.Hooper
a5169a49a7
Merge remote-tracking branch 'vlab/asdt_16.2.1' into master_16.2.1
...
Former-commit-id: 7ba4e13879d7a8be9fb0d9e125e8f9c439231339
2016-03-09 12:42:42 -05:00
Steve Harris
92b2e2f374
Merge tag 'OB_16.2.1-14' into omaha_16.2.1
...
16.2.1-14
Former-commit-id: ada4058e2d87f359044d4d2132b715aadc569ad2
2016-03-08 13:13:31 -06:00
Andrew Moore
8d07e30859
VLab Issue #15589 - DR 18336, binlightning legends should update on keep-alive records; fixes #15589
...
Change-Id: I76706147e72fface4155ab4be763dd8b1407991d
Former-commit-id: fc1cfd3b3729926aaa6bd6f12416065f1e625d00
2016-03-08 15:29:41 +00:00
Nate Jensen
7f9838710e
Merge "Omaha #5428 Removed spaces" into omaha_16.2.1
...
Former-commit-id: 02764e3400481ded0faab18f94fbed08ee956ecd
2016-03-07 12:54:51 -06:00
Dave Hladky
e077ea9a79
Omaha #5428 Removed spaces
...
Change-Id: Iedab999dfed6272472784179841d479166a01de9
Former-commit-id: 15ab338de93810369e8365196e880dce0d77d354
2016-03-07 12:06:34 -06:00
Richard Peter
5fd1cea160
Omaha #5414 - Allow subgrids to be disabled
...
Change-Id: I8f111e3e18550080b9b933d46c492d4a0245e065
Former-commit-id: 658eb843c65bf460be49989540c349a0dade0ad7
2016-03-04 17:12:36 -06:00
Shawn.Hooper
aa20e18b40
Merge remote-tracking branch 'asm/asm_16.2.1' into master_16.2.1
...
Former-commit-id: b7fb2f630b454ea128c92740d901bca37985dd41
2016-03-04 15:18:44 -05:00
Shawn.Hooper
768d7bb626
Merge tag 'OB_16.1.4-3' into master_16.2.1
...
16.1.4-3
Former-commit-id: 09588baffaabb1419369427ddc27266126d04956
2016-03-04 15:16:00 -05:00
Wen Kwock
3ebb92f178
VLab Issue #16168 - DR18731 Fix TDWR 8bit SW issues; fixes #16168
...
Change-Id: I703cdbc1761099f2c8ca69b788b03dcdc617419a
Former-commit-id: 406823b82a2a1a06bc06bba4f6124f104e844b7c
2016-03-04 20:11:37 +00:00
Dave Hladky
88493b5ac8
Omaha #5429 Fix for RFCFFG mosaic holes
...
Former-commit-id: 0904ef85468d9049534cdbb668b05de677757555
2016-03-04 13:33:24 -06:00
Tom Filiaggi
7f535d31da
VLab Issue #15901 serverConfig.py update for NIC; fixes #15901
...
Change-Id: I340c945191d1ae94c1d3fbb9d4682c69bb03d6d3
Former-commit-id: bd65358cb955da3864bc73aee8ffb8e83a638009
2016-03-03 22:29:34 +00:00
Shawn.Hooper
a6eaa71947
ASM #18056 - Fix merge issue with viirsHeaderMapping.xml
...
Change-Id: Icad51f2119d630839e22d120675373f2dc3115b9
Former-commit-id: 5f1a36e5caa704af1161cb3f244bd9ec4c843c97
2016-03-03 14:32:57 -05:00
Ana Rivera
063cb084fc
Merge "VLab Issue #11629:NamDNG changes; fixes #11629 " into field_16.2.2
...
Former-commit-id: 7bc352d786db1b38048ef5c92624a47a72c57627
2016-03-03 13:52:56 +00:00
Ana Rivera
67a6509e6d
Merge "VLab Issue #11631:NAVGEM changes; fixes #11631 " into field_16.2.2
...
Former-commit-id: 62422adfadd58ab88100d55dd3bf30c5eec9fb9c
2016-03-03 13:33:59 +00:00
Dave Hladky
65078d7555
Omaha #5428 update source config file
...
Change-Id: If119c71b183e9dbdb35e69c458c8f1eb9a0576d8
Former-commit-id: abe1ea33ebec0f9485bc33ff87368ba81b0a09f4
2016-03-02 15:33:41 -06:00
Richard Peter
e90384109e
Merge "Omaha #5414 - Fix subgrids along boundary." into omaha_16.2.1
...
Former-commit-id: edd56b84955310a0fe7fc61b4d58bba764d8e44e
2016-03-02 09:10:34 -06:00
Ron Anderson
57f84c8f59
Omaha #5411 Additional changes to formatters and added mixed case check in OUPHandler.
...
Change-Id: Iece6e5eb63dede9c1df120a6a26f14b96548c073
Former-commit-id: 8ba700bb99ba8c4aa290390deb7dc9e5ac94882b
2016-03-01 17:37:59 -06:00
Joshua Watson
226c8feb87
VLab Issue #11631:NAVGEM changes; fixes #11631
...
Change-Id: Ief86879960f137e5dbfdf5d56337b1e5e5d5d952
Former-commit-id: e61914b51f5dc6d5fca3bba2b9420ef3bdad48f1
2016-03-01 15:21:04 -05:00
Mamoudou Ba
805e158bbc
VLab Issue #13942
...
DCS# 18405 Add an entry to "userRoles.xml" to allow BoundaryTool data to be saved to SITE level.
rebase to correct the conflict
Clean up conflict. Rebased with latest in mdl_16.2.2
Change-Id: Ib5e69424275b74ba33e9648bdd16e070436c5f28
Former-commit-id: f65153d656aff2ef166e83e7370d7f3fe342dd7a
2016-03-01 09:30:03 -08:00
Kenneth Sperow
aa038d9bd2
Merge remote-tracking branch 'origin/master_16.2.1' into mdl_16.2.2
...
Former-commit-id: 4315dc9cf3900225db8482e90719398bae06adb1
2016-03-01 09:11:17 -08:00
David Friedman
53d3c72bba
ASM #621 - Support SBN radar data directories in FSIprocessor
...
Change-Id: I576b03742475cd3eba78d39dfd358c654cbea908
Former-commit-id: 4e86adf31fc2a582054e369842b0582a41816065
2016-03-01 17:01:14 +00:00
David Friedman
d7ac171705
ASM #18528 - Merge remote branch 'origin/master_16.2.2' into HEAD
...
Conflicts:
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
Change-Id: Ie8a4ab8afd5eb80b714f0739bc8ac99fe0552be4
Former-commit-id: 95d232da9522aa1bc9bf738b027c32042eea797e
2016-02-29 20:35:54 +00:00
Steve Harris
c2b471a870
Merge branch 'omaha_16.2.1-lx' into omaha_16.2.2
...
Conflicts:
cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/MonitorDisplayThreshDlg.java
cave/com.raytheon.uf.viz.monitor/src/com/raytheon/uf/viz/monitor/ui/dialogs/TableComp.java
cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/StormTrackDisplay.java
cave/com.raytheon.viz.gfe/localization/gfe/userPython/utilities/SmartScript.py
cave/com.raytheon.viz.gfe/localization/gfe/userPython/utilities/TCVDictionary.py
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/IFPClient.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
cave/com.raytheon.viz.textworkstation/src/com/raytheon/viz/textworkstation/TextWorkstationDlg.java
rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
Former-commit-id: a7340c2bf23cbc3d27ca52fbf2ccd9c7d1cb09c2
2016-02-29 13:39:42 -06:00
Richard Peter
291f2afacd
Omaha #5414 - Fix subgrids along boundary.
...
Change-Id: I7bd0bd0a983a0028f79593570a95960801c6585a
Former-commit-id: 770c6472bad85f1a293db69c2da496b999b164c2
2016-02-28 14:27:08 -06:00
