Commit graph

79 commits

Author SHA1 Message Date
Brian Clements
8bb6a1ac40 Issue #3076 added clear all to shared display sessions
Former-commit-id: 02c921ed12 [formerly 729e717be1] [formerly f545c548cc] [formerly 02c921ed12 [formerly 729e717be1] [formerly f545c548cc] [formerly 1432aa1302 [formerly f545c548cc [formerly 9e4a518f2ecbe86fed87fbb6dac7fad08ffb33eb]]]]
Former-commit-id: 1432aa1302
Former-commit-id: 0fbb5dc22a [formerly 8674841154] [formerly bcb942f3e18364de413f94465a2f8a874c91dc8e [formerly 5583c3903b]]
Former-commit-id: db57e64f5cb253ecb97388555bf76c0cac27eaf9 [formerly 3a60b0db05]
Former-commit-id: 89f3a0a1d2
2014-05-06 09:30:07 -05:00
Nate Jensen
2b6ad3264c Issue #2956 more safety checks
Change-Id: I3984fa2b534b16b2e4485e1f66d65f8df48b2e4e

Former-commit-id: 54c6d5d07f [formerly d759efcaa8] [formerly f4d20c41f4] [formerly 54c6d5d07f [formerly d759efcaa8] [formerly f4d20c41f4] [formerly 7d142d9d9d [formerly f4d20c41f4 [formerly a24190f35b87351a5f699ac05041bec7a13a1cdb]]]]
Former-commit-id: 7d142d9d9d
Former-commit-id: 9f08442039 [formerly 6f211aa9f8] [formerly fb99f58ad5a7cfb43ae453f0c000e943ba999928 [formerly f3b68178bd]]
Former-commit-id: 930f4906645edbcafbe567a1652cb392d52f18a5 [formerly 3f9a33bf35]
Former-commit-id: 42a27546f9
2014-05-01 16:28:16 -05:00
Brian Clements
d3813b0f96 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: 345fe6f866 [formerly 334ad3ca81] [formerly 02f08d75c6] [formerly 345fe6f866 [formerly 334ad3ca81] [formerly 02f08d75c6] [formerly 94aa761e19 [formerly 02f08d75c6 [formerly 01e773fb9d4ec8b0ab75ddf714b79debb9ad4096]]]]
Former-commit-id: 94aa761e19
Former-commit-id: 32b8ddd64c [formerly 84f75ca30a] [formerly 71f1e691809a438edfee89c10c322f7e092afc10 [formerly 12304655e8]]
Former-commit-id: 7d1e4b70e650e3930f0ba2b7d95a341ff827b93d [formerly c27f2d9e53]
Former-commit-id: 670c4e1611
2014-04-24 16:10:27 -05:00
Brian Clements
88c8e3be8e Issue #2955 ignore duplicate session invites
Former-commit-id: 9f18c5d54c [formerly e81ee94171] [formerly f888819646] [formerly 9f18c5d54c [formerly e81ee94171] [formerly f888819646] [formerly 4fa9afc9ae [formerly f888819646 [formerly a48b12b8aaeea250680c0726f72425eac170ecd7]]]]
Former-commit-id: 4fa9afc9ae
Former-commit-id: 363632479a [formerly 39c2a1ac37] [formerly 8ac39537a1c44d7ebe4df3667107708e5209338d [formerly 75465b69ed]]
Former-commit-id: 729b6df5f19a32c2faab5eaeae7c9625470cf031 [formerly 3b96c4c628]
Former-commit-id: 9e2497714b
2014-04-24 09:25:54 -05:00
Lee Venable
cb2d378302 Issue #3040 - Fixed contact request and group name issues.
Change-Id: I7a430d4a443bdbcf7951ca9b6047b5cbda88238e

Former-commit-id: e17fa9f609 [formerly eed8c6cbba] [formerly df05a79d63] [formerly e17fa9f609 [formerly eed8c6cbba] [formerly df05a79d63] [formerly f13ac7e1b9 [formerly df05a79d63 [formerly badc9fa46aebe7f7da25c3a115294a37b30aa507]]]]
Former-commit-id: f13ac7e1b9
Former-commit-id: 0c67eecb00 [formerly 421a4e4677] [formerly 0c6b693c6efe16d8a10f2143e1a25863ed0ea9e1 [formerly 222154d094]]
Former-commit-id: d5533a155ad3c0d43ac03773bee2a4a39ca0e4aa [formerly e81836e371]
Former-commit-id: 6c54817117
2014-04-23 18:24:25 -05:00
Nate Jensen
bfc78fc68f Merge "Issue #2822 shared display invitations always go to cave" into development
Former-commit-id: 68e3650305 [formerly 827112349a] [formerly ad6e4712d6] [formerly 68e3650305 [formerly 827112349a] [formerly ad6e4712d6] [formerly 2b20cf5440 [formerly ad6e4712d6 [formerly 2a61b602d55922e5b7f5002f794449880c2cc1a7]]]]
Former-commit-id: 2b20cf5440
Former-commit-id: 73a3cde77b [formerly 418741ce55] [formerly 56369e0fe9e69598af2bbd95632d4f6ff4857957 [formerly a0423843b3]]
Former-commit-id: 92e3587e5640d2a1f27ca32c1843be9b9df2ba4a [formerly 1abd65120e]
Former-commit-id: 61eca0980f
2014-04-23 15:30:44 -05:00
Brian Clements
9c6a004507 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 148d158380 [formerly 117eeca83a] [formerly f3ee7b453a] [formerly 6969321db0 [formerly f3ee7b453a [formerly 796e4dcd2d81d8b34ae835dbe8443fd56ba873e3]]]]
Former-commit-id: 6969321db0
Former-commit-id: 00ebd60fad [formerly 50acaac149] [formerly a24c2596dc9f506edbc4e849e78e744becb558ec [formerly 5d2ec9b909]]
Former-commit-id: fbd7e100e18e887890a44088729e97f34fef0552 [formerly d9a1bba4c8]
Former-commit-id: 8cdeb571f3
2014-04-23 14:16:42 -05:00
Nate Jensen
52cf9e0b37 Issue #3060 safety checks for SWT widgets being disposed
Change-Id: I85c56318452a31122ee7f144e5500d089aa614e2

Former-commit-id: 37371486ba [formerly fbecf66f79] [formerly 426f103e7b] [formerly 37371486ba [formerly fbecf66f79] [formerly 426f103e7b] [formerly 38d493ff1b [formerly 426f103e7b [formerly 0c391f8c7f1694c6939419b5fcc4a6a963092ae3]]]]
Former-commit-id: 38d493ff1b
Former-commit-id: 342c851b04 [formerly 2b68a49a43] [formerly f2ca8041ae7698bcc9759ba71d21e9d90aae5740 [formerly 20f3f8ffa2]]
Former-commit-id: 455ce998f25ebf8f278cbe9b316a5e569c7eb06a [formerly ff9101c057]
Former-commit-id: 7c349e268e
2014-04-23 12:26:27 -05:00
Nate Jensen
c93aa94cde Merge "Issue #3056 made venue participant equals method case insensitive" into development
Former-commit-id: bf06389b9e [formerly cc1da5fb88] [formerly fe3ff669a7] [formerly bf06389b9e [formerly cc1da5fb88] [formerly fe3ff669a7] [formerly 8df505325c [formerly fe3ff669a7 [formerly d6f1435a902615724aed2ff0279a6deb29933ce1]]]]
Former-commit-id: 8df505325c
Former-commit-id: 9ca82ebdd7 [formerly 484b197a56] [formerly 58158f2fd8ff32145cf4fa8dd05d47988bbcbd10 [formerly be6818e96b]]
Former-commit-id: 5eea4c11b89c95940f50903c81294fd99a1657b7 [formerly ad96f9d128]
Former-commit-id: 2b71b60b2e
2014-04-22 12:50:27 -05:00
Brian Clements
e750a1e5a5 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 a5730ca7bd [formerly bfd88f3e14] [formerly 1adbf6253a] [formerly 2a9d341910 [formerly 1adbf6253a [formerly 7a2423f4a90597706e52ce0f89bacb1a0e10f067]]]]
Former-commit-id: 2a9d341910
Former-commit-id: 38fbf8048e [formerly 19c2695dca] [formerly a85a4bc02f2dd752ca54943517184b9bdbf83b43 [formerly 8677a9f359]]
Former-commit-id: f678746e9629ae3e37e221f399d19883fbdc4848 [formerly 97c5fe6d4a]
Former-commit-id: d74f192819
2014-04-22 11:55:36 -05:00
Brian Clements
95e4effdc3 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 1665175d35 [formerly cdf3aa90e9] [formerly 717cdf4280] [formerly ef61a7c281 [formerly 717cdf4280 [formerly 9b6c20ac39765120efc523c03a3d11d4b21c1748]]]]
Former-commit-id: ef61a7c281
Former-commit-id: 001e0b030b [formerly e7005953eb] [formerly 80e474ab1d11f23309bd83f864334950b90dc4ac [formerly 295ff106b6]]
Former-commit-id: 2047ae5bb2050dbdf619f1a51871a47a0ff3718e [formerly fb24e315bf]
Former-commit-id: fb74637aa8
2014-04-22 10:01:27 -05:00
Mike Duff
326b17ce50 Issue #2955 - Made chat invitation dialogs non-modal
Change-Id: Ib7294e8149996715b6a247a1e04335dc1a0c7023

Former-commit-id: 6da65fe71a [formerly 71cf0d04e7] [formerly ead90bc794] [formerly 6da65fe71a [formerly 71cf0d04e7] [formerly ead90bc794] [formerly b507739637 [formerly ead90bc794 [formerly bb61e3c39d5dabf7e698726f0a093d8cf4f7088a]]]]
Former-commit-id: b507739637
Former-commit-id: ebbb721787 [formerly 75f794d54d] [formerly 5c415e155bfe7e16d70fc0b35ad0574fc7085261 [formerly 9a082a1588]]
Former-commit-id: 6157e38ab3e1698599dadf55b906513f06b68612 [formerly ae984e4c16]
Former-commit-id: 6c4490b08c
2014-04-21 09:00:42 -05:00
Brian Clements
cdd2dc4286 Issue #3021 increased width of create session dialog to fit error msg
Former-commit-id: 78c1b34cdf [formerly ef791fe481] [formerly 1112ca621e] [formerly 78c1b34cdf [formerly ef791fe481] [formerly 1112ca621e] [formerly bb915796ad [formerly 1112ca621e [formerly f0bcc20987d814a716994f712c6132bb79963457]]]]
Former-commit-id: bb915796ad
Former-commit-id: b8f40429ec [formerly 549941882e] [formerly fd6c03748bfb24190c526a992357f258a7c91630 [formerly 5c46c768d2]]
Former-commit-id: df9e17c1cd4d0111d5fb577725292b44c1b93fd4 [formerly f674aa07d7]
Former-commit-id: 9a8c3231c6
2014-04-16 14:33:02 -05:00
Brian Clements
2a8d66a9f7 Issue #2822 only allow transfer leader if participant is using shared display
Former-commit-id: dc1d2d39f8 [formerly db67c03382] [formerly 5250f7a442] [formerly dc1d2d39f8 [formerly db67c03382] [formerly 5250f7a442] [formerly 6ccedc1182 [formerly 5250f7a442 [formerly af9577548e40397c67f72eb60485ee8de48f169b]]]]
Former-commit-id: 6ccedc1182
Former-commit-id: 602794b56d [formerly 6f9ef9a515] [formerly fffe96d7c192b1e0ed78a1625828ff61c7efe072 [formerly e8907aa729]]
Former-commit-id: 05d59da434ed10fbd0f9d1601a73552672294e6c [formerly 9acb5a4a5b]
Former-commit-id: 8945b26e9b
2014-04-15 15:15:11 -05:00
Brian Clements
19d7cef419 Issue #2903 made xmpp reconnect an explicit action by user
moved non-session classes out of session package
connection classes moved to connection package
made separate classes for connection listeners
removed password from heap
login dialog remembers last server used
added reconnect handler to prompt user to re-login after disconnect


Former-commit-id: 3d8bcb8701 [formerly 6f7851d8c4] [formerly 8ab1bab974] [formerly 3d8bcb8701 [formerly 6f7851d8c4] [formerly 8ab1bab974] [formerly 6b22374046 [formerly 8ab1bab974 [formerly 762e7d3a1ff47f794aa843d2b159ac78b4ab12a3]]]]
Former-commit-id: 6b22374046
Former-commit-id: 5b5669e1e1 [formerly ca5909e222] [formerly 3329c6cc7af41bc830f1a278385881ed9ff2d11c [formerly 7cf5f06f2a]]
Former-commit-id: 54da4997513795ce82cf53a0964eb73eee1095d9 [formerly 054b47951d]
Former-commit-id: 86081dda91
2014-04-15 15:12:33 -05:00
Mike Duff
a2316806a5 Issue #2785 - Fix loading of groups in sub request dialog
Change-Id: If42e1f3fe80bde16fcc86dfa0a0b5673e5359722

Former-commit-id: c70da23f91 [formerly 3a6e718ff0] [formerly 81e4c9b05d] [formerly c70da23f91 [formerly 3a6e718ff0] [formerly 81e4c9b05d] [formerly d2a80ca966 [formerly 81e4c9b05d [formerly e72a852935dcb519604b37dc873645d4b419ee43]]]]
Former-commit-id: d2a80ca966
Former-commit-id: dceb75c423 [formerly 0bf14203ff] [formerly 97976d43b384551d73f379695ead9b9d54c82cb5 [formerly 4773c3722c]]
Former-commit-id: 8b2b23ba29774d082ea5cf0ea4bc20efdf754a73 [formerly ddeb7fe4d2]
Former-commit-id: 78a0ad33ef
2014-04-15 10:10:18 -05:00
Brad Gonzales
34981c24ea Issue #2937 Connect to the venue after the feed view is available.
Change-Id: I6e560014308e6d17c8d7af525ded82d2399fa936

Former-commit-id: 0380e02c77 [formerly 5fcec27765] [formerly cc0fd1e9af] [formerly 0380e02c77 [formerly 5fcec27765] [formerly cc0fd1e9af] [formerly ea03096031 [formerly cc0fd1e9af [formerly 7b0e689a06eeee9f7c39dd79642fcde8e329c990]]]]
Former-commit-id: ea03096031
Former-commit-id: ccc4bc5a27 [formerly e41f9defa4] [formerly 4877a895772c022be238b72f3f06a1ed801f3390 [formerly 3b25edad9a]]
Former-commit-id: 7532bd6c2903b0a647393634444c14f575bbb9a0 [formerly 8f72707b3a]
Former-commit-id: 91d546d015
2014-04-10 14:01:53 -05:00
Mike Duff
dc7d97752f Issue #2785 - Change connection order of events
Fixed classpath
Change-Id: I15296306ee105a54379a370da7d53c7e46dc34bb

Former-commit-id: 7c9a7d609e [formerly bdde561f8a] [formerly efefe62e0f] [formerly 7c9a7d609e [formerly bdde561f8a] [formerly efefe62e0f] [formerly 7da1547c22 [formerly efefe62e0f [formerly a2d595f4232e86606f7e2338ece59961649080a3]]]]
Former-commit-id: 7da1547c22
Former-commit-id: 6fd58b3778 [formerly 2b67272b60] [formerly 130275c111513af444bdaa0efc7abcffce08c460 [formerly 7145820d62]]
Former-commit-id: 8e79399cf0153a7c7c8746851927e35e63f1b36b [formerly 3c6c0824ce]
Former-commit-id: 2b520fe31e
2014-04-08 14:14:20 -05:00
Nate Jensen
51502f7db5 Merge "Issue #2632 - Remove user from list on sign-off. Fixed check for available" into development
Former-commit-id: 72c8f1d844 [formerly c0704488cc] [formerly 6b20d38b1a] [formerly 72c8f1d844 [formerly c0704488cc] [formerly 6b20d38b1a] [formerly 579d2416cb [formerly 6b20d38b1a [formerly 8f25c8c9f9e47cbff07e8ac39dfb6ab672adb611]]]]
Former-commit-id: 579d2416cb
Former-commit-id: 5821a0e0e0 [formerly d5d42f2f6b] [formerly b937a5eaf68a15c6804ca9d1bfabddacdd99ff79 [formerly 19560ebc7c]]
Former-commit-id: bf3a7ac4f9e4177a919e5423eb8d193e349a283a [formerly 62f1451e50]
Former-commit-id: 691c4411fc
2014-04-02 11:23:02 -05:00
Mike Duff
a5a38133ca Issue #2632 - Remove user from list on sign-off. Fixed check for available
Change-Id: I2a389e290b697dfe06be9b4fef8d5957676f3cbe

Former-commit-id: ac9678dc6e [formerly 2a9b434883] [formerly 538261f6d5] [formerly ac9678dc6e [formerly 2a9b434883] [formerly 538261f6d5] [formerly d5df936431 [formerly 538261f6d5 [formerly 2f9981c5173f0c2523b586ce10147f738028b907]]]]
Former-commit-id: d5df936431
Former-commit-id: 378909ad2c [formerly 7aa5cebfb0] [formerly 42269ff35b4c62e12785ae2a916e17bf654fe7c6 [formerly 92f1a3a9aa]]
Former-commit-id: 326f3902389d6b4cb29f450dd9b92a133b682aa9 [formerly 0aea45197a]
Former-commit-id: ce774c07a8
2014-04-02 10:08:45 -05:00
Mike Duff
5d31ddb1ca Issue #2938 - Fix site/role change logic for messages
Change-Id: I5a08020f28b986c7815bb5ab2b71a34d9e105500

Former-commit-id: 656966669d [formerly 66181ca3a5] [formerly 8967ddd94a] [formerly 656966669d [formerly 66181ca3a5] [formerly 8967ddd94a] [formerly 169ad502de [formerly 8967ddd94a [formerly 9ffc540c21245b308334040234be03d78a501656]]]]
Former-commit-id: 169ad502de
Former-commit-id: fe8961bb24 [formerly 3686e50328] [formerly f6d2ebf70d78eeca18274f66c05c2ad2791f600b [formerly f117f575eb]]
Former-commit-id: 4d6d18da98db131b315736ebe9f687afb4224c68 [formerly 54d17b375f]
Former-commit-id: cc53c1ac23
2014-04-02 08:12:53 -05:00
Brad Gonzales
2637e3c237 Issue #2937 Separate room logging into a subdirectory to separate room logs from
other logging. Updated abstract_setup.xml to check the javaUtilities baseline directory and the cots directory
for dependency jars so that symbolic links are not needed in order to build.  Fixes for Archive log access
and search.

Change-Id: I7ca111cebb4dae998ce1390f3bb73b0f48eb7174

Former-commit-id: 85911a9d01 [formerly d4659c48a6] [formerly 404faeeca0] [formerly 85911a9d01 [formerly d4659c48a6] [formerly 404faeeca0] [formerly 15e1b7a7f6 [formerly 404faeeca0 [formerly 480c86e5bbe6866b8c4c285006d3d7f7fed2b056]]]]
Former-commit-id: 15e1b7a7f6
Former-commit-id: c12c4cf7e2 [formerly 1c685a9eb6] [formerly f8fc71ad10a4d9dbd3464113660b2d2d68675fd5 [formerly 2f56fd3c9d]]
Former-commit-id: 742e4cc46d2a1218def59e841a9507b8581e81ce [formerly 4940c40a7f]
Former-commit-id: 5506e9362a
2014-03-31 11:45:22 -05:00
Lee Venable
2644d48fc0 Issue #2960 - added checks for SashForm weights
Former-commit-id: 0b8d762f4b [formerly bdb18ea85b] [formerly 19dd95ba24] [formerly 0b8d762f4b [formerly bdb18ea85b] [formerly 19dd95ba24] [formerly 3018ff1f5f [formerly 19dd95ba24 [formerly 1a3c0743b773f695fa881f83a9773a899a2ef111]]]]
Former-commit-id: 3018ff1f5f
Former-commit-id: 5ffe5c01f6 [formerly f7e1ee666b] [formerly 8994df39c007e35516677413a4a7d0c0f74e7bc6 [formerly 1504b3532e]]
Former-commit-id: 8b5260355b4e750a39f73f261eadbf55b49f4555 [formerly 5bbb65637e]
Former-commit-id: d1928c95d9
2014-03-28 15:30:11 -05:00
Mike Duff
db4d8b76f0 Issue #2632 - Fixed notifier preference OK, Apply, Cancel actions
Change-Id: I9af93c4935c5d9dc6777be0e0435bb71be5f613b

Former-commit-id: 5476afd095 [formerly d2eed9891a] [formerly d803986440] [formerly 5476afd095 [formerly d2eed9891a] [formerly d803986440] [formerly 98b5fd762e [formerly d803986440 [formerly a50bd58e95a929fe569f5df68dd4d4a8b6625807]]]]
Former-commit-id: 98b5fd762e
Former-commit-id: cd626d0555 [formerly f92754f752] [formerly 7b61ae882d35a9231f7bff856832af42ae2f309a [formerly b1d74f855e]]
Former-commit-id: 7aadfd7a15d93ff37cbf9b952a4c1868beb41dee [formerly 531e66cbb6]
Former-commit-id: 5e0e640336
2014-03-27 16:31:30 -05:00
Nate Jensen
64be4dae2d Merge "Issue #2938 - Show status message for site/role changes, but not return from away" into development
Former-commit-id: d1ca7d7c75 [formerly c7dc0baeb9] [formerly 38e3305e60] [formerly d1ca7d7c75 [formerly c7dc0baeb9] [formerly 38e3305e60] [formerly 4861f92ef6 [formerly 38e3305e60 [formerly 578a9ec587b83d77c6e6882a7e8bf71aecd996ff]]]]
Former-commit-id: 4861f92ef6
Former-commit-id: 0a9da8ca6c [formerly 307cdc15c1] [formerly f289ec627b5f30e10b3a962e1f08f3e13492e4e2 [formerly 7c581cb5d7]]
Former-commit-id: 2b59d9930948c459e8f6edef62cf78dc6f8d5fda [formerly 015dc45eba]
Former-commit-id: a36bdb3b99
2014-03-25 13:11:29 -05:00
Mike Duff
3b224f6ac9 Issue #2938 - Show status message for site/role changes, but not return from away
Change-Id: I30f6e1122e813d70b1c3fbee5e0b0f6ce9107dd2

Former-commit-id: 1d0edcc2c6 [formerly 758fdca514] [formerly 1e42d8a30d] [formerly 1d0edcc2c6 [formerly 758fdca514] [formerly 1e42d8a30d] [formerly a06f058ea9 [formerly 1e42d8a30d [formerly 666a354d6f676b899bd14371517bce9de88192d2]]]]
Former-commit-id: a06f058ea9
Former-commit-id: 47402575c0 [formerly 81ac35a1b8] [formerly 6fb4c8dc2286133134b00c03341141f90a3454df [formerly d497c533e6]]
Former-commit-id: 2740eb49374c5a2de83bcfcf6da18c01c8648899 [formerly 97c4e48255]
Former-commit-id: 7705874ea3
2014-03-25 11:18:09 -05:00
Nate Jensen
d085d6bfcb Issue #2935 fix refresh issue
Change-Id: I0bd19d2667610a5db68fc12b0d320b4236937994

Former-commit-id: c6474ef98e [formerly d1f080fd05] [formerly 68f9181340] [formerly c6474ef98e [formerly d1f080fd05] [formerly 68f9181340] [formerly 7b586ebd67 [formerly 68f9181340 [formerly 517fd6fca0f08cbc166b58d67d86af43331533cf]]]]
Former-commit-id: 7b586ebd67
Former-commit-id: 19b2056aaf [formerly 447b1a36bb] [formerly 1685ee85fb1e67da2bfbc2821c89b427bb01d5d0 [formerly 0cad1fa167]]
Former-commit-id: 48d96d20b890321c6bbe7e22129e08fa04053556 [formerly a5b0c8b432]
Former-commit-id: 8e3b78ba6a
2014-03-25 10:24:11 -05:00
Mike Duff
e9dae1a861 Issue #2936 - Remove the join alert from the nws collaboration feed
Change-Id: Icf246e86cc7d7d04ed56d1aefafe0e27d1292840

Former-commit-id: 0fd2a2a426 [formerly eacc161ee4] [formerly fd31ea7fa5] [formerly 0fd2a2a426 [formerly eacc161ee4] [formerly fd31ea7fa5] [formerly ca27ceac1f [formerly fd31ea7fa5 [formerly ca47cb349b4749edaac6afe0648c18cb06a9f9df]]]]
Former-commit-id: ca27ceac1f
Former-commit-id: dd804a13ff [formerly 86fc8d74d5] [formerly 26a0a3d7ea325414e2b4fd69c1a38bcc0d1f1c56 [formerly fc7a71889c]]
Former-commit-id: aaf5ab7ad0f3fc0cc724c92a5e30b5288b163eed [formerly a1661a5389]
Former-commit-id: 9075ec61a0
2014-03-24 14:59:33 -05:00
Nate Jensen
a99fd8dbbb Issue #2895 fixed telestration when leadership returns to a previous
leader

Change-Id: Ie61adbe281b6920db994e1e30a3cbe621a1d5033

Former-commit-id: 1447abe995 [formerly 68b60eba47] [formerly e75d3dfb7c] [formerly 1447abe995 [formerly 68b60eba47] [formerly e75d3dfb7c] [formerly 2fc1030fad [formerly e75d3dfb7c [formerly 8a0f86ebb2f659e55afc39cb6cf4bb4bdfb857b0]]]]
Former-commit-id: 2fc1030fad
Former-commit-id: 52e60a68a9 [formerly 8589374171] [formerly 389d920f6cf85e74cfa2b1864b84d9f952b0b23a [formerly ca1ec93450]]
Former-commit-id: 2113aab9642e8adaee09df90029c31ddc9b73949 [formerly 5cb38bd511]
Former-commit-id: 1125203c93
2014-03-18 12:52:01 -05:00
Mike Duff
6f1a28796f Issue #2798 - Fix issue with color not changing for existing user changing site.
Change-Id: Ida0fac975d477d4d248036d5948c72b44658bd57

Former-commit-id: 3d62505600 [formerly ac65a87fe5] [formerly 3d10260065] [formerly 3d62505600 [formerly ac65a87fe5] [formerly 3d10260065] [formerly 7bdef60a55 [formerly 3d10260065 [formerly 8c82d25f6197e838bbd6119003d589bf4fa266ee]]]]
Former-commit-id: 7bdef60a55
Former-commit-id: e0d65b3d63 [formerly 1a3e88c5da] [formerly 28df91565a1ef26047c815bc98382442f1c3836b [formerly 5bbe504f82]]
Former-commit-id: 18df7f16b5a9135e21e0b5b37cd5579d82035bca [formerly b560f16623]
Former-commit-id: 179082ebf9
2014-03-18 11:55:00 -05:00
Nate Jensen
16c7c19469 Merge "Issue #2632 - Don't execute notifier on null presence, fix bug with group in UI when deleting last user in group, property change to handle String and Boolean." into development
Former-commit-id: 84d698b111 [formerly 0e39a89ea3] [formerly 82778ad21b] [formerly 84d698b111 [formerly 0e39a89ea3] [formerly 82778ad21b] [formerly f8180587d4 [formerly 82778ad21b [formerly b723095f6d5d59b67370c7292f88f339d349993a]]]]
Former-commit-id: f8180587d4
Former-commit-id: dd1818bcd9 [formerly 32ccf77885] [formerly e60e13c06f98e845a0be9a81f12628aa3cec8c08 [formerly 34c5d1de25]]
Former-commit-id: b179639787b8133c9613c1bd824d46ea7d5df645 [formerly 2c0d7d2d3e]
Former-commit-id: 718d69723b
2014-03-12 16:05:19 -05:00
Mike Duff
11e96f8bd5 Issue #2632 - Don't execute notifier on null presence, fix bug with group in UI when deleting last user in group, property change to handle String and Boolean.
Change-Id: I533e0831529038cb4205e38e706369ca74f4f824

Former-commit-id: bb2b251cd0 [formerly 6444131768] [formerly 8068c9aa83] [formerly bb2b251cd0 [formerly 6444131768] [formerly 8068c9aa83] [formerly e01c5c3534 [formerly 8068c9aa83 [formerly 13f134bafc5331939e23ce0e14d350593bb7c2e1]]]]
Former-commit-id: e01c5c3534
Former-commit-id: cbc15d479a [formerly 4fddc0c631] [formerly ea4a4997b336401081920b43fb91017011502ca3 [formerly 832dd498fc]]
Former-commit-id: ad32cd2a661ff65b5b8dddf880094042db699f30 [formerly fc1cc39479]
Former-commit-id: 6e1ef1196a
2014-03-12 10:52:18 -05:00
Lee Venable
b7b1d88680 Issue #2865 - added more null and dispose checks
Former-commit-id: 7f6792f1c5 [formerly fe6e7328c0] [formerly df65d7c7ce] [formerly 7f6792f1c5 [formerly fe6e7328c0] [formerly df65d7c7ce] [formerly 1f9d1af221 [formerly df65d7c7ce [formerly c2aa1d021c49e522a3b4a9dd17a55317a13e91e1]]]]
Former-commit-id: 1f9d1af221
Former-commit-id: 9b11bcedb1 [formerly 8ef7fe57c4] [formerly ebbc4eff228045a38bf9d41b60b39929f6e27fbe [formerly 46fa017e1b]]
Former-commit-id: 3cd64bcf0cda402268f02162ee27b86ac2bc3d26 [formerly 0931ce72c9]
Former-commit-id: 66a87595af
2014-03-11 16:30:33 -05:00
Lee Venable
ab2cc176e3 Issue #2865 - fixed font memory leak
Change-Id: I0cfbd494924aadcb134c60313836cb9ab815253d

Former-commit-id: 7aab4252d5 [formerly 44733489b9] [formerly 2c67c4f6c4] [formerly 7aab4252d5 [formerly 44733489b9] [formerly 2c67c4f6c4] [formerly 58d7f759b2 [formerly 2c67c4f6c4 [formerly 2555d382f26278c5f972c17da778338142cdaaec]]]]
Former-commit-id: 58d7f759b2
Former-commit-id: 8bec7ebcb1 [formerly 86e6547a63] [formerly 8fe2ec93b5265755e9333c787d93b1c92293eceb [formerly a5487de998]]
Former-commit-id: 97cae7373d3e7a83f0b8e4c464d4a9dab888a084 [formerly 97a124ca58]
Former-commit-id: 374a2da1a1
2014-03-11 10:31:50 -05:00
Brian Clements
ac70455dc6 Issue #2848 fixed session create, listen, join ordering
clients were missing events and messages because listeners weren't up before joining
collaboration connection needed to add to session map before joining the session
display containers needed to register with session event bus before joining the session
clients no longer send events to empty sessions


Former-commit-id: 9b6c283fc9 [formerly 2456c2308f] [formerly dc55cd5b5c] [formerly 9b6c283fc9 [formerly 2456c2308f] [formerly dc55cd5b5c] [formerly aee98ecfb0 [formerly dc55cd5b5c [formerly e832f6420b6363a3c951725e0d23f460b2efb42e]]]]
Former-commit-id: aee98ecfb0
Former-commit-id: 67db5cb4f8 [formerly 3486f1f241] [formerly eb63cfebccc689b3ac62c518759624fc43c5c7b9 [formerly 4f9a2577f2]]
Former-commit-id: 6188fed145573399f401e7319702f154913b200b [formerly 6245b550aa]
Former-commit-id: c4e9aff9fc
2014-03-10 14:06:45 -05:00
Brian Clements
e81c8368dd Issue #2751 ensured that room admins know real userids
the server can be queried for userids by room admins
this does not update the stored participant info in muc
added cached, on-demand check for userid for participants
needed for leadership transfer


Former-commit-id: 8aff9ee95c [formerly 2afc1a9319] [formerly 44d161729f] [formerly 8aff9ee95c [formerly 2afc1a9319] [formerly 44d161729f] [formerly dc94769c14 [formerly 44d161729f [formerly b3bf76b676b7e75559236d67c687cd5011859a8b]]]]
Former-commit-id: dc94769c14
Former-commit-id: cfe64d833a [formerly acb20cfbbe] [formerly 7e2fb485cd2c4586601a3aa2ff0a182aaca10fab [formerly ac63129ad1]]
Former-commit-id: f030c8528ac78571000ec83546e396d509e9d0ae [formerly 6590587d9e]
Former-commit-id: 975bfca460
2014-03-07 15:37:29 -06:00
Nate Jensen
2bc7230179 Merge "Issue #2632 - Fix problem with multiple notifiers per user." into development
Former-commit-id: dcbafebc0d [formerly ae9adefbf7] [formerly cf4631f9bf] [formerly dcbafebc0d [formerly ae9adefbf7] [formerly cf4631f9bf] [formerly 48fa8f8d1b [formerly cf4631f9bf [formerly e6dc5f076bfd4811b2b1cdaf3782a5066e032381]]]]
Former-commit-id: 48fa8f8d1b
Former-commit-id: ddebec5791 [formerly b097d488ca] [formerly 81dc1f611ab2e4fba7afbbabdd044e8afece9c33 [formerly d3f18729c3]]
Former-commit-id: 7efdb261cff848db48e2d71cacdd8d5280fbeb1f [formerly 8380226f6b]
Former-commit-id: f84030e2b7
2014-03-05 14:41:12 -06:00
Mike Duff
f061ae43a1 Issue #2798 - Fix user presence messages and settings
Peer review comments

Change-Id: I615edc12a7fe93540b5e62cf673b92829cac3dfa

Former-commit-id: ec892bb7a7 [formerly 25425a4268] [formerly e97e745b61] [formerly ec892bb7a7 [formerly 25425a4268] [formerly e97e745b61] [formerly 9c873e6dd9 [formerly e97e745b61 [formerly b087558dce4e19596c93d47e986af50fae806a74]]]]
Former-commit-id: 9c873e6dd9
Former-commit-id: b88162e504 [formerly 0251ad5bca] [formerly acfecc3a2b5c6336080649496608081ffae17a97 [formerly c0bf150e15]]
Former-commit-id: 96b5f8c7c3c165fba26eb85059fdf5317d2287b5 [formerly 15c32a1513]
Former-commit-id: 8a798710c5
2014-03-05 14:39:55 -06:00
Mike Duff
fd2f53f5cf Issue #2632 - Fix problem with multiple notifiers per user.
Change-Id: Ia6f9d18e9217c74e6ecf6a2df324860a2b817000

Former-commit-id: a670398424 [formerly 14107f0914] [formerly 8c693a5f70] [formerly a670398424 [formerly 14107f0914] [formerly 8c693a5f70] [formerly 9963324b60 [formerly 8c693a5f70 [formerly 168a656194aa3b455f403aa92b290bbbe17d3b45]]]]
Former-commit-id: 9963324b60
Former-commit-id: 1c0d844dc2 [formerly 198d9e6780] [formerly fd61ded4da051608ff2b758971fbc5bacbaca791 [formerly 3bdf20dea3]]
Former-commit-id: fad3c8f0caa37c2db8f82dd2e72cb5514148ddc8 [formerly 85ac8c85e0]
Former-commit-id: c6e743bbc1
2014-03-05 12:02:33 -06:00
Brian Clements
e75dde54ab Issue #2837 collaboration icon changes
changed add/remove group icon colors
created icons for add/remove contact, alias contact and rename group


Former-commit-id: 17661200a1 [formerly d76dd2a8f6] [formerly c0e4615967] [formerly 17661200a1 [formerly d76dd2a8f6] [formerly c0e4615967] [formerly c9906cde88 [formerly c0e4615967 [formerly 3f7cfbbf1c60cffa0aa31f53b29521b78774042e]]]]
Former-commit-id: c9906cde88
Former-commit-id: f4a6d2a30d [formerly 3d4323b447] [formerly 1d8422aecbe75d313717ff186a0a87becafd9906 [formerly d06182573e]]
Former-commit-id: eca406e298a4b6e7098a2a7b0f34a68bbede8557 [formerly dec443b1af]
Former-commit-id: 6dc478d975
2014-03-05 09:00:57 -06:00
Max Schenkelberg
7c66cf792b Issue #2861 Rewrote HierarchicalPreferenceStore to be more efficient and thread safe when reading values.
Amend: Added comments and cleaned up preference store

Change-Id: Iac708c0988fc1b8f552d3bccf76b1706d6324b8d

Former-commit-id: dbc6cc3fc6 [formerly 59434c8a60] [formerly a01a6d68d0] [formerly dbc6cc3fc6 [formerly 59434c8a60] [formerly a01a6d68d0] [formerly cbf8b9249c [formerly a01a6d68d0 [formerly cc34e3dbebe13ec4f63b7529f5053391135837ef]]]]
Former-commit-id: cbf8b9249c
Former-commit-id: d85fd52c26 [formerly 39e1c4fa46] [formerly d886f6a0f4f81e75f3b006fbf72cebc9033f58c2 [formerly 654da3c0a2]]
Former-commit-id: 22a289abbef9ce66bd6d9f68b9610a2b65dc9258 [formerly f509321134]
Former-commit-id: c6cf08db73
2014-03-04 09:23:36 -06:00
Mike Duff
60c471f48e Issue #2632 - Implement buddy pounce (Contact Notifiers)
Review comments

Change-Id: I7492b84b59406cf2ddbc65d9e6fc7c0c41c30ce7

Former-commit-id: 512e634a97 [formerly 377c1f9998] [formerly 5440ff64d1] [formerly 512e634a97 [formerly 377c1f9998] [formerly 5440ff64d1] [formerly 5f433b4f6b [formerly 5440ff64d1 [formerly 8ece6e53095ee80d7d4baa249125b3fe7a03add7]]]]
Former-commit-id: 5f433b4f6b
Former-commit-id: 6c5c943a5e [formerly 63fc5f8c66] [formerly 0494775290c2982f78ac45adef680a21db012453 [formerly ee06fc58b5]]
Former-commit-id: 7a26eed4e3d8caf57b1f136686d6c69b9947d11a [formerly 02fa0d3c59]
Former-commit-id: 6c60255b75
2014-02-28 13:23:34 -06:00
Mike Duff
b74ed7f1fe Issue #2631 - Set preference defaults in the Activator.
Removed unused file.

Change-Id: Idd6fee39cae4cc8d4cf4cd2ae652ed0722d6cd2e

Former-commit-id: 9eafacaac2 [formerly a96a833f51] [formerly ed5cb91406] [formerly 9eafacaac2 [formerly a96a833f51] [formerly ed5cb91406] [formerly a7b1e79d2d [formerly ed5cb91406 [formerly 61e803bb38b398fd6758d650b6120dc2514064b4]]]]
Former-commit-id: a7b1e79d2d
Former-commit-id: 5754117aad [formerly f98eec12b9] [formerly 054cdc944f74842daa02964eb9d5d80d21f23654 [formerly d90f4495c2]]
Former-commit-id: a5e60f93a5f9480cbb884fd30320154fc0368ef6 [formerly 5014499431]
Former-commit-id: 692830c5c9
2014-02-20 15:09:10 -06:00
Brian Clements
49b39bcaf6 Issue #2751 collab menu icons, fixed NPE
new icons for change color and transfer leader menu items
fixed NPE when cancelling change color dialog


Former-commit-id: 8bbf2bb6bd [formerly a2bdfa25cc] [formerly aaa2de20f4] [formerly 8bbf2bb6bd [formerly a2bdfa25cc] [formerly aaa2de20f4] [formerly 89a48c3f6b [formerly aaa2de20f4 [formerly 71c13c7a24fb4c3d7556d30ae35a3633b74f7bb3]]]]
Former-commit-id: 89a48c3f6b
Former-commit-id: e7584f3a49 [formerly 04697836b8] [formerly 5cc63f048c2ca2bae92c62e08c20b8a3fc4c7681 [formerly 4b7ba54dc3]]
Former-commit-id: c4d86142773d02aa243a5b8e729feaf2e433b4bc [formerly e3973b9fc7]
Former-commit-id: 1d2406e180
2014-02-20 11:50:54 -06:00
Brian Clements
cbef95a1bb Issue #2751 implemented room/topic ownership transfer
Former-commit-id: 4e165aba58 [formerly a8ff1effc1] [formerly c3cadff705] [formerly 4e165aba58 [formerly a8ff1effc1] [formerly c3cadff705] [formerly ab72938246 [formerly c3cadff705 [formerly cf5041f2d052c4900e2871e0fc8dc1a2b71794de]]]]
Former-commit-id: ab72938246
Former-commit-id: 08a0e5baf2 [formerly 9d00fe2bab] [formerly d96f62f0208dbdcb69677a9d6b014fc0a7761a39 [formerly d9ac2c0037]]
Former-commit-id: e46a572ae9fd237caee1e14f1bd4825f8f3b942b [formerly d218686d1f]
Former-commit-id: 9b0fd74f5b
2014-02-20 11:10:14 -06:00
Nate Jensen
8ee4ae7565 Merge "Issue #2631 - Add sound preference for users joining a room. review comments" into development
Former-commit-id: f545a8a74d [formerly a241472c34] [formerly df376abcb7] [formerly f545a8a74d [formerly a241472c34] [formerly df376abcb7] [formerly f99cf7df47 [formerly df376abcb7 [formerly ff080a6b5184f486348a015f31b957325fa280fa]]]]
Former-commit-id: f99cf7df47
Former-commit-id: eeac24c773 [formerly d3ec0da1bb] [formerly 76b7d9b753824f510f6d112e0bfada581f946906 [formerly 8b152a8027]]
Former-commit-id: bcd8e67559fb255fbb3d3d11663bad0ea365591b [formerly dafb323edb]
Former-commit-id: dbdcfa8e41
2014-02-19 16:19:27 -06:00
Mike Duff
352b114250 Issue #2631 - Add sound preference for users joining a room.
review comments

Change-Id: I5ae0872dd3a498413f4f5b74bc4e7881bf0f9207

Former-commit-id: 659cb1f2a0 [formerly e2a6251a6b] [formerly 663ea8decd] [formerly 659cb1f2a0 [formerly e2a6251a6b] [formerly 663ea8decd] [formerly 95fcee385a [formerly 663ea8decd [formerly f578e45e37f7ac0780d2dc6b6ea21e81630ddc78]]]]
Former-commit-id: 95fcee385a
Former-commit-id: a723f69ad9 [formerly 89c4a3e04b] [formerly 280611ef49d0a886c12f13b5471242ae42c55bac [formerly 3100a71f34]]
Former-commit-id: d105e7a0938fbc4a67695d10a5942cb2e4247a07 [formerly 92d356f4f0]
Former-commit-id: 401973b39e
2014-02-19 15:26:14 -06:00
Brian Clements
c420979556 Issue #2751 fixed chat room bugs
fixed history messages having incorrect 'from' type
added ignore to dispose messages after room is closed
renamed tool tip for userid to match how JIDs are labled in client


Former-commit-id: abc01f5475 [formerly 06c16118e1] [formerly dc074a9650] [formerly abc01f5475 [formerly 06c16118e1] [formerly dc074a9650] [formerly 3a135b8eac [formerly dc074a9650 [formerly 453604eca5fca9e5d14ba1842dc7f76f1e0180ca]]]]
Former-commit-id: 3a135b8eac
Former-commit-id: 30027665ac [formerly 77bb396c9a] [formerly 7c130f893c124249133b51cb750375f7ea62663d [formerly bee7cdb71a]]
Former-commit-id: 2bd4a38066d755ff2faaae6125ca4744d0e08564 [formerly ddc0945e40]
Former-commit-id: b47b194564
2014-02-19 08:32:26 -06:00
Brian Clements
393036071a Issue #2751 fixed blocked icon for roster entries
previous refactor broke type check for blocked icon logic
moved blocked icon logic to subclass that handles roster tree labels


Former-commit-id: ab8f47413f [formerly e894019715] [formerly a94b366e26] [formerly ab8f47413f [formerly e894019715] [formerly a94b366e26] [formerly 3307f5ea5e [formerly a94b366e26 [formerly 7f3a2f5e631176426ece6384719f3b1c9b00105a]]]]
Former-commit-id: 3307f5ea5e
Former-commit-id: f5a25c9030 [formerly 02d3a9ae7e] [formerly 0a4ca2ccc03c0b3bc7d6e3a7885088347d34525e [formerly 476d0c3257]]
Former-commit-id: 6d18992103101e38f58bfbe34e30a1e17a53251b [formerly 6574733eba]
Former-commit-id: df4c4af7e9
2014-02-17 17:11:36 -06:00
Nate Jensen
4c3bdc0dfb Issue #2751 first cut of transfer leadership
Change-Id: Ia0495d8d5acfe28801ceb416090d47c250ecf0f9

Former-commit-id: 47b27c602f [formerly 63d5f94cbb] [formerly e05f1eae96] [formerly 47b27c602f [formerly 63d5f94cbb] [formerly e05f1eae96] [formerly a85575a763 [formerly e05f1eae96 [formerly cd0a838d34c9d7533bf59a477a17f4cb1af75a00]]]]
Former-commit-id: a85575a763
Former-commit-id: 740e71adba [formerly 139479b4e1] [formerly 759372ba16bb02e06f0e8472c362cf3299be0ff5 [formerly 11fb06810f]]
Former-commit-id: fe5669f9eeae8061972d1a92d1593cd4aea98162 [formerly 70285796ac]
Former-commit-id: 65068869e1
2014-02-13 15:35:53 -06:00