Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'refs/remotes/siacs/master' | Christian Schneppe | 2016-05-27 | 1 | -0/+11 |
|\ | |||||
| * | don't push default muc conf twice | Daniel Gultsch | 2016-05-27 | 1 | -0/+10 |
| | | |||||
| * | make newly created conferences private by default | Daniel Gultsch | 2016-05-26 | 1 | -0/+1 |
| | | |||||
* | | Merge remote-tracking branch 'refs/remotes/siacs/master' | Christian Schneppe | 2016-05-20 | 1 | -56/+203 |
|\| | |||||
| * | sync around individual calls instead of synchronizing entire object | Daniel Gultsch | 2016-05-19 | 1 | -49/+79 |
| | | |||||
| * | improved ordering of muc participants | Daniel Gultsch | 2016-05-17 | 1 | -2/+23 |
| | | |||||
| * | refactored muc item parsing to also parse muc status messages | Daniel Gultsch | 2016-05-17 | 1 | -8/+4 |
| | | |||||
| * | offer offline members to be invited again | Daniel Gultsch | 2016-05-17 | 1 | -2/+16 |
| | | |||||
| * | change affiliation for in memory users that are currently not joined in a ↵ | Daniel Gultsch | 2016-05-16 | 1 | -3/+5 |
| | | | | | | | | conference | ||||
| * | keep conference members in memory and show them in conference details | Daniel Gultsch | 2016-05-16 | 1 | -45/+129 |
| | | |||||
* | | Merge remote-tracking branch 'refs/remotes/siacs/master' into development | Christian S | 2016-04-14 | 1 | -0/+3 |
|\| | |||||
| * | return own jid as true counterpart on self messages in muc | Daniel Gultsch | 2016-04-13 | 1 | -0/+3 |
| | | |||||
* | | Merge branch 'siacs/master' into development | Christian S | 2016-03-17 | 1 | -11/+2 |
|\| | |||||
| * | simplified getUsers(max) code | Daniel Gultsch | 2016-03-13 | 1 | -11/+2 |
| | | |||||
* | | Merge branch 'siacs/master' into development | Christian S | 2016-03-04 | 1 | -1/+12 |
|\| | |||||
| * | use correct jid when leaving a conference. fixes #1732 | Daniel Gultsch | 2016-02-29 | 1 | -1/+1 |
| | | |||||
| * | refactored omemo to take multiple recipients | Daniel Gultsch | 2016-02-29 | 1 | -0/+11 |
| | | |||||
* | | Merge branch 'siacs/master' into development | Christian S | 2016-02-23 | 1 | -16/+22 |
|\| | |||||
| * | turned muc errors into enum. added error codes for service shutdown | Daniel Gultsch | 2016-02-22 | 1 | -15/+19 |
| | | |||||
| * | some mucs may grant voice to visitors in unmoderated rooms | Daniel Gultsch | 2016-02-21 | 1 | -1/+3 |
| | | |||||
* | | optimized subtitle in MUCs | Christian S | 2016-02-06 | 1 | -1/+1 |
|/ | |||||
* | refactored user handling in conferences. show try again button when ↵ | Daniel Gultsch | 2016-02-01 | 1 | -84/+57 |
| | | | | conference has errors | ||||
* | when no avatar found show avatar of contact and not the muc user in conferences | Daniel Gultsch | 2015-12-09 | 1 | -3/+3 |
| | |||||
* | properly clear muc user avatar caches | Daniel Gultsch | 2015-12-04 | 1 | -2/+7 |
| | |||||
* | use proposed nick as default nick in mucoptions | Daniel Gultsch | 2015-12-04 | 1 | -1/+1 |
| | |||||
* | parse vcard avatars from muc presences | Daniel Gultsch | 2015-12-03 | 1 | -155/+122 |
| | |||||
* | hide subject edit button if not editable by user | Daniel Gultsch | 2015-11-26 | 1 | -4/+18 |
| | |||||
* | pgp fixes and revert configuration changes | Daniel Gultsch | 2015-11-25 | 1 | -23/+4 |
| | |||||
* | Show whether MAM is supported in MUCs | saqura | 2015-10-06 | 1 | -0/+5 |
| | | | | | The conference details in "Advanced Mode" now indicate whether MAM is supported by the conference server. | ||||
* | fixed NPE when executing rename callback in muc | Daniel Gultsch | 2015-09-28 | 1 | -1/+3 |
| | |||||
* | added possibiltiy to set conferences as moderated (only visible in advanced ↵ | Daniel Gultsch | 2015-09-13 | 1 | -6/+20 |
| | | | | mode) | ||||
* | show warning when trying to highlight users that have left the conference | Daniel Gultsch | 2015-07-22 | 1 | -0/+9 |
| | |||||
* | Optimize imports | Andreas Straub | 2015-07-20 | 1 | -2/+2 |
| | |||||
* | don't set unknown error in muc | Daniel Gultsch | 2015-05-12 | 1 | -2/+0 |
| | |||||
* | don't add users with null nicks to muc user list | iNPUTmice | 2015-02-27 | 1 | -1/+1 |
| | |||||
* | clear muc tiles cache only when necessary | iNPUTmice | 2015-02-21 | 1 | -0/+15 |
| | |||||
* | keep proper image file extension | Daniel Gultsch | 2015-01-11 | 1 | -1/+0 |
| | |||||
* | make room persistant when changing subject or other muc options | Daniel Gultsch | 2015-01-10 | 1 | -0/+4 |
| | |||||
* | allow for very basic muc configuration | Daniel Gultsch | 2015-01-08 | 1 | -2/+4 |
| | |||||
* | more muc options | Daniel Gultsch | 2015-01-07 | 1 | -5/+25 |
| | | | | | | * show invite button only with admin privileges or on public conferences * Offer to ban user in public conferences. Thanks to @betheg for the awesome ground work for this | ||||
* | basic affiliation changes in muc | Daniel Gultsch | 2015-01-07 | 1 | -12/+36 |
| | |||||
* | Show affiliation instead of role in MucDetails and offer 'advanced mode' to ↵ | Daniel Gultsch | 2015-01-05 | 1 | -33/+70 |
| | | | | display role | ||||
* | Add support for XEP-0191 (Blocking command) | Sam Whited | 2014-12-22 | 1 | -33/+33 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #791 Squash of commits: 534f25d7dae3ce6852243e28fdd0a69ac01e9463 808fdf5147f27a912a60bee39aa4bf1ddd4f43b4 1eaf8a8330710ad35ba7c368e04f909af623ae4c 31585242c2359efdcd0eeddb9745077f54dbc9eb 2e69bd0bd0286ed1e98a42f4c3421ba4d8cf524b e904fb5015bf3a1904ab941a1957edf3b1e7abd2 eebbadf3b3816bbf8fcccb763e419fed252d266f 7c5b87724ce494e5a6e8026557ed50a8fd9f23e8 b0eaaf446937794fe19cbdb4f8309c3ff83d4e42 8c652f9e8bb3512958d9ad8c6f1326505f2d98c8 ad0ea1ad948ff6f8fde7b0b10f5163dc8852032f f5d49897e0dba691ef53a0eddb9ed34d129ad442 a08fa64c505bd895b7c626cfad182380373be20b de67079113e08394a276048c31f6b21baa300829 9069f342173ba30c2b20c67529c7ff497a6a257d 0169fa79d161ee898c4b6762e207087682a952d8 8585a5bd75a5d56927fed8317729bd15fffe4dcc 0053528a078369e0b65dcf71bda251072a1299c7 e901a9c3554bd7cca193e92919b463991eadfea7 c5c78257434813c69ab9b7558bcc8f7cbe858433 e905af348d46d77bc46b5f7211527684acc02fab 13a0f9a10c7892b0f90f5fabd2f2615701b0fd66 2cfba1e24b0139839e4453b92be7e20634d150cf 58e074fb5bb44b05a8104250fccd7c024c808c1a 0d6cf98fc8eab212d798ac79b336f9b70a14f06d e23620f56b85bcab9f3b5d9ce1c01524cd9674dc d72cd2fcc8d54176c3ff53411a69b9bb4642eff3 195143dff8836623a37094a6b8fa6aa01ef31580 5f5f3caf3a1e480a99d27ee5c34ba516419c52e4 1dee3d5861c9f9c710da4cbda3688d94c622ca93 23949b8aa32c78b27bab49bb3c4f3ff588925ce1 9bf97f8ae522796e0dacb7f6fe7a7f90f86a93a1 | ||||
* | made muc parser more compatible with legacy mucs?! (whatever that is exactly) | iNPUTmice | 2014-12-03 | 1 | -3/+1 |
| | |||||
* | clean up getProposedNick | iNPUTmice | 2014-12-03 | 1 | -6/+5 |
| | |||||
* | MUC: do not add yourself to the muc user list. | Michael | 2014-11-23 | 1 | -0/+2 |
| | |||||
* | remove unused imports. | Michael | 2014-11-21 | 1 | -2/+0 |
| | |||||
* | STATUS_CODE_SELF_PRESENCE is not set in all case. | Michael | 2014-11-21 | 1 | -10/+16 |
| | |||||
* | change status codes string 'number' to a better readable constant. | Michael | 2014-11-20 | 1 | -3/+5 |
| | |||||
* | brought ad hoc conferences back. fixed #688 fixed #367 | iNPUTmice | 2014-11-20 | 1 | -59/+101 |
| |