Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | allow for private messages being started from muc details in anonymous mucs | Daniel Gultsch | 2015-07-21 | 1 | -7/+15 |
| | |||||
* | Merge branch 'CryptoNextBeta' into development | Andreas Straub | 2015-07-20 | 1 | -2/+1 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * CryptoNextBeta: (60 commits) Lock TrustKeys if no trusted keys are available Optimize imports Use MD style for key trust toggle switch Fix set/remove OnUpdateBlocklistListener Fix axolotl database migration Remove device list from EditAccount Add clear devices to overflow menu in EditAccount Ask for key trust when sending messages Encrypt files for HTTP upload in encrypted chats Refactor trust key ui and show in account details Send correct body for HTTP files Handle file transmission properly in axolotl Remove unneccessary code Fix trust status for outgoing messages Don't merge messages with different trust statuses Fix copying of axolotl keys to clipboard Add refresh icon to v21 theme Disable Axolotl option if not usable Show trust status of messages' originating session Add key trust toggle to ContactDetailsActivity ... | ||||
| * | Optimize imports | Andreas Straub | 2015-07-20 | 1 | -2/+1 |
| | | |||||
* | | don't show 'show contact details' context menu item when contact isn not in ↵ | Daniel Gultsch | 2015-07-20 | 1 | -3/+8 |
| | | | | | | | | roster | ||||
* | | show contact details in conference details ... | Christian S | 2015-07-19 | 1 | -0/+5 |
|/ | |||||
* | handle conference invites differently to deal with killed activities. fixes ↵ | Daniel Gultsch | 2015-05-12 | 1 | -0/+4 |
| | | | | #1188 | ||||
* | stop conference details from crashing when rotating the screen | Daniel Gultsch | 2015-04-28 | 1 | -0/+3 |
| | |||||
* | limit ui refresh rate | iNPUTmice | 2015-02-17 | 1 | -13/+6 |
| | |||||
* | sort users in muc | Daniel Gultsch | 2015-02-07 | 1 | -3/+12 |
| | |||||
* | make room persistant when changing subject or other muc options | Daniel Gultsch | 2015-01-10 | 1 | -16/+10 |
| | |||||
* | ensure that everyone is member before making a room private | Daniel Gultsch | 2015-01-09 | 1 | -1/+8 |
| | |||||
* | allow for very basic muc configuration | Daniel Gultsch | 2015-01-08 | 1 | -7/+73 |
| | |||||
* | code cleanup | Daniel Gultsch | 2015-01-08 | 1 | -2/+0 |
| | |||||
* | kick after ban | Daniel Gultsch | 2015-01-08 | 1 | -1/+14 |
| | |||||
* | some clean ups for affiliation change context menu | Daniel Gultsch | 2015-01-08 | 1 | -2/+8 |
| | |||||
* | more muc options | Daniel Gultsch | 2015-01-07 | 1 | -1/+26 |
| | | | | | | * 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 | -13/+63 |
| | |||||
* | Show affiliation instead of role in MucDetails and offer 'advanced mode' to ↵ | Daniel Gultsch | 2015-01-05 | 1 | -45/+48 |
| | | | | display role | ||||
* | Add support for XEP-0191 (Blocking command) | Sam Whited | 2014-12-22 | 1 | -12/+12 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | ||||
* | set nick and autojoin=true for new bookmarks | iNPUTmice | 2014-12-03 | 1 | -0/+4 |
| | |||||
* | Misc. "fixes" to correct warnings. | Sam Whited | 2014-11-29 | 1 | -3/+6 |
| | |||||
* | create conversation with bare jid | iNPUTmice | 2014-11-27 | 1 | -1/+1 |
| | |||||
* | Merge pull request #713 from betheg/muc | Daniel Gultsch | 2014-11-24 | 1 | -1/+13 |
|\ | | | | | MUC: do not add yourself to the muc user list. | ||||
| * | add an listener for the muc roster update. | Michael | 2014-11-23 | 1 | -1/+13 |
| | | | | | | | | | | this is for the ConferenceDetailsActivity to show precence updates immediately. | ||||
* | | MUC: option to set/delete bookmark in conference details. | Michael | 2014-11-23 | 1 | -0/+39 |
|/ | |||||
* | remove unused imports. | Michael | 2014-11-21 | 1 | -1/+0 |
| | |||||
* | brought ad hoc conferences back. fixed #688 fixed #367 | iNPUTmice | 2014-11-20 | 1 | -21/+28 |
| | |||||
* | context menu for muc participants + refactor trueCounterpart to use Jid class | iNPUTmice | 2014-11-17 | 1 | -23/+70 |
| | |||||
* | Fix linter suppression | Sam Whited | 2014-11-17 | 1 | -2/+3 |
| | |||||
* | highlight muc members by touching their name in muc details. fixed #503 | iNPUTmice | 2014-11-17 | 1 | -71/+87 |
| | |||||
* | auto register/unregister listeners | iNPUTmice | 2014-11-11 | 1 | -40/+22 |
| | |||||
* | Rework `Account.getJid()' to return full JIDs | Sam Whited | 2014-11-09 | 1 | -1/+1 |
| | | | | Remove `Account.getFullJid()' | ||||
* | Update another chunk of stuff to use JID objects | Sam Whited | 2014-11-09 | 1 | -3/+3 |
| | |||||
* | register nfc callback in every activity that provides a proper sharable uri | iNPUTmice | 2014-11-04 | 1 | -1/+1 |
| | |||||
* | made qr code available from muc and contact details as well | iNPUTmice | 2014-11-04 | 1 | -0/+9 |
| | |||||
* | Merge branch 'gradle' into development | Sam Whited | 2014-10-30 | 1 | -1/+1 |
| | | | | | | | | | | Conflicts: .gitignore CHANGELOG.md README.md libs/MemorizingTrustManager libs/minidns libs/openpgp-api-lib | ||||
* | Make conversations the root project | Sam Whited | 2014-10-22 | 1 | -0/+280 |