aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'refs/remotes/siacs/master' into HEADChristian S2016-05-0463-322/+1102
|\
| * clear password field before setting new oneDaniel Gultsch2016-05-041-0/+1
| * fixed npe when calling changepassword activity directlyDaniel Gultsch2016-05-041-2/+4
| * pulled translations from transifexDaniel Gultsch2016-05-044-2/+21
| * Merge pull request #1827 from ka7/spelling_fix_no_translationsDaniel Gultsch2016-05-046-9/+9
| |\
| | * spelling fixesklemens2016-05-046-9/+9
| |/
| * Merge pull request #1826 from sebastianv89/patch-1Daniel Gultsch2016-05-041-6/+6
| |\
| | * Renaming of variableSebastian2016-05-031-6/+6
| |/
| * Merge branch 'master' of github.com:siacs/ConversationsDaniel Gultsch2016-05-031-1/+1
| |\
| | * fixed spelling in readmeDaniel Gultsch2016-05-031-1/+1
| * | fixed presence template dedup for 'online' statusDaniel Gultsch2016-05-031-1/+2
| * | use app name in resource suggestionsDaniel Gultsch2016-05-031-1/+1
| |/
| * update 'create account' faq entryDaniel Gultsch2016-05-021-8/+1
| * ping all accounts at the same timeDaniel Gultsch2016-05-021-5/+17
| * version bump to 1.12.0 + changelogDaniel Gultsch2016-05-022-2/+6
| * pulled translations from transifexDaniel Gultsch2016-05-0215-41/+353
| * show only username when registering account with magic createDaniel Gultsch2016-05-022-13/+22
| * removed unnecessary loggingDaniel Gultsch2016-04-301-1/+0
| * properly cancel avatar tasksDaniel Gultsch2016-04-293-5/+8
| * catch ActivityNotFoundException when requesting battery opDaniel Gultsch2016-04-293-2/+13
| * port all android drop down list items to our ownDaniel Gultsch2016-04-293-10/+9
| * catch rare NPE when determining max http sizeDaniel Gultsch2016-04-291-3/+3
| * synchronize around thumbnail cache to avoid loading images twiceDaniel Gultsch2016-04-281-12/+21
| * cancel potential tasks when receiving image preview from cacheDaniel Gultsch2016-04-281-3/+7
| * cleaned up captcha dialogDaniel Gultsch2016-04-283-53/+69
| * don't request disco from selfDaniel Gultsch2016-04-282-3/+1
| * removed unused config variablesDaniel Gultsch2016-04-2710-64/+14
| * made it possible to go back to welcome screen from edit accountDaniel Gultsch2016-04-272-4/+7
| * renamed welcome header to untranslatable 'Start your Conversations'Daniel Gultsch2016-04-271-1/+1
| * prevent user from accidentally changing password after using magic createDaniel Gultsch2016-04-267-23/+84
| * fixed table creationDaniel Gultsch2016-04-251-10/+14
| * Merge pull request #1821 from kriztan/patch-1Daniel Gultsch2016-04-241-10/+0
| |\
| | * Update build.gradleChristian S2016-04-231-10/+0
| * | don't create templates for empty status messagesDaniel Gultsch2016-04-231-2/+6
| * | add change prescence to manage account context menuDaniel Gultsch2016-04-233-3/+16
| * | show status messages in contact detailsDaniel Gultsch2016-04-233-17/+56
| * | expert setting to manually change presenceDaniel Gultsch2016-04-2240-79/+683
| |/
* | version 1.12.0Christian S2016-04-232-3/+3
* | clean upChristian S2016-04-231-10/+0
* | Update README.mdChristian S2016-04-231-136/+2
* | changlog for upcoming versionChristian S2016-04-232-1/+7
* | increased disco timeoutChristian S2016-04-231-1/+1
* | optimized UIChristian S2016-04-235-10/+18
* | changed updater a bitChristian S2016-04-235-74/+71
* | hide disable account via config switchChristian S2016-04-231-3/+5
* | Prevent presences from being cleared on connectionChristian S2016-04-231-2/+1
* | disable suggestions in password fieldChristian S2016-04-231-1/+1
* | Merge remote-tracking branch 'refs/remotes/siacs/master' into developmentChristian S2016-04-233-64/+77
|\|
| * put welcome screen in scrollviewDaniel Gultsch2016-04-221-62/+67
* | started 1.11.8-betaChristian S2016-04-232-2/+2