aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge tag '1.11.7' into trz/merge_1.11.7lookshe2016-04-171-2/+4
|\
| * fixed 'connecting…' buttonDaniel Gultsch2016-04-101-3/+6
* | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-04-061-2/+2
|\ \
* \ \ Merge tag '1.11.3' into trz/rebaselookshe2016-04-051-1/+1
|\ \ \ | | |/ | |/|
| * | add methods to check max file size for http uploadDaniel Gultsch2016-03-311-1/+1
* | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-03-291-16/+10
|\ \ \ | | |/ | |/|
* | | Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebasesteckbrief2016-03-291-6/+7
|\| |
* | | Merge tag '1.11.0' into trz/merge_1.11.0lookshe2016-03-081-3/+11
|\ \ \ | | |/ | |/|
| * | don't show opt-out of battery optimization dialog when push is enabledDaniel Gultsch2016-03-061-2/+3
| * | changed single_account config into more simple lock_settingsDaniel Gultsch2016-02-271-1/+8
* | | Fixes FS#146: Remove Tor-Supportsteckbrief2016-03-021-3/+1
* | | Merge tag '1.10.0' into trz/merge_1.10.0lookshe2016-02-221-6/+19
|\| |
| * | skip avatar ui when pep is not available. fixes #1706Daniel Gultsch2016-02-191-5/+5
| * | made clear that archiving preferences are server sideDaniel Gultsch2016-02-161-1/+1
| * | 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.4trz/merge_1.9.4lookshe2016-02-161-1/+63
|\| |
| * | allow user to set MAM preferencesDaniel Gultsch2016-02-091-1/+63
* | | Imports organizedsteckbrief2016-02-121-2/+2
* | | Compilation errors and merge mixups fixedsteckbrief2016-02-111-2/+2
* | | Merge tag '1.9.3' into trz/merge_1.9.3lookshe2016-02-111-88/+453
|\| |
| * | expert setting to trigger extended connection optionsDaniel Gultsch2016-01-251-7/+23
| * | use extract account from intent method and final EXTRA_ACCOUNT variableDaniel Gultsch2016-01-221-4/+4
| * | ask to be excluded from battery optimizationDaniel Gultsch2016-01-111-3/+24
| * | edit account activity was still showing the omemo key with leading 0x05. fixe...Daniel Gultsch2016-01-031-2/+2
| * | show certificate informationDaniel Gultsch2015-12-231-1/+1
| * | splite PARANOIA_MODE into three different optionsDaniel Gultsch2015-12-141-1/+1
| * | show tor config in paranoid modeDaniel Gultsch2015-12-021-1/+1
| * | do socks5 connect manuallyDaniel Gultsch2015-12-011-21/+31
| * | initial tor supportDaniel Gultsch2015-12-011-1/+42
| * | pgp fixes and revert configuration changesDaniel Gultsch2015-11-251-6/+0
| * | Merge pull request #1520 from saqura/self_handle_orientationDaniel Gultsch2015-10-261-0/+9
| |\ \
| | * | Reset the margins manually after rotatingsaqura2015-10-261-0/+9
| * | | invalidate menu after backend connection.Daniel Gultsch2015-10-251-0/+1
| |/ /
| * | improved error reporting in trust keys activityDaniel Gultsch2015-10-171-1/+1
| * | set cursor to end of jid in edit accountDaniel Gultsch2015-10-131-2/+3
| * | add menu item in account details to renew certificateDaniel Gultsch2015-10-111-24/+56
| * | Captcha support.Armin Novak2015-10-111-1/+73
| * | initial UI work to allow setting up accounts from certifcatesDaniel Gultsch2015-10-091-21/+25
| * | do not dismiss editAccountActivity when still trying to register new accountDaniel Gultsch2015-10-091-1/+3
| * | indicate broken pep in server infoDaniel Gultsch2015-09-061-1/+7
| * | Only show that have sessions in fingerprint listAndreas Straub2015-09-061-9/+6
| * | show HTTP upload availability on Edit account screenhlad2015-08-141-0/+7
| * | renamed multi-end / axolotl to OMEMODaniel Gultsch2015-08-081-2/+2
| * | added Config.java varibale to lock account creation to specfic domainDaniel Gultsch2015-08-031-20/+55
| * | Highlight selected message's fingerprint in listAndreas Straub2015-07-291-1/+4
| * | Hide regenerate keys buttonAndreas Straub2015-07-221-10/+13
| * | Add INACTIVE state for removed keysAndreas Straub2015-07-211-1/+7
| * | Do not display clear devices button if not onlineAndreas Straub2015-07-201-0/+1