Commit graph

7 commits

Author SHA1 Message Date
Brian Clements
d06182573e 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: c0e4615967 [formerly 3f7cfbbf1c60cffa0aa31f53b29521b78774042e]
Former-commit-id: c9906cde88
2014-03-05 09:00:57 -06:00
Brian Clements
4b7ba54dc3 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: aaa2de20f4 [formerly 71c13c7a24fb4c3d7556d30ae35a3633b74f7bb3]
Former-commit-id: 89a48c3f6b
2014-02-20 11:50:54 -06:00
Nate Jensen
11fb06810f Issue #2751 first cut of transfer leadership
Change-Id: Ia0495d8d5acfe28801ceb416090d47c250ecf0f9

Former-commit-id: e05f1eae96 [formerly cd0a838d34c9d7533bf59a477a17f4cb1af75a00]
Former-commit-id: a85575a763
2014-02-13 15:35:53 -06:00
Brian Clements
f22052321b 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: 6b1843f19a [formerly 8ad4c1674d2719a7781eb137669eb15212a1488c]
Former-commit-id: bd19366ada
2014-01-28 10:07:11 -06:00
Brian Clements
8944860cbb 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: f615f2226f [formerly 06a9db4836fa2753a913e2314a8c003380416eac]
Former-commit-id: 26ac549096
2014-01-27 10:14:10 -06:00
Brian Clements
b8df043202 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: 8ece30944a [formerly 6fc85f79c126283eb4dbddfa94943523d9ff0a6d]
Former-commit-id: e6c4b39aca
2013-12-06 17:07:16 -06:00
Steve Harris
cbbdb231ce 12.11.1-4 baseline
Former-commit-id: d3497e47eb [formerly dddf20c9518c578d1bebd0b5e01b10c5080fd24e]
Former-commit-id: 6958b861f0
2012-10-16 13:27:07 -05:00