aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* bug fixesChristian S2016-05-042-68/+112
|
* Merge branch 'refs/heads/news' into developmentChristian S2016-05-0416-102/+181
|\
| * changed avatar format to JPEG and increased size to 720pxChristian S2016-05-041-2/+2
| |
| * set manually_change_presence to true as defaultChristian S2016-05-042-19/+20
| | | | | | | | and hide option to set presence for all accounts
| * merge upstream changesChristian S2016-05-043-10/+45
| |
| * removed duplicate stringsChristian S2016-05-041-4/+0
| |
| * 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 fixes
| | | * spelling fixesklemens2016-05-046-9/+9
| | |/
| | * Merge pull request #1826 from sebastianv89/patch-1Daniel Gultsch2016-05-041-6/+6
| | |\ | | | | | | | | Renaming of variable
| | | * Renaming of variableSebastian2016-05-031-6/+6
| | |/ | | | | | | Was probably just a copy/paste typo.
| | * 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
| | |
* | | changed avatar format to JPEG and increased size to 720 pxChristian S2016-04-301-2/+2
| | |
* | | set manually_change_presence to true as defaultChristian S2016-04-302-2/+3
| | | | | | | | | | | | and hide option to set presence for all accounts
* | | use old ChangePassword activityChristian S2016-04-302-125/+73
| | |
* | | remove old config variableChristian S2016-04-302-7/+2
| | |
* | | Merge remote-tracking branch 'refs/remotes/siacs/master' into developmentChristian S2016-04-3057-261/+1004
|\ \ \ | |/ / |/| / | |/
| * 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.gradle
| | * Update build.gradleChristian S2016-04-231-10/+0
| | | | | | | | | this seems be be never used and could be removed
| * | 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
| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-11 02:59:22 +0000