Commit graph

3108 commits

Author SHA1 Message Date
Nate Jensen
ad7a69f2e3 Issue #2060 fill in units on GridRecords created from URIs
Change-Id: Ic7c1594c1442d8463c5050bdefb434995ffc7f8a

Former-commit-id: 3719c41d2b [formerly 71b4227061] [formerly 3719c41d2b [formerly 71b4227061] [formerly 7cea97ab15 [formerly 949d132cf3260db5f75ea665f21601ab91440958]]]
Former-commit-id: 7cea97ab15
Former-commit-id: 5bf1554597 [formerly 6bdbfb7e1a]
Former-commit-id: 66cd43313a
2014-05-06 12:26:21 -05:00
Lee Venable
46eb74e982 Issue #3109 - removed code that sets the Cave cursor.
Change-Id: I1d6d640c5abafffdea29f1e2e835142fe6598470

Former-commit-id: 550668cbf7 [formerly a6c2260dd1] [formerly 550668cbf7 [formerly a6c2260dd1] [formerly b0a251f4e3 [formerly d875f73ff44986b2c7862f0dee06504d576fd96b]]]
Former-commit-id: b0a251f4e3
Former-commit-id: a092fd45dc [formerly 631a8d3cb1]
Former-commit-id: f48d571cb6
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: 0ac4de6ad0 [formerly 333bf8b36d] [formerly 0ac4de6ad0 [formerly 333bf8b36d] [formerly ccaaa1cfea [formerly 2e5ee5565d1847490e46c59866b14f77555e2a7e]]]
Former-commit-id: ccaaa1cfea
Former-commit-id: 93ca9cfe6a [formerly 7611339cd8]
Former-commit-id: cb94f9fc97
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: f233d104d7 [formerly e9b3041170] [formerly f233d104d7 [formerly e9b3041170] [formerly d6518bede1 [formerly c4d06eea732629d5fac66593269ec82b9ee6463d]]]
Former-commit-id: d6518bede1
Former-commit-id: e8e971d434 [formerly 8ee8937daf]
Former-commit-id: e8b7cec960
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: 4e1bc16d70 [formerly 478cedd3a3] [formerly 4e1bc16d70 [formerly 478cedd3a3] [formerly d4a138c534 [formerly f124cee1070a3dd0e09cb54f773f63095f18bd16]]]
Former-commit-id: d4a138c534
Former-commit-id: 160ce06137 [formerly 1b7dd13525]
Former-commit-id: 67eb0867ea
2014-05-02 09:50:40 -05:00
Richard Peter
338b2c53d0 Issue #2854: Pack commons.lang for alertviz
Change-Id: Ib6eb59c6cbdb5b52acc051aec4339445fdc14166

Former-commit-id: 1738b065b8 [formerly a9b088146c] [formerly 1738b065b8 [formerly a9b088146c] [formerly bcd87195ee [formerly 7d69b9fdc60b0c07121eab0119cf45b1624653cd]]]
Former-commit-id: bcd87195ee
Former-commit-id: 926cd5f6d1 [formerly e1a2767f8f]
Former-commit-id: df422d1516
2014-05-01 16:30:21 -05:00
Nate Jensen
42a27546f9 Issue #2956 more safety checks
Change-Id: I3984fa2b534b16b2e4485e1f66d65f8df48b2e4e

Former-commit-id: d759efcaa8 [formerly f4d20c41f4] [formerly d759efcaa8 [formerly f4d20c41f4] [formerly 7d142d9d9d [formerly a24190f35b87351a5f699ac05041bec7a13a1cdb]]]
Former-commit-id: 7d142d9d9d
Former-commit-id: 6f211aa9f8 [formerly f3b68178bd]
Former-commit-id: 3f9a33bf35
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: 3222914fde [formerly 137818d03a] [formerly 3222914fde [formerly 137818d03a] [formerly a73a310709 [formerly 6f8ef50f7cf8f245f749bf8ff9dbcc33a1d64d64]]]
Former-commit-id: a73a310709
Former-commit-id: b245e49d53 [formerly 84dbedcff5]
Former-commit-id: c7ddb6d476
2014-05-01 16:20:35 -05:00
Richard Peter
b8bdced87a Issue #2854: Fix features.
Change-Id: Iab5371d51b5a582387bfd9a8ef8bdd595d1dd0fe

Former-commit-id: 25fd0e03f4 [formerly 4056f53fa2] [formerly 25fd0e03f4 [formerly 4056f53fa2] [formerly a4fb460e17 [formerly 0d675fd5b0fdb0adceef0052adaf31c1c9a7911b]]]
Former-commit-id: a4fb460e17
Former-commit-id: f364f02f58 [formerly c3c7ebb146]
Former-commit-id: 472077fbd5
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: 9ecd871825 [formerly c8ba70a146] [formerly 9ecd871825 [formerly c8ba70a146] [formerly 779e85cc77 [formerly 36d5942b4a7f1df9b69388b40d0f6c866d9d30b8]]]
Former-commit-id: 779e85cc77
Former-commit-id: 9a6ab8c52f [formerly bdf6d0b6be]
Former-commit-id: d7c31fe4a9
2014-05-01 13:25:15 -05:00
Brian Clements
36b2419ff1 Issue #2903 changed commons.lang to match other unpacking foss
Former-commit-id: 93912625ea [formerly 3ca4f8cc52] [formerly 93912625ea [formerly 3ca4f8cc52] [formerly dd5412e119 [formerly ee24eaf54704dcfdf698089a8269e055f7856c80]]]
Former-commit-id: dd5412e119
Former-commit-id: 3fd504f1de [formerly 2337d5ef56]
Former-commit-id: c7cea4b5f7
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: fee0a858cb [formerly 873efa1c64] [formerly fee0a858cb [formerly 873efa1c64] [formerly f45e435f2c [formerly b27a714c2cbdf2f13eb0c494ace4cbd016ef8132]]]
Former-commit-id: f45e435f2c
Former-commit-id: 20830253ba [formerly c187523782]
Former-commit-id: c3d2b4be86
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: d28c4fdbae [formerly de9eb60629] [formerly d28c4fdbae [formerly de9eb60629] [formerly 86ddd480c1 [formerly 4e6364a24d5f9354946455218cc394fbda4a11ed]]]
Former-commit-id: 86ddd480c1
Former-commit-id: d961ff6edc [formerly 6ecb5018b6]
Former-commit-id: dd54408a10
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: e2a4bb6755 [formerly c352643c79] [formerly e2a4bb6755 [formerly c352643c79] [formerly 3b00ae03cc [formerly a34955102d1316135c4151210daba0e5807ff6c9]]]
Former-commit-id: 3b00ae03cc
Former-commit-id: ea791b5ca5 [formerly bf42c8d740]
Former-commit-id: 5b11e45636
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: 37a5292083 [formerly f80e16d0c9] [formerly 37a5292083 [formerly f80e16d0c9] [formerly bfe46bb5e6 [formerly 31d75a4b82413b015353055668defab0095ef893]]]
Former-commit-id: bfe46bb5e6
Former-commit-id: f2d07ce35c [formerly 8ddc4eaffd]
Former-commit-id: 5d18fbe5d3
2014-04-30 14:49:24 -05:00
Nate Jensen
eb5dd811ca Issue #2060 fix FFG processing
Change-Id: I2338c4b311e1d660bc53933633c645e07a1687b0

Former-commit-id: 2d19ee46e5 [formerly 8cbea21f32] [formerly 2d19ee46e5 [formerly 8cbea21f32] [formerly 9b19f95d24 [formerly 14ce9854abc51b2791b5f93756ae12cbe69b8589]]]
Former-commit-id: 9b19f95d24
Former-commit-id: 9a2c674142 [formerly a33ca4e3ac]
Former-commit-id: 58618a1842
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: e56bd61ee6 [formerly 278aab6b6f] [formerly e56bd61ee6 [formerly 278aab6b6f] [formerly 63137ed69c [formerly 64c3766ed570885a796f846b889d40413e8250c6]]]
Former-commit-id: 63137ed69c
Former-commit-id: fcf13ae9f7 [formerly 8160209e52]
Former-commit-id: 5d31c9ec9a
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: c5e29cc46a [formerly 35b637c3e2] [formerly c5e29cc46a [formerly 35b637c3e2] [formerly bdda2e9a7a [formerly 9a017e543fc6be9fd0d7b9361bd2226bf2af6211]]]
Former-commit-id: bdda2e9a7a
Former-commit-id: f8c3dca497 [formerly 59f34e3108]
Former-commit-id: 85bf52ef22
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: 67683dd891 [formerly 44b1782461] [formerly 67683dd891 [formerly 44b1782461] [formerly 32957285fc [formerly 311c52426b3715d3a73c1fa79a8fd427a4b1b09d]]]
Former-commit-id: 32957285fc
Former-commit-id: 6966b79246 [formerly 80d4153878]
Former-commit-id: 24a3fe1466
2014-04-28 16:27:40 -05:00
Lee Venable
3a133f6626 Issue #3053 - added check for selected items.
Change-Id: Iba7dff4291679524b03518790b0e183c3a980934

Former-commit-id: a8ab7f3946 [formerly 573465f316] [formerly a8ab7f3946 [formerly 573465f316] [formerly e054a7ab98 [formerly ca47394d9578aac17d1696bd78c0fbcee5fe3f8f]]]
Former-commit-id: e054a7ab98
Former-commit-id: eda26e6076 [formerly 43fdbe9ab6]
Former-commit-id: ede8740acc
2014-04-28 15:24:26 -05:00
Ben Steffensmeier
c59046cda1 Issue #2947 ensure consistent interpolation levels for derived satellite.
Former-commit-id: 41b0c1a3c8 [formerly 812eebdd72] [formerly 41b0c1a3c8 [formerly 812eebdd72] [formerly f318c9eb62 [formerly 33d87894c4385cb8f6982c1833f6956fd60d7368]]]
Former-commit-id: f318c9eb62
Former-commit-id: bb562c9755 [formerly 868945fb1b]
Former-commit-id: 40e3df3ba1
2014-04-28 13:00:39 -05:00
Nate Jensen
d2bfcfa53b Merge "Issue #2972 fix thin client startup" into development
Former-commit-id: d145961f4c [formerly 48cab0ae71] [formerly d145961f4c [formerly 48cab0ae71] [formerly dc3ba942a9 [formerly 8cb26c62f4ea421f3ab769561ae62a646cad2f4a]]]
Former-commit-id: dc3ba942a9
Former-commit-id: 74e77d307a [formerly 11a3ae5054]
Former-commit-id: 195db736e8
2014-04-25 15:05:07 -05:00
Nate Jensen
4b6db92b9f Issue #2972 fix thin client startup
Change-Id: I000da2e3dc289d1441f9df452a9f3e5f39fce5b4

Former-commit-id: 7811040f3e [formerly d47a09530a] [formerly 7811040f3e [formerly d47a09530a] [formerly 86e9502341 [formerly 0b72fe025d46b92c125a1e36651b966bf9f00481]]]
Former-commit-id: 86e9502341
Former-commit-id: c802e6a05c [formerly 27ed7e5dab]
Former-commit-id: ce3c2c1341
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: 9478f8adc9 [formerly 2d96d9d2df] [formerly 9478f8adc9 [formerly 2d96d9d2df] [formerly fa3d4bb618 [formerly 1e430dd1227f2e368a7da21d116677a3b522d5ed]]]
Former-commit-id: fa3d4bb618
Former-commit-id: 080c2a48f3 [formerly 7499987f52]
Former-commit-id: 86174019b5
2014-04-25 14:38:36 -05:00
Brian Clements
eb318a9a0d Issue #3070 fixed contact request logic when adding to group
Former-commit-id: 5f746c9c56 [formerly 17ab4f6184] [formerly 5f746c9c56 [formerly 17ab4f6184] [formerly f1213c1bda [formerly 57120491452b36bf15227bd4b6d0236221c71124]]]
Former-commit-id: f1213c1bda
Former-commit-id: ed2d66a6fa [formerly fe6af8c315]
Former-commit-id: edaaa9a426
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: c14497b1b7 [formerly 2426e463f7] [formerly c14497b1b7 [formerly 2426e463f7] [formerly 6ca193b8e9 [formerly 33197dc6708b65e85233b51be1e99e6411ece60f]]]
Former-commit-id: 6ca193b8e9
Former-commit-id: 48bc49fd4b [formerly 2e8b8c6e86]
Former-commit-id: c0fd32360d
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: f0b8ea5822 [formerly fb1f5aa593] [formerly f0b8ea5822 [formerly fb1f5aa593] [formerly 3524838f9f [formerly f54d2c639a915db14f01f56a7fcc5841b60e1509]]]
Former-commit-id: 3524838f9f
Former-commit-id: bf3758efa3 [formerly 029f5753ad]
Former-commit-id: c6d3fe6952
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: 5b14b22ee1 [formerly 37342cba87] [formerly 5b14b22ee1 [formerly 37342cba87] [formerly 9a7e1aa9b0 [formerly 75ec73e02885fe0f646bc8961f3ea876597abab9]]]
Former-commit-id: 9a7e1aa9b0
Former-commit-id: 2d1262e41f [formerly caccf6ca52]
Former-commit-id: b234142252
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: 15c9311c97 [formerly a511f8d4e7] [formerly 15c9311c97 [formerly a511f8d4e7] [formerly e7acb04432 [formerly 9762326cea40526042cd7f371d864a96abd63842]]]
Former-commit-id: e7acb04432
Former-commit-id: ae333a34dc [formerly 20d563cd15]
Former-commit-id: 40e1bbc5f1
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: fd7a86e187 [formerly e45c999d47] [formerly fd7a86e187 [formerly e45c999d47] [formerly 9642dac1f1 [formerly cd77697623d93188b703d2813cbda8af53dbebc7]]]
Former-commit-id: 9642dac1f1
Former-commit-id: 059a2f59b5 [formerly e776e8c3d0]
Former-commit-id: 890891c1b5
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: 8eb4c91ab3 [formerly 3a2a6afaf1] [formerly 8eb4c91ab3 [formerly 3a2a6afaf1] [formerly cf6d1c8ca1 [formerly f00ce42d8e79ef47d9b14125dc61129fc60fc0cf]]]
Former-commit-id: cf6d1c8ca1
Former-commit-id: 555c8cf617 [formerly 0490023b2c]
Former-commit-id: 3d744452af
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: 334ad3ca81 [formerly 02f08d75c6] [formerly 334ad3ca81 [formerly 02f08d75c6] [formerly 94aa761e19 [formerly 01e773fb9d4ec8b0ab75ddf714b79debb9ad4096]]]
Former-commit-id: 94aa761e19
Former-commit-id: 84f75ca30a [formerly 12304655e8]
Former-commit-id: c27f2d9e53
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: e2b03eb190 [formerly 9dad4c959b] [formerly e2b03eb190 [formerly 9dad4c959b] [formerly 2a0a9b5334 [formerly 17a06743e41fe6bf15a895d9842bb51d99901602]]]
Former-commit-id: 2a0a9b5334
Former-commit-id: ef81949dd1 [formerly d73f61c7e7]
Former-commit-id: ca30aa6b8a
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: 150a132320 [formerly 689930c484] [formerly 150a132320 [formerly 689930c484] [formerly f458f75ecf [formerly 879a50a60209abf95752c178a0266cdd42bde012]]]
Former-commit-id: f458f75ecf
Former-commit-id: 27095ecca8 [formerly e78c6edb8c]
Former-commit-id: 1bf6d72572
2014-04-24 15:40:52 -04:00
Brian Clements
9e2497714b Issue #2955 ignore duplicate session invites
Former-commit-id: e81ee94171 [formerly f888819646] [formerly e81ee94171 [formerly f888819646] [formerly 4fa9afc9ae [formerly a48b12b8aaeea250680c0726f72425eac170ecd7]]]
Former-commit-id: 4fa9afc9ae
Former-commit-id: 39c2a1ac37 [formerly 75465b69ed]
Former-commit-id: 3b96c4c628
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: eed8c6cbba [formerly df05a79d63] [formerly eed8c6cbba [formerly df05a79d63] [formerly f13ac7e1b9 [formerly badc9fa46aebe7f7da25c3a115294a37b30aa507]]]
Former-commit-id: f13ac7e1b9
Former-commit-id: 421a4e4677 [formerly 222154d094]
Former-commit-id: e81836e371
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: baa6714566 [formerly 07fec6a69c] [formerly baa6714566 [formerly 07fec6a69c] [formerly ecb6b4d0ce [formerly 98e3e2137ecb9ce14f8dfd295791a79a897867a2]]]
Former-commit-id: ecb6b4d0ce
Former-commit-id: 9bac89c776 [formerly 3671e18036]
Former-commit-id: 91b8d9b72b
2014-04-23 17:29:00 -05:00
Richard Peter
4a7642c44e Merge "Issue #2947 Fixes for derived products with multiple records per frame." into development
Former-commit-id: 99036341f3 [formerly 026575b202] [formerly 99036341f3 [formerly 026575b202] [formerly e10434a727 [formerly 820dfe6db6a1a7abf3c753aebe3d51ead31cd3cc]]]
Former-commit-id: e10434a727
Former-commit-id: 4d2ee42fc9 [formerly b4226666be]
Former-commit-id: bf8b504942
2014-04-23 17:25:25 -05:00
Ben Steffensmeier
fbb4703fe3 Issue #2947 Fixes for derived products with multiple records per frame.
Former-commit-id: c6fc0fd4b1 [formerly c19d52db72] [formerly c6fc0fd4b1 [formerly c19d52db72] [formerly 01fc21b6f2 [formerly f47911308acb9d0a90304233da304bdbd0d002e4]]]
Former-commit-id: 01fc21b6f2
Former-commit-id: e3e78283dd [formerly 0cde4689fa]
Former-commit-id: bae8296507
2014-04-23 17:14:02 -05:00
Ron Anderson
dd5c3bf2fd Issue #3006 Fixed GetPointDataHandler to handle grids longer than 1 hour.
Fixed Wx parsing for AvnFPS

Change-Id: I34286a7cc46f6116aaa4026d22fd41223cc16f73

Former-commit-id: 2f68fb8f2c [formerly 221a06e467] [formerly 2f68fb8f2c [formerly 221a06e467] [formerly f3185dd206 [formerly e636563052042d2dbfab6a4e476b71004b28c165]]]
Former-commit-id: f3185dd206
Former-commit-id: 00f2f374cd [formerly 3e37419dc6]
Former-commit-id: 78ef1d5c4c
2014-04-23 17:04:16 -05:00
Nate Jensen
61eca0980f Merge "Issue #2822 shared display invitations always go to cave" into development
Former-commit-id: 827112349a [formerly ad6e4712d6] [formerly 827112349a [formerly ad6e4712d6] [formerly 2b20cf5440 [formerly 2a61b602d55922e5b7f5002f794449880c2cc1a7]]]
Former-commit-id: 2b20cf5440
Former-commit-id: 418741ce55 [formerly a0423843b3]
Former-commit-id: 1abd65120e
2014-04-23 15:30:44 -05:00
Nate Jensen
ba32067353 Merge "Issue #3060 safety checks for SWT widgets being disposed" into development
Former-commit-id: 547bcafdb6 [formerly c193eac6e8] [formerly 547bcafdb6 [formerly c193eac6e8] [formerly 1067e4b09c [formerly 0f33d8dfe65574db7cfbf37f7fc34393707538d3]]]
Former-commit-id: 1067e4b09c
Former-commit-id: a2df4a7ec5 [formerly d1c581aed6]
Former-commit-id: c1aa647d6d
2014-04-23 14:24:33 -05:00
Brian Clements
8cdeb571f3 Issue #2822 shared display invitations always go to cave
if user is logged in to a client that supports shared displays, invites always go there
behaviour unchanged if not logged into a client that supports shared displays
added better resource name than 'Smack' for cave clients


Former-commit-id: 117eeca83a [formerly f3ee7b453a] [formerly 117eeca83a [formerly f3ee7b453a] [formerly 6969321db0 [formerly 796e4dcd2d81d8b34ae835dbe8443fd56ba873e3]]]
Former-commit-id: 6969321db0
Former-commit-id: 50acaac149 [formerly 5d2ec9b909]
Former-commit-id: d9a1bba4c8
2014-04-23 14:16:42 -05:00
Lee Venable
711d471f3e Issue #3053 - updated list selection dialog to be more configurable and fixed subset action.
Change-Id: Ib65472679cf5c04f8c11b8fe3fe552058d9e6986

Former-commit-id: 41cd3242f5 [formerly 331dc3397f] [formerly 41cd3242f5 [formerly 331dc3397f] [formerly 765d2e80bc [formerly 4554f647e0f6de78f5ade64e1371fc8d9ba6a65c]]]
Former-commit-id: 765d2e80bc
Former-commit-id: 029de4a1b1 [formerly 26e8c1ecf6]
Former-commit-id: 906340fb07
2014-04-23 14:07:29 -05:00
Brian.Dyke
2161c569ea Merge branch 'master_14.2.1' into master_14.2.2
Former-commit-id: 88d44a3129 [formerly 2a4fe3dbae] [formerly 88d44a3129 [formerly 2a4fe3dbae] [formerly a7c9ddc05e [formerly 64ca88d2ed7de18f9ed1f57edd2286bbc552135f]]]
Former-commit-id: a7c9ddc05e
Former-commit-id: 953236aad8 [formerly 911c0c6c17]
Former-commit-id: 26cb172a04
2014-04-23 14:05:50 -04:00
Nate Jensen
7c349e268e Issue #3060 safety checks for SWT widgets being disposed
Change-Id: I85c56318452a31122ee7f144e5500d089aa614e2

Former-commit-id: fbecf66f79 [formerly 426f103e7b] [formerly fbecf66f79 [formerly 426f103e7b] [formerly 38d493ff1b [formerly 0c391f8c7f1694c6939419b5fcc4a6a963092ae3]]]
Former-commit-id: 38d493ff1b
Former-commit-id: 2b68a49a43 [formerly 20f3f8ffa2]
Former-commit-id: ff9101c057
2014-04-23 12:26:27 -05:00
Nate Jensen
f4cefbc459 Merge "Issue #2903 added connection tests to session close methods" into development
Former-commit-id: c88597b6c2 [formerly 9ec6169646] [formerly c88597b6c2 [formerly 9ec6169646] [formerly 4a04662972 [formerly 81b95799744bd155cc0df1147bb8a5372ea2fee4]]]
Former-commit-id: 4a04662972
Former-commit-id: d60701a264 [formerly e9456b4ab7]
Former-commit-id: 455f4385aa
2014-04-22 12:53:08 -05:00
Nate Jensen
2b71b60b2e Merge "Issue #3056 made venue participant equals method case insensitive" into development
Former-commit-id: cc1da5fb88 [formerly fe3ff669a7] [formerly cc1da5fb88 [formerly fe3ff669a7] [formerly 8df505325c [formerly d6f1435a902615724aed2ff0279a6deb29933ce1]]]
Former-commit-id: 8df505325c
Former-commit-id: 484b197a56 [formerly be6818e96b]
Former-commit-id: ad96f9d128
2014-04-22 12:50:27 -05:00
Nate Jensen
a3036cee45 Merge "Issue #3038 added initialized flag to session feed view" into development
Former-commit-id: 963a848f90 [formerly 42d0d7681d] [formerly 963a848f90 [formerly 42d0d7681d] [formerly fc2be9521a [formerly a7f36cd46b29887c3210f45e83f83fd24f52b314]]]
Former-commit-id: fc2be9521a
Former-commit-id: 7f777e6fb9 [formerly ca8eab399f]
Former-commit-id: 5f35eedfb1
2014-04-22 12:49:02 -05:00
Brian Clements
d2b2106f4c Issue #2903 added connection tests to session close methods
fixes illegal state exception problem when booted from xmpp server


Former-commit-id: f9ab4f9cfe [formerly 50f3f420eb] [formerly f9ab4f9cfe [formerly 50f3f420eb] [formerly 49f86e4153 [formerly d570c81caed35576e867df15c2a8d900135fef5f]]]
Former-commit-id: 49f86e4153
Former-commit-id: 9ef018dbe8 [formerly c9453a2440]
Former-commit-id: 9ea5430774
2014-04-22 12:36:40 -05:00