aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java (follow)
Commit message (Expand)AuthorAgeFilesLines
* bug fixesChristian S2016-05-041-66/+100
* Merge branch 'refs/heads/news' into developmentChristian S2016-05-041-22/+49
|\
| * merge upstream changesChristian S2016-05-041-7/+22
| * Merge remote-tracking branch 'refs/remotes/siacs/master' into HEADChristian S2016-05-041-88/+141
| |\
| | * show only username when registering account with magic createDaniel Gultsch2016-05-021-12/+21
* | | use old ChangePassword activityChristian S2016-04-301-104/+70
* | | remove old config variableChristian S2016-04-301-5/+0
* | | Merge remote-tracking branch 'refs/remotes/siacs/master' into developmentChristian S2016-04-301-68/+114
|\ \ \ | |/ / |/| / | |/
| * catch ActivityNotFoundException when requesting battery opDaniel Gultsch2016-04-291-1/+6
| * port all android drop down list items to our ownDaniel Gultsch2016-04-291-1/+1
| * cleaned up captcha dialogDaniel Gultsch2016-04-281-51/+41
| * removed unused config variablesDaniel Gultsch2016-04-271-6/+0
| * made it possible to go back to welcome screen from edit accountDaniel Gultsch2016-04-271-3/+7
| * prevent user from accidentally changing password after using magic createDaniel Gultsch2016-04-261-11/+46
| * add change prescence to manage account context menuDaniel Gultsch2016-04-231-3/+2
| * expert setting to manually change presenceDaniel Gultsch2016-04-221-1/+13
* | changed hidden password fieldChristian S2016-04-231-2/+3
* | make password invisible in edit account viewChristian S2016-04-221-0/+4
* | modified welcome screenChristian S2016-04-211-27/+2
* | Merge branch 'refs/heads/siacs/master' into welcome-screenChristian S2016-04-211-1/+3
|\|
| * added magic create welcome screenDaniel Gultsch2016-04-191-1/+3
* | Merge remote-tracking branch 'refs/remotes/siacs/master' into developmentChristian S2016-04-111-3/+6
|\|
| * fixed 'connecting…' buttonDaniel Gultsch2016-04-101-3/+6
* | Merge remote-tracking branch 'siacs/master' into developmentChristian S2016-04-031-1/+1
|\|
| * add methods to check max file size for http uploadDaniel Gultsch2016-03-311-1/+1
* | Merge branch 'siacs/master' into developmentChristian S2016-03-131-2/+3
|\|
| * don't show opt-out of battery optimization dialog when push is enabledDaniel Gultsch2016-03-061-2/+3
* | Merge branch 'siacs/master' into developmentChristian S2016-03-041-1/+8
|\|
| * changed single_account config into more simple lock_settingsDaniel Gultsch2016-02-271-1/+8
* | Merge branch 'siacs/master' into developmentChristian S2016-02-201-8/+8
|\|
| * 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
* | 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
* | Merge branch 'siacs/master'Christian S2016-01-311-7/+23
|\|
| * expert setting to trigger extended connection optionsDaniel Gultsch2016-01-251-7/+23
* | Merge branch 'siacs/master' into developmentChristian S2016-01-231-4/+4
|\|
| * use extract account from intent method and final EXTRA_ACCOUNT variableDaniel Gultsch2016-01-221-4/+4
* | Merge branch 'siacs/master' into developmentChristian S2016-01-131-3/+24
|\|
| * ask to be excluded from battery optimizationDaniel Gultsch2016-01-111-3/+24
* | copy commitsChristian S2016-01-041-2/+2
|\|
| * edit account activity was still showing the omemo key with leading 0x05. fixe...Daniel Gultsch2016-01-031-2/+2
* | copy commitsChristian S2015-12-281-1/+1
|\|
| * show certificate informationDaniel Gultsch2015-12-231-1/+1
* | copy commitsChristian S2015-12-161-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
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-29 11:32:13 +0000