aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/ui/XmppActivity.java (follow)
Commit message (Expand)AuthorAgeFilesLines
* 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
| * Refactor out inner classes, cache trust storeAndreas Straub2015-07-291-9/+9
| * Disable trust toggle completely for INACTIVE keysAndreas Straub2015-07-221-0/+1
| * Add INACTIVE state for removed keysAndreas Straub2015-07-211-4/+20
| * allow for private messages being started from muc details in anonymous mucsDaniel Gultsch2015-07-211-4/+9
| * Add purge axolotl key optionAndreas Straub2015-07-201-4/+33
| * rely on refreshUi/refreshUiReal and make sure it is being used everywhereDaniel Gultsch2015-07-201-4/+2
| * Optimize importsAndreas Straub2015-07-201-1/+0
| * Ask for key trust when sending messagesAndreas Straub2015-07-191-1/+8
| * Refactor trust key ui and show in account detailsAndreas Straub2015-07-191-0/+79
| * Disable Axolotl option if not usableAndreas Straub2015-07-191-23/+0
| * Added axolotl activation code to UIAndreas Straub2015-07-191-0/+23
| * renamed colorsDaniel Gultsch2015-07-131-12/+8
| * display toast in ui on failed http downloadDaniel Gultsch2015-07-101-6/+9
| * removed debug loggingDaniel Gultsch2015-05-121-2/+0
| * handle conference invites differently to deal with killed activities. fixes #...Daniel Gultsch2015-05-121-31/+56
| * fixed regression where the selected conversation wasn't highlighted anymore o...iNPUTmice2015-04-131-1/+7
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-01-131-5/+0
|\ \
* | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-12-101-1/+1
|\| |
* | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2015-12-041-8/+6
|\| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-24 11:57:44 +0000