Commit graph

9 commits

Author SHA1 Message Date
Brian Clements
0fbb5dc22a Issue #3076 added clear all to shared display sessions
Former-commit-id: 02c921ed12 [formerly 729e717be1] [formerly f545c548cc] [formerly 1432aa1302 [formerly f545c548cc [formerly 9e4a518f2ecbe86fed87fbb6dac7fad08ffb33eb]]]
Former-commit-id: 1432aa1302
Former-commit-id: bcb942f3e18364de413f94465a2f8a874c91dc8e [formerly 5583c3903b]
Former-commit-id: 8674841154
2014-05-06 09:30:07 -05:00
Brian Clements
32b8ddd64c 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 94aa761e19 [formerly 02f08d75c6 [formerly 01e773fb9d4ec8b0ab75ddf714b79debb9ad4096]]]
Former-commit-id: 94aa761e19
Former-commit-id: 71f1e691809a438edfee89c10c322f7e092afc10 [formerly 12304655e8]
Former-commit-id: 84f75ca30a
2014-04-24 16:10:27 -05:00
Brian Clements
f4a6d2a30d 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 c9906cde88 [formerly c0e4615967 [formerly 3f7cfbbf1c60cffa0aa31f53b29521b78774042e]]]
Former-commit-id: c9906cde88
Former-commit-id: 1d8422aecbe75d313717ff186a0a87becafd9906 [formerly d06182573e]
Former-commit-id: 3d4323b447
2014-03-05 09:00:57 -06:00
Brian Clements
e7584f3a49 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 89a48c3f6b [formerly aaa2de20f4 [formerly 71c13c7a24fb4c3d7556d30ae35a3633b74f7bb3]]]
Former-commit-id: 89a48c3f6b
Former-commit-id: 5cc63f048c2ca2bae92c62e08c20b8a3fc4c7681 [formerly 4b7ba54dc3]
Former-commit-id: 04697836b8
2014-02-20 11:50:54 -06:00
Nate Jensen
740e71adba Issue #2751 first cut of transfer leadership
Change-Id: Ia0495d8d5acfe28801ceb416090d47c250ecf0f9

Former-commit-id: 47b27c602f [formerly 63d5f94cbb] [formerly e05f1eae96] [formerly a85575a763 [formerly e05f1eae96 [formerly cd0a838d34c9d7533bf59a477a17f4cb1af75a00]]]
Former-commit-id: a85575a763
Former-commit-id: 759372ba16bb02e06f0e8472c362cf3299be0ff5 [formerly 11fb06810f]
Former-commit-id: 139479b4e1
2014-02-13 15:35:53 -06:00
Brian Clements
a2cc9001ae 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: aa642d5577 [formerly b4d930bcb9] [formerly 6b1843f19a] [formerly bd19366ada [formerly 6b1843f19a [formerly 8ad4c1674d2719a7781eb137669eb15212a1488c]]]
Former-commit-id: bd19366ada
Former-commit-id: aa6da3ca1e9307689f8365bc7178e584cb7032e6 [formerly f22052321b]
Former-commit-id: bffa4d84fe
2014-01-28 10:07:11 -06:00
Brian Clements
e2ca671173 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: fffb6aaf9a [formerly b86ad8ca6f] [formerly f615f2226f] [formerly 26ac549096 [formerly f615f2226f [formerly 06a9db4836fa2753a913e2314a8c003380416eac]]]
Former-commit-id: 26ac549096
Former-commit-id: beabd84fb816fcf8a5201927f1389915efb941f7 [formerly 8944860cbb]
Former-commit-id: cfe945d76b
2014-01-27 10:14:10 -06:00
Brian Clements
4d04f6edbf 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: d0d14ec091 [formerly 5d1d44b60d] [formerly 8ece30944a] [formerly e6c4b39aca [formerly 8ece30944a [formerly 6fc85f79c126283eb4dbddfa94943523d9ff0a6d]]]
Former-commit-id: e6c4b39aca
Former-commit-id: ea97705eee929964d9b775519d5de735e490a0d4 [formerly b8df043202]
Former-commit-id: 5a7fca6352
2013-12-06 17:07:16 -06:00
Steve Harris
c9b563338a 12.11.1-4 baseline
Former-commit-id: 6e44abdba1 [formerly 98171b5de9] [formerly d3497e47eb] [formerly 6958b861f0 [formerly d3497e47eb [formerly dddf20c9518c578d1bebd0b5e01b10c5080fd24e]]]
Former-commit-id: 6958b861f0
Former-commit-id: d50a176f97de36460cafeb5bb47f7dc824e33ce1 [formerly cbbdb231ce]
Former-commit-id: 2c82d9cb07
2012-10-16 13:27:07 -05:00