Commit graph

93 commits

Author SHA1 Message Date
Brian Clements
276dd801f2 Omaha #3342 added count to collaboration participant list
Change-Id: I68e285b809ab45ad7284a7c695d0c6e89642bd1e

Former-commit-id: bfd9f59de8 [formerly bfd9f59de8 [formerly 4c0f95639ab7876c952775bcaa7cfd45dde7d3c4]]
Former-commit-id: e4c9a13adb
Former-commit-id: bd9520f4fe
2014-07-03 15:11:48 -05:00
Brian Clements
0be4260b4c Omaha #1798 fixed collaboration drawing issues when leader shares new map
fixed cursor icon not updating properly
fixed attempting to draw to inactive layer

Change-Id: Ic0f29feddbd611d918ba9d7e5a515a7624bf72aa

Former-commit-id: 88ba6b47ad [formerly 88ba6b47ad [formerly 4df0a485d285a920a53e812bec204683f5ff29f6]]
Former-commit-id: fc70dbc86e
Former-commit-id: 44f8b3dce1
2014-06-30 15:57:58 -05:00
Richard Peter
25dd598b55 Merge "Omaha #3323 fixed collaboration disposed font issue" into omaha_14.4.1
Former-commit-id: 706409b459 [formerly 706409b459 [formerly f81ae068eca41eeae5d785668f4c1d7cf59ae9df]]
Former-commit-id: f4cdd661fe
Former-commit-id: e3c3d55883
2014-06-27 16:52:39 -05:00
Brian Clements
0800ea7cb7 Omaha #3323 fixed collaboration disposed font issue
Change-Id: I89fda01efad46299a08b3067edc3f16a812a31c2

Former-commit-id: dc7a76197d [formerly dc7a76197d [formerly e216af49d135ceeff5e6cd251c6742602230553c]]
Former-commit-id: fe149faffa
Former-commit-id: cb108f12b8
2014-06-27 16:33:27 -05:00
Brian Clements
c1bfab0914 Omaha #3281 made venue session views non-sticky (except for feed view)
Change-Id: If36f1c53155f39c46b05302880a046f3b4a5ceb0

Former-commit-id: 741afe7d39 [formerly 741afe7d39 [formerly e7f48359f00b2e91b39b7646da0f9f409f5d3805]]
Former-commit-id: 31a08efb61
Former-commit-id: ed2823daef
2014-06-27 15:33:11 -05:00
Nate Jensen
217a0999d0 Merge "Omaha #3281 peer2peer chat view improvements" into omaha_14.4.1
Former-commit-id: 61640d5c22 [formerly 61640d5c22 [formerly 449a40d7981b0814f9cc7feb62f52b2259e83e5f]]
Former-commit-id: 172f18a5b1
Former-commit-id: 48995ed5ca
2014-06-23 12:12:03 -05:00
Brian Clements
7060fe3fba Omaha #3281 peer2peer chat view improvements
bounced chat messages now result in error messages in window
fixed view secondary id bug with userids (removed resource from key)

Change-Id: I76a68bf290b0c5205361bc6c78fda99336d7c62d

Former-commit-id: 9d626a97e5 [formerly 9d626a97e5 [formerly a31b7f213081f384bd23d53a431ce53593254c25]]
Former-commit-id: 93a1ee71c4
Former-commit-id: a9827ef8e8
2014-06-20 09:04:15 -05:00
Brian Clements
5560b12a5a Omaha #3281 collaboration views persist between perspectives
fixed bug that prevented re-opening collaboration after views were closed

Change-Id: I62651d9d5fe52defe3f4f37ee97b4d824cb974e3

Former-commit-id: 9aa5a87c4b [formerly 9aa5a87c4b [formerly b84f7571415871f2983b913cf816ed227b24bbac]]
Former-commit-id: fd95df3bc0
Former-commit-id: 795fa49ced
2014-06-20 08:53:54 -05:00
Brian Clements
4433482d56 Omaha #3078 added private chat to collaboration
Change-Id: Ifcc4a33c1551e4209721fcc181b0becb49bdb5ae

Former-commit-id: 37699395ef [formerly 37699395ef [formerly 93f7d7088e7d7888a878558c6f2fcc368bf3ab05]]
Former-commit-id: 97a6f5bfe8
Former-commit-id: 60508bf674
2014-06-17 11:52:58 -05:00
Brian Clements
616315d830 Omaha #3288 collaboration feed venue config comes from server
Change-Id: I5bc747507e44cc31093d7a7f470a263d0cf116c0

Former-commit-id: b6a2bf0ae4 [formerly b6a2bf0ae4 [formerly baab2ea12e1117446295ae60bc06228eb6139895]]
Former-commit-id: 84e3f967d9
Former-commit-id: 5436efb886
2014-06-17 09:26:24 -05:00
Brian Clements
e13aeb0ca5 Omaha #3267 fixed collaboration NPE possibility
Change-Id: I9bc68be7d9106396a0c369e3181e15baf25ca260

Former-commit-id: adbffa5ddd [formerly adbffa5ddd [formerly a23e57f3d1a6f4213216a7e038b85b17b6628faa]]
Former-commit-id: 91eb7d40c2
Former-commit-id: 3bdbf79eeb
2014-06-12 15:06:46 -05:00
Mike Duff
5e0aa25048 Omaha #3269 - Fix editing of Notifiers before saving
Amend - Remove save confirmation dialog, rename buttons

Change-Id: I0dd81db4c74d07f0535341fc410c288b077463c4

Former-commit-id: 80922824a3 [formerly 80922824a3 [formerly 47d57692c81757a8b8c0d3217e21f701f18cdf2c]]
Former-commit-id: c920a24300
Former-commit-id: b15b6514fd
2014-06-12 11:21:15 -05:00
Brian Clements
213aab834f Omaha #3172 fixed ui filtering for contacts and sessions
Former-commit-id: b774503931 [formerly b774503931 [formerly 4e6f168df1f957c5eed73a281441a0d4d0d76cdb]]
Former-commit-id: 8dce7e9b85
Former-commit-id: 4078bbaa63
2014-05-20 11:04:57 -05:00
Brian Clements
3c6a10e154 Omaha #3180 fixed inviting strangers and multiple users in collaboration
can now invite users to session from search dialog
fixed bug where only first person in selection would be invited


Former-commit-id: 0e18d45bdf [formerly 0e18d45bdf [formerly 2509bb6d8c28cb78adc8fd4380d16a0f8f0d8acb]]
Former-commit-id: 573ffcb0bf
Former-commit-id: e4433c5e10
2014-05-19 15:54:36 -05:00
Brian Clements
3a60b0db05 Issue #3076 added clear all to shared display sessions
Former-commit-id: f545c548cc [formerly f545c548cc [formerly 9e4a518f2ecbe86fed87fbb6dac7fad08ffb33eb]]
Former-commit-id: 1432aa1302
Former-commit-id: 5583c3903b
2014-05-06 09:30:07 -05:00
Nate Jensen
3f9a33bf35 Issue #2956 more safety checks
Change-Id: I3984fa2b534b16b2e4485e1f66d65f8df48b2e4e

Former-commit-id: f4d20c41f4 [formerly f4d20c41f4 [formerly a24190f35b87351a5f699ac05041bec7a13a1cdb]]
Former-commit-id: 7d142d9d9d
Former-commit-id: f3b68178bd
2014-05-01 16:28:16 -05:00
Brian Clements
c27f2d9e53 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: 02f08d75c6 [formerly 02f08d75c6 [formerly 01e773fb9d4ec8b0ab75ddf714b79debb9ad4096]]
Former-commit-id: 94aa761e19
Former-commit-id: 12304655e8
2014-04-24 16:10:27 -05:00
Brian Clements
3b96c4c628 Issue #2955 ignore duplicate session invites
Former-commit-id: f888819646 [formerly f888819646 [formerly a48b12b8aaeea250680c0726f72425eac170ecd7]]
Former-commit-id: 4fa9afc9ae
Former-commit-id: 75465b69ed
2014-04-24 09:25:54 -05:00
Lee Venable
e81836e371 Issue #3040 - Fixed contact request and group name issues.
Change-Id: I7a430d4a443bdbcf7951ca9b6047b5cbda88238e

Former-commit-id: df05a79d63 [formerly df05a79d63 [formerly badc9fa46aebe7f7da25c3a115294a37b30aa507]]
Former-commit-id: f13ac7e1b9
Former-commit-id: 222154d094
2014-04-23 18:24:25 -05:00
Nate Jensen
1abd65120e Merge "Issue #2822 shared display invitations always go to cave" into development
Former-commit-id: ad6e4712d6 [formerly ad6e4712d6 [formerly 2a61b602d55922e5b7f5002f794449880c2cc1a7]]
Former-commit-id: 2b20cf5440
Former-commit-id: a0423843b3
2014-04-23 15:30:44 -05:00
Brian Clements
d9a1bba4c8 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: f3ee7b453a [formerly f3ee7b453a [formerly 796e4dcd2d81d8b34ae835dbe8443fd56ba873e3]]
Former-commit-id: 6969321db0
Former-commit-id: 5d2ec9b909
2014-04-23 14:16:42 -05:00
Nate Jensen
ff9101c057 Issue #3060 safety checks for SWT widgets being disposed
Change-Id: I85c56318452a31122ee7f144e5500d089aa614e2

Former-commit-id: 426f103e7b [formerly 426f103e7b [formerly 0c391f8c7f1694c6939419b5fcc4a6a963092ae3]]
Former-commit-id: 38d493ff1b
Former-commit-id: 20f3f8ffa2
2014-04-23 12:26:27 -05:00
Nate Jensen
ad96f9d128 Merge "Issue #3056 made venue participant equals method case insensitive" into development
Former-commit-id: fe3ff669a7 [formerly fe3ff669a7 [formerly d6f1435a902615724aed2ff0279a6deb29933ce1]]
Former-commit-id: 8df505325c
Former-commit-id: be6818e96b
2014-04-22 12:50:27 -05:00
Brian Clements
97c5fe6d4a 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: 1adbf6253a [formerly 1adbf6253a [formerly 7a2423f4a90597706e52ce0f89bacb1a0e10f067]]
Former-commit-id: 2a9d341910
Former-commit-id: 8677a9f359
2014-04-22 11:55:36 -05:00
Brian Clements
fb24e315bf Issue #3038 added initialized flag to session feed view
differentiates between roster population and new joins


Former-commit-id: 717cdf4280 [formerly 717cdf4280 [formerly 9b6c20ac39765120efc523c03a3d11d4b21c1748]]
Former-commit-id: ef61a7c281
Former-commit-id: 295ff106b6
2014-04-22 10:01:27 -05:00
Mike Duff
ae984e4c16 Issue #2955 - Made chat invitation dialogs non-modal
Change-Id: Ib7294e8149996715b6a247a1e04335dc1a0c7023

Former-commit-id: ead90bc794 [formerly ead90bc794 [formerly bb61e3c39d5dabf7e698726f0a093d8cf4f7088a]]
Former-commit-id: b507739637
Former-commit-id: 9a082a1588
2014-04-21 09:00:42 -05:00
Brian Clements
f674aa07d7 Issue #3021 increased width of create session dialog to fit error msg
Former-commit-id: 1112ca621e [formerly 1112ca621e [formerly f0bcc20987d814a716994f712c6132bb79963457]]
Former-commit-id: bb915796ad
Former-commit-id: 5c46c768d2
2014-04-16 14:33:02 -05:00
Brian Clements
9acb5a4a5b Issue #2822 only allow transfer leader if participant is using shared display
Former-commit-id: 5250f7a442 [formerly 5250f7a442 [formerly af9577548e40397c67f72eb60485ee8de48f169b]]
Former-commit-id: 6ccedc1182
Former-commit-id: e8907aa729
2014-04-15 15:15:11 -05:00
Brian Clements
054b47951d 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: 8ab1bab974 [formerly 8ab1bab974 [formerly 762e7d3a1ff47f794aa843d2b159ac78b4ab12a3]]
Former-commit-id: 6b22374046
Former-commit-id: 7cf5f06f2a
2014-04-15 15:12:33 -05:00
Mike Duff
ddeb7fe4d2 Issue #2785 - Fix loading of groups in sub request dialog
Change-Id: If42e1f3fe80bde16fcc86dfa0a0b5673e5359722

Former-commit-id: 81e4c9b05d [formerly 81e4c9b05d [formerly e72a852935dcb519604b37dc873645d4b419ee43]]
Former-commit-id: d2a80ca966
Former-commit-id: 4773c3722c
2014-04-15 10:10:18 -05:00
Brad Gonzales
8f72707b3a Issue #2937 Connect to the venue after the feed view is available.
Change-Id: I6e560014308e6d17c8d7af525ded82d2399fa936

Former-commit-id: cc0fd1e9af [formerly cc0fd1e9af [formerly 7b0e689a06eeee9f7c39dd79642fcde8e329c990]]
Former-commit-id: ea03096031
Former-commit-id: 3b25edad9a
2014-04-10 14:01:53 -05:00
Mike Duff
3c6c0824ce Issue #2785 - Change connection order of events
Fixed classpath
Change-Id: I15296306ee105a54379a370da7d53c7e46dc34bb

Former-commit-id: efefe62e0f [formerly efefe62e0f [formerly a2d595f4232e86606f7e2338ece59961649080a3]]
Former-commit-id: 7da1547c22
Former-commit-id: 7145820d62
2014-04-08 14:14:20 -05:00
Nate Jensen
62f1451e50 Merge "Issue #2632 - Remove user from list on sign-off. Fixed check for available" into development
Former-commit-id: 6b20d38b1a [formerly 6b20d38b1a [formerly 8f25c8c9f9e47cbff07e8ac39dfb6ab672adb611]]
Former-commit-id: 579d2416cb
Former-commit-id: 19560ebc7c
2014-04-02 11:23:02 -05:00
Mike Duff
0aea45197a Issue #2632 - Remove user from list on sign-off. Fixed check for available
Change-Id: I2a389e290b697dfe06be9b4fef8d5957676f3cbe

Former-commit-id: 538261f6d5 [formerly 538261f6d5 [formerly 2f9981c5173f0c2523b586ce10147f738028b907]]
Former-commit-id: d5df936431
Former-commit-id: 92f1a3a9aa
2014-04-02 10:08:45 -05:00
Mike Duff
54d17b375f Issue #2938 - Fix site/role change logic for messages
Change-Id: I5a08020f28b986c7815bb5ab2b71a34d9e105500

Former-commit-id: 8967ddd94a [formerly 8967ddd94a [formerly 9ffc540c21245b308334040234be03d78a501656]]
Former-commit-id: 169ad502de
Former-commit-id: f117f575eb
2014-04-02 08:12:53 -05:00
Brad Gonzales
4940c40a7f 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: 404faeeca0 [formerly 404faeeca0 [formerly 480c86e5bbe6866b8c4c285006d3d7f7fed2b056]]
Former-commit-id: 15e1b7a7f6
Former-commit-id: 2f56fd3c9d
2014-03-31 11:45:22 -05:00
Lee Venable
5bbb65637e Issue #2960 - added checks for SashForm weights
Former-commit-id: 19dd95ba24 [formerly 19dd95ba24 [formerly 1a3c0743b773f695fa881f83a9773a899a2ef111]]
Former-commit-id: 3018ff1f5f
Former-commit-id: 1504b3532e
2014-03-28 15:30:11 -05:00
Mike Duff
531e66cbb6 Issue #2632 - Fixed notifier preference OK, Apply, Cancel actions
Change-Id: I9af93c4935c5d9dc6777be0e0435bb71be5f613b

Former-commit-id: d803986440 [formerly d803986440 [formerly a50bd58e95a929fe569f5df68dd4d4a8b6625807]]
Former-commit-id: 98b5fd762e
Former-commit-id: b1d74f855e
2014-03-27 16:31:30 -05:00
Nate Jensen
015dc45eba Merge "Issue #2938 - Show status message for site/role changes, but not return from away" into development
Former-commit-id: 38e3305e60 [formerly 38e3305e60 [formerly 578a9ec587b83d77c6e6882a7e8bf71aecd996ff]]
Former-commit-id: 4861f92ef6
Former-commit-id: 7c581cb5d7
2014-03-25 13:11:29 -05:00
Mike Duff
97c4e48255 Issue #2938 - Show status message for site/role changes, but not return from away
Change-Id: I30f6e1122e813d70b1c3fbee5e0b0f6ce9107dd2

Former-commit-id: 1e42d8a30d [formerly 1e42d8a30d [formerly 666a354d6f676b899bd14371517bce9de88192d2]]
Former-commit-id: a06f058ea9
Former-commit-id: d497c533e6
2014-03-25 11:18:09 -05:00
Nate Jensen
a5b0c8b432 Issue #2935 fix refresh issue
Change-Id: I0bd19d2667610a5db68fc12b0d320b4236937994

Former-commit-id: 68f9181340 [formerly 68f9181340 [formerly 517fd6fca0f08cbc166b58d67d86af43331533cf]]
Former-commit-id: 7b586ebd67
Former-commit-id: 0cad1fa167
2014-03-25 10:24:11 -05:00
Mike Duff
a1661a5389 Issue #2936 - Remove the join alert from the nws collaboration feed
Change-Id: Icf246e86cc7d7d04ed56d1aefafe0e27d1292840

Former-commit-id: fd31ea7fa5 [formerly fd31ea7fa5 [formerly ca47cb349b4749edaac6afe0648c18cb06a9f9df]]
Former-commit-id: ca27ceac1f
Former-commit-id: fc7a71889c
2014-03-24 14:59:33 -05:00
Nate Jensen
5cb38bd511 Issue #2895 fixed telestration when leadership returns to a previous
leader

Change-Id: Ie61adbe281b6920db994e1e30a3cbe621a1d5033

Former-commit-id: e75d3dfb7c [formerly e75d3dfb7c [formerly 8a0f86ebb2f659e55afc39cb6cf4bb4bdfb857b0]]
Former-commit-id: 2fc1030fad
Former-commit-id: ca1ec93450
2014-03-18 12:52:01 -05:00
Mike Duff
b560f16623 Issue #2798 - Fix issue with color not changing for existing user changing site.
Change-Id: Ida0fac975d477d4d248036d5948c72b44658bd57

Former-commit-id: 3d10260065 [formerly 3d10260065 [formerly 8c82d25f6197e838bbd6119003d589bf4fa266ee]]
Former-commit-id: 7bdef60a55
Former-commit-id: 5bbe504f82
2014-03-18 11:55:00 -05:00
Nate Jensen
2c0d7d2d3e 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: 82778ad21b [formerly 82778ad21b [formerly b723095f6d5d59b67370c7292f88f339d349993a]]
Former-commit-id: f8180587d4
Former-commit-id: 34c5d1de25
2014-03-12 16:05:19 -05:00
Mike Duff
fc1cc39479 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: 8068c9aa83 [formerly 8068c9aa83 [formerly 13f134bafc5331939e23ce0e14d350593bb7c2e1]]
Former-commit-id: e01c5c3534
Former-commit-id: 832dd498fc
2014-03-12 10:52:18 -05:00
Lee Venable
0931ce72c9 Issue #2865 - added more null and dispose checks
Former-commit-id: df65d7c7ce [formerly df65d7c7ce [formerly c2aa1d021c49e522a3b4a9dd17a55317a13e91e1]]
Former-commit-id: 1f9d1af221
Former-commit-id: 46fa017e1b
2014-03-11 16:30:33 -05:00
Lee Venable
97a124ca58 Issue #2865 - fixed font memory leak
Change-Id: I0cfbd494924aadcb134c60313836cb9ab815253d

Former-commit-id: 2c67c4f6c4 [formerly 2c67c4f6c4 [formerly 2555d382f26278c5f972c17da778338142cdaaec]]
Former-commit-id: 58d7f759b2
Former-commit-id: a5487de998
2014-03-11 10:31:50 -05:00
Brian Clements
6245b550aa 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: dc55cd5b5c [formerly dc55cd5b5c [formerly e832f6420b6363a3c951725e0d23f460b2efb42e]]
Former-commit-id: aee98ecfb0
Former-commit-id: 4f9a2577f2
2014-03-10 14:06:45 -05:00
Brian Clements
6590587d9e 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: 44d161729f [formerly 44d161729f [formerly b3bf76b676b7e75559236d67c687cd5011859a8b]]
Former-commit-id: dc94769c14
Former-commit-id: ac63129ad1
2014-03-07 15:37:29 -06:00