xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
6153 commits 31 branches 40 tags 3.8 GiB
Commit graph

3354 commits

Author SHA1 Message Date
Ron Anderson
62056f6eff Issue #2998 Fix regression made in earlier check in. 
Change-Id: Ic7c915fef09b3398e2946d8e7688e5d2997acc71

Former-commit-id: 2a819003c5 [formerly ed99abbb9d] [formerly 2a819003c5 [formerly ed99abbb9d] [formerly 04467d51dd [formerly 8c48d369b3b6af0222b541ccfa9230495d4cb0f9]]]
Former-commit-id: 04467d51dd
Former-commit-id: 243c929fc1 [formerly 04a7c2d8cd]
Former-commit-id: d6990dd0b8
 2014-04-21 17:26:29 -05:00
Nate Jensen
0972f4e3f1 Merge "Issue #2997 Fix Geostationary projection to work with GeoTools 10.5" into development 
Former-commit-id: 1651a79187 [formerly 1a617796cb] [formerly 1651a79187 [formerly 1a617796cb] [formerly ec82e51d28 [formerly 1fde0217948dad64221d0348f9e45a8e1430cdd7]]]
Former-commit-id: ec82e51d28
Former-commit-id: efc5dba997 [formerly 0d7ae042d5]
Former-commit-id: 2cf79494bc
 2014-04-21 17:08:17 -05:00
Nate Jensen
f685ade735 Merge "Issue #2822 fixed check for topic subscription before leader transfer" into development 
Former-commit-id: 535a5f836d [formerly e401fca661] [formerly 535a5f836d [formerly e401fca661] [formerly cb7d485004 [formerly 74946a00033737aae24aabbfc333d661598cd6f2]]]
Former-commit-id: cb7d485004
Former-commit-id: f75fc8da0c [formerly 87457f26fc]
Former-commit-id: 252fb2a3a7
 2014-04-21 15:13:53 -05:00
Ron Anderson
0cbbc279f0 Issue #2997 Fix Geostationary projection to work with GeoTools 10.5 
Change-Id: Id9f3dc3af07548039509e4121cafd2e02a01453c

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

Former-commit-id: ac914e72e7 [formerly 3c45a24efb] [formerly ac914e72e7 [formerly 3c45a24efb] [formerly dcb7e697e8 [formerly ed2fc05f61861efe6c70b8fc73ad10d27bb73c12]]]
Former-commit-id: dcb7e697e8
Former-commit-id: 91d37d783c [formerly 20764b1d97]
Former-commit-id: 294d8ff917
 2014-04-21 13:47:31 -05:00
Ron Anderson
d52b56aa2a Merge "Issue #2998 Fixed null pointer in AttributeViewer. Improved sizing of displayAttributes." into development 
Former-commit-id: efdd37b012 [formerly 750c054ab0] [formerly efdd37b012 [formerly 750c054ab0] [formerly 5f82bb7cc8 [formerly 3038cbecf8efc76c76cdc86702986069788b6a02]]]
Former-commit-id: 5f82bb7cc8
Former-commit-id: 020045fee3 [formerly 1df03eb2dc]
Former-commit-id: 83062cb3d5
 2014-04-21 13:25:11 -05:00
Brian Clements
24b594529a 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: c4a38d1f68 [formerly 6c47c78038] [formerly c4a38d1f68 [formerly 6c47c78038] [formerly aed25eeb61 [formerly 09d7a1113a6254d8f01cf42d863e9365aac23cc7]]]
Former-commit-id: aed25eeb61
Former-commit-id: 56e0dad5ff [formerly 474255ed29]
Former-commit-id: a0871fad9a
 2014-04-21 13:07:14 -05:00
Ron Anderson
841a48b86e Issue #2998 Fixed null pointer in AttributeViewer. 
Improved sizing of displayAttributes.

Change-Id: I40b3dc486a713f6ba6ce6f5075ffce1eb6555f93

Former-commit-id: a3a8a1ebb4 [formerly 811f05f164] [formerly a3a8a1ebb4 [formerly 811f05f164] [formerly 541a908a41 [formerly 0fac12a4f17de189a88e6dd4415f6364afc4f459]]]
Former-commit-id: 541a908a41
Former-commit-id: d4fcdb0851 [formerly a5cea97c6f]
Former-commit-id: 899785875f
 2014-04-21 13:03:50 -05:00
Lee Venable
369246903f Merge "Issue #2891 - Fix refresh of Utilization Graph" into development 
Former-commit-id: b01eac4cc3 [formerly dd7f0a82f9] [formerly b01eac4cc3 [formerly dd7f0a82f9] [formerly 370ff09548 [formerly 194b601d5938ba599abc5dd9e29f0a62a7713cb0]]]
Former-commit-id: 370ff09548
Former-commit-id: a8cb00e2c6 [formerly 74df7202b0]
Former-commit-id: 3d17b7eddb
 2014-04-21 12:59:00 -05:00
Nate Jensen
311b6fb729 Merge "Issue #2947 Improve support for Satellite combined products." into development 
Former-commit-id: 2eba6b705e [formerly 5c223a8ce3] [formerly 2eba6b705e [formerly 5c223a8ce3] [formerly 35891b2dcd [formerly 4f1ca4c4dfeb84b582bfe7fe8375fb9f619cdd94]]]
Former-commit-id: 35891b2dcd
Former-commit-id: 648df0eead [formerly 91698d222b]
Former-commit-id: 56776a7ee2
 2014-04-21 12:39:56 -05:00
Dave Hladky
4ce5dfcd92 Issue #3012 Various fixes. 
Change-Id: I3c71c6aefede685438e55e5aceb8cae6ffb7dded

Former-commit-id: 91bd735d47 [formerly 61fc2fea51] [formerly 91bd735d47 [formerly 61fc2fea51] [formerly 45059e722a [formerly 212e15c397fe22c3bc074e054d608c0094ce8dad]]]
Former-commit-id: 45059e722a
Former-commit-id: 117a3953af [formerly ae84d2991e]
Former-commit-id: 6c83fd0929
 2014-04-21 12:26:47 -05:00
Ben Steffensmeier
a531487982 Issue #2947 Improve support for Satellite combined products. 
Former-commit-id: 87adc0e3c5 [formerly 043d9c8b8d] [formerly 87adc0e3c5 [formerly 043d9c8b8d] [formerly c3cd473158 [formerly 891422a7d324514d5ee82d3d195e923c27fc58ef]]]
Former-commit-id: c3cd473158
Former-commit-id: 8b80c6d8fa [formerly b05e2a22b8]
Former-commit-id: d4b73c4531
 2014-04-21 11:57:01 -05:00
Nate Jensen
3236175a84 Merge "Issue #2984 remove unnecessary dependencies on edex" into development 
Former-commit-id: f91c4d1c26 [formerly 327e1ab78b] [formerly f91c4d1c26 [formerly 327e1ab78b] [formerly b3aa1392dd [formerly 7de7469b6fa8acc42bf15a60f5096506d1cfc215]]]
Former-commit-id: b3aa1392dd
Former-commit-id: e4ed440f5a [formerly 5c81a3b897]
Former-commit-id: 6b0b7eefcd
 2014-04-21 11:47:10 -05:00
Ron Anderson
c7378e6125 Merge "Issue #3030 Avoid GeoTools Resampler2D infinite recursion." into development 
Former-commit-id: dd362ec359 [formerly c2a1533ff8] [formerly dd362ec359 [formerly c2a1533ff8] [formerly 536ec2790a [formerly a74c24200e9911ff4f2023d9fb1be77516b4c09a]]]
Former-commit-id: 536ec2790a
Former-commit-id: 4ac5fd90f4 [formerly d34a8c9753]
Former-commit-id: c0f6a951c4
 2014-04-21 11:44:10 -05:00
Nate Jensen
cc150c8a1a Issue #2984 remove unnecessary dependencies on edex 
Change-Id: Iad6ebd93d0ec6cd3823042f8ef2653dac963c746

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

Former-commit-id: 3a71c05caa [formerly 59241fed1d] [formerly 3a71c05caa [formerly 59241fed1d] [formerly 892330a89c [formerly acb92afe49544fc0a1d9f5b08c7ec2d2e8016c16]]]
Former-commit-id: 892330a89c
Former-commit-id: ca76217776 [formerly 0f39afb4de]
Former-commit-id: 3d5feda17c
 2014-04-21 10:55:43 -05:00
Brad Gonzales
7f946c41d1 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: ab5481218d [formerly 3fb2835dd3] [formerly ab5481218d [formerly 3fb2835dd3] [formerly 44ada20a68 [formerly cd85b148b6b267779d1fe8b510f14f63c45db77a]]]
Former-commit-id: 44ada20a68
Former-commit-id: 40e1214776 [formerly dd237ea8ff]
Former-commit-id: 4303081919
 2014-04-21 10:22:57 -05:00
Mike Duff
4bde76c765 Issue #3000 - Split bufrmos plugin into common and edex. 
Change-Id: Id3142b8746cfb28966e7378a522e4db775dfcf37

Former-commit-id: a729b8b8a5 [formerly b288bd46de] [formerly a729b8b8a5 [formerly b288bd46de] [formerly 0be8ad31d1 [formerly 3fd04e796b7c409c67c06517265648e576852352]]]
Former-commit-id: 0be8ad31d1
Former-commit-id: ad034ab285 [formerly 50a65c5a31]
Former-commit-id: 1ceb378d0b
 2014-04-21 09:50:18 -05:00
Nate Jensen
24b3163c37 Merge "Issue #2955 - Made chat invitation dialogs non-modal" into development 
Former-commit-id: d265706c90 [formerly cdd56443f0] [formerly d265706c90 [formerly cdd56443f0] [formerly db6fba6f75 [formerly f4ced5dc67106d959dd97a35e589a266fe8089ce]]]
Former-commit-id: db6fba6f75
Former-commit-id: 339f68fa9b [formerly 897133a27a]
Former-commit-id: 474612939c
 2014-04-21 09:29:23 -05:00
Mike Duff
6c4490b08c Issue #2955 - Made chat invitation dialogs non-modal 
Change-Id: Ib7294e8149996715b6a247a1e04335dc1a0c7023

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

Former-commit-id: 581e1a95dd [formerly 76c5bb67a5] [formerly 581e1a95dd [formerly 76c5bb67a5] [formerly d7e6ab67d6 [formerly 123ddd451854e93063f518b0ece746b1109df9d1]]]
Former-commit-id: d7e6ab67d6
Former-commit-id: 941b6d9109 [formerly 8583e0fb64]
Former-commit-id: 281ffc1ecc
 2014-04-21 08:38:52 -05:00
Brad Gonzales
e0245983cf 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: c267d077c3 [formerly 1a43f04b16] [formerly c267d077c3 [formerly 1a43f04b16] [formerly 6c7e2ac2a7 [formerly 9374912aeb3e3a642d34a0aec75bcda7c707bcf9]]]
Former-commit-id: 6c7e2ac2a7
Former-commit-id: b2a95e4f12 [formerly b796120ec9]
Former-commit-id: 2a7aae659c
 2014-04-18 15:16:41 -05:00
Brian.Dyke
8275f3907f Merge branch 'asm_14.2.2' of /data/integration-asm-gerrit/update-latest/AWIPS2_baseline into master_14.2.2 
Former-commit-id: 53ce26a9b6 [formerly 1aec3b3698] [formerly 53ce26a9b6 [formerly 1aec3b3698] [formerly 645fe64a4a [formerly 178acb792036869e903beea636c7216e1d3a4f58]]]
Former-commit-id: 645fe64a4a
Former-commit-id: 66974e17b9 [formerly 4eb3317f80]
Former-commit-id: 59cbfdf093
 2014-04-17 14:42:44 -04:00
Brian.Dyke
de500c093f Merged 14.2.1 -17, -18 into 1422-3 
Former-commit-id: 9df6fb2d4d [formerly 12a482e1d7] [formerly 9df6fb2d4d [formerly 12a482e1d7] [formerly b8829139a2 [formerly 712064db471de93da585f9c765bb4dfbe510df53]]]
Former-commit-id: b8829139a2
Former-commit-id: 6f35818917 [formerly 0ea7c51ad7]
Former-commit-id: a925ba6219
 2014-04-17 14:42:35 -04:00
Ron Anderson
3b177c01ce Merge "Issue #2664 Fix NullPointerException when no .prj file present" into development 
Former-commit-id: 3806a1fd05 [formerly 6b226db27c] [formerly 3806a1fd05 [formerly 6b226db27c] [formerly 66929690c7 [formerly de57933506ad588c8da38a49de6a2cd5530e2091]]]
Former-commit-id: 66929690c7
Former-commit-id: 55f31328af [formerly cacff76564]
Former-commit-id: 07f66078a4
 2014-04-17 13:13:03 -05:00
Ron Anderson
a2ec4af060 Issue #2664 Fix NullPointerException when no .prj file present 
Change-Id: I2716eca6b71d79657f19feadb931a23ee3e44f4d

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

Former-commit-id: a17f187929 [formerly 0b9f8ce7f1] [formerly a17f187929 [formerly 0b9f8ce7f1] [formerly b1a4f69578 [formerly 9c275288183b93ba5cac991dbbdf72bdf122ad0a]]]
Former-commit-id: b1a4f69578
Former-commit-id: 989fcfb42f [formerly 54e95e399b]
Former-commit-id: ce6d95bd3c
 2014-04-17 09:55:45 -05:00
Nate Jensen
f607630d72 Issue #3018 addressing code review comments 
Former-commit-id: 54951100af [formerly e327f5e0bf] [formerly 54951100af [formerly e327f5e0bf] [formerly 8ba6b2722d [formerly 85d9dd0158ab873e1e9b76805853c712bb0c7c2c]]]
Former-commit-id: 8ba6b2722d
Former-commit-id: 81f8f6f328 [formerly 8b6650c898]
Former-commit-id: 3737ad85b6
 2014-04-17 09:28:47 -05:00
Nate Jensen
7b01116623 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: df1b5183c1 [formerly 6e49d78e0d] [formerly df1b5183c1 [formerly 6e49d78e0d] [formerly d26c150aa9 [formerly 6d713f6a8a563b49bd1e2fa8151591657bd6735c]]]
Former-commit-id: d26c150aa9
Former-commit-id: 23082fd637 [formerly 8bf12cc32a]
Former-commit-id: e28da969c6
 2014-04-17 09:04:52 -05:00
Roger Ferrel
25c92e4b11 Issue #3023 Configurable available disk thresholds and unit test fixes 
Change-Id: Ia179baab388a9f9faf62e84e4a3338a7af3464b0

Former-commit-id: dc25ece75f [formerly 8ce590c31c] [formerly dc25ece75f [formerly 8ce590c31c] [formerly 3af564a653 [formerly ce00327d4cd248efb65fd8b6e823d93c81c9a902]]]
Former-commit-id: 3af564a653
Former-commit-id: 56da257816 [formerly 1214aac2a2]
Former-commit-id: 2e98b24e91
 2014-04-17 08:57:15 -05:00
Ron Anderson
d704f90445 Merge "Issue #3018 synchronize in BundleReflections to avoid shutdown deadlock" into omaha_14.2.1 
Former-commit-id: 85a1f55ea0 [formerly f9a393172f] [formerly 85a1f55ea0 [formerly f9a393172f] [formerly 1ba72371be [formerly 6813b32786289503950322c02e32803299566c5d]]]
Former-commit-id: 1ba72371be
Former-commit-id: 2139c2308e [formerly 7d09397faa]
Former-commit-id: 94f852cda7
 2014-04-16 18:02:11 -05:00
Nate Jensen
de32624fdf Issue #3018 synchronize in BundleReflections to avoid shutdown deadlock 
Former-commit-id: 781ec3ecd6 [formerly a085b71c81] [formerly 781ec3ecd6 [formerly a085b71c81] [formerly c362af04f3 [formerly 7384a2d32ef554362a0693038e9b60a589afb86a]]]
Former-commit-id: c362af04f3
Former-commit-id: 1a40bc4824 [formerly e1caa66625]
Former-commit-id: e4aeb8394d
 2014-04-16 17:25:09 -05:00
Brad Gonzales
3081ab6276 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: fd0bb35109 [formerly ab2488b2db] [formerly fd0bb35109 [formerly ab2488b2db] [formerly 975a088945 [formerly b80a3b8d1c90b7fb8720171f16529edc81bc30a8]]]
Former-commit-id: 975a088945
Former-commit-id: 4ad01be9e1 [formerly 72b4b07fb4]
Former-commit-id: e06b46c765
 2014-04-16 17:07:49 -05:00
Nate Jensen
33b397e461 Merge "Issue #3037 - Add dispose check in runAsync call." into development 
Former-commit-id: 5ea27f270f [formerly 8ad4b26151] [formerly 5ea27f270f [formerly 8ad4b26151] [formerly 70d132c59a [formerly b44bb9043a002e0749f6bcda41158a56d047c5af]]]
Former-commit-id: 70d132c59a
Former-commit-id: 65ee834371 [formerly 82267f8b0b]
Former-commit-id: 2438a08648
 2014-04-16 16:31:18 -05:00
Nate Jensen
77208c0507 Merge "Issue #3020 fixed error message when attempting to create already accessible room" into development 
Former-commit-id: 27c9ee561e [formerly f313f2f20c] [formerly 27c9ee561e [formerly f313f2f20c] [formerly 2ea1878403 [formerly fc8880c642201685feefbf3eb14cb4f1a7c962b1]]]
Former-commit-id: 2ea1878403
Former-commit-id: ecf9a4e671 [formerly 05e1aa10a8]
Former-commit-id: 2f348d60e6
 2014-04-16 16:30:46 -05:00
Nate Jensen
4cfdfae410 Merge "Issue #3021 increased width of create session dialog to fit error msg" into development 
Former-commit-id: 109051a061 [formerly d96b75ca13] [formerly 109051a061 [formerly d96b75ca13] [formerly 52b9060f7a [formerly e59d579fc51125b7805c22dfea26b31f17d1be97]]]
Former-commit-id: 52b9060f7a
Former-commit-id: d29f4091ca [formerly 78a240fded]
Former-commit-id: ff1df44da0
 2014-04-16 16:30:39 -05:00
Nate Jensen
64e7ac4225 Issue #3039 fix ifpImage class cast exception 
Former-commit-id: a5edace073 [formerly 2b6db445c0] [formerly a5edace073 [formerly 2b6db445c0] [formerly 31fb61e824 [formerly a2fd849c603aebacce09662557bf1f008d379982]]]
Former-commit-id: 31fb61e824
Former-commit-id: 19f0be6afc [formerly a1dd7f24fa]
Former-commit-id: 7e7bbfd784
 2014-04-16 16:17:05 -05:00
Lee Venable
ea2db1a45d Issue #3037 - Add dispose check in runAsync call. 
Change-Id: I13c7475f8c56f677f3dbdfab8d6000061db86f9f

Former-commit-id: 6b0468f07e [formerly 33fc376f33] [formerly 6b0468f07e [formerly 33fc376f33] [formerly 7386d4b318 [formerly c511ef6d5566f0e1d9ae3d5ea886abbf1159d41a]]]
Former-commit-id: 7386d4b318
Former-commit-id: cc6380ba33 [formerly 98e9912a94]
Former-commit-id: b47e0f7e87
 2014-04-16 15:40:46 -05:00
Richard Peter
56ee6e0240 Merge "Issue #2947 Redo satellite derived parameters to use an inventory to determine availability." into development 
Former-commit-id: 0b82df7ad0 [formerly 852cb3cd46] [formerly 0b82df7ad0 [formerly 852cb3cd46] [formerly 8c190bd158 [formerly 326b9ef83021ce71f715b6f352401dd936e992c7]]]
Former-commit-id: 8c190bd158
Former-commit-id: bed7035a67 [formerly f8c75819bb]
Former-commit-id: f6ec3782b6
 2014-04-16 15:11:07 -05:00
Ben Steffensmeier
3c1adead47 Issue #2947 Redo satellite derived parameters to use an inventory to determine availability. 
Former-commit-id: bb51fb299a [formerly 709e3411c4] [formerly bb51fb299a [formerly 709e3411c4] [formerly a8bb2c0dfd [formerly 1a041cb3be1141f4af116335e5b9540beda817cb]]]
Former-commit-id: a8bb2c0dfd
Former-commit-id: a51b965c4f [formerly 119ced4a01]
Former-commit-id: cc6d858f47
 2014-04-16 14:54:59 -05:00
Brian Clements
9a8c3231c6 Issue #3021 increased width of create session dialog to fit error msg 
Former-commit-id: ef791fe481 [formerly 1112ca621e] [formerly ef791fe481 [formerly 1112ca621e] [formerly bb915796ad [formerly f0bcc20987d814a716994f712c6132bb79963457]]]
Former-commit-id: bb915796ad
Former-commit-id: 549941882e [formerly 5c46c768d2]
Former-commit-id: f674aa07d7
 2014-04-16 14:33:02 -05:00
Brian Clements
0b7e067d96 Issue #3020 fixed error message when attempting to create already accessible room 
Former-commit-id: 57d2f28d54 [formerly bfafb0d055] [formerly 57d2f28d54 [formerly bfafb0d055] [formerly 4a8ee65cca [formerly 738e4cb06a549e6067274af033cc7ba725b1a8e2]]]
Former-commit-id: 4a8ee65cca
Former-commit-id: 4829ef25bc [formerly 8861489810]
Former-commit-id: 63b9349843
 2014-04-16 14:26:17 -05:00
Lee Venable
9b085066c0 Issue #3034 - added widget dispose checks in runAsync methods. 
Change-Id: I9182441c34c63c5a78023adda2ec036f2a51192e

Former-commit-id: f4fb7b24f6 [formerly 7f068f164c] [formerly f4fb7b24f6 [formerly 7f068f164c] [formerly ff3b42468f [formerly 8e8e65ecbc22dcebb7a494ddbd6b7183d67981a0]]]
Former-commit-id: ff3b42468f
Former-commit-id: 885e17788d [formerly 4cdbf301f3]
Former-commit-id: 31c8e61cb6
 2014-04-16 13:15:31 -05:00
Brian.Dyke
73efa466f9 Merged 13.5.5-1 into 1412 
Former-commit-id: 65ad515a6e [formerly 188d84cc87] [formerly 65ad515a6e [formerly 188d84cc87] [formerly 35ad867281 [formerly f44629e87a6401a5b872c050b9cf79defd306171]]]
Former-commit-id: 35ad867281
Former-commit-id: c0266e8988 [formerly 72618c4214]
Former-commit-id: 737283b94a
 2014-04-16 12:09:12 -04:00
Brian Clements
4979fe13df Issue #2981 fixed NPE when cached shared group deleted on server 
Former-commit-id: 8a4f212fdb [formerly 7afb1e66f5] [formerly 8a4f212fdb [formerly 7afb1e66f5] [formerly 7fd7817af4 [formerly 8ee453e3f5256d3ffed255aaebc792155001bc8e]]]
Former-commit-id: 7fd7817af4
Former-commit-id: 1daf03844c [formerly 007ba2ae4d]
Former-commit-id: 14084ee128
 2014-04-16 09:23:26 -05:00
Nate Jensen
0e6fdab306 Merge "Issue #2956 safety checks for GLShadedShapeBase" into development 
Former-commit-id: 2fba1f36ef [formerly 80434db98d] [formerly 2fba1f36ef [formerly 80434db98d] [formerly 120d8429a7 [formerly 85aa7d53fdbbad696aa86e4fc992ff6288d199e3]]]
Former-commit-id: 120d8429a7
Former-commit-id: 2e23ae75f4 [formerly 62613ab33d]
Former-commit-id: 2f2d965833
 2014-04-16 08:41:43 -05:00
Nate Jensen
baafe7f7da Merge "Issue #2822 only allow transfer leader if participant is using shared display" into development 
Former-commit-id: c723ec0bda [formerly 771885f9a5] [formerly c723ec0bda [formerly 771885f9a5] [formerly c16bbb52e4 [formerly fb0c92951904565dbde6763cad15c6925265ccb2]]]
Former-commit-id: c16bbb52e4
Former-commit-id: 79c3f5f3a8 [formerly 550577806f]
Former-commit-id: 267258647e
 2014-04-15 17:55:21 -05:00
Nate Jensen
c9a79bc2d5 Issue #2956 safety checks for GLShadedShapeBase 
Change-Id: I7ec226af0de46ee3c7dffc34e82da9cf6846e451

Former-commit-id: 66f4ce250a [formerly 726c122dc7] [formerly 66f4ce250a [formerly 726c122dc7] [formerly 8b93dffb4f [formerly 1249c06521c5575960605176dcd46b77cbe1a1bc]]]
Former-commit-id: 8b93dffb4f
Former-commit-id: 2cf5941fe1 [formerly 56f645bbc7]
Former-commit-id: 77cf2d682f
 2014-04-15 17:38:17 -05:00
Lee Venable
4d0bead6bd Merge "Issue #3031 - Added dispose check in the runAsync calls." into development 
Former-commit-id: 14f0dc298e [formerly cde3cdeed1] [formerly 14f0dc298e [formerly cde3cdeed1] [formerly 2a93e03117 [formerly 05afe0e610860eca39453ddf12180466b48e43ea]]]
Former-commit-id: 2a93e03117
Former-commit-id: a34e169792 [formerly c9c845d5f2]
Former-commit-id: 195a4dacfa
 2014-04-15 17:37:13 -05:00