Mark Peters
|
14604bcc7b
|
Omaha #3430 Remove errors returned when MB3 clicking off the map with snapping tool in editable mode
Change-Id: Id4fbe8480e1d796eed448a791982570bb85f657c
Former-commit-id: cc690ec2c3 [formerly 33e311c361 [formerly b27dc2ad7076e73461d880e4daa987f49496f30d]]
Former-commit-id: 33e311c361
Former-commit-id: 23538197f6
|
2014-07-28 14:44:28 -05:00 |
|
Mark Peters
|
ec50c16d7e
|
Omaha #3430 Remove errors returned when MB3 clicking off the map with snapping tool in editable mode
Change-Id: Id4fbe8480e1d796eed448a791982570bb85f657c
Former-commit-id: 14604bcc7b [formerly 23538197f6] [formerly 33e311c361] [formerly 14604bcc7b [formerly 23538197f6] [formerly 33e311c361] [formerly cc690ec2c3 [formerly 33e311c361 [formerly b27dc2ad7076e73461d880e4daa987f49496f30d]]]]
Former-commit-id: cc690ec2c3
Former-commit-id: e28f394b97 [formerly 0356569e9f] [formerly 2a77cc92bf9909ae7070ddd4770b41778d1e7c50 [formerly c4eb912c7d]]
Former-commit-id: 6a66f1dd7727d1b46bffd2ae45a9a31dbc699efb [formerly 7685d6ac9a]
Former-commit-id: 3393501814
|
2014-07-28 14:44:28 -05:00 |
|
Lee Venable
|
143e42b887
|
Omaha #3400 - removed application modal shell style
Former-commit-id: 4841fab5ff0eab3c4f27b56e71f2e4cb35b32aaa
|
2014-07-25 10:56:48 -05:00 |
|
Lee Venable
|
8c010849e9
|
Omaha #3400 - removed application modal shell style
Former-commit-id: c068efccc3 [formerly 143e42b887 [formerly 4841fab5ff0eab3c4f27b56e71f2e4cb35b32aaa]]
Former-commit-id: 143e42b887
Former-commit-id: 4ec7dd68dc
|
2014-07-25 10:56:48 -05:00 |
|
Lee Venable
|
e5c778806d
|
Omaha #3400 - removed application modal shell style
Former-commit-id: 8c010849e9 [formerly 4ec7dd68dc] [formerly 143e42b887] [formerly 8c010849e9 [formerly 4ec7dd68dc] [formerly 143e42b887] [formerly c068efccc3 [formerly 143e42b887 [formerly 4841fab5ff0eab3c4f27b56e71f2e4cb35b32aaa]]]]
Former-commit-id: c068efccc3
Former-commit-id: fc1b82d9fd [formerly f4555772f1] [formerly 42f8430d6aecc8cade0a0e59ee771acb2c572849 [formerly 82b9b320c5]]
Former-commit-id: ddb40d450b39e9795a61cb98abb1c981ac66ee87 [formerly 7efc684837]
Former-commit-id: 5eb631d759
|
2014-07-25 10:56:48 -05:00 |
|
Mark Peters
|
e638d2f41b
|
Omaha #3412 Replace drawCircle calls
Change-Id: I812f1941b0fe1c7601126e327bb001772eedf5ca
Former-commit-id: c176ef7e45f8ad9e8273dd1a74ace2075aacdddd
|
2014-07-21 17:07:02 -05:00 |
|
Mark Peters
|
d04f7dd252
|
Omaha #3412 Replace drawCircle calls
Change-Id: I812f1941b0fe1c7601126e327bb001772eedf5ca
Former-commit-id: e4c455f5c0 [formerly e638d2f41b [formerly c176ef7e45f8ad9e8273dd1a74ace2075aacdddd]]
Former-commit-id: e638d2f41b
Former-commit-id: b5a25e7372
|
2014-07-21 17:07:02 -05:00 |
|
Mark Peters
|
0411b26ec6
|
Omaha #3412 Replace drawCircle calls
Change-Id: I812f1941b0fe1c7601126e327bb001772eedf5ca
Former-commit-id: d04f7dd252 [formerly b5a25e7372] [formerly e638d2f41b] [formerly d04f7dd252 [formerly b5a25e7372] [formerly e638d2f41b] [formerly e4c455f5c0 [formerly e638d2f41b [formerly c176ef7e45f8ad9e8273dd1a74ace2075aacdddd]]]]
Former-commit-id: e4c455f5c0
Former-commit-id: 66fafe363b [formerly 30a6e96d7c] [formerly a4e5ff382cd813f911beab0fb26c8f30196d7ec9 [formerly e48c2b7116]]
Former-commit-id: 781f6322906c1d4bfd6979543164111cd6386e57 [formerly 3aee17fbb5]
Former-commit-id: 969c6a4685
|
2014-07-21 17:07:02 -05:00 |
|
Richard Peter
|
93bbd98cbc
|
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 |
|
Richard Peter
|
ed38bf2372
|
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: 8ecc27f714 [formerly 93bbd98cbc [formerly fc71e1cb26481e91c7d0c16ed0bd06ec5c8c22b9]]
Former-commit-id: 93bbd98cbc
Former-commit-id: 6636b301e5
|
2014-07-01 15:34:39 -05:00 |
|
Richard Peter
|
0b0b58e89c
|
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: ed38bf2372 [formerly 6636b301e5] [formerly 93bbd98cbc] [formerly ed38bf2372 [formerly 6636b301e5] [formerly 93bbd98cbc] [formerly 8ecc27f714 [formerly 93bbd98cbc [formerly fc71e1cb26481e91c7d0c16ed0bd06ec5c8c22b9]]]]
Former-commit-id: 8ecc27f714
Former-commit-id: 948e0cd011 [formerly 552ac6d640] [formerly bb5cc0ca71fa6abf17e95b29fbe41a184ac1297e [formerly fc27824dbc]]
Former-commit-id: 98c7362b289abd5b8e115f957b14dcd73116b99a [formerly 0fefdc7cd6]
Former-commit-id: 342192e967
|
2014-07-01 15:34:39 -05:00 |
|
Steve Harris
|
d4dc1723c1
|
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 |
|
Steve Harris
|
741dc31fcb
|
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: 7acd9ab2dd [formerly d4dc1723c1 [formerly d25ab509cb53d559edbd520dd1e3c036166f2e29]]
Former-commit-id: d4dc1723c1
Former-commit-id: 2f2958df37
|
2014-07-01 11:08:46 -04:00 |
|
Steve Harris
|
1bbbdc9c62
|
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: 741dc31fcb [formerly 2f2958df37] [formerly d4dc1723c1] [formerly 741dc31fcb [formerly 2f2958df37] [formerly d4dc1723c1] [formerly 7acd9ab2dd [formerly d4dc1723c1 [formerly d25ab509cb53d559edbd520dd1e3c036166f2e29]]]]
Former-commit-id: 7acd9ab2dd
Former-commit-id: d70da4127e [formerly 7fb4663d75] [formerly 109f5e557e8f5a7076b56c4f8d0f0c548c0f0cc6 [formerly dcbab5621f]]
Former-commit-id: 8343b8e876918b72044e0b509f5b5b8afdbd53e2 [formerly 71357da9d2]
Former-commit-id: 8fb747ad27
|
2014-07-01 11:08:46 -04:00 |
|
Qinglu.Lin
|
edb9dd1ff2
|
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 |
|
Qinglu.Lin
|
0e482de8ef
|
ASM #657 - Errors loading Distance Speed tool and Time of Arrival Tool
Change-Id: I73ca64048b00338b82ee13c5958d6b823cc4a43d
Former-commit-id: 30bc1b7450 [formerly edb9dd1ff2 [formerly 4d58f21546e01f4dda1414b60d0de48c13608c99]]
Former-commit-id: edb9dd1ff2
Former-commit-id: e71e54b5da
|
2014-06-25 08:28:55 -04:00 |
|
Qinglu.Lin
|
5b26bb16ee
|
ASM #657 - Errors loading Distance Speed tool and Time of Arrival Tool
Change-Id: I73ca64048b00338b82ee13c5958d6b823cc4a43d
Former-commit-id: 0e482de8ef [formerly e71e54b5da] [formerly edb9dd1ff2] [formerly 0e482de8ef [formerly e71e54b5da] [formerly edb9dd1ff2] [formerly 30bc1b7450 [formerly edb9dd1ff2 [formerly 4d58f21546e01f4dda1414b60d0de48c13608c99]]]]
Former-commit-id: 30bc1b7450
Former-commit-id: b39c1428eb [formerly 28de7f52a2] [formerly da825f15830072d8193dda6e633466497a7933e6 [formerly 166004b927]]
Former-commit-id: 52f1ba62ae811b62383e3ad197d30ceb52266baa [formerly 12081d6035]
Former-commit-id: 283a952738
|
2014-06-25 08:28:55 -04:00 |
|
Steve Harris
|
b84dda5930
|
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 |
|
Steve Harris
|
869235c02a
|
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: 419c5f4aba [formerly b84dda5930 [formerly ce5767f2bbf5c9627bd43e766c6193c261c48af3]]
Former-commit-id: b84dda5930
Former-commit-id: 16f5ff0979
|
2014-06-20 14:01:55 -04:00 |
|
Steve Harris
|
7e7529e482
|
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: 869235c02a [formerly 16f5ff0979] [formerly b84dda5930] [formerly 869235c02a [formerly 16f5ff0979] [formerly b84dda5930] [formerly 419c5f4aba [formerly b84dda5930 [formerly ce5767f2bbf5c9627bd43e766c6193c261c48af3]]]]
Former-commit-id: 419c5f4aba
Former-commit-id: bab435f286 [formerly af06c5a890] [formerly dd639a780b77ef5a2f827ee961c20e9db23d2d31 [formerly 66d30e59a3]]
Former-commit-id: 27bd7f3ff5ce8e46cd91569a3f0cf62fa9127e53 [formerly 935542914d]
Former-commit-id: 196f53e609
|
2014-06-20 14:01:55 -04:00 |
|
Brian.Dyke
|
399c06820a
|
CM-MERGE:OB13.5.6-4 into 14.1.3
Former-commit-id: 86dc406cd227362abc5274f4cd64813ceb91d00d
|
2014-06-18 08:55:49 -04:00 |
|
Brian.Dyke
|
e3dc97e246
|
CM-MERGE:OB13.5.6-4 into 14.1.3
Former-commit-id: 8ecdd9a192 [formerly 399c06820a [formerly 86dc406cd227362abc5274f4cd64813ceb91d00d]]
Former-commit-id: 399c06820a
Former-commit-id: be589ceb9b
|
2014-06-18 08:55:49 -04:00 |
|
Brian.Dyke
|
71ca3ae180
|
CM-MERGE:OB13.5.6-4 into 14.1.3
Former-commit-id: e3dc97e246 [formerly be589ceb9b] [formerly 399c06820a] [formerly e3dc97e246 [formerly be589ceb9b] [formerly 399c06820a] [formerly 8ecdd9a192 [formerly 399c06820a [formerly 86dc406cd227362abc5274f4cd64813ceb91d00d]]]]
Former-commit-id: 8ecdd9a192
Former-commit-id: f09000ec64 [formerly e28febcf27] [formerly 9723a25d830a41cf2e060dc218ad841643217c3e [formerly 9031f58d02]]
Former-commit-id: c6144f8a9f4e5c44b2c2c7442f0100f646622fba [formerly 3e10995d87]
Former-commit-id: b602d29456
|
2014-06-18 08:55:49 -04:00 |
|
Ben Steffensmeier
|
f292f204c9
|
Omaha #2061 Remove references to IDecoderGettable.Amount from Range Rings.
Former-commit-id: e267e8b0bae314abf3396db6072c6ff8adc732bf
|
2014-06-11 13:45:42 -05:00 |
|
Ben Steffensmeier
|
db668f8b63
|
Omaha #2061 Remove references to IDecoderGettable.Amount from Range Rings.
Former-commit-id: fc25774506 [formerly f292f204c9 [formerly e267e8b0bae314abf3396db6072c6ff8adc732bf]]
Former-commit-id: f292f204c9
Former-commit-id: 5a4f7a1fd4
|
2014-06-11 13:45:42 -05:00 |
|
Ben Steffensmeier
|
ed865c330a
|
Omaha #2061 Remove references to IDecoderGettable.Amount from Range Rings.
Former-commit-id: db668f8b63 [formerly 5a4f7a1fd4] [formerly f292f204c9] [formerly db668f8b63 [formerly 5a4f7a1fd4] [formerly f292f204c9] [formerly fc25774506 [formerly f292f204c9 [formerly e267e8b0bae314abf3396db6072c6ff8adc732bf]]]]
Former-commit-id: fc25774506
Former-commit-id: c9b474afb9 [formerly 217734a2ba] [formerly f401961b28b14a7264ad7debe15758c82f45e504 [formerly 94b465fa15]]
Former-commit-id: 0558994679c2da78da91ba8ad2e4c69c953ea5d5 [formerly 3c8b94e08a]
Former-commit-id: 2aebff4f06
|
2014-06-11 13:45:42 -05:00 |
|
Ben Steffensmeier
|
eff1921f70
|
Omaha #3263 Synchronize dataTimes of storm track resources.
Former-commit-id: d0a3a73a3a2375a49dc3e224a1c13956530d3351
|
2014-06-10 16:34:44 -05:00 |
|
Ben Steffensmeier
|
e7128150f9
|
Omaha #3263 Synchronize dataTimes of storm track resources.
Former-commit-id: cad15768cc [formerly eff1921f70 [formerly d0a3a73a3a2375a49dc3e224a1c13956530d3351]]
Former-commit-id: eff1921f70
Former-commit-id: 8783e9e23c
|
2014-06-10 16:34:44 -05:00 |
|
Ben Steffensmeier
|
82f3aaa41e
|
Omaha #3263 Synchronize dataTimes of storm track resources.
Former-commit-id: e7128150f9 [formerly 8783e9e23c] [formerly eff1921f70] [formerly e7128150f9 [formerly 8783e9e23c] [formerly eff1921f70] [formerly cad15768cc [formerly eff1921f70 [formerly d0a3a73a3a2375a49dc3e224a1c13956530d3351]]]]
Former-commit-id: cad15768cc
Former-commit-id: 814cabbcfc [formerly e4ac81c0e9] [formerly 0968abe7b80aa03d6d67b8c88ad9529a151531f3 [formerly b02383f878]]
Former-commit-id: f97a310ca82b1a763f344ac25119445501694a5b [formerly f60667703f]
Former-commit-id: c0b8a49ee9
|
2014-06-10 16:34:44 -05:00 |
|
Brian.Dyke
|
f72380ad60
|
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
|
7056d79f70
|
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: 9ab17ddecb [formerly f72380ad60 [formerly 797aa6bfbf2802aa7355b7a4a77d0fb4f54dfd6a]]
Former-commit-id: f72380ad60
Former-commit-id: 0f07e14bf1
|
2014-06-10 13:56:03 -04:00 |
|
Brian.Dyke
|
f5befd7116
|
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: 7056d79f70 [formerly 0f07e14bf1] [formerly f72380ad60] [formerly 7056d79f70 [formerly 0f07e14bf1] [formerly f72380ad60] [formerly 9ab17ddecb [formerly f72380ad60 [formerly 797aa6bfbf2802aa7355b7a4a77d0fb4f54dfd6a]]]]
Former-commit-id: 9ab17ddecb
Former-commit-id: 5893782ec3 [formerly 816dcf74e4] [formerly d838e1972c1a8529e2efc996d44a235ce685e8db [formerly 49cd9574d9]]
Former-commit-id: b46938d836881d648f671f55d48408d36e6cb22f [formerly a4b39dfca5]
Former-commit-id: 1ae1410e46
|
2014-06-10 13:56:03 -04:00 |
|
Brian.Dyke
|
c1b3f9d180
|
CM-MERGE:OB13.5.6-1,-2 into 14.1.3
Former-commit-id: b859032bcec187616adfd414dd1ce5fe27829e9e
|
2014-06-10 12:52:59 -04:00 |
|
Brian.Dyke
|
64a10ce12d
|
CM-MERGE:OB13.5.6-1,-2 into 14.1.3
Former-commit-id: 8874d41872 [formerly c1b3f9d180 [formerly b859032bcec187616adfd414dd1ce5fe27829e9e]]
Former-commit-id: c1b3f9d180
Former-commit-id: ef5c74dece
|
2014-06-10 12:52:59 -04:00 |
|
Brian.Dyke
|
7caa757318
|
CM-MERGE:OB13.5.6-1,-2 into 14.1.3
Former-commit-id: 64a10ce12d [formerly ef5c74dece] [formerly c1b3f9d180] [formerly 64a10ce12d [formerly ef5c74dece] [formerly c1b3f9d180] [formerly 8874d41872 [formerly c1b3f9d180 [formerly b859032bcec187616adfd414dd1ce5fe27829e9e]]]]
Former-commit-id: 8874d41872
Former-commit-id: d6ebcad87e [formerly 4f0fc67b1f] [formerly c763da54d370b72fa17bd0154f839ff80cd9226a [formerly f568b5606a]]
Former-commit-id: cb4c4f5cdbcafd5e7f18339757c3484f03c17e30 [formerly 81d732477e]
Former-commit-id: a39afc1dfa
|
2014-06-10 12:52:59 -04:00 |
|
Michael Gamazaychikov
|
c07bcacbf8
|
ASM #114 - Problem with Distance Speed Tool.
Change-Id: I2b3218b2fb407f99cf9c81edf69feb042a6fee75
Former-commit-id: a38308fa5a6efe9a07ecd84bd93662bea32afc94
|
2014-06-05 13:43:04 +01:00 |
|
Michael Gamazaychikov
|
efd0fb50b8
|
ASM #114 - Problem with Distance Speed Tool.
Change-Id: I2b3218b2fb407f99cf9c81edf69feb042a6fee75
Former-commit-id: 50ab77046b [formerly c07bcacbf8 [formerly a38308fa5a6efe9a07ecd84bd93662bea32afc94]]
Former-commit-id: c07bcacbf8
Former-commit-id: e5a9fa0827
|
2014-06-05 13:43:04 +01:00 |
|
Michael Gamazaychikov
|
b3afeb981b
|
ASM #114 - Problem with Distance Speed Tool.
Change-Id: I2b3218b2fb407f99cf9c81edf69feb042a6fee75
Former-commit-id: efd0fb50b8 [formerly e5a9fa0827] [formerly c07bcacbf8] [formerly efd0fb50b8 [formerly e5a9fa0827] [formerly c07bcacbf8] [formerly 50ab77046b [formerly c07bcacbf8 [formerly a38308fa5a6efe9a07ecd84bd93662bea32afc94]]]]
Former-commit-id: 50ab77046b
Former-commit-id: fc5acb6bcb [formerly a2423cfadc] [formerly a99f478987db9b40c18652f3f209154a8dfc3177 [formerly 5efb82ea3e]]
Former-commit-id: 177375df5384d0a8fa51c23b24915e671ade7ce1 [formerly 29e197404f]
Former-commit-id: 94595e6af4
|
2014-06-05 13:43:04 +01:00 |
|
Michael Gamazaychikov
|
63409ef272
|
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 |
|
Michael Gamazaychikov
|
b3d76892d1
|
ASM #114 - Problem with Distance Speed Tool (merge with 13.5.4 changes).
Change-Id: Ic4d6f50c28d0aba440a02010b09b2e3b3117fe85
Former-commit-id: 5bff9f2ac8 [formerly 63409ef272 [formerly f3ee76edfd95e9c25eff89d1ecbff9e466b3ca75]]
Former-commit-id: 63409ef272
Former-commit-id: 8ae5d535de
|
2014-05-21 15:12:08 +01:00 |
|
Michael Gamazaychikov
|
a8672786bf
|
ASM #114 - Problem with Distance Speed Tool (merge with 13.5.4 changes).
Change-Id: Ic4d6f50c28d0aba440a02010b09b2e3b3117fe85
Former-commit-id: b3d76892d1 [formerly 8ae5d535de] [formerly 63409ef272] [formerly b3d76892d1 [formerly 8ae5d535de] [formerly 63409ef272] [formerly 5bff9f2ac8 [formerly 63409ef272 [formerly f3ee76edfd95e9c25eff89d1ecbff9e466b3ca75]]]]
Former-commit-id: 5bff9f2ac8
Former-commit-id: b499ee2828 [formerly 0d38d04dad] [formerly 3f60fc9aefaa49ce841bebfd87ef42af677038af [formerly 134f486069]]
Former-commit-id: de7589ac82c2fe4ab8fce61c3a0e6a30b30502d2 [formerly 55d44735ef]
Former-commit-id: 0217549622
|
2014-05-21 15:12:08 +01:00 |
|
brian.dyke
|
011d121e4b
|
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 |
|
brian.dyke
|
4d161aaf90
|
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: 58683ad040 [formerly 011d121e4b [formerly 52358cb3e2ba2c7ff4ff9c9a5de03af50c3a1199]]
Former-commit-id: 011d121e4b
Former-commit-id: 9626317825
|
2014-05-19 09:45:37 -04:00 |
|
brian.dyke
|
5c9495ee04
|
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: 4d161aaf90 [formerly 9626317825] [formerly 011d121e4b] [formerly 4d161aaf90 [formerly 9626317825] [formerly 011d121e4b] [formerly 58683ad040 [formerly 011d121e4b [formerly 52358cb3e2ba2c7ff4ff9c9a5de03af50c3a1199]]]]
Former-commit-id: 58683ad040
Former-commit-id: a2add51880 [formerly 2e105c1d5d] [formerly cba44a8343721392c8a010e859fb1efaca4b604b [formerly bc4649765a]]
Former-commit-id: 161c7365002f1434a02f072bc8ba71aba3cbf346 [formerly b42011fc76]
Former-commit-id: b2e3c50ec0
|
2014-05-19 09:45:37 -04:00 |
|
Qinglu.Lin
|
18e92f03c1
|
ASM #514 - Line of Storms functionality behaving oddly in WarnGen
Change-Id: I0bd2b9e4200b5acbb19a06caa45f18d36346de39
Former-commit-id: 66a6c50cd501358e0c8c993631b288aa78dfdc97
|
2014-05-05 11:54:56 -04:00 |
|
Qinglu.Lin
|
d3220c8e71
|
ASM #514 - Line of Storms functionality behaving oddly in WarnGen
Change-Id: I0bd2b9e4200b5acbb19a06caa45f18d36346de39
Former-commit-id: d8753a4145 [formerly 18e92f03c1 [formerly 66a6c50cd501358e0c8c993631b288aa78dfdc97]]
Former-commit-id: 18e92f03c1
Former-commit-id: 5f0e0bda69
|
2014-05-05 11:54:56 -04:00 |
|
Qinglu.Lin
|
db716647bb
|
ASM #514 - Line of Storms functionality behaving oddly in WarnGen
Change-Id: I0bd2b9e4200b5acbb19a06caa45f18d36346de39
Former-commit-id: d3220c8e71 [formerly 5f0e0bda69] [formerly 18e92f03c1] [formerly d3220c8e71 [formerly 5f0e0bda69] [formerly 18e92f03c1] [formerly d8753a4145 [formerly 18e92f03c1 [formerly 66a6c50cd501358e0c8c993631b288aa78dfdc97]]]]
Former-commit-id: d8753a4145
Former-commit-id: 153128e11e [formerly 580d7e3ba7] [formerly de233bb13dc17298e3aa8b3e59813a4bc72ebe5a [formerly 8de2d2f718]]
Former-commit-id: 27cacced16ec33e1bb5c01e87c75e6050fffec36 [formerly 6ba15bd00c]
Former-commit-id: 03f7862321
|
2014-05-05 11:54:56 -04:00 |
|
Richard Peter
|
44b1782461
|
Merge branch 'master_14.3.1' (14.3.1-2) into omaha_14.3.1
Conflicts:
cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/CaseCreationDlg.java
cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/GenerateCaseDlg.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
edexOsgi/com.raytheon.edex.utilitysrv/res/spring/utility-request.xml
edexOsgi/com.raytheon.uf.common.colormap/src/com/raytheon/uf/common/colormap/image/Colormapper.java
edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/SerializationUtil.java
edexOsgi/com.raytheon.uf.edex.textdbsrv/res/spring/textdbsrv-request.xml
Change-Id: I316979d4036b2e2d05b361c8c466747b04ee4900
Former-commit-id: 311c52426b3715d3a73c1fa79a8fd427a4b1b09d
|
2014-04-28 16:27:40 -05:00 |
|
Richard Peter
|
8b1a177110
|
Merge branch 'master_14.3.1' (14.3.1-2) into omaha_14.3.1
Conflicts:
cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/CaseCreationDlg.java
cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/GenerateCaseDlg.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
edexOsgi/com.raytheon.edex.utilitysrv/res/spring/utility-request.xml
edexOsgi/com.raytheon.uf.common.colormap/src/com/raytheon/uf/common/colormap/image/Colormapper.java
edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/SerializationUtil.java
edexOsgi/com.raytheon.uf.edex.textdbsrv/res/spring/textdbsrv-request.xml
Change-Id: I316979d4036b2e2d05b361c8c466747b04ee4900
Former-commit-id: 32957285fc [formerly 44b1782461 [formerly 311c52426b3715d3a73c1fa79a8fd427a4b1b09d]]
Former-commit-id: 44b1782461
Former-commit-id: 67683dd891
|
2014-04-28 16:27:40 -05:00 |
|
Richard Peter
|
e748b7c1e5
|
Merge branch 'master_14.3.1' (14.3.1-2) into omaha_14.3.1
Conflicts:
cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/CaseCreationDlg.java
cave/com.raytheon.uf.viz.archive/src/com/raytheon/uf/viz/archive/ui/GenerateCaseDlg.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
edexOsgi/com.raytheon.edex.utilitysrv/res/spring/utility-request.xml
edexOsgi/com.raytheon.uf.common.colormap/src/com/raytheon/uf/common/colormap/image/Colormapper.java
edexOsgi/com.raytheon.uf.common.serialization/src/com/raytheon/uf/common/serialization/SerializationUtil.java
edexOsgi/com.raytheon.uf.edex.textdbsrv/res/spring/textdbsrv-request.xml
Change-Id: I316979d4036b2e2d05b361c8c466747b04ee4900
Former-commit-id: 8b1a177110 [formerly 67683dd891] [formerly 44b1782461] [formerly 8b1a177110 [formerly 67683dd891] [formerly 44b1782461] [formerly 32957285fc [formerly 44b1782461 [formerly 311c52426b3715d3a73c1fa79a8fd427a4b1b09d]]]]
Former-commit-id: 32957285fc
Former-commit-id: 0dfa8cc4c6 [formerly 6966b79246] [formerly 2a324b0264c6962014f41df55690c7e2b09955e1 [formerly 80d4153878]]
Former-commit-id: 5715dc841fc8db519f94f6126094e2ff4eb83ea8 [formerly 24a3fe1466]
Former-commit-id: 938e39a0fc
|
2014-04-28 16:27:40 -05:00 |
|