aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* don't show contact details when in conversations with selfChristian S2016-04-111-26/+23
* Insert /me on long click send buttonArtem Shipovskiy2016-04-091-0/+11
* Merge remote-tracking branch 'refs/remotes/siacs/master' into developmentChristian S2016-04-0911-26/+97
|\
| * use startdate as lower bound when querying archive with after=xDaniel Gultsch2016-04-091-13/+3
| * don't show contact details when in conversations with selfDaniel Gultsch2016-04-093-1/+8
| * use last received message id when querying archiveDaniel Gultsch2016-04-091-7/+17
| * transform nimbuzz workaround into a more general 'waitForDisco' conditionDaniel Gultsch2016-04-091-6/+11
| * add required disco#items query to timeout listDaniel Gultsch2016-04-081-1/+4
| * increase version code to fix nasty bug in 1.11.5 betaDaniel Gultsch2016-04-081-1/+1
| * removed ernoexception in exchange for a regular exeption to prevent verify er...Daniel Gultsch2016-04-081-3/+2
| * version bump to 1.11.5 + changelogDaniel Gultsch2016-04-082-2/+5
| * pulled translations from transifexDaniel Gultsch2016-04-082-3/+23
| * check file owner when attaching files or using them as avatarDaniel Gultsch2016-04-074-2/+55
| * prevent null pointer when checking http upload max sizeDaniel Gultsch2016-04-071-6/+6
* | chnaged avatar format to match XEPChristian S2016-04-091-1/+1
* | Merge remote-tracking branch 'siacs/master' into developmentChristian S2016-04-072-2/+4
|\|
| * tell people to build debug instead of releaseDaniel Gultsch2016-04-061-1/+1
| * 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