aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * version bump to 1.11.4 + changelogDaniel Gultsch2016-04-052-2/+6
* | Merge remote-tracking branch 'refs/remotes/siacs/master' into developmentChristian S2016-04-074-6/+21
|\|
| * better detect broken pepDaniel Gultsch2016-04-052-2/+10
| * fixing travisDaniel Gultsch2016-04-042-4/+11
* | fix ui bug in edit account viewChristian S2016-04-051-3/+3
* | Merge remote-tracking branch 'siacs/master' into developmentChristian S2016-04-042-19/+25
|\|
| * switched around info and items query to avoid race conditionDaniel Gultsch2016-04-041-1/+1
| * pulled translations from transifexDaniel Gultsch2016-04-0412-26/+71
| * removed unnecessary wait for disconnectDaniel Gultsch2016-04-041-6/+0
| * made sure the disco#items query has returned before finalizing the bindDaniel Gultsch2016-04-041-12/+24
* | add option to only allow one account and set it to trueChristian S2016-04-042-5/+4
* | Merge remote-tracking branch 'siacs/master' into developmentChristian S2016-04-0318-54/+189
|\|
| * version bump to 1.11.3 and changelogDaniel Gultsch2016-04-022-2/+6
| * don't ask for resource when server uses http upload v0.1Daniel Gultsch2016-04-023-6/+8
| * check max http file size when attaching filesDaniel Gultsch2016-04-016-12/+83
| * add methods to check max file size for http uploadDaniel Gultsch2016-03-315-12/+41
| * save otr fingerprint in messageDaniel Gultsch2016-03-316-12/+15
| * include form fields into caps hash calculationDaniel Gultsch2016-03-312-6/+25
| * closed some cursors under error conditionsDaniel Gultsch2016-03-311-3/+13
| * made setting aes keys in DownloadableFile more readableDaniel Gultsch2016-03-311-12/+8
| * Merge pull request #1784 from kriztan/patch-2Daniel Gultsch2016-03-282-3/+3
| |\
| | * Update ShortcutBadger to version 1.1.4Christian S2016-03-272-3/+3
| |/
* | set sending crash reports to true as defaultChristian S2016-04-031-1/+1
* | updated about infoChristian S2016-04-031-1/+3
* | added "blocklist" and "change password" iconsChristian S2016-04-031-2/+4
* | changed HomeAsUpIndicatorChristian S2016-04-036-0/+1
* | fixed crashes during updates on Android 6Christian S2016-03-302-35/+57
* | fixed bug in ShortcutBadgerChristian S2016-03-271-2/+2
* | Merge remote-tracking branch 'refs/remotes/origin/patch-2' into developmentChristian S2016-03-272-3/+3
|\ \
| * | Update ShortcutBadger to version 1.1.4Christian S2016-03-272-3/+3
| |/
* | added spinner to app updater activityChristian S2016-03-261-0/+8
* | Merge branch 'siacs/master' into developmentChristian S2016-03-2613-44/+78
|\|
| * version bump to 1.11.2 and changelogDaniel Gultsch2016-03-232-2/+7
| * allow to delete attachments. fixes #1539Daniel Gultsch2016-03-238-31/+46
| * only add image files to media scannerDaniel Gultsch2016-03-236-13/+26
| * update build depsDaniel Gultsch2016-03-231-2/+2
| * Merge pull request #1780 from licaon-kter/patch-1Daniel Gultsch2016-03-221-1/+1
| |\
| | * Typo `attempt`licaon-kter2016-03-221-1/+1
| |/
* | version bumpChristian S2016-03-232-2/+6
* | added missing/new stringsChristian S2016-03-232-0/+7
* | added VoiceRecorder to pluginsChristian S2016-03-231-0/+6
* | Merge pull request #80 from siacs/masterChristian S2016-03-206-12/+19
|\|
| * show room nick for /me command in sent muc messages. fixes #1773Daniel Gultsch2016-03-201-4/+5
| * be less strict when sharing EXTRA_TEXT intentsDaniel Gultsch2016-03-201-1/+1
| * be more careful to avoid creating multiple connectionsDaniel Gultsch2016-03-202-3/+8
| * don't show v\omemo keys as such if not enabledDaniel Gultsch2016-03-202-4/+5
* | add border to roundedimageviewChristian S2016-03-202-3/+4
* | add border to roundedimageviewChristian S2016-03-193-4/+6
* | Merge branch 'siacs/master' into developmentChristian S2016-03-1710-60/+104
|\|
| * version bump to 1.11.1 and changelogDaniel Gultsch2016-03-162-2/+5