aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/ui/XmppActivity.java (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge tag '1.12.4' into trz/merge_1.12.4 (not tested yet)trz/merge_1.12.4lookshe2016-05-261-27/+56
|\
| * offer offline members to be invited againDaniel Gultsch2016-05-171-1/+1
| * keep conference members in memory and show them in conference detailsDaniel Gultsch2016-05-161-3/+1
| * check if pgpengine is still bound before using itDaniel Gultsch2016-05-121-0/+3
| * republish pgp signature when changing statusDaniel Gultsch2016-05-051-7/+32
| * cancel potential tasks when receiving image preview from cacheDaniel Gultsch2016-04-281-3/+7
| * removed unused config variablesDaniel Gultsch2016-04-271-13/+0
| * expert setting to manually change presenceDaniel Gultsch2016-04-221-0/+15
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-04-061-22/+0
|\ \
* \ \ Merge tag '1.11.3' into trz/rebaselookshe2016-04-051-0/+4
|\ \ \ | | |/ | |/|
| * | check max http file size when attaching filesDaniel Gultsch2016-04-011-0/+4
* | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-03-291-56/+10
|\ \ \ | | |/ | |/|
* | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-03-281-1/+1
|\| |
* | | FS#169 - Merge Conversations 1.11.2 into Conversations+ devlookshe2016-03-251-3/+4
|\ \ \ | | |/ | |/|
| * | don't show v\omemo keys as such if not enabledDaniel Gultsch2016-03-201-3/+4
* | | fixed merge errorslookshe2016-03-201-4/+4
* | | Merge tag '1.11.1' into trz/merge_1.11.1lookshe2016-03-171-5/+5
|\| |
| * | reworked sharewith activity to stay open during sharingDaniel Gultsch2016-03-161-0/+1
* | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-03-111-5/+6
|\ \ \ | | |/ | |/|
* | | Merge tag '1.11.0' into trz/merge_1.11.0lookshe2016-03-081-2/+16
|\ \ \ | | |/ | |/|
| * | don't show opt-out of battery optimization dialog when push is enabledDaniel Gultsch2016-03-061-1/+1
| * | rename purge keys positive button to 'purge keys'Daniel Gultsch2016-02-281-1/+1
| * | changed single_account config into more simple lock_settingsDaniel Gultsch2016-02-271-0/+14
* | | Imports organizedsteckbrief2016-02-121-3/+0
* | | Compilation errors and merge mixups fixedsteckbrief2016-02-111-1/+1
* | | Merge tag '1.9.3' into trz/merge_1.9.3lookshe2016-02-111-51/+305
|\| |
| * | use extract account from intent method and final EXTRA_ACCOUNT variableDaniel Gultsch2016-01-221-5/+4
| * | added convenience method to extract account from intentDaniel Gultsch2016-01-221-1/+13
| * | check for file storage permission before selecting avatarDaniel Gultsch2016-01-131-0/+14
| * | Revert "Add additional warnings to OMEMO purge key function"Daniel Gultsch2016-01-121-26/+2
| * | Add additional warnings to OMEMO purge key functionAndreas Straub2016-01-121-2/+26
| * | ask to be excluded from battery optimizationDaniel Gultsch2016-01-111-0/+11
| * | Allow entering a JID from 'choose contact'. thanks @singpolymaDaniel Gultsch2016-01-041-0/+2
| * | strip leading 0x05 off omemo fingerprintsDaniel Gultsch2015-12-271-4/+7
| * | show certificate informationDaniel Gultsch2015-12-231-3/+7
| * | Sign empty statusfiaxh2015-11-091-2/+1
| * | Use OpenPGP-API 9.0fiaxh2015-11-091-23/+50
| * | explicitly mark verified omemo keys in UIDaniel Gultsch2015-10-311-6/+11
| * | Reset the margins manually after rotatingsaqura2015-10-261-1/+1
| * | Merge pull request #1461 from akallabeth/captcha_supportDaniel Gultsch2015-10-111-0/+6
| |\ \
| | * | Captcha support.Armin Novak2015-10-111-0/+6
| * | | prevent null pointer when trying to display device fingerprints of not existi...Daniel Gultsch2015-10-111-0/+3
| |/ /
| * | initial UI work to allow setting up accounts from certifcatesDaniel Gultsch2015-10-091-0/+5
| * | Only show that have sessions in fingerprint listAndreas Straub2015-09-061-11/+8
| * | use dedicated colors for primary and primary_darkDaniel Gultsch2015-08-261-1/+1
| * | renamed multi-end / axolotl to OMEMODaniel Gultsch2015-08-081-3/+3
| * | Let UNTRUSTED/UNDECIDED keys become INACTIVEAndreas Straub2015-08-011-12/+18
| * | fixed some colors in message adapterDaniel Gultsch2015-07-301-1/+1
| * | Highlight selected message's fingerprint in listAndreas Straub2015-07-291-8/+20
| * | Improve trust toggle responsivenessAndreas Straub2015-07-291-6/+1
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-17 05:50:24 +0000