aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/ui/XmppActivity.java (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'refs/remotes/siacs/master' into developmentChristian S2016-05-051-7/+32
|\
| * republish pgp signature when changing statusDaniel Gultsch2016-05-051-7/+32
* | blue themeMatthias Rieber2016-05-051-1/+1
* | go directly to the user account via menuChristian S2016-05-051-1/+5
* | set manually_change_presence to true as defaultChristian S2016-04-301-1/+1
* | Merge remote-tracking branch 'refs/remotes/siacs/master' into developmentChristian S2016-04-301-16/+22
|\|
| * 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 'siacs/master' into developmentChristian S2016-04-031-0/+4
|\|
| * check max http file size when attaching filesDaniel Gultsch2016-04-011-0/+4
* | Merge pull request #80 from siacs/masterChristian S2016-03-201-3/+4
|\|
| * don't show v\omemo keys as such if not enabledDaniel Gultsch2016-03-201-3/+4
* | Merge branch 'siacs/master' into developmentChristian S2016-03-171-0/+1
|\|
| * reworked sharewith activity to stay open during sharingDaniel Gultsch2016-03-161-0/+1
* | Merge branch 'siacs/master' into developmentChristian S2016-03-131-1/+1
|\|
| * don't show opt-out of battery optimization dialog when push is enabledDaniel Gultsch2016-03-061-1/+1
* | Merge branch 'siacs/master' into developmentChristian S2016-03-041-1/+15
|\|
| * 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
* | Merge branch 'siacs/master' into developmentChristian S2016-01-231-3/+14
|\|
| * 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
* | Merge branch 'siacs/master' into developmentChristian S2016-01-131-0/+25
|\|
| * 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
* | copy commitsChristian S2016-01-041-0/+2
|\|
| * Allow entering a JID from 'choose contact'. thanks @singpolymaDaniel Gultsch2016-01-041-0/+2
* | copy commitsChristian S2015-12-281-7/+14
|\|
| * strip leading 0x05 off omemo fingerprintsDaniel Gultsch2015-12-271-4/+7
| * show certificate informationDaniel Gultsch2015-12-231-3/+7
* | copy commitsChristian S2015-11-291-23/+49
|\|
| * Sign empty statusfiaxh2015-11-091-2/+1
| * Use OpenPGP-API 9.0fiaxh2015-11-091-23/+50
* | Merge pull request #47 from siacs/masterChristian S2015-11-011-6/+11
|\|
| * explicitly mark verified omemo keys in UIDaniel Gultsch2015-10-311-6/+11
* | Merge remote-tracking branch 'siacs/master' into developmentChristian S2015-10-311-1/+1
|\|
| * Reset the margins manually after rotatingsaqura2015-10-261-1/+1
* | Merge remote-tracking branch 'siacs/master' into developmentChristian S2015-10-161-0/+14
|\|
| * 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
* | Version 1.6.9Christian S2015-09-121-11/+8
|\|
| * Only show that have sessions in fingerprint listAndreas Straub2015-09-061-11/+8
* | version 1.6.9 betaChristian S2015-09-061-0/+3
|/
* use dedicated colors for primary and primary_darkDaniel Gultsch2015-08-261-1/+1
* renamed multi-end / axolotl to OMEMODaniel Gultsch2015-08-081-3/+3
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-04 08:57:32 +0000