Lee Venable
0fc85255e4
Merge "Issue #3145 - Fix Scan threat labels, dispose font" into omaha_14.3.1
...
Former-commit-id: bb5cc2c9accd5956d21a364f0d877ae3c6407be3364f0d877ae3c6407be3b06e8e6e3ea46987ef36
2014-05-09 11:14:51 -05:00
Mike Duff
4d00418164
Issue #3145 - Fix Scan threat labels, dispose font
...
Change-Id: I385e184d81a021a350c7df7ee4948ad7e407784d
Former-commit-id: 279dd3dbad158fb46b9f03356dd554a81569849b03356dd554a81569849b4ec26b6e31456038d161
2014-05-09 10:32:04 -05:00
Nate Jensen
f15db04d4f
Merge "Issue #3026 - feature.xml fix" into omaha_14.3.1
...
Former-commit-id: 3330d7e72dd0d20849b6575360192ae8c4279d10575360192ae8c4279d1095ca77688ae0365dd4a3
2014-05-09 09:53:25 -05:00
Mike Duff
b8696720cd
Issue #3026 - feature.xml fix
...
Change-Id: I07d5043a8c968fa841f4e94eee47617e018ea794
Former-commit-id: 53d81818d37e996909d178f2a26903038b2b750078f2a26903038b2b7500c7f5379b78b73e635162
2014-05-09 09:27:10 -05:00
Ben Steffensmeier
ad64b8b197
Issue #2920 Fix default color of BOXED text.
...
Former-commit-id: ee99dba93360479824d187ea43cf0d9d4c33ba9187ea43cf0d9d4c33ba91199a2df79e082a5c515d
2014-05-08 18:18:08 -05:00
Mike Duff
69e7cfa1ed
Issue #3026 - NullPointer fix, test classpath fix
...
Change-Id: Iabc347e51a276fd4c8beb3fd512d928f184767f1
Former-commit-id: 03a2c17f36a6e0ed67d1b23473ee8a335c02d2c6b23473ee8a335c02d2c616a973372e0df3f51c87
2014-05-08 15:02:54 -05:00
Lee Venable
892931b35d
Merge "Issue #2060 fix auto-update errors with grids in non-map displays" into omaha_14.3.1
...
Former-commit-id: b6cd70f862319073a79592517d3ca21496955e4492517d3ca21496955e440b25428b040a45b07910
2014-05-08 14:47:03 -05:00
Mike Duff
3966697849
Issue #3026 - Implement HPE bias source labels on FFMP and volume browser displays
...
Change-Id: Ib17ff7cfcb5efcb1737804800a93ec4f82bc6f13
Former-commit-id: f4062cd2770456fd05978498235fd86a67638a948498235fd86a67638a9470c8135fdef49192936a
2014-05-08 14:36:54 -05:00
Nate Jensen
3084f2db9b
Issue #2060 fix auto-update errors with grids in non-map displays
...
Change-Id: Id99693f6fd54d56a4a1255f7ee5e2308e2f5d9de
Former-commit-id: 71603c231984f9cd1dc83e3035b6f1ecc5c5849f3e3035b6f1ecc5c5849f6c55f4832cd2070f782b
2014-05-08 14:08:06 -05:00
Nate Jensen
1adf6d304f
Merge "Issue #3117 update satellite inventory for new sectors or elements." into omaha_14.3.1
...
Former-commit-id: e93e248f9adaac0701fcd271dfb1a50f1cab916ad271dfb1a50f1cab916a70f70371b189621db281
2014-05-06 17:09:56 -05:00
Ben Steffensmeier
c83559ee61
Issue #3117 update satellite inventory for new sectors or elements.
...
Former-commit-id: 34c4ce1630e70a6999b7bbbf957ba870df0ee87ebbbf957ba870df0ee87e945fe1db2f81916ecdb6
2014-05-06 16:19:58 -05:00
Nate Jensen
baf8e4a3ea
Merge "Issue #3076 added clear all to shared display sessions" into omaha_14.3.1
...
Former-commit-id: 0b046a18e126f47e3b00a5834937118f8ea5d014a5834937118f8ea5d014f1c48f10b14f3570324a
2014-05-06 16:15:41 -05:00
Nate Jensen
e8ca9729eb
Issue #2060 fill in units on GridRecords created from URIs
...
Change-Id: Ic7c1594c1442d8463c5050bdefb434995ffc7f8a
Former-commit-id: 1d38804eb23719c41d2b71b42270617cea97ab1571b42270617cea97ab156bdbfb7e1a5bf1554597
2014-05-06 12:26:21 -05:00
Brian Clements
0fbb5dc22a
Issue #3076 added clear all to shared display sessions
...
Former-commit-id: 02c921ed12729e717be1f545c548cc1432aa1302f545c548cc1432aa13025583c3903b8674841154
2014-05-06 09:30:07 -05:00
Lee Venable
a8864844bb
Issue #3109 - removed code that sets the Cave cursor.
...
Change-Id: I1d6d640c5abafffdea29f1e2e835142fe6598470
Former-commit-id: a57f0e338d550668cbf7a6c2260dd1b0a251f4e3a6c2260dd1b0a251f4e3631a8d3cb1a092fd45dc
2014-05-05 16:13:31 -05:00
Dave Hladky
d9243205e4
Merge branch 'master_14.3.1' (14.3.1-3) into omaha_14.3.1
...
Conflicts:
edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/BandwidthManager.java
edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/EdexBandwidthManager.java
edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/util/BandwidthDaoUtil.java
edexOsgi/com.raytheon.uf.edex.datadelivery.harvester/res/spring/harvester-datadelivery.xml
edexOsgi/com.raytheon.uf.edex.datadelivery.retrieval/src/com/raytheon/uf/edex/datadelivery/retrieval/util/RetrievalGeneratorUtilities.java
Former-commit-id: 7d244313a50ac4de6ad0333bf8b36dccaaa1cfea333bf8b36dccaaa1cfea7611339cd893ca9cfe6a
2014-05-05 12:15:14 -05:00
Nate Jensen
dcbedcbbc0
Merge "Issue #2956 more safety checks" into omaha_14.3.1
...
Former-commit-id: a2607513bff233d104d7e9b3041170d6518bede1e9b3041170d6518bede18ee8937dafe8e971d434
2014-05-05 09:45:11 -05:00
Richard Peter
4537e1276f
Merge "Issue #2956 remove unsafe glMultiDrawArrays(), undo previous change" into omaha_14.3.1
...
Former-commit-id: aeebf173734e1bc16d70478cedd3a3d4a138c534478cedd3a3d4a138c5341b7dd13525160ce06137
2014-05-02 09:50:40 -05:00
Richard Peter
2d597d61ab
Issue #2854 : Pack commons.lang for alertviz
...
Change-Id: Ib6eb59c6cbdb5b52acc051aec4339445fdc14166
Former-commit-id: 36d579c2061738b065b8a9b088146cbcd87195eea9b088146cbcd87195eee1a2767f8f926cd5f6d1
2014-05-01 16:30:21 -05:00
Nate Jensen
9f08442039
Issue #2956 more safety checks
...
Change-Id: I3984fa2b534b16b2e4485e1f66d65f8df48b2e4e
Former-commit-id: 54c6d5d07fd759efcaa8f4d20c41f47d142d9d9df4d20c41f47d142d9d9df3b68178bd6f211aa9f8
2014-05-01 16:28:16 -05:00
Nate Jensen
834dd4895a
Issue #2956 remove unsafe glMultiDrawArrays(), undo previous change
...
Change-Id: I25bd1305568d26940b69565f53a06661955f240b
Former-commit-id: 8d5ec4bb043222914fde137818d03aa73a310709137818d03aa73a31070984dbedcff5b245e49d53
2014-05-01 16:20:35 -05:00
Richard Peter
3297632b5d
Issue #2854 : Fix features.
...
Change-Id: Iab5371d51b5a582387bfd9a8ef8bdd595d1dd0fe
Former-commit-id: c7f5b2363325fd0e03f44056f53fa2a4fb460e174056f53fa2a4fb460e17c3c7ebb146f364f02f58
2014-05-01 14:47:41 -05:00
Steve Harris
9a268173ac
Merge branch 'omaha_14.3.1-NHDA' into omaha_14.3.1
...
Former-commit-id: d2905e51d49ecd871825c8ba70a146779e85cc77c8ba70a146779e85cc77bdf6d0b6be9a6ab8c52f
2014-05-01 13:25:15 -05:00
Brian Clements
8fc0feed89
Issue #2903 changed commons.lang to match other unpacking foss
...
Former-commit-id: eae19ec5ca93912625ea3ca4f8cc52dd5412e1193ca4f8cc52dd5412e1192337d5ef563fd504f1de
2014-05-01 12:34:09 -05:00
Brian Clements
00e7061f42
Issue #2903 set commons.lang to unpack in feature to fix odd bug
...
collaboration gets in a state where commons.lang is no longer found
setting unpack to true might help
Former-commit-id: fe53a23d2cfee0a858cb873efa1c64f45e435f2c873efa1c64f45e435f2cc18752378220830253ba
2014-04-30 17:52:43 -05:00
Richard Peter
9ee5b7c648
Merge "Issue #2992 Updated DD list of active registries Change-Id: Iaef7dc76442d1e101cf9865a542a777afe1722ca" into omaha_14.3.1
...
Former-commit-id: 83658fcbb5d28c4fdbaede9eb6062986ddd480c1de9eb6062986ddd480c16ecb5018b6d961ff6edc
2014-04-30 17:43:50 -05:00
Dave Hladky
5fc17cf3b8
Issue #2992 Updated DD list of active registries
...
Change-Id: Iaef7dc76442d1e101cf9865a542a777afe1722ca
Former-commit-id: a14cb8c45fe2a4bb6755c352643c793b00ae03ccc352643c793b00ae03ccbf42c8d740ea791b5ca5
2014-04-30 17:38:28 -05:00
Richard Peter
307a149bea
Merge "Issue #2946 Fix auxillary purge rules." into omaha_14.3.1-NHDA
...
Former-commit-id: 9e9ff43e1637a5292083f80e16d0c9bfe46bb5e6f80e16d0c9bfe46bb5e68ddc4eaffdf2d07ce35c
2014-04-30 14:49:24 -05:00
Nate Jensen
65ad418a94
Issue #2060 fix FFG processing
...
Change-Id: I2338c4b311e1d660bc53933633c645e07a1687b0
Former-commit-id: acfcaea04e2d19ee46e58cbea21f329b19f95d248cbea21f329b19f95d24a33ca4e3ac9a2c674142
2014-04-30 13:08:26 -05:00
Brian.Dyke
624606c9dd
Merge branch 'master_14.2.2-6' into master_14.3.1 (at 14.3.1-2)
...
Conflicts:
cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/SubscriptionManagerDlg.java
cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/SubscriptionTableComp.java
cave/com.raytheon.uf.viz.datadelivery/src/com/raytheon/uf/viz/datadelivery/subscription/approve/SubscriptionApprovalDlg.java
edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/BandwidthManager.java
edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/EdexBandwidthManager.java
edexOsgi/com.raytheon.uf.edex.datadelivery.bandwidth/src/com/raytheon/uf/edex/datadelivery/bandwidth/util/BandwidthDaoUtil.java
edexOsgi/com.raytheon.uf.edex.datadelivery.registry/src/com/raytheon/uf/edex/datadelivery/registry/web/RegistryDataAccessService.java
edexOsgi/com.raytheon.uf.edex.ogc.registry/src/com/raytheon/uf/edex/ogc/registry/RegistryCollectorAddon.java
Former-commit-id: 2e687fbfb7e56bd61ee6278aab6b6f63137ed69c278aab6b6f63137ed69c8160209e52fcf13ae9f7
2014-04-30 12:57:09 -04:00
Brian.Dyke
fba8753c81
Merge branch 'master_14.2.1' into master_14.2.2
...
Merge (14.2.1-21 into 14.2.2-5)
Former-commit-id: 7364553aeac5e29cc46a35b637c3e2bdda2e9a7a35b637c3e2bdda2e9a7a59f34e3108f8c3dca497
2014-04-29 12:07:21 -04:00
Richard Peter
0dfa8cc4c6
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: 8b1a17711067683dd89144b178246132957285fc44b178246132957285fc80d41538786966b79246
2014-04-28 16:27:40 -05:00
Lee Venable
090ea0fa5a
Issue #3053 - added check for selected items.
...
Change-Id: Iba7dff4291679524b03518790b0e183c3a980934
Former-commit-id: 761101dd50a8ab7f3946573465f316e054a7ab98573465f316e054a7ab9843fdbe9ab6eda26e6076
2014-04-28 15:24:26 -05:00
Ben Steffensmeier
e9bc29a18e
Issue #2947 ensure consistent interpolation levels for derived satellite.
...
Former-commit-id: f4744737e441b0c1a3c8812eebdd72f318c9eb62812eebdd72f318c9eb62868945fb1bbb562c9755
2014-04-28 13:00:39 -05:00
Nate Jensen
8830b4dc71
Merge "Issue #2972 fix thin client startup" into development
...
Former-commit-id: 99612f1324d145961f4c48cab0ae71dc3ba942a948cab0ae71dc3ba942a911a3ae505474e77d307a
2014-04-25 15:05:07 -05:00
Nate Jensen
c7a6389dc5
Issue #2972 fix thin client startup
...
Change-Id: I000da2e3dc289d1441f9df452a9f3e5f39fce5b4
Former-commit-id: f007819a3b7811040f3ed47a09530a86e9502341d47a09530a86e950234127ed7e5dabc802e6a05c
2014-04-25 14:42:07 -05:00
Ben Steffensmeier
5b61473bd6
Issue #2874 Allow RTOFS nowcast to be identified by process type.
...
Former-commit-id: 214311cc6e9478f8adc92d96d9d2dffa3d4bb6182d96d9d2dffa3d4bb6187499987f52080c2a48f3
2014-04-25 14:38:36 -05:00
Brian Clements
922d56617f
Issue #3070 fixed contact request logic when adding to group
...
Former-commit-id: 1dc13cc1515f746c9c5617ab4f6184f1213c1bda17ab4f6184f1213c1bdafe6af8c315ed2d66a6fa
2014-04-25 13:41:17 -05:00
David Gillingham
8db5524b3f
Issue #2897 : Add support for Multi-grid Hurricane Wave Models to D2D and GFE.
...
Change-Id: I66e609d17afcfc900ceaf1b1eed328320d022fbb
Former-commit-id: 777456404bc14497b1b72426e463f76ca193b8e92426e463f76ca193b8e92e8b8c6e8648bc49fd4b
2014-04-25 10:56:43 -05:00
Brian.Dyke
14a63a19e1
Merge branch 'master_14.2.2' into master_14.3.1
...
Merge (14.2.2-5 into 14.3.1-1)
Conflicts:
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/core/internal/GFESpatialDisplayManager.java
edexOsgi/com.raytheon.edex.plugin.gfe/utility/common_static/base/grid/dataset/alias/gfeParamInfo.xml
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py
edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/gfe/isc/iscMosaic.py
edexOsgi/com.raytheon.uf.common.archive/src/com/raytheon/uf/common/archive/config/ArchiveConfigManager.java
edexOsgi/com.raytheon.uf.common.python/utility/common_static/base/python/MasterInterface.py
edexOsgi/com.raytheon.uf.edex.datadelivery.registry/src/com/raytheon/uf/edex/datadelivery/registry/federation/RegistryFederationManager.java
edexOsgi/com.raytheon.uf.edex.registry.ebxml/src/com/raytheon/uf/edex/registry/ebxml/services/lifecycle/LifecycleManagerImpl.java
Former-commit-id: 362d882b40f0b8ea5822fb1f5aa5933524838f9ffb1f5aa5933524838f9f029f5753adbf3758efa3
2014-04-25 11:06:11 -04:00
Richard Peter
d8950196fa
Issue #2726 : Add hooks to stop archiving processes during shutdown.
...
Change-Id: I16a219d8300eae431a8baaf27bcb00707908c67a
Former-commit-id: ee59a298eb5b14b22ee137342cba879a7e1aa9b037342cba879a7e1aa9b0caccf6ca522d1262e41f
2014-04-24 19:11:50 -05:00
Lee Venable
ae2a0c44df
Merge "Issue #3054 - Fix issues in the Fog, SAFESEAS and SNOW Area configuration dialogs." into development
...
Former-commit-id: 4583301be415c9311c97a511f8d4e7e7acb04432a511f8d4e7e7acb0443220d563cd15ae333a34dc
2014-04-24 17:53:05 -05:00
Lee Venable
cd5d582898
Merge "Issue #3045 Change column label to "Data Set"." into development
...
Former-commit-id: e35e76282ffd7a86e187e45c999d479642dac1f1e45c999d479642dac1f1e776e8c3d0059a2f59b5
2014-04-24 17:42:12 -05:00
Roger Ferrel
f88302b94d
Issue #3045 Change column label to "Data Set".
...
Change-Id: I4088fb29fd942ecc07c82e3da24d9561cb3b1b13
Former-commit-id: dd679c79788eb4c91ab33a2a6afaf1cf6d1c8ca13a2a6afaf1cf6d1c8ca10490023b2c555c8cf617
2014-04-24 16:25:01 -05:00
Brian Clements
32b8ddd64c
Issue #3070 fixed contact request handling
...
no longer get empty group if user denies contact request
fixed UI update issue when server removes from your roster
added icon for pending contact request
fixed auto accept reply from users you initiated contact request with
Former-commit-id: 345fe6f866334ad3ca8102f08d75c694aa761e1902f08d75c694aa761e1912304655e884f75ca30a
2014-04-24 16:10:27 -05:00
Roger Ferrel
b511341dc4
Issue #3045 - Change to prevent race conditions while getting table labels.
...
Change-Id: I82d0ab9deaa2b2b89a859fcb76af5d5cd7692120
Former-commit-id: dd86b04686e2b03eb1909dad4c959b2a0a9b53349dad4c959b2a0a9b5334d73f61c7e7ef81949dd1
2014-04-24 14:48:15 -05:00
Slav Korolev
4dca796283
Issue #3054 - Fix issues in the Fog, SAFESEAS and SNOW Area configuration dialogs.
...
Former-commit-id: f39c9c151d150a132320689930c484f458f75ecf689930c484f458f75ecfe78c6edb8c27095ecca8
2014-04-24 15:40:52 -04:00
Brian Clements
363632479a
Issue #2955 ignore duplicate session invites
...
Former-commit-id: 9f18c5d54ce81ee94171f8888196464fa9afc9aef8888196464fa9afc9ae75465b69ed39c2a1ac37
2014-04-24 09:25:54 -05:00
Lee Venable
0c67eecb00
Issue #3040 - Fixed contact request and group name issues.
...
Change-Id: I7a430d4a443bdbcf7951ca9b6047b5cbda88238e
Former-commit-id: e17fa9f609eed8c6cbbadf05a79d63f13ac7e1b9df05a79d63f13ac7e1b9222154d094421a4e4677
2014-04-23 18:24:25 -05:00
Nate Jensen
168283b32c
Issue #2623 remove ecf plugins from being included in cave
...
Change-Id: I2a822440735cee1cc7ef9e556dff3c49ae976d18
Former-commit-id: 692e3de7d0baa671456607fec6a69cecb6b4d0ce07fec6a69cecb6b4d0ce3671e180369bac89c776
2014-04-23 17:29:00 -05:00
