aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/ui (follow)
Commit message (Expand)AuthorAgeFilesLines
* Fixes FS#147: Disable OMEMOsteckbrief2016-03-022-1/+9
* Fixes FS#146: Remove Tor-Supportsteckbrief2016-03-022-13/+1
* Merge tag '1.10.1' into trz/merge_1.10.1steckbrief2016-02-288-34/+80
|\
| * hide add account icons when single_account is set to trueDaniel Gultsch2016-02-241-0/+3
| * optionally lock conference domains as well and hide known domains in uiDaniel Gultsch2016-02-245-17/+39
| * made hard coded choice for encryptions more flexible and disable parsingDaniel Gultsch2016-02-242-5/+7
| * Merge pull request #1715 from fiaxh/gpg_decryption_failedDaniel Gultsch2016-02-241-0/+13
| |\
| | * Retry decryption from message menufiaxh2016-02-231-0/+13
| * | set noMessagesLeftOnServer before conference configuration fetchDaniel Gultsch2016-02-231-1/+0
| |/
| * properly trigger show load more messages in mucsDaniel Gultsch2016-02-221-2/+10
| * turned muc errors into enum. added error codes for service shutdownDaniel Gultsch2016-02-221-11/+16
* | Fixes FS#48 and FS#136lookshe2016-02-282-14/+1
* | Unused imports / methods removedsteckbrief2016-02-241-19/+0
* | Readded MessageDetailsDialog to message context menu after mergesteckbrief2016-02-241-0/+4
* | Removed stupid message correctionsteckbrief2016-02-234-69/+10
* | Removed useless 'button-message' to load more messages. Implementation alread...steckbrief2016-02-232-45/+7
* | Changed access to presences according to new Presence representation in Csteckbrief2016-02-231-5/+5
* | Removed non-existing member variablesteckbrief2016-02-231-1/+1
* | Fix visibility of updateStatusMessages method that LoadMoreMessages can worksteckbrief2016-02-231-1/+1
* | Merge tag '1.10.0' into trz/merge_1.10.0lookshe2016-02-226-32/+112
|\|
| * show load more messages when auto loading is disabled and messages are still ...Daniel Gultsch2016-02-211-6/+10
| * skip avatar ui when pep is not available. fixes #1706Daniel Gultsch2016-02-191-5/+5
| * don't reset whisper on reInit. fixes #1637Daniel Gultsch2016-02-191-3/+0
| * only offer message correction for the very last messageDaniel Gultsch2016-02-171-3/+6
| * made clear that archiving preferences are server sideDaniel Gultsch2016-02-161-1/+1
| * added setting to opt-out of message correction. renamed preferences and optio...Daniel Gultsch2016-02-161-1/+2
| * basic support for XEP-0308: Last Message Correction. fixes #864Daniel Gultsch2016-02-153-15/+74
| * removed unnecessary conditions when sending read markerDaniel Gultsch2016-02-151-5/+1
| * only show load more messages button when mam is availableDaniel Gultsch2016-02-142-1/+6
| * fixed server info push not showing up when unavailableDaniel Gultsch2016-02-141-2/+2
| * fixed compile bug in free versionDaniel Gultsch2016-02-131-1/+1
| * client side support for XEP-0357: Push NotificationsDaniel Gultsch2016-02-121-0/+13
* | Merge tag '1.9.4' into trz/merge_1.9.4lookshe2016-02-165-41/+155
|\|
| * allow user to set MAM preferencesDaniel Gultsch2016-02-091-1/+63
| * fixed performance regression in on scroll listenerDaniel Gultsch2016-02-041-1/+6
| * prevent previoulsly cleared messages from reloading. fixes #1110Daniel Gultsch2016-02-043-9/+49
| * Merge branch 'disco-caps' of https://github.com/singpolyma/Conversations into...Daniel Gultsch2016-02-022-35/+39
| |\
| | * Use a Presence class for presence informationStephen Paul Weber2016-01-242-35/+39
| * | fixed 'unencrypted' not showing up for conferences when encryption is forcedDaniel Gultsch2016-02-021-1/+1
* | | Implements FS#64: Show who wrote last message in conversation overviewsteckbrief2016-02-131-2/+13
* | | Fixed settings synchronizationsteckbrief2016-02-121-60/+66
* | | Imports organizedsteckbrief2016-02-1220-110/+28
* | | green bubbles and setting to choose green or white bubbles removedsteckbrief2016-02-123-20/+1
* | | Compilation errors and merge mixups fixedsteckbrief2016-02-118-140/+58
* | | Merge tag '1.9.3' into trz/merge_1.9.3lookshe2016-02-1133-983/+3785
|\| |
| * | respect autojoin setting on newly created bookmarks as wellDaniel Gultsch2016-02-011-1/+1
| * | opt out handling of the autojoin flag. fixes #1666Daniel Gultsch2016-02-012-2/+2
| * | made create context menu call in StartConversationsActivity more failsafeDaniel Gultsch2016-02-011-1/+1
| * | refactored user handling in conferences. show try again button when conferenc...Daniel Gultsch2016-02-011-1/+4
| * | show values in formfieldwrappers and allow form to be set to read onlyDaniel Gultsch2016-01-265-4/+55