Lee Venable
fb58021364
Merge "Issue #3145 - Fix Scan threat labels, dispose font" into omaha_14.3.1
...
Former-commit-id: cd5956d21a364f0d877acd5956d21a364f0d877ae3c6407be3e3c6407be3a46987ef36b06e8e6e3ed23ba206c9
2014-05-09 11:14:51 -05:00
Mike Duff
e4e8e0fe8e
Issue #3145 - Fix Scan threat labels, dispose font
...
Change-Id: I385e184d81a021a350c7df7ee4948ad7e407784d
Former-commit-id: 158fb46b9f03356dd554158fb46b9f03356dd554a81569849ba81569849b456038d1614ec26b6e3132f6ad40ec
2014-05-09 10:32:04 -05:00
Nate Jensen
db6d756ffd
Merge "Issue #3026 - feature.xml fix" into omaha_14.3.1
...
Former-commit-id: d0d20849b6575360192ad0d20849b6575360192ae8c4279d10e8c4279d10e0365dd4a395ca77688a191d3a0d06
2014-05-09 09:53:25 -05:00
Mike Duff
c984973464
Issue #3026 - feature.xml fix
...
Change-Id: I07d5043a8c968fa841f4e94eee47617e018ea794
Former-commit-id: 7e996909d178f2a269037e996909d178f2a26903038b2b7500038b2b7500b73e635162c7f5379b7825638a5b40
2014-05-09 09:27:10 -05:00
Ben Steffensmeier
f0c4cc03a0
Issue #2920 Fix default color of BOXED text.
...
Former-commit-id: 60479824d187ea43cf0d60479824d187ea43cf0d9d4c33ba919d4c33ba91082a5c515d199a2df79e2b4d783fd7
2014-05-08 18:18:08 -05:00
Mike Duff
718fc22e25
Issue #3026 - NullPointer fix, test classpath fix
...
Change-Id: Iabc347e51a276fd4c8beb3fd512d928f184767f1
Former-commit-id: a6e0ed67d1b23473ee8aa6e0ed67d1b23473ee8a335c02d2c6335c02d2c60df3f51c8716a973372e1dc95cf8de
2014-05-08 15:02:54 -05:00
Lee Venable
70e31865be
Merge "Issue #2060 fix auto-update errors with grids in non-map displays" into omaha_14.3.1
...
Former-commit-id: 319073a79592517d3ca2319073a79592517d3ca21496955e441496955e440a45b079100b25428b040075d2a450
2014-05-08 14:47:03 -05:00
Mike Duff
4adf657556
Issue #3026 - Implement HPE bias source labels on FFMP and volume browser displays
...
Change-Id: Ib17ff7cfcb5efcb1737804800a93ec4f82bc6f13
Former-commit-id: 0456fd05978498235fd80456fd05978498235fd86a67638a946a67638a94f49192936a70c8135fde916d90ee64
2014-05-08 14:36:54 -05:00
Nate Jensen
1dc7cc875e
Issue #2060 fix auto-update errors with grids in non-map displays
...
Change-Id: Id99693f6fd54d56a4a1255f7ee5e2308e2f5d9de
Former-commit-id: 84f9cd1dc83e3035b6f184f9cd1dc83e3035b6f1ecc5c5849fecc5c5849fd2070f782b6c55f4832c93f71ec65c
2014-05-08 14:08:06 -05:00
Nate Jensen
76750c319a
Merge "Issue #3117 update satellite inventory for new sectors or elements." into omaha_14.3.1
...
Former-commit-id: daac0701fcd271dfb1a5daac0701fcd271dfb1a50f1cab916a0f1cab916a89621db28170f70371b112f88d14bf
2014-05-06 17:09:56 -05:00
Ben Steffensmeier
b978e0fc1d
Issue #3117 update satellite inventory for new sectors or elements.
...
Former-commit-id: e70a6999b7bbbf957ba8e70a6999b7bbbf957ba870df0ee87e70df0ee87e81916ecdb6945fe1db2fa39b05ac71
2014-05-06 16:19:58 -05:00
Nate Jensen
3aa1481c98
Merge "Issue #3076 added clear all to shared display sessions" into omaha_14.3.1
...
Former-commit-id: 26f47e3b00a58349371126f47e3b00a5834937118f8ea5d0148f8ea5d0144f3570324af1c48f10b1a20245a64d
2014-05-06 16:15:41 -05:00
Nate Jensen
ad7a69f2e3
Issue #2060 fill in units on GridRecords created from URIs
...
Change-Id: Ic7c1594c1442d8463c5050bdefb434995ffc7f8a
Former-commit-id: 3719c41d2b71b42270613719c41d2b71b42270617cea97ab157cea97ab155bf15545976bdbfb7e1a66cd43313a
2014-05-06 12:26:21 -05:00
Brian Clements
89f3a0a1d2
Issue #3076 added clear all to shared display sessions
...
Former-commit-id: 729e717be1f545c548cc729e717be1f545c548cc1432aa13021432aa130286748411545583c3903b3a60b0db05
2014-05-06 09:30:07 -05:00
Lee Venable
46eb74e982
Issue #3109 - removed code that sets the Cave cursor.
...
Change-Id: I1d6d640c5abafffdea29f1e2e835142fe6598470
Former-commit-id: 550668cbf7a6c2260dd1550668cbf7a6c2260dd1b0a251f4e3b0a251f4e3a092fd45dc631a8d3cb1f48d571cb6
2014-05-05 16:13:31 -05:00
Dave Hladky
7e763a5a22
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: 0ac4de6ad0333bf8b36d0ac4de6ad0333bf8b36dccaaa1cfeaccaaa1cfea93ca9cfe6a7611339cd8cb94f9fc97
2014-05-05 12:15:14 -05:00
Nate Jensen
3eaaf56f8e
Merge "Issue #2956 more safety checks" into omaha_14.3.1
...
Former-commit-id: f233d104d7e9b3041170f233d104d7e9b3041170d6518bede1d6518bede1e8e971d4348ee8937dafe8b7cec960
2014-05-05 09:45:11 -05:00
Richard Peter
7481634fdb
Merge "Issue #2956 remove unsafe glMultiDrawArrays(), undo previous change" into omaha_14.3.1
...
Former-commit-id: 4e1bc16d70478cedd3a34e1bc16d70478cedd3a3d4a138c534d4a138c534160ce061371b7dd1352567eb0867ea
2014-05-02 09:50:40 -05:00
Richard Peter
338b2c53d0
Issue #2854 : Pack commons.lang for alertviz
...
Change-Id: Ib6eb59c6cbdb5b52acc051aec4339445fdc14166
Former-commit-id: 1738b065b8a9b088146c1738b065b8a9b088146cbcd87195eebcd87195ee926cd5f6d1e1a2767f8fdf422d1516
2014-05-01 16:30:21 -05:00
Nate Jensen
42a27546f9
Issue #2956 more safety checks
...
Change-Id: I3984fa2b534b16b2e4485e1f66d65f8df48b2e4e
Former-commit-id: d759efcaa8f4d20c41f4d759efcaa8f4d20c41f47d142d9d9d7d142d9d9d6f211aa9f8f3b68178bd3f9a33bf35
2014-05-01 16:28:16 -05:00
Nate Jensen
562a70b8fb
Issue #2956 remove unsafe glMultiDrawArrays(), undo previous change
...
Change-Id: I25bd1305568d26940b69565f53a06661955f240b
Former-commit-id: 3222914fde137818d03a3222914fde137818d03aa73a310709a73a310709b245e49d5384dbedcff5c7ddb6d476
2014-05-01 16:20:35 -05:00
Richard Peter
b8bdced87a
Issue #2854 : Fix features.
...
Change-Id: Iab5371d51b5a582387bfd9a8ef8bdd595d1dd0fe
Former-commit-id: 25fd0e03f44056f53fa225fd0e03f44056f53fa2a4fb460e17a4fb460e17f364f02f58c3c7ebb146472077fbd5
2014-05-01 14:47:41 -05:00
Steve Harris
523cf536e2
Merge branch 'omaha_14.3.1-NHDA' into omaha_14.3.1
...
Former-commit-id: 9ecd871825c8ba70a1469ecd871825c8ba70a146779e85cc77779e85cc779a6ab8c52fbdf6d0b6bed7c31fe4a9
2014-05-01 13:25:15 -05:00
Brian Clements
36b2419ff1
Issue #2903 changed commons.lang to match other unpacking foss
...
Former-commit-id: 93912625ea3ca4f8cc5293912625ea3ca4f8cc52dd5412e119dd5412e1193fd504f1de2337d5ef56c7cea4b5f7
2014-05-01 12:34:09 -05:00
Brian Clements
4c1a6b44c8
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: fee0a858cb873efa1c64fee0a858cb873efa1c64f45e435f2cf45e435f2c20830253bac187523782c3d2b4be86
2014-04-30 17:52:43 -05:00
Richard Peter
cfb980db11
Merge "Issue #2992 Updated DD list of active registries Change-Id: Iaef7dc76442d1e101cf9865a542a777afe1722ca" into omaha_14.3.1
...
Former-commit-id: d28c4fdbaede9eb60629d28c4fdbaede9eb6062986ddd480c186ddd480c1d961ff6edc6ecb5018b6dd54408a10
2014-04-30 17:43:50 -05:00
Dave Hladky
a06db5a4e7
Issue #2992 Updated DD list of active registries
...
Change-Id: Iaef7dc76442d1e101cf9865a542a777afe1722ca
Former-commit-id: e2a4bb6755c352643c79e2a4bb6755c352643c793b00ae03cc3b00ae03ccea791b5ca5bf42c8d7405b11e45636
2014-04-30 17:38:28 -05:00
Richard Peter
fe5fe5b587
Merge "Issue #2946 Fix auxillary purge rules." into omaha_14.3.1-NHDA
...
Former-commit-id: 37a5292083f80e16d0c937a5292083f80e16d0c9bfe46bb5e6bfe46bb5e6f2d07ce35c8ddc4eaffd5d18fbe5d3
2014-04-30 14:49:24 -05:00
Nate Jensen
eb5dd811ca
Issue #2060 fix FFG processing
...
Change-Id: I2338c4b311e1d660bc53933633c645e07a1687b0
Former-commit-id: 2d19ee46e58cbea21f322d19ee46e58cbea21f329b19f95d249b19f95d249a2c674142a33ca4e3ac58618a1842
2014-04-30 13:08:26 -05:00
Brian.Dyke
f16c305ae4
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: e56bd61ee6278aab6b6fe56bd61ee6278aab6b6f63137ed69c63137ed69cfcf13ae9f78160209e525d31c9ec9a
2014-04-30 12:57:09 -04:00
Brian.Dyke
1aec51b7c4
Merge branch 'master_14.2.1' into master_14.2.2
...
Merge (14.2.1-21 into 14.2.2-5)
Former-commit-id: c5e29cc46a35b637c3e2c5e29cc46a35b637c3e2bdda2e9a7abdda2e9a7af8c3dca49759f34e310885bf52ef22
2014-04-29 12:07:21 -04:00
Richard Peter
938e39a0fc
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: 67683dd89144b178246167683dd89144b178246132957285fc32957285fc6966b7924680d415387824a3fe1466
2014-04-28 16:27:40 -05:00
Lee Venable
3a133f6626
Issue #3053 - added check for selected items.
...
Change-Id: Iba7dff4291679524b03518790b0e183c3a980934
Former-commit-id: a8ab7f3946573465f316a8ab7f3946573465f316e054a7ab98e054a7ab98eda26e607643fdbe9ab6ede8740acc
2014-04-28 15:24:26 -05:00
Ben Steffensmeier
c59046cda1
Issue #2947 ensure consistent interpolation levels for derived satellite.
...
Former-commit-id: 41b0c1a3c8812eebdd7241b0c1a3c8812eebdd72f318c9eb62f318c9eb62bb562c9755868945fb1b40e3df3ba1
2014-04-28 13:00:39 -05:00
Nate Jensen
d2bfcfa53b
Merge "Issue #2972 fix thin client startup" into development
...
Former-commit-id: d145961f4c48cab0ae71d145961f4c48cab0ae71dc3ba942a9dc3ba942a974e77d307a11a3ae5054195db736e8
2014-04-25 15:05:07 -05:00
Nate Jensen
4b6db92b9f
Issue #2972 fix thin client startup
...
Change-Id: I000da2e3dc289d1441f9df452a9f3e5f39fce5b4
Former-commit-id: 7811040f3ed47a09530a7811040f3ed47a09530a86e950234186e9502341c802e6a05c27ed7e5dabce3c2c1341
2014-04-25 14:42:07 -05:00
Ben Steffensmeier
1bb8ce2cbe
Issue #2874 Allow RTOFS nowcast to be identified by process type.
...
Former-commit-id: 9478f8adc92d96d9d2df9478f8adc92d96d9d2dffa3d4bb618fa3d4bb618080c2a48f37499987f5286174019b5
2014-04-25 14:38:36 -05:00
Brian Clements
eb318a9a0d
Issue #3070 fixed contact request logic when adding to group
...
Former-commit-id: 5f746c9c5617ab4f61845f746c9c5617ab4f6184f1213c1bdaf1213c1bdaed2d66a6fafe6af8c315edaaa9a426
2014-04-25 13:41:17 -05:00
David Gillingham
83674f8444
Issue #2897 : Add support for Multi-grid Hurricane Wave Models to D2D and GFE.
...
Change-Id: I66e609d17afcfc900ceaf1b1eed328320d022fbb
Former-commit-id: c14497b1b72426e463f7c14497b1b72426e463f76ca193b8e96ca193b8e948bc49fd4b2e8b8c6e86c0fd32360d
2014-04-25 10:56:43 -05:00
Brian.Dyke
f31d8cc8cf
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: f0b8ea5822fb1f5aa593f0b8ea5822fb1f5aa5933524838f9f3524838f9fbf3758efa3029f5753adc6d3fe6952
2014-04-25 11:06:11 -04:00
Richard Peter
dcd2468bee
Issue #2726 : Add hooks to stop archiving processes during shutdown.
...
Change-Id: I16a219d8300eae431a8baaf27bcb00707908c67a
Former-commit-id: 5b14b22ee137342cba875b14b22ee137342cba879a7e1aa9b09a7e1aa9b02d1262e41fcaccf6ca52b234142252
2014-04-24 19:11:50 -05:00
Lee Venable
9bbc3844f9
Merge "Issue #3054 - Fix issues in the Fog, SAFESEAS and SNOW Area configuration dialogs." into development
...
Former-commit-id: 15c9311c97a511f8d4e715c9311c97a511f8d4e7e7acb04432e7acb04432ae333a34dc20d563cd1540e1bbc5f1
2014-04-24 17:53:05 -05:00
Lee Venable
70465fb1bd
Merge "Issue #3045 Change column label to "Data Set"." into development
...
Former-commit-id: fd7a86e187e45c999d47fd7a86e187e45c999d479642dac1f19642dac1f1059a2f59b5e776e8c3d0890891c1b5
2014-04-24 17:42:12 -05:00
Roger Ferrel
0ece281810
Issue #3045 Change column label to "Data Set".
...
Change-Id: I4088fb29fd942ecc07c82e3da24d9561cb3b1b13
Former-commit-id: 8eb4c91ab33a2a6afaf18eb4c91ab33a2a6afaf1cf6d1c8ca1cf6d1c8ca1555c8cf6170490023b2c3d744452af
2014-04-24 16:25:01 -05:00
Brian Clements
670c4e1611
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: 334ad3ca8102f08d75c6334ad3ca8102f08d75c694aa761e1994aa761e1984f75ca30a12304655e8c27f2d9e53
2014-04-24 16:10:27 -05:00
Roger Ferrel
5fda70501e
Issue #3045 - Change to prevent race conditions while getting table labels.
...
Change-Id: I82d0ab9deaa2b2b89a859fcb76af5d5cd7692120
Former-commit-id: e2b03eb1909dad4c959be2b03eb1909dad4c959b2a0a9b53342a0a9b5334ef81949dd1d73f61c7e7ca30aa6b8a
2014-04-24 14:48:15 -05:00
Slav Korolev
cd38f3636d
Issue #3054 - Fix issues in the Fog, SAFESEAS and SNOW Area configuration dialogs.
...
Former-commit-id: 150a132320689930c484150a132320689930c484f458f75ecff458f75ecf27095ecca8e78c6edb8c1bf6d72572
2014-04-24 15:40:52 -04:00
Brian Clements
9e2497714b
Issue #2955 ignore duplicate session invites
...
Former-commit-id: e81ee94171f888819646e81ee94171f8888196464fa9afc9ae4fa9afc9ae39c2a1ac3775465b69ed3b96c4c628
2014-04-24 09:25:54 -05:00
Lee Venable
6c54817117
Issue #3040 - Fixed contact request and group name issues.
...
Change-Id: I7a430d4a443bdbcf7951ca9b6047b5cbda88238e
Former-commit-id: eed8c6cbbadf05a79d63eed8c6cbbadf05a79d63f13ac7e1b9f13ac7e1b9421a4e4677222154d094e81836e371
2014-04-23 18:24:25 -05:00
Nate Jensen
e0b54d7b7a
Issue #2623 remove ecf plugins from being included in cave
...
Change-Id: I2a822440735cee1cc7ef9e556dff3c49ae976d18
Former-commit-id: baa671456607fec6a69cbaa671456607fec6a69cecb6b4d0ceecb6b4d0ce9bac89c7763671e1803691b8d9b72b
2014-04-23 17:29:00 -05:00
