Commit graph

3046 commits

Author SHA1 Message Date
Brian Clements
00ebd60fad 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: 148d158380 [formerly 117eeca83a] [formerly f3ee7b453a] [formerly 6969321db0 [formerly f3ee7b453a [formerly 796e4dcd2d81d8b34ae835dbe8443fd56ba873e3]]]
Former-commit-id: 6969321db0
Former-commit-id: a24c2596dc9f506edbc4e849e78e744becb558ec [formerly 5d2ec9b909]
Former-commit-id: 50acaac149
2014-04-23 14:16:42 -05:00
Nate Jensen
439e345f98 Merge "Issue #2903 added connection tests to session close methods" into development
Former-commit-id: a24262b3a9 [formerly c88597b6c2] [formerly 9ec6169646] [formerly 4a04662972 [formerly 9ec6169646 [formerly 81b95799744bd155cc0df1147bb8a5372ea2fee4]]]
Former-commit-id: 4a04662972
Former-commit-id: efae253c5ad86a47ac5d792c2c5124876253603d [formerly e9456b4ab7]
Former-commit-id: d60701a264
2014-04-22 12:53:08 -05:00
Nate Jensen
9ca82ebdd7 Merge "Issue #3056 made venue participant equals method case insensitive" into development
Former-commit-id: bf06389b9e [formerly cc1da5fb88] [formerly fe3ff669a7] [formerly 8df505325c [formerly fe3ff669a7 [formerly d6f1435a902615724aed2ff0279a6deb29933ce1]]]
Former-commit-id: 8df505325c
Former-commit-id: 58158f2fd8ff32145cf4fa8dd05d47988bbcbd10 [formerly be6818e96b]
Former-commit-id: 484b197a56
2014-04-22 12:50:27 -05:00
Nate Jensen
7434d299fa Merge "Issue #3038 added initialized flag to session feed view" into development
Former-commit-id: a9f0d3f6ee [formerly 963a848f90] [formerly 42d0d7681d] [formerly fc2be9521a [formerly 42d0d7681d [formerly a7f36cd46b29887c3210f45e83f83fd24f52b314]]]
Former-commit-id: fc2be9521a
Former-commit-id: 4cf54574a3262851c041d42381722c70bb079ea0 [formerly ca8eab399f]
Former-commit-id: 7f777e6fb9
2014-04-22 12:49:02 -05:00
Brian Clements
15279b35c9 Issue #2903 added connection tests to session close methods
fixes illegal state exception problem when booted from xmpp server


Former-commit-id: 053136ccbb [formerly f9ab4f9cfe] [formerly 50f3f420eb] [formerly 49f86e4153 [formerly 50f3f420eb [formerly d570c81caed35576e867df15c2a8d900135fef5f]]]
Former-commit-id: 49f86e4153
Former-commit-id: 6540ea31c93aa2adc8f9e805932f31f84eb11dec [formerly c9453a2440]
Former-commit-id: 9ef018dbe8
2014-04-22 12:36:40 -05:00
Nate Jensen
6f504176ea Issue #2984 remove unnecessary dependencies
Change-Id: I2066a1e903680068e0d25f7faa99bc7bda2b8877

Former-commit-id: 3e583eaa7a [formerly 48d4759371] [formerly d03afcdcba] [formerly be21c41512 [formerly d03afcdcba [formerly 290ec544e38e71332be2072435aff3b933c649ab]]]
Former-commit-id: be21c41512
Former-commit-id: d216f1bdf02ec5de7389774511663158b90f5596 [formerly 8f893545f1]
Former-commit-id: 8eb74232df
2014-04-22 12:03:44 -05:00
Brian Clements
38fbf8048e Issue #3056 made venue participant equals method case insensitive
needed since collaboration server lower cases room names
lower cased on creation so in memory matches what is on the server


Former-commit-id: a5730ca7bd [formerly bfd88f3e14] [formerly 1adbf6253a] [formerly 2a9d341910 [formerly 1adbf6253a [formerly 7a2423f4a90597706e52ce0f89bacb1a0e10f067]]]
Former-commit-id: 2a9d341910
Former-commit-id: a85a4bc02f2dd752ca54943517184b9bdbf83b43 [formerly 8677a9f359]
Former-commit-id: 19c2695dca
2014-04-22 11:55:36 -05:00
Nate Jensen
a0095992e1 Merge "Issue #2060 dropping grid dataURI column" into development
Former-commit-id: 17945fcbef [formerly 96268f1d35] [formerly c161a2ba50] [formerly ffaa7d8f58 [formerly c161a2ba50 [formerly d9876133fcb3975c8c7e58ff2ee75ca90dc8a0dd]]]
Former-commit-id: ffaa7d8f58
Former-commit-id: 19c714125fe5658e7f57714616e9191ebd8cfaa0 [formerly 0b25aebbb1]
Former-commit-id: c65e827d4e
2014-04-22 10:42:11 -05:00
Brian Clements
001e0b030b Issue #3038 added initialized flag to session feed view
differentiates between roster population and new joins


Former-commit-id: 1665175d35 [formerly cdf3aa90e9] [formerly 717cdf4280] [formerly ef61a7c281 [formerly 717cdf4280 [formerly 9b6c20ac39765120efc523c03a3d11d4b21c1748]]]
Former-commit-id: ef61a7c281
Former-commit-id: 80e474ab1d11f23309bd83f864334950b90dc4ac [formerly 295ff106b6]
Former-commit-id: e7005953eb
2014-04-22 10:01:27 -05:00
Ron Anderson
2afa2d0cda Merge "Issue #2998 Fix regression made in earlier check in." into development
Former-commit-id: b9f41e3108 [formerly 447ff809a3] [formerly 8026973c95] [formerly a6b5997663 [formerly 8026973c95 [formerly 2a78a1d70ab05322a8a69f96865cb3eba0fa6397]]]
Former-commit-id: a6b5997663
Former-commit-id: 406a14e47fd69c8d2b25bdc3aab2841b0b42ace9 [formerly 5f8ac71e11]
Former-commit-id: b389398c95
2014-04-21 17:55:22 -05:00
Nate Jensen
c4819a4e95 Issue #2060 dropping grid dataURI column
Change-Id: I8b8ba3f2ec71e15aa3c40e7eab42525dbf09157e

Former-commit-id: 03451ab6b2 [formerly 263611f905] [formerly a37a2afe18] [formerly 5dfb652775 [formerly a37a2afe18 [formerly 1aab87d9572089a09351ebdfb8fbcef884866feb]]]
Former-commit-id: 5dfb652775
Former-commit-id: 6295d04b083ae6cd109f1c2f595fb1922420e2a1 [formerly cdb932cc4d]
Former-commit-id: 3eddbf452d
2014-04-21 17:34:39 -05:00
Ron Anderson
b1b0dcf75f Issue #2998 Fix regression made in earlier check in.
Change-Id: Ic7c915fef09b3398e2946d8e7688e5d2997acc71

Former-commit-id: 5570193f21 [formerly 2a819003c5] [formerly ed99abbb9d] [formerly 04467d51dd [formerly ed99abbb9d [formerly 8c48d369b3b6af0222b541ccfa9230495d4cb0f9]]]
Former-commit-id: 04467d51dd
Former-commit-id: f335a0dab919cc88d957bc2df62452c5a76437b7 [formerly 04a7c2d8cd]
Former-commit-id: 243c929fc1
2014-04-21 17:26:29 -05:00
Nate Jensen
9c7e88211f Merge "Issue #2997 Fix Geostationary projection to work with GeoTools 10.5" into development
Former-commit-id: f0cdb9e8ad [formerly 1651a79187] [formerly 1a617796cb] [formerly ec82e51d28 [formerly 1a617796cb [formerly 1fde0217948dad64221d0348f9e45a8e1430cdd7]]]
Former-commit-id: ec82e51d28
Former-commit-id: 31f7dac3240712ec81e5f3265ec55796ae1240a7 [formerly 0d7ae042d5]
Former-commit-id: efc5dba997
2014-04-21 17:08:17 -05:00
Nate Jensen
9e6ca096e7 Merge "Issue #2822 fixed check for topic subscription before leader transfer" into development
Former-commit-id: 7530137f38 [formerly 535a5f836d] [formerly e401fca661] [formerly cb7d485004 [formerly e401fca661 [formerly 74946a00033737aae24aabbfc333d661598cd6f2]]]
Former-commit-id: cb7d485004
Former-commit-id: 1f516d923aaa0e50bc15f2399e7e29a856f577ad [formerly 87457f26fc]
Former-commit-id: f75fc8da0c
2014-04-21 15:13:53 -05:00
Ron Anderson
d851b549ef Issue #2997 Fix Geostationary projection to work with GeoTools 10.5
Change-Id: Id9f3dc3af07548039509e4121cafd2e02a01453c

Former-commit-id: 0097799e2c [formerly 8aac4d32b1] [formerly 665246d72e] [formerly c4a0a4ef6e [formerly 665246d72e [formerly 2b67417e6128e3cd4cafa5c8f2ac23c10be2b300]]]
Former-commit-id: c4a0a4ef6e
Former-commit-id: 9ccb16c1887bb7f23193c421183a85e48e5cb136 [formerly e515f42b94]
Former-commit-id: b5dc730fea
2014-04-21 14:25:53 -05:00
Lee Venable
e5d73f64ac Issue #3041 - added dispose check to runAsync call and cleaned up code.
Change-Id: I50e6ce1a214a884221fbc256a133e57e579862da

Former-commit-id: ed407b11c6 [formerly ac914e72e7] [formerly 3c45a24efb] [formerly dcb7e697e8 [formerly 3c45a24efb [formerly ed2fc05f61861efe6c70b8fc73ad10d27bb73c12]]]
Former-commit-id: dcb7e697e8
Former-commit-id: dcaad16ef8d601c796b1e22040cf86806d2002cf [formerly 20764b1d97]
Former-commit-id: 91d37d783c
2014-04-21 13:47:31 -05:00
Ron Anderson
2c67fd60b4 Merge "Issue #2998 Fixed null pointer in AttributeViewer. Improved sizing of displayAttributes." into development
Former-commit-id: 0bf7593ccd [formerly efdd37b012] [formerly 750c054ab0] [formerly 5f82bb7cc8 [formerly 750c054ab0 [formerly 3038cbecf8efc76c76cdc86702986069788b6a02]]]
Former-commit-id: 5f82bb7cc8
Former-commit-id: 75334e768d73f39e084bb28d84fc8f55e8865a82 [formerly 1df03eb2dc]
Former-commit-id: 020045fee3
2014-04-21 13:25:11 -05:00
Brian Clements
79c5884e45 Issue #2822 fixed check for topic subscription before leader transfer
now only checks if the bare ID (no resource) is subscribed to topic
added method to check for same ID using multiple handles


Former-commit-id: 833d693098 [formerly c4a38d1f68] [formerly 6c47c78038] [formerly aed25eeb61 [formerly 6c47c78038 [formerly 09d7a1113a6254d8f01cf42d863e9365aac23cc7]]]
Former-commit-id: aed25eeb61
Former-commit-id: 7ac0692b2d053f58ada13699f7e27bac3e23b62c [formerly 474255ed29]
Former-commit-id: 56e0dad5ff
2014-04-21 13:07:14 -05:00
Ron Anderson
0a9cfdea1a Issue #2998 Fixed null pointer in AttributeViewer.
Improved sizing of displayAttributes.

Change-Id: I40b3dc486a713f6ba6ce6f5075ffce1eb6555f93

Former-commit-id: a506479e56 [formerly a3a8a1ebb4] [formerly 811f05f164] [formerly 541a908a41 [formerly 811f05f164 [formerly 0fac12a4f17de189a88e6dd4415f6364afc4f459]]]
Former-commit-id: 541a908a41
Former-commit-id: 6f390a352c1b816539d9422ef8bd0ec4832c766f [formerly a5cea97c6f]
Former-commit-id: d4fcdb0851
2014-04-21 13:03:50 -05:00
Lee Venable
e70c07c29d Merge "Issue #2891 - Fix refresh of Utilization Graph" into development
Former-commit-id: 13c46b95a7 [formerly b01eac4cc3] [formerly dd7f0a82f9] [formerly 370ff09548 [formerly dd7f0a82f9 [formerly 194b601d5938ba599abc5dd9e29f0a62a7713cb0]]]
Former-commit-id: 370ff09548
Former-commit-id: 82cb64c66e31fa00648fe582e7f00b4040f23e2f [formerly 74df7202b0]
Former-commit-id: a8cb00e2c6
2014-04-21 12:59:00 -05:00
Nate Jensen
355fe1f5f1 Merge "Issue #2947 Improve support for Satellite combined products." into development
Former-commit-id: a61e0dff2e [formerly 2eba6b705e] [formerly 5c223a8ce3] [formerly 35891b2dcd [formerly 5c223a8ce3 [formerly 4f1ca4c4dfeb84b582bfe7fe8375fb9f619cdd94]]]
Former-commit-id: 35891b2dcd
Former-commit-id: 46064df15844f46a8ec4d9674773f826e2cd2908 [formerly 91698d222b]
Former-commit-id: 648df0eead
2014-04-21 12:39:56 -05:00
Ben Steffensmeier
f16fab0d68 Issue #2947 Improve support for Satellite combined products.
Former-commit-id: 4abdb898f4 [formerly 87adc0e3c5] [formerly 043d9c8b8d] [formerly c3cd473158 [formerly 043d9c8b8d [formerly 891422a7d324514d5ee82d3d195e923c27fc58ef]]]
Former-commit-id: c3cd473158
Former-commit-id: c84842cbdc7ae780b96dc50e92fdeb467f64bad1 [formerly b05e2a22b8]
Former-commit-id: 8b80c6d8fa
2014-04-21 11:57:01 -05:00
Nate Jensen
69e45bdfbd Merge "Issue #2984 remove unnecessary dependencies on edex" into development
Former-commit-id: d566c3cafc [formerly f91c4d1c26] [formerly 327e1ab78b] [formerly b3aa1392dd [formerly 327e1ab78b [formerly 7de7469b6fa8acc42bf15a60f5096506d1cfc215]]]
Former-commit-id: b3aa1392dd
Former-commit-id: b76bb1108addd41e95f96f1bfde5900bd9eefe27 [formerly 5c81a3b897]
Former-commit-id: e4ed440f5a
2014-04-21 11:47:10 -05:00
Ron Anderson
91a90d44e0 Merge "Issue #3030 Avoid GeoTools Resampler2D infinite recursion." into development
Former-commit-id: 8f3b8c9bdf [formerly dd362ec359] [formerly c2a1533ff8] [formerly 536ec2790a [formerly c2a1533ff8 [formerly a74c24200e9911ff4f2023d9fb1be77516b4c09a]]]
Former-commit-id: 536ec2790a
Former-commit-id: c6dab31639d3dfc9ab7163fe5b8b72ec9ca0af2a [formerly d34a8c9753]
Former-commit-id: 4ac5fd90f4
2014-04-21 11:44:10 -05:00
Nate Jensen
d6a968cac2 Issue #2984 remove unnecessary dependencies on edex
Change-Id: Iad6ebd93d0ec6cd3823042f8ef2653dac963c746

Former-commit-id: 2561050293 [formerly ef43b2d325] [formerly 2253938ed5] [formerly df4171b29d [formerly 2253938ed5 [formerly 39d1f72292414d008c0899dac616e76c8c0f2512]]]
Former-commit-id: df4171b29d
Former-commit-id: 024b55876a4025da8b49a4ff3d68557b772e23a5 [formerly 24c8b0a327]
Former-commit-id: 4011b1351f
2014-04-21 11:32:41 -05:00
Mike Duff
e40a69a415 Issue #2891 - Fix refresh of Utilization Graph
Change-Id: Ib5fb5cb5a367459ab306dc223ab11172310d6cd8

Former-commit-id: de82aa7359 [formerly 3a71c05caa] [formerly 59241fed1d] [formerly 892330a89c [formerly 59241fed1d [formerly acb92afe49544fc0a1d9f5b08c7ec2d2e8016c16]]]
Former-commit-id: 892330a89c
Former-commit-id: 74522e1d5d94453632db42633b60036f571579aa [formerly 0f39afb4de]
Former-commit-id: ca76217776
2014-04-21 10:55:43 -05:00
Brad Gonzales
8a7acc9442 Issue #3001 Changed ccfp-common.xml to used common. Fixed version in com.raytheon.viz.aviation/META-INF/MANIFEST.MF.
Change-Id: I118afa785fff93251950f0f10e72979174de35cb

Former-commit-id: 1e1a8e76bd [formerly ab5481218d] [formerly 3fb2835dd3] [formerly 44ada20a68 [formerly 3fb2835dd3 [formerly cd85b148b6b267779d1fe8b510f14f63c45db77a]]]
Former-commit-id: 44ada20a68
Former-commit-id: 92ad6759c57e75cfbff18396170bbbfcd7952bdd [formerly dd237ea8ff]
Former-commit-id: 40e1214776
2014-04-21 10:22:57 -05:00
Mike Duff
5efd5741f7 Issue #3000 - Split bufrmos plugin into common and edex.
Change-Id: Id3142b8746cfb28966e7378a522e4db775dfcf37

Former-commit-id: 8250c23357 [formerly a729b8b8a5] [formerly b288bd46de] [formerly 0be8ad31d1 [formerly b288bd46de [formerly 3fd04e796b7c409c67c06517265648e576852352]]]
Former-commit-id: 0be8ad31d1
Former-commit-id: 08a545b76f857a2a41c798d80966021fe535f72a [formerly 50a65c5a31]
Former-commit-id: ad034ab285
2014-04-21 09:50:18 -05:00
Nate Jensen
ce3e1793cd Merge "Issue #2955 - Made chat invitation dialogs non-modal" into development
Former-commit-id: 98bd36ee38 [formerly d265706c90] [formerly cdd56443f0] [formerly db6fba6f75 [formerly cdd56443f0 [formerly f4ced5dc67106d959dd97a35e589a266fe8089ce]]]
Former-commit-id: db6fba6f75
Former-commit-id: 522c875e651b5a312c176729c7d6dfa6c3eb0050 [formerly 897133a27a]
Former-commit-id: 339f68fa9b
2014-04-21 09:29:23 -05:00
Mike Duff
ebbb721787 Issue #2955 - Made chat invitation dialogs non-modal
Change-Id: Ib7294e8149996715b6a247a1e04335dc1a0c7023

Former-commit-id: 6da65fe71a [formerly 71cf0d04e7] [formerly ead90bc794] [formerly b507739637 [formerly ead90bc794 [formerly bb61e3c39d5dabf7e698726f0a093d8cf4f7088a]]]
Former-commit-id: b507739637
Former-commit-id: 5c415e155bfe7e16d70fc0b35ad0574fc7085261 [formerly 9a082a1588]
Former-commit-id: 75f794d54d
2014-04-21 09:00:42 -05:00
Ron Anderson
b2ea6031ce Issue #3030 Avoid GeoTools Resampler2D infinite recursion.
Change-Id: Ie2dc0a66e8f15648b1a76a0d54efb36795223345

Former-commit-id: ab83f0ec0f [formerly 581e1a95dd] [formerly 76c5bb67a5] [formerly d7e6ab67d6 [formerly 76c5bb67a5 [formerly 123ddd451854e93063f518b0ece746b1109df9d1]]]
Former-commit-id: d7e6ab67d6
Former-commit-id: 8ea06d4f50652b41024861c0cde7cbd76f67046d [formerly 8583e0fb64]
Former-commit-id: 941b6d9109
2014-04-21 08:38:52 -05:00
Brad Gonzales
4c463adc7e Issue #3001 Renamed com.raytheon.edex.plugin.ccfp to com.raytheon.uf.edex.plugin.ccfp.
Amend: Updates from peer review.

Change-Id: Ib5719f711234005e021bc4d8dec899289d8b447b

Former-commit-id: 8a6655cb35 [formerly c267d077c3] [formerly 1a43f04b16] [formerly 6c7e2ac2a7 [formerly 1a43f04b16 [formerly 9374912aeb3e3a642d34a0aec75bcda7c707bcf9]]]
Former-commit-id: 6c7e2ac2a7
Former-commit-id: f7b416cc828835e0d7166283f219d0f260c3e42e [formerly b796120ec9]
Former-commit-id: b2a95e4f12
2014-04-18 15:16:41 -05:00
Ron Anderson
9b5d743027 Merge "Issue #2664 Fix NullPointerException when no .prj file present" into development
Former-commit-id: 77cf9b366c [formerly 3806a1fd05] [formerly 6b226db27c] [formerly 66929690c7 [formerly 6b226db27c [formerly de57933506ad588c8da38a49de6a2cd5530e2091]]]
Former-commit-id: 66929690c7
Former-commit-id: 8b68cd3c4868310fe8a550a72548e02fe12db72e [formerly cacff76564]
Former-commit-id: 55f31328af
2014-04-17 13:13:03 -05:00
Ron Anderson
8de698fb5b Issue #2664 Fix NullPointerException when no .prj file present
Change-Id: I2716eca6b71d79657f19feadb931a23ee3e44f4d

Former-commit-id: f27f84e50f [formerly ddf45d649c] [formerly f4823976f3] [formerly f30c29bfbd [formerly f4823976f3 [formerly 66db062f94a5136902bac5cd5df8cbf30305a30a]]]
Former-commit-id: f30c29bfbd
Former-commit-id: 7eef58459f9ae3bb450f759c1b276249d81df227 [formerly ba88a0836d]
Former-commit-id: 5a8d4be559
2014-04-17 11:38:40 -05:00
Nate Jensen
a48dd9ab1f Merge "Issue #3025 - Fix incorrect sort algorithm." into development
Former-commit-id: b4717280de [formerly adcc7ac6b5] [formerly be79b04b59] [formerly c36a5f7272 [formerly be79b04b59 [formerly 7ad033ab9c35ea2a169f5041ed2ed1dfae7c63b2]]]
Former-commit-id: c36a5f7272
Former-commit-id: db5c7deed79d8cc758597e151da3c968a990ad9a [formerly 7d8f18ef18]
Former-commit-id: d237113d35
2014-04-17 09:56:54 -05:00
Mike Duff
a700a1a1dc Issue #3025 - Fix incorrect sort algorithm.
Change-Id: Ied1ec59a8703c1f7476793d3896a253ec6aa2707

Former-commit-id: dd24e15b53 [formerly a17f187929] [formerly 0b9f8ce7f1] [formerly b1a4f69578 [formerly 0b9f8ce7f1 [formerly 9c275288183b93ba5cac991dbbdf72bdf122ad0a]]]
Former-commit-id: b1a4f69578
Former-commit-id: 70adbb0b80aadc062137a471048c29cdebf395e7 [formerly 54e95e399b]
Former-commit-id: 989fcfb42f
2014-04-17 09:55:45 -05:00
Nate Jensen
00766a599c Merge "Issue #3001 Created com.raytheon.uf.common.dataplugin.ccfp. Moved CcfpLocation and CcfpRecord to that project. Updated feature and manifest references." into development
Former-commit-id: 2cbe701f82 [formerly df1b5183c1] [formerly 6e49d78e0d] [formerly d26c150aa9 [formerly 6e49d78e0d [formerly 6d713f6a8a563b49bd1e2fa8151591657bd6735c]]]
Former-commit-id: d26c150aa9
Former-commit-id: c7b3b9828876e046db7ef21c197c4bffcbc75692 [formerly 8bf12cc32a]
Former-commit-id: 23082fd637
2014-04-17 09:04:52 -05:00
Roger Ferrel
c1a0504758 Issue #3023 Configurable available disk thresholds and unit test fixes
Change-Id: Ia179baab388a9f9faf62e84e4a3338a7af3464b0

Former-commit-id: 84c10d3cd2 [formerly dc25ece75f] [formerly 8ce590c31c] [formerly 3af564a653 [formerly 8ce590c31c [formerly ce00327d4cd248efb65fd8b6e823d93c81c9a902]]]
Former-commit-id: 3af564a653
Former-commit-id: 927fe825a123966e78c6c609abe7894b1787733e [formerly 1214aac2a2]
Former-commit-id: 56da257816
2014-04-17 08:57:15 -05:00
Brad Gonzales
d6ecf7a63e Issue #3001 Created com.raytheon.uf.common.dataplugin.ccfp. Moved CcfpLocation and
CcfpRecord to that project.  Updated feature and manifest references.

Amend: Updates from peer review.

Change-Id: I5606bbf3ba1dc3d5ad7bdcf3341c57436f9485b3

Former-commit-id: 09accb6fc3 [formerly fd0bb35109] [formerly ab2488b2db] [formerly 975a088945 [formerly ab2488b2db [formerly b80a3b8d1c90b7fb8720171f16529edc81bc30a8]]]
Former-commit-id: 975a088945
Former-commit-id: 7aa4e12f54f97b61e748a6950c8f532ae66df86b [formerly 72b4b07fb4]
Former-commit-id: 4ad01be9e1
2014-04-16 17:07:49 -05:00
Nate Jensen
b225b05ab1 Merge "Issue #3037 - Add dispose check in runAsync call." into development
Former-commit-id: 89bb03eb12 [formerly 5ea27f270f] [formerly 7b1f93fdfc27b35ff9a504cac0a005636fbd3df1 [formerly 8ad4b26151]] [formerly 70d132c59a [formerly 8ad4b26151 [formerly b44bb9043a002e0749f6bcda41158a56d047c5af]]]
Former-commit-id: 70d132c59a
Former-commit-id: 0b25ff12454689632fcd64e7d50c32163364f247 [formerly 82267f8b0b]
Former-commit-id: 65ee834371
2014-04-16 16:31:18 -05:00
Nate Jensen
026bdba6d5 Merge "Issue #3020 fixed error message when attempting to create already accessible room" into development
Former-commit-id: b8403476ee [formerly 27c9ee561e] [formerly f313f2f20c] [formerly 2ea1878403 [formerly f313f2f20c [formerly fc8880c642201685feefbf3eb14cb4f1a7c962b1]]]
Former-commit-id: 2ea1878403
Former-commit-id: 84856846656ce3174e03d59de632d5d282fc7ab1 [formerly 05e1aa10a8]
Former-commit-id: ecf9a4e671
2014-04-16 16:30:46 -05:00
Nate Jensen
f1152bca2f Merge "Issue #3021 increased width of create session dialog to fit error msg" into development
Former-commit-id: 23fdfcf11f [formerly 109051a061] [formerly d96b75ca13] [formerly 52b9060f7a [formerly d96b75ca13 [formerly e59d579fc51125b7805c22dfea26b31f17d1be97]]]
Former-commit-id: 52b9060f7a
Former-commit-id: 2f1f0573a1ee55e7a82ce91d3141d8f88fd2a4b9 [formerly 78a240fded]
Former-commit-id: d29f4091ca
2014-04-16 16:30:39 -05:00
Lee Venable
acd88d1d38 Issue #3037 - Add dispose check in runAsync call.
Change-Id: I13c7475f8c56f677f3dbdfab8d6000061db86f9f

Former-commit-id: 680f607c18 [formerly 6b0468f07e] [formerly 33fc376f33] [formerly 7386d4b318 [formerly 33fc376f33 [formerly c511ef6d5566f0e1d9ae3d5ea886abbf1159d41a]]]
Former-commit-id: 7386d4b318
Former-commit-id: 414f3accd00b50fb116af44bd4097d3b89b5cb69 [formerly 98e9912a94]
Former-commit-id: cc6380ba33
2014-04-16 15:40:46 -05:00
Richard Peter
d6359fa404 Merge "Issue #2947 Redo satellite derived parameters to use an inventory to determine availability." into development
Former-commit-id: 825757e217 [formerly 0b82df7ad0] [formerly 852cb3cd46] [formerly 8c190bd158 [formerly 852cb3cd46 [formerly 326b9ef83021ce71f715b6f352401dd936e992c7]]]
Former-commit-id: 8c190bd158
Former-commit-id: 7f1e29571c0c37d84320ad1a27dfc62471139ce5 [formerly f8c75819bb]
Former-commit-id: bed7035a67
2014-04-16 15:11:07 -05:00
Ben Steffensmeier
858deeaef5 Issue #2947 Redo satellite derived parameters to use an inventory to determine availability.
Former-commit-id: 2d8106bc5b [formerly bb51fb299a] [formerly 709e3411c4] [formerly a8bb2c0dfd [formerly 709e3411c4 [formerly 1a041cb3be1141f4af116335e5b9540beda817cb]]]
Former-commit-id: a8bb2c0dfd
Former-commit-id: 4a7f1c2296d79b72f15c1dafa088a798fe5a813e [formerly 119ced4a01]
Former-commit-id: a51b965c4f
2014-04-16 14:54:59 -05:00
Brian Clements
b8f40429ec Issue #3021 increased width of create session dialog to fit error msg
Former-commit-id: 78c1b34cdf [formerly ef791fe481] [formerly 1112ca621e] [formerly bb915796ad [formerly 1112ca621e [formerly f0bcc20987d814a716994f712c6132bb79963457]]]
Former-commit-id: bb915796ad
Former-commit-id: fd6c03748bfb24190c526a992357f258a7c91630 [formerly 5c46c768d2]
Former-commit-id: 549941882e
2014-04-16 14:33:02 -05:00
Brian Clements
89741a1e62 Issue #3020 fixed error message when attempting to create already accessible room
Former-commit-id: 0c203cfd07 [formerly 57d2f28d54] [formerly bfafb0d055] [formerly 4a8ee65cca [formerly bfafb0d055 [formerly 738e4cb06a549e6067274af033cc7ba725b1a8e2]]]
Former-commit-id: 4a8ee65cca
Former-commit-id: 58b38675284b585270d0e5118c40f102fbfd1852 [formerly 8861489810]
Former-commit-id: 4829ef25bc
2014-04-16 14:26:17 -05:00
Lee Venable
8380646a7a Issue #3034 - added widget dispose checks in runAsync methods.
Change-Id: I9182441c34c63c5a78023adda2ec036f2a51192e

Former-commit-id: 27b5524848 [formerly f4fb7b24f6] [formerly 7f068f164c] [formerly ff3b42468f [formerly 7f068f164c [formerly 8e8e65ecbc22dcebb7a494ddbd6b7183d67981a0]]]
Former-commit-id: ff3b42468f
Former-commit-id: aa35106e2bcb598175d4b13f4c68868a8f657f1d [formerly 4cdbf301f3]
Former-commit-id: 885e17788d
2014-04-16 13:15:31 -05:00
Brian Clements
3a6bb9f43c Issue #2981 fixed NPE when cached shared group deleted on server
Former-commit-id: 9473f1f799 [formerly 8a4f212fdb] [formerly 7afb1e66f5] [formerly 7fd7817af4 [formerly 7afb1e66f5 [formerly 8ee453e3f5256d3ffed255aaebc792155001bc8e]]]
Former-commit-id: 7fd7817af4
Former-commit-id: bd2ff121fc86675239805e4cf8a2decb18f093b2 [formerly 007ba2ae4d]
Former-commit-id: 1daf03844c
2014-04-16 09:23:26 -05:00
Nate Jensen
76f191192c Merge "Issue #2956 safety checks for GLShadedShapeBase" into development
Former-commit-id: 0b85a99337 [formerly 2fba1f36ef] [formerly 80434db98d] [formerly 120d8429a7 [formerly 80434db98d [formerly 85aa7d53fdbbad696aa86e4fc992ff6288d199e3]]]
Former-commit-id: 120d8429a7
Former-commit-id: ba3109c60afbaff247b963019ac0ea3cfd8248fb [formerly 62613ab33d]
Former-commit-id: 2e23ae75f4
2014-04-16 08:41:43 -05:00