mjames-upc
|
c986e0d703
|
typo fix: verticallAlignment to verticalAlignment
Former-commit-id: c8bf982c48949a9d7f4a6cb423f13a0fa61da34f
|
2016-06-27 14:36:02 -05:00 |
|
Steve Harris
|
abaa61769f
|
Merge tag 'OB_16.2.2-3' into omaha_16.2.2
16.2.2-3
Conflicts:
cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/StormTrackDisplay.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
edexOsgi/com.raytheon.edex.plugin.grib/src/com/raytheon/edex/plugin/grib/spatial/GribSpatialCache.java
Former-commit-id: 55bc369bddace873c371d0b5b51c383b33c6ca3d
|
2016-04-12 16:14:15 -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
|
385401f9ae
|
Merge branch 'omaha_16.2.1-lx' into omaha_16.2.2
Conflicts:
cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/StormTrackDisplay.java
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/flashfloodguidance/FlashFloodGuidanceDlg.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
Former-commit-id: 445a3ae3da804f366c1162104640d8459ab650d0
|
2016-03-28 17:31:59 -05:00 |
|
Steve Harris
|
29adcc65b4
|
Merge branch 'omaha_16.2.1' into omaha_16.2.1-lx
Conflicts:
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
Former-commit-id: 3b7825bf9015097ce3be0a82c7f0a117475fd3e8
|
2016-03-28 17:13:12 -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 |
|
David Friedman
|
3dd572e6a0
|
ASM #18751 - WarnGen: Switching between templates using specific set of steps can cause storm track to change to 180 or 0 degrees
Change-Id: I0b2008ba1a8e769fe2f8a0d527bc002c85861570
Former-commit-id: 505a1a69c6733fcc63a46c591a583cac5cffb3de
|
2016-03-21 12:42:35 +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 |
|
Steve Harris
|
bbd0a34445
|
Merge branch 'omaha_16.2.1' into omaha_16.2.1-lx
Conflicts:
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
Former-commit-id: 50282f22b76f6d393c1918652a9e0da8696847f0
|
2016-02-29 13:18:08 -06:00 |
|
Shawn.Hooper
|
663c44637f
|
Merge tag 'OB_16.1.2-20' into asm_16.2.1
16.1.2-20
Conflicts:
cave/com.raytheon.viz.gfe/localization/gfe/userPython/procedures/TCStormSurgeThreat.py
rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
Change-Id: I9ed1c12896ffa710e7995f9682b4be1de88fa077
Former-commit-id: 9e3470f2b741592182dfae3e873503eb22df4f18
|
2016-02-22 11:13:16 -05:00 |
|
Shawn.Hooper
|
d2c142b7bf
|
Merge branch 'master_16.2.2' into asm_16.2.2
Former-commit-id: 97a9c6a6ec0845c1ea823c0374365d3b0cd1bc14
|
2016-02-19 16:44:43 -05:00 |
|
David Gillingham
|
1f2a0f0c69
|
Omaha #5242: Remove calls to deprecated Localization APIs from D2D code.
Change-Id: I98c154307a62fbbb05b7351451b5c3c444e73bda
Former-commit-id: b91de1ced4a6630cb2e9e36fef0dfea89e09ab1b
|
2016-02-12 15:29:40 -06:00 |
|
David Friedman
|
8628b66f1f
|
ASM #18421 - Radar storm relative motion isn't loading correctly in D2D - WarnGen Track
Change-Id: Idbead573f4ce4924af5c24d34d732bd379d13ebd
Former-commit-id: 5d1bb95710ac274b7ac587dcb78b88bfa0742092
|
2016-02-09 19:00:07 +00:00 |
|
Steve Harris
|
dcaaf9f52b
|
Merge branch 'omaha_16.2.1' into omaha_16.2.1-lx
Conflicts:
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
Former-commit-id: 13a968811d1cdde95f663d7af4b8a6030ece556e
|
2016-01-28 15:47:31 -06:00 |
|
Shawn.Hooper
|
2861d7abd7
|
Merge tag 'OB_16.1.2-14' into master_16.2.1
16.1.2-14
Conflicts:
cave/com.raytheon.uf.viz.d2d.core/src/com/raytheon/uf/viz/d2d/core/time/D2DTimeMatcher.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java
Change-Id: If4483610b92d4c2ef975c3ac75403e12a70d612c
Former-commit-id: 66d3cd35731e59996c34f003e42cbb2a41010717
|
2016-01-25 14:32:31 -05:00 |
|
Steve Harris
|
52279f6cc1
|
Merge branch 'omaha_16.2.1-lx' into omaha_16.2.2
Conflicts:
cave/com.raytheon.uf.viz.alertviz.ui/src/com/raytheon/uf/viz/alertviz/ui/dialogs/AlertMessageDlg.java
cave/com.raytheon.uf.viz.tcs/src/com/raytheon/uf/viz/tcs/rsc/TCSResource.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/GFEConfigDialog.java
cave/com.raytheon.viz.pointdata/src/com/raytheon/viz/pointdata/rsc/MetarPrecipResource.java
cave/com.raytheon.viz.redbook/src/com/raytheon/viz/redbook/rsc/RedbookResource.java
cave/com.raytheon.viz.redbook/src/com/raytheon/viz/redbookua/rsc/RedbookUpperAirResource.java
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/alarmalert/util/AlarmAlertFunctions.java
cave/com.raytheon.viz.textworkstation/src/com/raytheon/viz/textworkstation/TextWorkstationDlg.java
cave/com.raytheon.viz.volumebrowser/src/com/raytheon/viz/volumebrowser/vbui/DataListsProdTableComp.java
Former-commit-id: afd3fb15b22d92b6b30205446b6fe4b3e21271bf
|
2016-01-20 09:44:34 -06:00 |
|
Ron Anderson
|
24bc0a3344
|
Omaha #5054 Fix Dialog parenting
Change-Id: Ie7e1727ef9666cf510093f8fb6b06a1a258a30e2
Former-commit-id: 5093e43e9d1d26898f9719e00f6489a7f3ea55c8
|
2016-01-19 09:19:13 -06:00 |
|
David Gillingham
|
5e18c49d19
|
Omaha #5247: Plugin-ize Tools menu in D2D.
Change-Id: I7543886b22c1535574b048923c7462226d444086
Former-commit-id: 81e5df1c594a447ea1ef0c4901fe98a242cc6692
|
2016-01-14 11:36:25 -06:00 |
|
Ron Anderson
|
9f255c8d50
|
Omaha #5070 Adjust font sizes for dpi scaling
(cherry picked from commit 0fac683b60 [formerly 330ae8034e6457f20224c81cf3886d797ea5b8fc])
Conflicts:
cave/com.raytheon.uf.viz.aviation.advisory/src/com/raytheon/uf/viz/aviation/advisory/rsc/AdvisoryResource.java
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPResource.java
cave/com.raytheon.viz.redbook/src/com/raytheon/viz/redbook/rsc/RedbookResource.java
cave/com.raytheon.viz.redbook/src/com/raytheon/viz/redbookua/rsc/RedbookUpperAirResource.java
Former-commit-id: 8817960b2aaea9188f868be38930903a498ef633
|
2016-01-13 19:17:37 -06:00 |
|
Andrew.Rickert
|
b53d17113c
|
ASM #11474 - Lat and Long parsed incorrectly
Change-Id: Ia004fc0bb7574d8348e3350e8757c866b0d1dcb5
Former-commit-id: be4a46e016aa1f99af74a643e3bc60318dc753c5
|
2016-01-12 12:31:03 -05:00 |
|
Shawn.Hooper
|
668ecd8724
|
ASM #18478 - Removed DamagePath from tools menu
Change-Id: I9d60d78cf7ef91ddb2441510555436b7254849f5
Former-commit-id: ac8d612dbacfdfa9aa4443fa8990284ca30f7378
|
2016-01-11 12:24:06 -05:00 |
|
Ben Steffensmeier
|
77fa171cea
|
Omaha #5150 Fix Polyline time of arrial.
Former-commit-id: c6ed62707eb88eae8d20da1c2c996e774f784d37
|
2015-12-04 15:22:21 -06:00 |
|
Ron Anderson
|
0fac683b60
|
Omaha #5070 Adjust font sizes for dpi scaling
Change-Id: I94b264ee1d96f42423874062b4682934a2521cae
Former-commit-id: 330ae8034e6457f20224c81cf3886d797ea5b8fc
|
2015-11-09 09:42:07 -06:00 |
|
David Gillingham
|
648bb0e367
|
Omaha #5003: Update A2 baseline code to utilize apache commons-lang version 3.
Change-Id: I2b23399b2cfd3d37a41f89cb3c3173ca628caecb
Former-commit-id: b9c41fe3354a90a03440e1ea67991e6ecd5885c0
|
2015-10-28 13:21:07 -05:00 |
|
Steve Harris
|
4bb1dfd213
|
Merge tag 'OB_16.1.1-9' into omaha_16.2.1
16.1.1-9
Conflicts:
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/ProductEditorComp.java
Former-commit-id: 4ff4f4722a0fd37cf6ec75c701acd43d778ce7c2
|
2015-09-01 16:06:40 -05:00 |
|
Shawn.Hooper
|
5759470634
|
Merge tag 'OB_15.1.1-32' into master_16.1.1
15.1.1-32
Conflicts:
cave/com.raytheon.uf.viz.d2d.core/src/com/raytheon/uf/viz/d2d/core/time/D2DTimeMatcher.java
cave/com.raytheon.viz.gfe/localization/gfe/userPython/procedures/MakeHazard.py
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/formatterlauncher/ProductEditorComp.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/template/TemplateRunner.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/text/AbstractLockingBehavior.java
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/VM_global_library.vm
edexOsgi/com.raytheon.uf.edex.plugin.text/src/com/raytheon/uf/edex/plugin/text/fax/FaxSender.java
Former-commit-id: f925ff11b783389e5ca32a2d7cd1ec5edfa835db
|
2015-08-19 14:58:31 -04:00 |
|
Nate Jensen
|
57c1aa2ab1
|
Omaha #3806 changes required by localization API updates
Change-Id: I73adb83fa8647d070166446f1f77d54abc8cf495
Former-commit-id: 895a66c508b9bfc059f99d3b8c45ddd8f15c1a58
|
2015-08-18 14:58:35 -05:00 |
|
Ben Steffensmeier
|
a05fa0b924
|
Omaha #4633 Implement an alternative daylight transition based off sunrise/sunset times.
Former-commit-id: 2461e886221639fb8de4bb39770936ab9be05848
|
2015-07-30 15:59:53 -05:00 |
|
David Friedman
|
03000dc48d
|
ASM #17761 - Fix storm track time matching
Change-Id: I441b98eedc3ab546aa29d1828c24c8918303a5a0
Former-commit-id: 31d15e1e106d5adfb588e086a3561b63c474da3e
|
2015-07-30 14:16:05 +00:00 |
|
David Lovely
|
80dc4c85d9
|
Omaha #4146 Bundled class files in a jar when unpacked.
Change-Id: Ie3e2a65f9696459774f67bcd4b6dee395e6f4e02
Former-commit-id: 2931134f27cd858716d5c0d97ef1d71c9f7ac165
|
2015-05-19 10:23:35 -05:00 |
|
Steve Harris
|
67b3a77c4f
|
Merge tag 'OB_14.4.1-18m' into omaha_15.1.1
14.4.1_18m
Conflicts:
edexOsgi/com.raytheon.uf.edex.archive/utility/common_static/base/archiver/purger/RAW_DATA.xml
rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template
Former-commit-id: 41217304fa68101d17e003b2fa6992d0e15b083c
|
2015-03-18 09:29:01 -05:00 |
|
Evan Polster
|
6b7bec9ce8
|
VLab Issue #6773; Fixed problem where LAPS config file wasn't being persisted to the server; fixes #6773
Change-Id: I133973de6a129709a151313f090066b09bc4222e
Former-commit-id: 948baed3df402f659cf9b80fd10a3bc3d9788036
|
2015-03-06 23:07:47 +00:00 |
|
Nate Jensen
|
a05af9b1b1
|
Omaha #3978 use InputStream instead of LocalizationFileInputStream or
read()
Change-Id: Ief0137559617f15ac9d7f6510b74630affa5aed5
Former-commit-id: 3a6c19cccad2a8ae2db0a49c47d737a5c5e0436c
|
2015-02-24 09:57:11 -06:00 |
|
Steve Harris
|
78b41638b9
|
Merge tag 'OB_14.4.1-13m' into omaha_15.1.1
14.4.1-13
Former-commit-id: ea76883b615967a79e8c9d0ee16accebd210ee0b
|
2015-02-20 13:17:47 -06:00 |
|
Fay.Liang
|
1208dbde06
|
Merge branch 'ncep_14.4.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.4.1
Former-commit-id: bc482f433223eee5f9a2fa209e1e33a39d3b3aa8
|
2015-02-11 15:36:05 -05:00 |
|
Steve Harris
|
d95158ec53
|
Merge tag 'OB_14.4.1-7m' into omaha_15.1.1
14.4.1-7
Former-commit-id: bf0368503a8defd41a20e369e154d560b93bee6c
|
2015-02-03 17:30:23 -06:00 |
|
Nate Jensen
|
57d35bc0a6
|
Omaha #3974 initial extensible drawing of polygons and preliminary
damage path tool
Change-Id: I0355b0a8a889bb0339412e4ad17e1b3f678d06c2
Former-commit-id: 9e748a3b6f49c17e7b9d84af1d4953b70a647b0a
|
2015-02-02 11:27:41 -06:00 |
|
Ana Rivera
|
070f0136ec
|
Merge branch 'master_14.4.1' into gsd_14.4.1
Change-Id: I5b7c7e17031ec4d081c03e3c4378faf6122849d5
Former-commit-id: d5996a81aad0809aaddbb8df99a985c86c66aaf8
|
2015-01-30 19:29:29 +00:00 |
|
Nate Jensen
|
ac9d787a26
|
ensure PGEN appears in thinclient D2D Tools menu
Change-Id: Ib02d9f5f3c63edd963129e742da9c3b3e09e89fa
Former-commit-id: 173c250aa3fd9d3e5b35283b10eb5f37a4732a3a
|
2015-01-20 11:52:37 -06:00 |
|
Paula McCaslin
|
a5c805cf4d
|
VLab Issue #5061. LAPS Tools; fixes #5061
Change-Id: I447e7e94b931ad2efad687efa90e16cebb2e7bf9
Former-commit-id: e05f01c705953d0c9528cfea6604f88455a5f5ac
|
2014-11-12 13:58:24 -07:00 |
|
Roger Ferrel
|
8cde49f98e
|
Omaha #3401 Enter events to upper case verification added.
Change-Id: I32e51568049dcd442b98b929af3041bc741ea6e3
Former-commit-id: 414f6e16547e0535ae36c5c4cc86f43db54b689c
|
2014-11-12 10:50:43 -06:00 |
|
Steve Harris
|
bfade7674d
|
Merge tag 'OB_14.3.1-27m' into omaha_14.4.1
Conflicts:
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/GH.xml
Former-commit-id: ea787b645974850607658e5a7dfc4a072d831a3b
|
2014-10-22 11:45:39 -05:00 |
|
David Friedman
|
68f985d668
|
ASM #16844 - WarnGen can become disabled when moving storm track
Change-Id: Ic54b4f10eea64db40ce7f9c5a787fe344a8d916a
Former-commit-id: f4000b425b8da6bb16fe124c0e5eaaab78a6b3b2
|
2014-10-10 19:33:21 +00:00 |
|
Steve Harris
|
2616fe04b6
|
Merge branch 'master_14.3.1' (14.3.1-23m) into omaha_14.4.1
Conflicts:
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/IFPClient.java
cave/com.raytheon.viz.volumebrowser/localization/menus/xml/planesMenusPlanView.xml
Issue #3648:
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFEDao.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/GridParmManager.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/IFPGridDatabase.java
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java
Issue #3560:
edexOsgi/com.raytheon.uf.common.registry.ebxml/src/com/raytheon/uf/common/registry/services/RegistryRESTServices.java
edexOsgi/com.raytheon.uf.common.registry.ebxml/src/com/raytheon/uf/common/registry/services/RegistrySOAPServices.java
Also modified with the resolution of #3560:
edexOsgi/com.raytheon.uf.common.registry.ebxml/src/com/raytheon/uf/common/registry/services/RegistryServiceConfiguration.java
Former-commit-id: 8dc5abec482b4c1c3f3469c0ffc7e06fa697c6cd
|
2014-10-03 10:18:34 -05:00 |
|
dmsys
|
9f4560c480
|
Merge branch 'master_14.2.4' into master_14.3.1 CM-MERGE:14.2.4-13-14 into 14.3.1
Conflicts:
cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/StormTrackDisplay.java
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/IFPClient.java
edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/specialWeatherStatement.vm
Former-commit-id: 0bf7ecb27d41f81f1d6727674fc1475eeaa8512c
|
2014-09-30 13:45:54 -04:00 |
|
Steve Harris
|
3b6a8a1447
|
Merge branch 'master_14.3.1' (14.3.1-22m) into omaha_14.4.1
Conflicts:
cave/com.raytheon.viz.volumebrowser/localization/menus/xml/fieldsMenus.xml
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/ohdlib/GagePP.java
edexOsgi/com.raytheon.uf.common.derivparam/utility/common_static/base/derivedParameters/definitions/T.xml
edexOsgi/com.raytheon.uf.tools.cli/impl/src/textdb/TextDB.py
Former-commit-id: c8b5d89c2e202e8bb4ad59d9ced8882ec8c2a6c1
|
2014-09-29 12:58:56 -05:00 |
|
David Friedman
|
8ab4649312
|
ASM #16773 - WarnGen can become disabled when a followup is selected
Change-Id: Ibe0e3b18914840515f8bc9d844a2ffb0a6abddf0
Former-commit-id: 5048af915b004067ec8a6e788a0e9ad3e006c9d8
|
2014-09-25 21:07:16 +00:00 |
|
Matthew Howard
|
7121e2e6e1
|
Merge "ASM #657 - Errors loading Distance Speed tool and Time of Arrival Tool" into asm_14.3.1
Former-commit-id: 57ba27ba3d21e8f96affe5056d20d6e0b1540dc7
|
2014-09-11 08:56:49 -05:00 |
|
Qinglu.Lin
|
3f666817e0
|
ASM #657 - Errors loading Distance Speed tool and Time of Arrival Tool
Change-Id: I68c2b4b336a5145de20f70cb0967c9dc484f3b09
Former-commit-id: 7a75687b76584b4578fad4c31c8557d78e507f46
|
2014-09-09 08:07:46 -04:00 |
|