Commit graph

19364 commits

Author SHA1 Message Date
Michael Gamazaychikov
459f0b841d ASM #17614 - TextWS does not display updated MND time in editor after sending.
Change-Id: I16cfe64239108ba488242a8d3a3cf2f267295c72

Former-commit-id: b123d919eab8485aaeb930d964c184513ad79e06
2016-06-14 14:26:29 -04:00
Shawn.Hooper
440020fd01 Merge remote-tracking branch 'origin/master_16.2.2' into asm_16.2.2
Former-commit-id: dd65faae9109958e2948179be494caad62be29ee
2016-06-13 11:38:26 -04:00
mjames-upc
bf989836c4 adding DAA/DTA composites to radar menu 2016-06-08 14:43:46 -06:00
Rici.Yu
4595e6fde7 ASM #19096 - change masks to boolean arrays
Change-Id: I94ac8f4150e4b84c3ba42451f2674a421eccd15f

Former-commit-id: fa83ddc0c55999f408c6b0587823b17605c3004b
2016-06-08 15:44:08 -04:00
Shawn.Hooper
49563426a3 Merge remote-tracking branch 'omaha/omaha_16.2.2' into master_16.2.2
Former-commit-id: 9ffd67bbd4bba9c476fdc8af3fca18bb62477d7d
2016-06-08 12:21:47 -04:00
Shawn.Hooper
105e4a5ceb Merge branch 'master_16.2.1-p1-lx' into master_16.2.2
Conflicts:
	cave/com.raytheon.viz.gfe/localization/gfe/userPython/utilities/SmartScript.py
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/Area.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
	edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/models/gribModels_NCEP-7.xml
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/extremeWindWarningFollowup.vm
	edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/impactSevereWeatherStatement.vm

Change-Id: I9093801630eb7c345d0ba69e684943798fb0b5d9

Former-commit-id: 8a4b0527806a73c69dc9be22e7aa1025fcb4b617
2016-06-08 10:55:30 -04:00
Steve Harris
9d58d5e1f1 Merge tag 'OB_16.2.2-13' into omaha_16.2.2
16.2.2-13


Former-commit-id: 60590ad3de24ecbe09b24f54e3cd009888d2259d
2016-06-07 14:07:39 -05:00
Shawn.Hooper
412facb625 Merge tag 'OB_16.2.1-p1-30p1.4' into master_16.2.1-p1-lx
16.2.1-p1-30p1.4


Former-commit-id: 7d87a3aca224aa469665eb8834d419f568eed750
2016-06-07 13:58:05 -04:00
Steve Harris
f9ea26ba71 Merge branch 'omaha_16.2.1-lx' into omaha_16.2.2
Conflicts:
	cave/com.raytheon.uf.viz.monitor.fog/src/com/raytheon/uf/viz/monitor/fog/ui/dialogs/FogDisplayMeteoTab.java
	cave/com.raytheon.uf.viz.monitor.fog/src/com/raytheon/uf/viz/monitor/fog/ui/dialogs/FogDisplayWindTab.java
	cave/com.raytheon.uf.viz.monitor.fog/src/com/raytheon/uf/viz/monitor/fog/ui/dialogs/FogMonitorMeteoTab.java
	cave/com.raytheon.uf.viz.monitor.safeseas/src/com/raytheon/uf/viz/monitor/safeseas/ui/dialogs/SSDisplayMeteoTab.java
	cave/com.raytheon.uf.viz.monitor.safeseas/src/com/raytheon/uf/viz/monitor/safeseas/ui/dialogs/SSDisplayProductTab.java
	cave/com.raytheon.uf.viz.monitor.safeseas/src/com/raytheon/uf/viz/monitor/safeseas/ui/dialogs/SSDisplaySwellTab.java
	cave/com.raytheon.uf.viz.monitor.safeseas/src/com/raytheon/uf/viz/monitor/safeseas/ui/dialogs/SSDisplayWindTab.java
	cave/com.raytheon.uf.viz.monitor.safeseas/src/com/raytheon/uf/viz/monitor/safeseas/ui/dialogs/SSMonitorMeteoTab.java
	cave/com.raytheon.uf.viz.monitor.safeseas/src/com/raytheon/uf/viz/monitor/safeseas/ui/dialogs/SSMonitorSwellTab.java
	cave/com.raytheon.uf.viz.monitor.snow/src/com/raytheon/uf/viz/monitor/snow/ui/dialogs/SnowDisplayMeteoTab.java
	cave/com.raytheon.uf.viz.monitor.snow/src/com/raytheon/uf/viz/monitor/snow/ui/dialogs/SnowDisplayProductTab.java
	cave/com.raytheon.uf.viz.monitor.snow/src/com/raytheon/uf/viz/monitor/snow/ui/dialogs/SnowDisplayWindTab.java
	cave/com.raytheon.uf.viz.monitor.snow/src/com/raytheon/uf/viz/monitor/snow/ui/dialogs/SnowMonitorMeteoTab.java


Former-commit-id: a9ddec499292c5e9d276ec940f6bab6ef5369c14
2016-06-07 12:29:23 -05:00
mjames-upc
95be752332 GFE include updates for vcmodule and gfe directories 2016-06-07 09:24:03 -06:00
Shawn.Hooper
d1cfaab789 Merge remote-tracking branch 'asm/asm_16.2.2' into master_16.2.2
Conflicts:
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java

Change-Id: I6c0ee27d5dba0255a365886af61f124bd4b64744

Former-commit-id: 12523a79aae3630156c95e62dc87e7ac4e1521c1
2016-06-07 10:30:36 -04:00
Mark Ruebens
b7572ff57a Merge "ASM #17614 - TextWS does not display updated MND time in editor after sending." into asm_16.2.2
Former-commit-id: a4ad23d0da2ee5c1a3f9e0f2632238da614a536c
2016-06-07 06:55:57 -05:00
Michael Gamazaychikov
a7e1d4154f ASM #17614 - TextWS does not display updated MND time in editor after sending.
Change-Id: I4ac1051d84dae0ca91c085a46e73222196fd0240

Former-commit-id: 0c09118f691cb151de552b6463c766aaae4929ae
2016-06-06 17:15:18 -04:00
mjames-upc
c542d480bd reorg import/export menu items 2016-06-06 13:35:20 -05:00
mjames-upc
f31292846c explicitly localize gfe/vcmodule/vtec python files 2016-06-06 13:33:20 -05:00
Ron Anderson
06b3f0e282 Omaha #5673 Fix Rel Hum header in Fog Display Meteo Table
Change-Id: I286701eb1ae0b91723c5cffb16bf74b9078bea5b

Former-commit-id: 369a39d3f11e0a6740bf96ca7f666be19f97da00
2016-06-06 12:56:28 -05:00
mjames-upc
4b75ed07b4 Revert "use sectorID CONUS for NEXRCOMP"
This reverts commit 21aec4a21f.
2016-06-05 12:38:29 -05:00
mjames-upc
21aec4a21f use sectorID CONUS for NEXRCOMP 2016-06-03 15:33:10 -05:00
Shawn.Hooper
9c748f1955 Merge remote-tracking branch 'vlab/asdt_16.2.2' into master_16.2.2
Former-commit-id: a9c70dac8ab92df858a4bc3acf91fe5c65ed92da
2016-06-03 16:23:18 -04:00
mjames-upc
407259c472 show GFE config scripts; add nhadomain and stormsurgeww maps from origin/ncep_16.1.4-n 2016-06-03 13:38:51 -05:00
Michael James
f5f384d3ef Merge branch 'unidata_16.1.4' of https://github.com/Unidata/awips2 into unidata_16.1.4-osx 2016-06-02 21:31:25 -06:00
Michael James
2fbbef2892 capitalization nonsense on osx 2016-06-02 21:28:23 -06:00
Ron Anderson
4b069fb447 Omaha #5673 Fixed header alignment in threshold dialogs
Change-Id: Ief38767e1ca71c4cb879b3939f125310654754fa

Former-commit-id: eea44558edf9132409cd0a1e096f07955087c83c
2016-06-02 18:53:18 -05:00
Andrew Moore
81808da3aa VLab Issue #19365 - DR 19072 fix for where statement due to changes from DCS 14607; fixes #19365
Change-Id: Ieeafea5d7ce890d70cfba96c717780e4471c9efe

Former-commit-id: 9eecf498a70a0ae03edbe2fbcb2d8dc23c2e776e
2016-06-02 16:37:18 +00:00
Shawn.Hooper
d02d9ddacc Merge remote-tracking branch 'omaha/omaha_16.2.2' into master_16.2.2
Former-commit-id: ac1209596d11cac91eade6c44284310260a59e7c
2016-06-01 15:05:08 -04:00
Shawn.Hooper
59eb8c331b Merge remote-tracking branch 'asm/asm_16.2.2' into master_16.2.2
Conflicts:
	cave/build/static/linux/cave/caveUtil.sh

Change-Id: Ica141f8cc3fe6aa899f98c42b4596c73d9da3462

Former-commit-id: 217f6814116282bb404e87fce99048df552e1ca9
2016-06-01 15:04:16 -04:00
Steve Harris
6c150da87f Merge branch 'omaha_16.2.1-lx' into omaha_16.2.2
Former-commit-id: 0aafd165bee6eb0e20584bfa3e30c1ef79e4bdeb
2016-06-01 08:25:25 -05:00
Ron Anderson
dc55dde5d5 Omaha #5513 Fix NPE when AlarmAlertDlg is opened the second time.
Change-Id: Iba0cfd1ed74d4ab045064abdf4768bd0fa3f1db4

Former-commit-id: 430701c960d301cfae54b65dc9c6a0187352a760
2016-05-31 17:01:18 -05:00
mjames-upc
d7256a182c cave should only run in PRACTICE mode 2016-05-31 15:10:11 -06:00
Shawn.Hooper
0960d09481 Merge branch 'master_16.1.2p3_for_merges' into master_16.2.1-p1
Conflicts:
	cave/com.raytheon.uf.viz.spellchecker/src/com/raytheon/uf/viz/spellchecker/dialogs/SpellCheckDlg.java
	cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/Area.java

Change-Id: I944b2f48026df080e494ab9104bfd63e30c0c9ef

Former-commit-id: f8ebc36d5e1edc7f625bfafc3f8e9d8a7d13303d
2016-05-31 13:13:50 -04:00
Melissa Porricel
dce51b58ea ASM #16930 - Spell checker should flag inappropriate words
Change-Id: Ib3c2fe784591fdaaa9eb57028e7fd435a72994bd
(cherry picked from commit b99defbc67fe2378e45260d71968f22e0049ec4b)

Former-commit-id: e38e96ec16cbc6e6bf33f963696252ef3461c09d
2016-05-31 13:12:43 -04:00
David Friedman
0daedab4cc ASM #18789 - WarnGen: it take a long time to create SPS at LI (additional changes)
Change-Id: Iba218a3d6a6fbd53d7c10f6f5a565cd25ccc50fa
(cherry picked from commit ac96afb33ce063940e23a0e5180e93a8b1bc60fd)

Former-commit-id: a0ad4e409c1a8822f95f61bd4c0bc1aa4dd07e70
2016-05-31 13:12:42 -04:00
David Friedman
cf71c7d648 ASM #18789 - WarnGen: it take a long time to create SPS at LIX
Change-Id: I6fa7bae740c2e369c4505a89dc1145742c38ca2a
(cherry picked from commit 533b14a4270411af6ddacb81914932d33b3191c1)

Former-commit-id: 919da1cff1b911a7de4224710bb38ad8017655a0
2016-05-31 13:12:42 -04:00
Mark Ruebens
a5e6a56f97 Merge "ASM #18971 - caveUtil.sh may attempt to create a temporary Eclipse configuration directory in a deleted directory" into asm_16.2.2
Former-commit-id: 349b7dda2cc10c24c00e1edf99b715b722278154
2016-05-27 11:39:52 -05:00
David Friedman
5f5d31f6ba ASM #18971 - caveUtil.sh may attempt to create a temporary Eclipse configuration directory in a deleted directory
Change-Id: I3ad32f649bfb63d97861cc8423dce590700a2857

Former-commit-id: 676bce601f6b694de6da0584c6eecd4ea00990ae
2016-05-27 16:26:46 +00:00
Loubna.Bousaidi
598ab33215 ASM #19012 fixed colorscale manager issue
Change-Id: Ifa4cfd6b380cb1cf7dc8410a168d9e495c843ef1

Former-commit-id: 3b3b48303647927fcee67ee873271bc15f406488
2016-05-27 14:44:00 +00:00
mjames-upc
ebb1279fe7 awips2_16.1.5 build 2016-05-26 13:22:09 -06:00
Ron Anderson
5b059253ce Omaha #5653 Handle empty printer list, code cleanup.
Change-Id: I41b8353524c54ac91947a994370616fb00ca9b26

Former-commit-id: 9ed56de279b7d19f6a18cde083da3c29fab0cb8b
2016-05-25 13:21:55 -05:00
Ron Anderson
3bd561ac2e Omaha #5653 Workaround printer/driver issue with landscape mode printing
Change-Id: I8ced511c0404b6b2a9c3249929829d3a8198d4d0

Former-commit-id: 473094783aad56e84bf6e018810cdca456e0518b
2016-05-24 16:32:19 -05:00
Steve Harris
cf8756b433 Merge tag 'OB_16.2.2-8' into omaha_16.2.2
16.2.2-8


Former-commit-id: 902012b504a1894a43e83963f52303fa56d6d5fe
2016-05-24 12:52:13 -05:00
mjames-upc
1936819314 fix key binding dupe; mute dev plugin 2016-05-24 10:46:37 -06:00
mjames-upc
3bbcfaeea8 mute alertviz dialog on startup 2016-05-24 10:28:47 -06:00
Shawn.Hooper
9726a3c191 Merge remote-tracking branch 'asm/asm_16.2.2' into master_16.2.2
Former-commit-id: ad309e585a084f274b68abfa72a20d048a00fc4c
2016-05-23 13:13:20 -04:00
Shawn.Hooper
3a03a83975 Merge remote-tracking branch 'omaha/omaha_16.2.2' into master_16.2.2
Former-commit-id: 90719ee2df7532ed6ab3172cf2345b03bced5ef4
2016-05-23 12:57:15 -04:00
Steve Harris
89e25dd014 Merge branch 'omaha_16.2.1-lx' into omaha_16.2.2
Conflicts:
	cave/com.raytheon.uf.viz.d2d.ui/src/com/raytheon/uf/viz/d2d/ui/dialogs/PrintDialog.java
	cave/com.raytheon.viz.hydro/META-INF/MANIFEST.MF
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/flashfloodguidance/FlashFloodGuidanceDlg.java
	cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/timeseries/TimeSeriesDisplayCanvas.java
	cave/com.raytheon.viz.hydrobase/src/com/raytheon/viz/hydrobase/HydroBaseDlg.java
	cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java


Former-commit-id: 30e9ffce1a90bd85f5b310944b309188447439ce
2016-05-19 22:07:52 -05:00
Sean.Webb
7ded8c476b ASM #19025 - Added bad words and delta script to update overrides
Change-Id: Ib751a128fc6fb8cfc1f620a7de9bdb6bd4c0ad95

Former-commit-id: 5afa3ca48d49a253f1ec9e037b9588bab0881bbf
2016-05-19 10:54:19 -04:00
mjames-upc
9b3c856474 oops. revert 2016-05-18 09:54:05 -06:00
mjames-upc
26cb4ec4aa installCAVE will now groupremove before groupinstall/update 2016-05-18 09:50:32 -06:00
mjames-upc
e1aef47c5a Merge branch 'unidata_16.1.4' of github.com:Unidata/awips2 into unidata_16.1.4
Conflicts:
	edexOsgi/build.edex/build.xml
	edexOsgi/com.raytheon.edex.feature.uframe/feature.xml
	rpms/build/common/rpms.sh
2016-05-18 09:34:45 -06:00
mjames-upc
41e328f176 more build updates for 16.1.4-15 from moe 2016-05-18 09:33:18 -06:00