mjames-upc
|
31ab502455
|
ui updates from osx cave
|
2015-12-29 23:03:48 -07:00 |
|
mjames-upc
|
0b01029e68
|
cleaning up unidata_15.1.1 enough to launch in eclipse
|
2015-12-29 20:15:31 -07:00 |
|
mjames-upc
|
c921ec69d6
|
another attempt to merge UPC master_14.4.1 into origin/ncep_14.4.1-n
Former-commit-id: f25e918e50
|
2015-09-03 15:48:53 -06:00 |
|
mjames-upc
|
d33cf5cbc8
|
Merge branch upc_14.4.1 into master_14.4.1
Former-commit-id: a2e6b5e6ed [formerly f71c396cef] [formerly 8624f9707276ae6bc8c638a057eaf9e7e1d2716a [formerly 2288995260]]
Former-commit-id: 7a2ac36eca3df270f4afc658f6f3530848347ee4 [formerly cd4cb8eb1d]
Former-commit-id: 93b22eeb17
|
2015-04-22 15:11:19 -06:00 |
|
AWIPS User
|
37f580ead3
|
menus organization for warngen and awipstools
Former-commit-id: d2e0d05d34 [formerly e47d48348b] [formerly 080d101c29e6917327b869065263b9b9702104b1 [formerly 90f6268724]]
Former-commit-id: b7dfe5f2bd26a8783450b9f48bbd179c16fd3b9f [formerly 43a2553d02]
Former-commit-id: fb03264ea1
|
2015-04-19 23:37:16 -06:00 |
|
Steve Harris
|
2fd5ba420f
|
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
|
3cb60bb1e7
|
VLab Issue #6773; Fixed problem where LAPS config file wasn't being persisted to the server; fixes #6773
Change-Id: I133973de6a129709a151313f090066b09bc4222e
Former-commit-id: 6b7bec9ce8 [formerly 0b5bb1291e [formerly 948baed3df402f659cf9b80fd10a3bc3d9788036]]
Former-commit-id: 0b5bb1291e
Former-commit-id: c895a60ff5
|
2015-03-06 23:07:47 +00:00 |
|
Evan Polster
|
0b5bb1291e
|
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
|
29bf0fc879
|
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
|
266e2af93a
|
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
|
30859f6ee6
|
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 |
|
Fay.Liang
|
8a38eb3a97
|
Merge branch 'ncep_14.4.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.4.1
Former-commit-id: 1208dbde06 [formerly 30859f6ee6 [formerly bc482f433223eee5f9a2fa209e1e33a39d3b3aa8]]
Former-commit-id: 30859f6ee6
Former-commit-id: 8d4bab98d5
|
2015-02-11 15:36:05 -05:00 |
|
Fay.Liang
|
29c9534a5e
|
Merge branch 'ncep_14.4.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.4.1
Former-commit-id: 8a38eb3a97 [formerly 8d4bab98d5] [formerly 30859f6ee6] [formerly 8a38eb3a97 [formerly 8d4bab98d5] [formerly 30859f6ee6] [formerly 1208dbde06 [formerly 30859f6ee6 [formerly bc482f433223eee5f9a2fa209e1e33a39d3b3aa8]]]]
Former-commit-id: 1208dbde06
Former-commit-id: 78101fed22 [formerly c8b9377e84] [formerly fe3c9f2d6f1216e7a04c3787ad7cd2442abe36cb [formerly 10c325518c]]
Former-commit-id: 2c9d0fc8e7d57b336fb7a1d64dd163b3f020d1a0 [formerly 9f2f5af448]
Former-commit-id: 9f124dc2e5
|
2015-02-11 15:36:05 -05:00 |
|
Steve Harris
|
85457e37cb
|
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
|
672b872990
|
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
|
ea92049aac
|
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 |
|
Ana Rivera
|
2be03903bc
|
Merge branch 'master_14.4.1' into gsd_14.4.1
Change-Id: I5b7c7e17031ec4d081c03e3c4378faf6122849d5
Former-commit-id: 070f0136ec [formerly ea92049aac [formerly d5996a81aad0809aaddbb8df99a985c86c66aaf8]]
Former-commit-id: ea92049aac
Former-commit-id: ccd0a40621
|
2015-01-30 19:29:29 +00:00 |
|
Ana Rivera
|
24e1be0580
|
Merge branch 'master_14.4.1' into gsd_14.4.1
Change-Id: I5b7c7e17031ec4d081c03e3c4378faf6122849d5
Former-commit-id: 2be03903bc [formerly ccd0a40621] [formerly ea92049aac] [formerly 2be03903bc [formerly ccd0a40621] [formerly ea92049aac] [formerly 070f0136ec [formerly ea92049aac [formerly d5996a81aad0809aaddbb8df99a985c86c66aaf8]]]]
Former-commit-id: 070f0136ec
Former-commit-id: c5182d351e [formerly e358377ca7] [formerly 83f5ea939fdc2f3bd6430413f7c32ec2de4681c6 [formerly 1bbb9bad78]]
Former-commit-id: 5a5444cf3e777acf29e90a268647565f4755def7 [formerly 0715e923df]
Former-commit-id: 7cea67cfc6
|
2015-01-30 19:29:29 +00:00 |
|
Nate Jensen
|
c44537ed72
|
ensure PGEN appears in thinclient D2D Tools menu
Change-Id: Ib02d9f5f3c63edd963129e742da9c3b3e09e89fa
Former-commit-id: 3bcd3a5d40 [formerly 7a10bd5620] [formerly bfcb36eeac] [formerly 3bcd3a5d40 [formerly 7a10bd5620] [formerly bfcb36eeac] [formerly ac9d787a26 [formerly bfcb36eeac [formerly 173c250aa3fd9d3e5b35283b10eb5f37a4732a3a]]]]
Former-commit-id: ac9d787a26
Former-commit-id: a19eef1d8a [formerly 74e207f306] [formerly 95e99af7a1db07abbf85ec2b55d69d333cf1a06f [formerly 0b9a5965a0]]
Former-commit-id: 4aceaa5766a0ba388f2e6d517429b5c1cb19738e [formerly 86868080c3]
Former-commit-id: 1915c27938
|
2015-01-20 11:52:37 -06:00 |
|
Nate Jensen
|
bfcb36eeac
|
ensure PGEN appears in thinclient D2D Tools menu
Change-Id: Ib02d9f5f3c63edd963129e742da9c3b3e09e89fa
Former-commit-id: 173c250aa3fd9d3e5b35283b10eb5f37a4732a3a
|
2015-01-20 11:52:37 -06:00 |
|
Nate Jensen
|
3bcd3a5d40
|
ensure PGEN appears in thinclient D2D Tools menu
Change-Id: Ib02d9f5f3c63edd963129e742da9c3b3e09e89fa
Former-commit-id: ac9d787a26 [formerly bfcb36eeac [formerly 173c250aa3fd9d3e5b35283b10eb5f37a4732a3a]]
Former-commit-id: bfcb36eeac
Former-commit-id: 7a10bd5620
|
2015-01-20 11:52:37 -06:00 |
|
Paula McCaslin
|
e2e8faf273
|
VLab Issue #5061. LAPS Tools; fixes #5061
Change-Id: I447e7e94b931ad2efad687efa90e16cebb2e7bf9
Former-commit-id: e05f01c705953d0c9528cfea6604f88455a5f5ac
|
2014-11-12 13:58:24 -07:00 |
|
Paula McCaslin
|
939adf14a1
|
VLab Issue #5061. LAPS Tools; fixes #5061
Change-Id: I447e7e94b931ad2efad687efa90e16cebb2e7bf9
Former-commit-id: a5c805cf4d [formerly e2e8faf273 [formerly e05f01c705953d0c9528cfea6604f88455a5f5ac]]
Former-commit-id: e2e8faf273
Former-commit-id: 1375bc38f3
|
2014-11-12 13:58:24 -07:00 |
|
Paula McCaslin
|
be91854d00
|
VLab Issue #5061. LAPS Tools; fixes #5061
Change-Id: I447e7e94b931ad2efad687efa90e16cebb2e7bf9
Former-commit-id: 939adf14a1 [formerly 1375bc38f3] [formerly e2e8faf273] [formerly 939adf14a1 [formerly 1375bc38f3] [formerly e2e8faf273] [formerly a5c805cf4d [formerly e2e8faf273 [formerly e05f01c705953d0c9528cfea6604f88455a5f5ac]]]]
Former-commit-id: a5c805cf4d
Former-commit-id: 4998c1aa02 [formerly 0b569fcba8] [formerly eb97f6ab49df798b44afdf2e60cd2f14406165b1 [formerly 1038498ced]]
Former-commit-id: fa2d1a7d9d91b8b773c7633e16cd676db979e98c [formerly 1d9995c826]
Former-commit-id: 01dc07b991
|
2014-11-12 13:58:24 -07:00 |
|
Roger Ferrel
|
334d738c79
|
Omaha #3401 Enter events to upper case verification added.
Change-Id: I32e51568049dcd442b98b929af3041bc741ea6e3
Former-commit-id: 414f6e16547e0535ae36c5c4cc86f43db54b689c
|
2014-11-12 10:50:43 -06:00 |
|
Roger Ferrel
|
2f9df228d7
|
Omaha #3401 Enter events to upper case verification added.
Change-Id: I32e51568049dcd442b98b929af3041bc741ea6e3
Former-commit-id: 8cde49f98e [formerly 334d738c79 [formerly 414f6e16547e0535ae36c5c4cc86f43db54b689c]]
Former-commit-id: 334d738c79
Former-commit-id: 1d6bec894e
|
2014-11-12 10:50:43 -06:00 |
|
Roger Ferrel
|
2d45fc13e0
|
Omaha #3401 Enter events to upper case verification added.
Change-Id: I32e51568049dcd442b98b929af3041bc741ea6e3
Former-commit-id: 2f9df228d7 [formerly 1d6bec894e] [formerly 334d738c79] [formerly 2f9df228d7 [formerly 1d6bec894e] [formerly 334d738c79] [formerly 8cde49f98e [formerly 334d738c79 [formerly 414f6e16547e0535ae36c5c4cc86f43db54b689c]]]]
Former-commit-id: 8cde49f98e
Former-commit-id: 8ff4776207 [formerly 2e30187e47] [formerly 9803e31e7a551d16b0b4b241ac6fbe2af4a04c36 [formerly ae35ba438a]]
Former-commit-id: 16a4af6421c896a3c2b39b9b08433cd5a72153ab [formerly a5f2fcf963]
Former-commit-id: 73b08f33c6
|
2014-11-12 10:50:43 -06:00 |
|
Steve Harris
|
dc557b2d0c
|
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 |
|
Steve Harris
|
f5b5d2bca2
|
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: bfade7674d [formerly dc557b2d0c [formerly ea787b645974850607658e5a7dfc4a072d831a3b]]
Former-commit-id: dc557b2d0c
Former-commit-id: e9c9a17f96
|
2014-10-22 11:45:39 -05:00 |
|
Steve Harris
|
a087a820cf
|
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: f5b5d2bca2 [formerly e9c9a17f96] [formerly dc557b2d0c] [formerly f5b5d2bca2 [formerly e9c9a17f96] [formerly dc557b2d0c] [formerly bfade7674d [formerly dc557b2d0c [formerly ea787b645974850607658e5a7dfc4a072d831a3b]]]]
Former-commit-id: bfade7674d
Former-commit-id: 10e766d644 [formerly 879b0608ed] [formerly c910f3c64c7d7ef6791f3502b2d2ed5eb7f82d29 [formerly 9e7ce04543]]
Former-commit-id: ba2773ec94554e459f05101098727f2b8b98e671 [formerly 040e641ec9]
Former-commit-id: 116b83101e
|
2014-10-22 11:45:39 -05:00 |
|
David Friedman
|
955809450d
|
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 |
|
David Friedman
|
b8556f48c4
|
ASM #16844 - WarnGen can become disabled when moving storm track
Change-Id: Ic54b4f10eea64db40ce7f9c5a787fe344a8d916a
Former-commit-id: 68f985d668 [formerly 955809450d [formerly f4000b425b8da6bb16fe124c0e5eaaab78a6b3b2]]
Former-commit-id: 955809450d
Former-commit-id: 455f1ad7aa
|
2014-10-10 19:33:21 +00:00 |
|
David Friedman
|
10e53eb90f
|
ASM #16844 - WarnGen can become disabled when moving storm track
Change-Id: Ic54b4f10eea64db40ce7f9c5a787fe344a8d916a
Former-commit-id: b8556f48c4 [formerly 455f1ad7aa] [formerly 955809450d] [formerly b8556f48c4 [formerly 455f1ad7aa] [formerly 955809450d] [formerly 68f985d668 [formerly 955809450d [formerly f4000b425b8da6bb16fe124c0e5eaaab78a6b3b2]]]]
Former-commit-id: 68f985d668
Former-commit-id: 2013b9427c [formerly 3f1ed65033] [formerly a9b3aa62a2f496643fd9046866f2e1b1496d8361 [formerly 7176b476a2]]
Former-commit-id: 7829e63f06d462f7116d3888d02d99561229d005 [formerly f325e4ad55]
Former-commit-id: 65eaac9743
|
2014-10-10 19:33:21 +00:00 |
|
Steve Harris
|
da463c484e
|
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 |
|
Steve Harris
|
fa1fa76dd9
|
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: 2616fe04b6 [formerly da463c484e [formerly 8dc5abec482b4c1c3f3469c0ffc7e06fa697c6cd]]
Former-commit-id: da463c484e
Former-commit-id: f4b771ea72
|
2014-10-03 10:18:34 -05:00 |
|
Steve Harris
|
e40f190f9a
|
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: fa1fa76dd9 [formerly f4b771ea72] [formerly da463c484e] [formerly fa1fa76dd9 [formerly f4b771ea72] [formerly da463c484e] [formerly 2616fe04b6 [formerly da463c484e [formerly 8dc5abec482b4c1c3f3469c0ffc7e06fa697c6cd]]]]
Former-commit-id: 2616fe04b6
Former-commit-id: 1c1e618183 [formerly 306826aed9] [formerly 97756f4cc415dba80b72fef671c8609b2b0ef779 [formerly 523cedbb56]]
Former-commit-id: 85a2c5f56cad1fa8121856b8cb5312cdf481051b [formerly 57f5294f08]
Former-commit-id: e05d31ae36
|
2014-10-03 10:18:34 -05:00 |
|
dmsys
|
8c3625cfec
|
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 |
|
dmsys
|
70cb8d81b0
|
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: 9f4560c480 [formerly 8c3625cfec [formerly 0bf7ecb27d41f81f1d6727674fc1475eeaa8512c]]
Former-commit-id: 8c3625cfec
Former-commit-id: f704781f4f
|
2014-09-30 13:45:54 -04:00 |
|
dmsys
|
6b2eccce36
|
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: 70cb8d81b0 [formerly f704781f4f] [formerly 8c3625cfec] [formerly 70cb8d81b0 [formerly f704781f4f] [formerly 8c3625cfec] [formerly 9f4560c480 [formerly 8c3625cfec [formerly 0bf7ecb27d41f81f1d6727674fc1475eeaa8512c]]]]
Former-commit-id: 9f4560c480
Former-commit-id: 0cb584f44e [formerly 07f84c6b26] [formerly 674f011faa89a8d6263043b42cfc79d80e3b82b4 [formerly b884e5e32d]]
Former-commit-id: 8f7a656cd223aa4bbbad7217939da98d6e8672ab [formerly e00ea2d8cd]
Former-commit-id: 71d6e48473
|
2014-09-30 13:45:54 -04:00 |
|
Steve Harris
|
90e08b96e1
|
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 |
|
Steve Harris
|
6900bb61c1
|
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: 3b6a8a1447 [formerly 90e08b96e1 [formerly c8b5d89c2e202e8bb4ad59d9ced8882ec8c2a6c1]]
Former-commit-id: 90e08b96e1
Former-commit-id: 3598e9b5b6
|
2014-09-29 12:58:56 -05:00 |
|
Steve Harris
|
10752cbc42
|
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: 6900bb61c1 [formerly 3598e9b5b6] [formerly 90e08b96e1] [formerly 6900bb61c1 [formerly 3598e9b5b6] [formerly 90e08b96e1] [formerly 3b6a8a1447 [formerly 90e08b96e1 [formerly c8b5d89c2e202e8bb4ad59d9ced8882ec8c2a6c1]]]]
Former-commit-id: 3b6a8a1447
Former-commit-id: e9774e46ea [formerly 842abaad49] [formerly 1f609e71c1d55fbd64663d85caf8d8fbf61ab92c [formerly 6330a62e85]]
Former-commit-id: df06a15df0e12cfd77916f5f59e1b95c241b34d2 [formerly 30f0d27dfb]
Former-commit-id: 4c4380580f
|
2014-09-29 12:58:56 -05:00 |
|
David Friedman
|
b3025aacb0
|
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 |
|
David Friedman
|
d8618f1419
|
ASM #16773 - WarnGen can become disabled when a followup is selected
Change-Id: Ibe0e3b18914840515f8bc9d844a2ffb0a6abddf0
Former-commit-id: 8ab4649312 [formerly b3025aacb0 [formerly 5048af915b004067ec8a6e788a0e9ad3e006c9d8]]
Former-commit-id: b3025aacb0
Former-commit-id: 973d0b9a55
|
2014-09-25 21:07:16 +00:00 |
|
David Friedman
|
30ee562dc7
|
ASM #16773 - WarnGen can become disabled when a followup is selected
Change-Id: Ibe0e3b18914840515f8bc9d844a2ffb0a6abddf0
Former-commit-id: d8618f1419 [formerly 973d0b9a55] [formerly b3025aacb0] [formerly d8618f1419 [formerly 973d0b9a55] [formerly b3025aacb0] [formerly 8ab4649312 [formerly b3025aacb0 [formerly 5048af915b004067ec8a6e788a0e9ad3e006c9d8]]]]
Former-commit-id: 8ab4649312
Former-commit-id: d017509506 [formerly a10060f45d] [formerly 78ef0251563c92144b5b39f6944eb8273d2bbaee [formerly c19d9ee755]]
Former-commit-id: 6265764de67efa983a3247d8e0f688518aca6844 [formerly f6a6032d61]
Former-commit-id: 0a94f1ccfb
|
2014-09-25 21:07:16 +00:00 |
|
Matthew Howard
|
6e0dbf4fb5
|
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 |
|
Matthew Howard
|
4b00403145
|
Merge "ASM #657 - Errors loading Distance Speed tool and Time of Arrival Tool" into asm_14.3.1
Former-commit-id: 7121e2e6e1 [formerly 6e0dbf4fb5 [formerly 57ba27ba3d21e8f96affe5056d20d6e0b1540dc7]]
Former-commit-id: 6e0dbf4fb5
Former-commit-id: c0a43b73ce
|
2014-09-11 08:56:49 -05:00 |
|
Matthew Howard
|
021d0fed40
|
Merge "ASM #657 - Errors loading Distance Speed tool and Time of Arrival Tool" into asm_14.3.1
Former-commit-id: 4b00403145 [formerly c0a43b73ce] [formerly 6e0dbf4fb5] [formerly 4b00403145 [formerly c0a43b73ce] [formerly 6e0dbf4fb5] [formerly 7121e2e6e1 [formerly 6e0dbf4fb5 [formerly 57ba27ba3d21e8f96affe5056d20d6e0b1540dc7]]]]
Former-commit-id: 7121e2e6e1
Former-commit-id: c6dbdef498 [formerly 5daf615bb0] [formerly 171a14168a3b3e901e938ab2ca3dfd65cc9e8a7f [formerly 03f33b687b]]
Former-commit-id: a1f06f360df2348392f27764b53793fd0df9b4f7 [formerly 1f79bceb26]
Former-commit-id: 5cace9fcbf
|
2014-09-11 08:56:49 -05:00 |
|
Qinglu.Lin
|
51d48a6fdc
|
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 |
|
Qinglu.Lin
|
f2bd188b06
|
ASM #657 - Errors loading Distance Speed tool and Time of Arrival Tool
Change-Id: I68c2b4b336a5145de20f70cb0967c9dc484f3b09
Former-commit-id: 3f666817e0 [formerly 51d48a6fdc [formerly 7a75687b76584b4578fad4c31c8557d78e507f46]]
Former-commit-id: 51d48a6fdc
Former-commit-id: 517f0c9d0c
|
2014-09-09 08:07:46 -04:00 |
|