aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/ui (follow)
Commit message (Expand)AuthorAgeFilesLines
...
| | * | Merge pull request #1721 from fiaxh/export_logs_storage_permissionDaniel Gultsch2016-02-272-0/+33
| | |\ \
| | | * | Request WRITE_EXTERNAL_STORAGE for ExportLogsPreference in >= Mfiaxh2016-02-242-0/+33
| * | | | changed single_account config into more simple lock_settingsDaniel Gultsch2016-02-277-7/+28
| |/ / /
* | | | bug fixesChristian S2016-02-271-2/+1
* | | | Merge branch 'siacs/master' into developmentChristian S2016-02-278-24/+63
|\| | |
| * | | 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
| | |/
* | | Merge branch 'siacs/master' into developmentChristian S2016-02-232-20/+35
|\| |
| * | 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
| * show load more messages when auto loading is disabled and messages are still ...Daniel Gultsch2016-02-211-6/+10
* | Merge branch 'siacs/master' into developmentChristian S2016-02-206-33/+94
|\|
| * 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
* | try to automatically rejoin muc after beeing kickedChristian S2016-02-141-1/+2
* | Merge branch 'siacs/master' into developmentChristian S2016-02-141-2/+77
|\|
| * fixed compile bug in free versionDaniel Gultsch2016-02-131-1/+1
| * client side support for XEP-0357: Push NotificationsDaniel Gultsch2016-02-121-0/+13
| * allow user to set MAM preferencesDaniel Gultsch2016-02-091-1/+63
* | optimized subtitle in MUCsChristian S2016-02-061-21/+18
* | match new presence modificationsChristian S2016-02-041-2/+2
* | Merge remote-tracking branch 'siacs/master' into developmentChristian S2016-02-045-66/+118
|\|
| * 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
| * | 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
* | | Merge branch 'siacs/master'Christian S2016-01-319-29/+342
|\| |
| * | show values in formfieldwrappers and allow form to be set to read onlyDaniel Gultsch2016-01-265-4/+55
| * | hide jid row in list item list when jid is nullDaniel Gultsch2016-01-261-1/+2
| * | expert setting to trigger extended connection optionsDaniel Gultsch2016-01-251-7/+23
| * | added FormWrapper and form field validationDaniel Gultsch2016-01-236-4/+144
| |/
| * introduced boolean form field wrapperDaniel Gultsch2016-01-234-13/+62
| * added support for field types jid-single and text-privateDaniel Gultsch2016-01-234-4/+59
| * show fetch errors in trust keys activityDaniel Gultsch2016-01-231-1/+2