aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | 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
| | | | | | | | | | | | 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
| |