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 |
|
Nate Jensen
|
cf41d7e3a3
|
Merge "Omaha #3467 Error occurs when loading/editing the Range Rings tool multiple times" into omaha_14.4.1
Former-commit-id: 03fc1d04092135970a6c7089bcbbf11d5c584dd1
|
2014-09-04 13:49:36 -05:00 |
|
Nate Jensen
|
9d462e1dd9
|
Omaha #3356 remove more unnecessary register buddies and policies
Change-Id: I3e39f9b8274b2b9104f3b3d037601c1553c43e13
Former-commit-id: b535d54c52c3e38bb9fa083ba911ad49c090f214
|
2014-09-03 11:34:10 -05:00 |
|
Mark Peters
|
ee36d09cb0
|
Omaha #3467 Error occurs when loading/editing the Range Rings tool multiple times
Change-Id: I68642e05ce970545a516d4fab1492a860c530032
Former-commit-id: 725354074d54112c8658dc34a8ac564739acbebb
|
2014-09-02 16:31:44 -05:00 |
|
Steve Harris
|
5d58625abc
|
Merge branch 'master_14.3.1' (14.3.1-16) into omaha_14.4.1
Conflicts:
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/reflect/BundleReflections.java
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/reflect/BundleRepositoryGetter.java
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/reflect/SubClassLocator.java
cave/com.raytheon.viz.aviation/src/com/raytheon/viz/aviation/editor/TafViewerEditorDlg.java
cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/StormTrackDisplay.java
cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java
cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
edexOsgi/com.raytheon.edex.plugin.binlightning/src/com/raytheon/edex/plugin/binlightning/BinLightningDecoder.java
edexOsgi/com.raytheon.uf.common.comm/src/com/raytheon/uf/common/comm/HttpClient.java
edexOsgi/com.raytheon.uf.tools.cli/impl/capture
ldm/src/pqact/pqact.c
Former-commit-id: 8793dca41f756ba812206b48391caea6e593a657
|
2014-08-29 10:17:52 -05:00 |
|
Brian.Dyke
|
aa83bf804f
|
Merge branch 'master_14.2.4' into master_14.3.1 CM-MERGE:14.2.4-5 into 14.3.1
Conflicts:
cave/com.raytheon.viz.awipstools/src/com/raytheon/viz/awipstools/common/stormtrack/StormTrackDisplay.java
cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java
cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/VbSources.xml
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java
edexOsgi/com.raytheon.uf.common.comm/src/com/raytheon/uf/common/comm/HttpClient.java
Former-commit-id: 7334d3991903dfe8a62728de33c21e81534fdbb6
|
2014-08-27 11:19:19 -04:00 |
|
Qinglu.Lin
|
2157a4aa3b
|
ASM #15700 - Warngen issues an error and toggles off on Radar update
Change-Id: I51085cd1bb9c7286719f1bff4e04abe5a7a2363b
Former-commit-id: b8a4741b2519e8c02a1b80ba8544be9b1c26d35c
|
2014-08-21 10:43:22 -04:00 |
|
Mark Peters
|
4011a4392c
|
Omaha #3523 Replace Raytheon usage of IGraphicsTarget.TextStyle.NORMAL and directly assigning the text style
Change-Id: Idcc31d11251df8de949bd1bd9bf8c402a5d47f4f
Former-commit-id: e409b578fcb15caadf28da57d2cb1860e1ea246c
|
2014-08-14 15:43:17 -05:00 |
|
Nate Jensen
|
9b72a1399d
|
Omaha #3356 cleanup of unnecessary register buddies and buddy policies
Change-Id: I1d6c279478f38876a8df67d2f9dd186a2efdeca0
Former-commit-id: 48536dd79d933508ac54b3b6e9bbd166fd218330
|
2014-08-14 10:22:37 -05:00 |
|
Nate Jensen
|
310f314b81
|
Merge "Omaha #3472 Clicking & dragging the Az/Ran Overlay tool off the map causes the map to jump" into omaha_14.4.1
Former-commit-id: 76ca557a25e6b09b3412cfe7a2d154b3a522cf74
|
2014-08-11 13:25:17 -05:00 |
|
Mark Peters
|
490f7ea209
|
Omaha #3472 Clicking & dragging the Az/Ran Overlay tool off the map causes the map to jump
Change-Id: I5dc3fc528a8e62dd32d87524f99adb1a8c9e610e
Former-commit-id: 1b0ac4736f7d63c5e49a48a28473ad6a38e6b6ea
|
2014-08-11 10:08:38 -05:00 |
|
Brian Clements
|
415f2dff64
|
Omaha #3503 common.serialization changes
moved adapters to new plugins
Change-Id: I34c66b004ce1c5aa61c093fe2eeb2fe8d3b138b6
Former-commit-id: adba61c3714678ce57f0de5bfd4f9aa860098bd9
|
2014-08-08 12:50:06 -05:00 |
|
Nate Jensen
|
61654ad2d1
|
Merge "Omaha #3356 remove unnecessary usage of ext and global buddy policies" into omaha_14.4.1
Former-commit-id: 01773a5dfc82902e28fa730e174177b2ce08934e
|
2014-08-04 14:49:57 -05:00 |
|
Nate Jensen
|
857f1b70cc
|
Omaha #3356 remove unnecessary usage of ext and global buddy policies
Change-Id: I0007eb5bb21bb3a3d7d0757bb53856054b4f380d
Former-commit-id: 41306351920aee44bdf2d9648616ddc8a4511632
|
2014-08-04 12:30:55 -05:00 |
|
Mark Peters
|
cf2a2d47b9
|
Omaha #3430 Error returned when MB3 clicking off the map with a snapping tool in edit mode
Change-Id: Iba81f6dc58b1223252711296b66a88a8afb02cdd
Former-commit-id: d81e1ac43cbf10b0cd6f475e41fc242ab3c6a3c7
|
2014-08-04 10:24:08 -05:00 |
|
Mark Peters
|
47aec2aae3
|
Omaha #3465 Replace plugin calls to deprecated IGraphicsTarget.drawStrings()
Change-Id: Ib72cf8806852aff718af56c5f2c2cf4e07f9f548
Former-commit-id: 29d170af7a0c36e614a84923c2fb5054db73c390
|
2014-07-30 16:03:57 -05:00 |
|
Mark Peters
|
bac12d844b
|
Omaha #3429 Replace Raytheon plugin calls to deprecated IGraphicsTarget.drawLine()
Change-Id: I9de68a9a047a2d6c3744b29de292efb7cfb44bbf
Former-commit-id: a222b29ff24bf81d1c8aefd54fa33f52461c9c25
|
2014-07-29 11:20:53 -05:00 |
|
Mark Peters
|
cc690ec2c3
|
Omaha #3430 Remove errors returned when MB3 clicking off the map with snapping tool in editable mode
Change-Id: Id4fbe8480e1d796eed448a791982570bb85f657c
Former-commit-id: b27dc2ad7076e73461d880e4daa987f49496f30d
|
2014-07-28 14:44:28 -05:00 |
|
Lee Venable
|
c068efccc3
|
Omaha #3400 - removed application modal shell style
Former-commit-id: 4841fab5ff0eab3c4f27b56e71f2e4cb35b32aaa
|
2014-07-25 10:56:48 -05:00 |
|
Mark Peters
|
e4c455f5c0
|
Omaha #3412 Replace drawCircle calls
Change-Id: I812f1941b0fe1c7601126e327bb001772eedf5ca
Former-commit-id: c176ef7e45f8ad9e8273dd1a74ace2075aacdddd
|
2014-07-21 17:07:02 -05:00 |
|
Richard Peter
|
8ecc27f714
|
Merge branch 'omaha_14.3.1' (14.3.1-12) into omaha_14.4.1
Conflicts:
cave/com.raytheon.uf.viz.core/src/com/raytheon/uf/viz/core/datastructure/LoopProperties.java
cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java
edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-spring.xml
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/src/com/raytheon/edex/plugin/gfe/watch/WCLWatchSrv.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/watch/WclInfo.java
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java
edexOsgi/com.raytheon.edex.plugin.warning/WarningDecoder.py
Change-Id: I6208fb3e1589dd3f2356f19ea9bbdfaa79ae6d61
Former-commit-id: fc71e1cb26481e91c7d0c16ed0bd06ec5c8c22b9
|
2014-07-01 15:34:39 -05:00 |
|
Steve Harris
|
7acd9ab2dd
|
Merge branch 'master_14.2.2' (-16) into master_14.3.1 (-11) CM-MERGE:14.2.2-11,-12,-13,-14,-15,-16 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/dialogs/sbu/ServiceBackupDlg.java
cave/com.raytheon.viz.lightning/src/com/raytheon/viz/lightning/LightningResource.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/GisUtil.java
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gis/PortionsUtil.java
edexOsgi/com.raytheon.edex.plugin.grib/utility/edex_static/base/grib/postProcessModels/postProcessedModels.xml
edexOsgi/com.raytheon.edex.plugin.shef/res/spring/shef-ingest.xml
edexOsgi/com.raytheon.edex.plugin.shef/src/com/raytheon/edex/plugin/shef/database/PostShef.java
Change-Id: Ia1c3637d1d6ee482896c9d7a41d77752d70317f5
Former-commit-id: d25ab509cb53d559edbd520dd1e3c036166f2e29
|
2014-07-01 11:08:46 -04:00 |
|
Qinglu.Lin
|
30bc1b7450
|
ASM #657 - Errors loading Distance Speed tool and Time of Arrival Tool
Change-Id: I73ca64048b00338b82ee13c5958d6b823cc4a43d
Former-commit-id: 4d58f21546e01f4dda1414b60d0de48c13608c99
|
2014-06-25 08:28:55 -04:00 |
|
Steve Harris
|
419c5f4aba
|
CM-MERGE:14.1.3-2,-3 into 14.2.2
Merge branch 'master_14.1.3' (-3) into master_14.2.2 (-14)
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-request.xml
edexOsgi/com.raytheon.edex.plugin.gfe/res/spring/gfe-spring.xml
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/spc/SPCWatchSrv.java
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/tpc/TPCWatchSrv.java
edexOsgi/com.raytheon.edex.plugin.gfe/test/com/raytheon/edex/plugin/gfe/watch/TestWCLWatchSrv.java
edexOsgi/com.raytheon.edex.plugin.warning/WarningDecoder.py
edexOsgi/com.raytheon.uf.common.dataplugin.warning/src/com/raytheon/uf/common/dataplugin/warning/gis/GeospatialFactory.java
Former-commit-id: ce5767f2bbf5c9627bd43e766c6193c261c48af3
|
2014-06-20 14:01:55 -04:00 |
|
Brian.Dyke
|
8ecdd9a192
|
CM-MERGE:OB13.5.6-4 into 14.1.3
Former-commit-id: 86dc406cd227362abc5274f4cd64813ceb91d00d
|
2014-06-18 08:55:49 -04:00 |
|
Ben Steffensmeier
|
fc25774506
|
Omaha #2061 Remove references to IDecoderGettable.Amount from Range Rings.
Former-commit-id: e267e8b0bae314abf3396db6072c6ff8adc732bf
|
2014-06-11 13:45:42 -05:00 |
|
Ben Steffensmeier
|
cad15768cc
|
Omaha #3263 Synchronize dataTimes of storm track resources.
Former-commit-id: d0a3a73a3a2375a49dc3e224a1c13956530d3351
|
2014-06-10 16:34:44 -05:00 |
|
Brian.Dyke
|
9ab17ddecb
|
Merge branch 'master_14.1.3' into master_14.2.2 CM-MERGE:14.1.3-1 into 14.2.2
Conflicts:
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
Former-commit-id: 797aa6bfbf2802aa7355b7a4a77d0fb4f54dfd6a
|
2014-06-10 13:56:03 -04:00 |
|
Brian.Dyke
|
8874d41872
|
CM-MERGE:OB13.5.6-1,-2 into 14.1.3
Former-commit-id: b859032bcec187616adfd414dd1ce5fe27829e9e
|
2014-06-10 12:52:59 -04:00 |
|
Michael Gamazaychikov
|
50ab77046b
|
ASM #114 - Problem with Distance Speed Tool.
Change-Id: I2b3218b2fb407f99cf9c81edf69feb042a6fee75
Former-commit-id: a38308fa5a6efe9a07ecd84bd93662bea32afc94
|
2014-06-05 13:43:04 +01:00 |
|
Michael Gamazaychikov
|
5bff9f2ac8
|
ASM #114 - Problem with Distance Speed Tool (merge with 13.5.4 changes).
Change-Id: Ic4d6f50c28d0aba440a02010b09b2e3b3117fe85
Former-commit-id: f3ee76edfd95e9c25eff89d1ecbff9e466b3ca75
|
2014-05-21 15:12:08 +01:00 |
|
brian.dyke
|
58683ad040
|
Merge branch 'master_14.3.1-4' into asm_14.3.1
Conflicts:
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPResource.java
edexOsgi/com.raytheon.uf.edex.grid.staticdata/src/com/raytheon/uf/edex/grid/staticdata/StaticDataGenerator.java
edexOsgi/com.raytheon.uf.edex.plugin.grid/utility/common_static/base/purge/gridPurgeRules.xml
Former-commit-id: 52358cb3e2ba2c7ff4ff9c9a5de03af50c3a1199
|
2014-05-19 09:45:37 -04:00 |
|