aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java (follow)
Commit message (Expand)AuthorAgeFilesLines
* 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
| * do socks5 connect manuallyDaniel Gultsch2015-12-011-21/+31
| * initial tor supportDaniel Gultsch2015-12-011-1/+42
* | show tor config in paranoid modeDaniel Gultsch2015-12-041-1/+1
* | do socks5 connect manuallyDaniel Gultsch2015-12-041-21/+31
* | initial tor supportDaniel Gultsch2015-12-041-1/+42
* | copy commitsChristian S2015-11-291-6/+0
|\|
| * pgp fixes and revert configuration changesDaniel Gultsch2015-11-251-6/+0
* | Merge remote-tracking branch 'siacs/master' into developmentChristian S2015-10-311-0/+9
|\|
| * Merge pull request #1520 from saqura/self_handle_orientationDaniel Gultsch2015-10-261-0/+9
| |\
| | * Reset the margins manually after rotatingsaqura2015-10-261-0/+9
* | | Merge remote-tracking branch 'refs/remotes/siacs/master' into developmentChristian S2015-10-261-0/+1
|\| |
| * | invalidate menu after backend connection.Daniel Gultsch2015-10-251-0/+1
| |/
* | copy commitsChristian S2015-10-171-1/+1
|\|
| * improved error reporting in trust keys activityDaniel Gultsch2015-10-171-1/+1
* | Merge remote-tracking branch 'siacs/master' into developmentChristian S2015-10-161-43/+152
|\|
| * 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-12 17:13:39 +0000