Commit graph

9 commits

Author SHA1 Message Date
Brian Clements
02c921ed12 Issue #3076 added clear all to shared display sessions
Former-commit-id: 1432aa1302 [formerly f545c548cc [formerly 9e4a518f2ecbe86fed87fbb6dac7fad08ffb33eb]]
Former-commit-id: f545c548cc
Former-commit-id: 729e717be1
2014-05-06 09:30:07 -05:00
Brian Clements
345fe6f866 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: 94aa761e19 [formerly 02f08d75c6 [formerly 01e773fb9d4ec8b0ab75ddf714b79debb9ad4096]]
Former-commit-id: 02f08d75c6
Former-commit-id: 334ad3ca81
2014-04-24 16:10:27 -05:00
Brian Clements
17661200a1 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: c9906cde88 [formerly c0e4615967 [formerly 3f7cfbbf1c60cffa0aa31f53b29521b78774042e]]
Former-commit-id: c0e4615967
Former-commit-id: d76dd2a8f6
2014-03-05 09:00:57 -06:00
Brian Clements
8bbf2bb6bd 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: 89a48c3f6b [formerly aaa2de20f4 [formerly 71c13c7a24fb4c3d7556d30ae35a3633b74f7bb3]]
Former-commit-id: aaa2de20f4
Former-commit-id: a2bdfa25cc
2014-02-20 11:50:54 -06:00
Nate Jensen
47b27c602f Issue #2751 first cut of transfer leadership
Change-Id: Ia0495d8d5acfe28801ceb416090d47c250ecf0f9

Former-commit-id: a85575a763 [formerly e05f1eae96 [formerly cd0a838d34c9d7533bf59a477a17f4cb1af75a00]]
Former-commit-id: e05f1eae96
Former-commit-id: 63d5f94cbb
2014-02-13 15:35:53 -06:00
Brian Clements
aa642d5577 Issue #2700 added contact request dialog
user is now prompted to accept contact request
added support for managing contacts that haven't accepted contact requests
contacts list shows new icon for contacts that haven't accepted contact requests


Former-commit-id: bd19366ada [formerly 6b1843f19a [formerly 8ad4c1674d2719a7781eb137669eb15212a1488c]]
Former-commit-id: 6b1843f19a
Former-commit-id: b4d930bcb9
2014-01-28 10:07:11 -06:00
Brian Clements
fffb6aaf9a Issue #2701 removed local groups from collaboration
added shared groups to represent groups managed by server
local group actions changed to modify roster groups
code cleanup on contacts manager including removing unneeded roster manager
update script to clean up localization files
removed ui option to create an empty group


Former-commit-id: 26ac549096 [formerly f615f2226f [formerly 06a9db4836fa2753a913e2314a8c003380416eac]]
Former-commit-id: f615f2226f
Former-commit-id: b86ad8ca6f
2014-01-27 10:14:10 -06:00
Brian Clements
d0d14ec091 Issue #2561 removed ECF from collaboration
added smack 3.3.1 to cots
collaboration now uses smack directly for XMPP
moderate code cleanup on collaboration.comm
added double click to start chat in participant list


Former-commit-id: e6c4b39aca [formerly 8ece30944a [formerly 6fc85f79c126283eb4dbddfa94943523d9ff0a6d]]
Former-commit-id: 8ece30944a
Former-commit-id: 5d1d44b60d
2013-12-06 17:07:16 -06:00
Steve Harris
6e44abdba1 12.11.1-4 baseline
Former-commit-id: 6958b861f0 [formerly d3497e47eb [formerly dddf20c9518c578d1bebd0b5e01b10c5080fd24e]]
Former-commit-id: d3497e47eb
Former-commit-id: 98171b5de9
2012-10-16 13:27:07 -05:00