aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Ask to uninstall the plugins because the features are directly integratedChristian S2016-05-063-3/+75
* changes for upcoming versionChristian S2016-05-061-1/+3
* Merge remote-tracking branch 'refs/remotes/origin/share_location' into develo...Christian S2016-05-069-2/+445
|\
| * increased heapsizeChristian S2016-05-061-0/+1
| * added missing stringsChristian S2016-05-062-2/+11
| * bug fix in manifestChristian S2016-05-061-3/+4
| * add share locationChristian S2016-05-059-1/+434
* | ignore api_keys.xmlChristian S2016-05-061-0/+1
* | Merge remote-tracking branch 'refs/remotes/siacs/master' into developmentChristian S2016-05-065-11/+22
|\ \ | |/ |/|
| * Merge pull request #1829 from sebastianv89/patch-1Daniel Gultsch2016-05-051-1/+0
| |\
| | * Remove copy of innerkeySebastian2016-05-051-1/+0
| * | report bind failure as account stateDaniel Gultsch2016-05-053-9/+14
| * | log more information about HTTP’s max upload sizeDaniel Gultsch2016-05-052-1/+8
| |/
* | remove plugin section from settingsChristian S2016-05-051-17/+0
* | add audio recorderChristian S2016-05-056-5/+235
|\ \
| * | add audio recorderChristian S2016-05-056-5/+235
* | | catch exceptionsChristian S2016-05-051-2/+2
* | | change storage pathsChristian S2016-05-051-2/+2
|/ /
* | bug fix in audio playerChristian S2016-05-051-95/+93
* | changed LED notification color to blueChristian S2016-05-051-1/+1
* | Merge remote-tracking branch 'refs/remotes/siacs/master' into developmentChristian S2016-05-0514-62/+127
|\|
| * republish pgp signature when changing statusDaniel Gultsch2016-05-0510-25/+97
| * refactor captcha response handling to avoid network on main thread exceptionDaniel Gultsch2016-05-053-35/+25
| * version bump to 1.12.1 + changelogDaniel Gultsch2016-05-042-2/+5
* | blue themeMatthias Rieber2016-05-05198-53/+225
* | bug fix in audioplayerChristian S2016-05-051-1/+2
* | changed some strings and added licencesChristian S2016-05-052-31/+35
* | some layout fixesChristian S2016-05-051-16/+22
* | go directly to the user account via menuChristian S2016-05-052-2/+6
* | set 'manually_change_presence' to true as default in preferences.xmlChristian S2016-05-051-1/+1
* | added audio playerChristian S2016-05-0516-2/+889
* | little layout improvementChristian S2016-05-041-3/+1
* | 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
| * | 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 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
| | |/