aboutsummaryrefslogtreecommitdiffstats
path: root/src (follow)
Commit message (Expand)AuthorAgeFilesLines
...
* Pass through device IDs when updating own listAndreas Straub2015-08-251-17/+17
* cleared up some error messages in axolotl service and execute publishOwnDevic...Daniel Gultsch2015-08-251-3/+7
* catch some db query exceptionsDaniel Gultsch2015-08-251-3/+5
* additonal null checks in file backendDaniel Gultsch2015-08-251-0/+3
* fixed session timeDaniel Gultsch2015-08-251-7/+2
* increased carbon grace period to 90sDaniel Gultsch2015-08-241-1/+1
* pulled translations from transifexDaniel Gultsch2015-08-2425-49/+18
* renamed plain text to unencrypted. fixes #1331Daniel Gultsch2015-08-2428-53/+53
* fixed regression with mlinks stream managment. fixes #1206Daniel Gultsch2015-08-241-1/+1
* added setting to allow for white backgrounds in incoming message bubblesDaniel Gultsch2015-08-2425-36/+68
* Merge branch 'master' into developmentDaniel Gultsch2015-08-241-1/+1
|\
| * catch invalid base64 in axolotl key parsingDaniel Gultsch2015-08-241-1/+1
* | Merge branch 'master' into developmentdevelopmentDaniel Gultsch2015-08-231-1/+1
|\|
| * open files with capital extensions as well. fixes #1354Daniel Gultsch2015-08-231-1/+1
* | Merge branch 'master' into developmentDaniel Gultsch2015-08-232-3/+2
|\|
| * bugfix: next encryption is now being properly detected1.6.2Daniel Gultsch2015-08-232-3/+2
* | Merge branch 'master' into developmentDaniel Gultsch2015-08-237-18/+16
|\|
| * introduce special iq type for internal timeouts. always use != result to chec...Daniel Gultsch2015-08-237-20/+18
* | Merge branch 'master' into developmentDaniel Gultsch2015-08-231-10/+10
|\|
| * reformatingDaniel Gultsch2015-08-231-3/+1
| * deal with another set of stream:features after bindDaniel Gultsch2015-08-231-7/+9
* | Merge branch 'master' into developmentDaniel Gultsch2015-08-236-177/+214
|\|
| * Add error handling to OMEMO PEP codeAndreas Straub2015-08-231-116/+131
| * remove the READ_PHONE_STATE permission.Michael2015-08-231-0/+2
| * remove callbacks directly from iteratorDaniel Gultsch2015-08-231-2/+2
| * don't make subsequent iq request when original stanza returned an errorDaniel Gultsch2015-08-232-51/+67
| * modified clearIqCallbacks into 2-step processDaniel Gultsch2015-08-233-19/+23
* | Merge branch 'master' into developmentDaniel Gultsch2015-08-1912-151/+397
|\|
| * pulled translations from transifex1.6.0Daniel Gultsch2015-08-1912-151/+397
* | simulate old behaviour with messages being set to waiting while offlineDaniel Gultsch2015-08-192-3/+10
* | Merge branch 'master' into developmentDaniel Gultsch2015-08-191-0/+1
|\|
| * fixed nasty 'stuck at sending' bug that got introduced in 32826ec29d28668b7f3...Daniel Gultsch2015-08-191-0/+1
* | Merge branch 'master' into developmentDaniel Gultsch2015-08-192-1/+7
|\|
| * check if inputstream is null before cropping avatar imagesDaniel Gultsch2015-08-191-0/+6
| * catch package manager has died exceptionDaniel Gultsch2015-08-191-1/+1
* | Merge branch 'master' into developmentDaniel Gultsch2015-08-163-34/+35
|\|
| * deal with broken frameworksDaniel Gultsch2015-08-161-4/+1
| * catch broken base64 in avatarsDaniel Gultsch2015-08-161-5/+1
| * synchronize packetCallbacksDaniel Gultsch2015-08-161-25/+30
| * catch null pointer in ScramSHA1 saslDaniel Gultsch2015-08-161-0/+3
* | Merge branch 'depend_on_sm' into developmentDaniel Gultsch2015-08-157-86/+76
|\ \ | |/ |/|
| * fully depend on smDaniel Gultsch2015-08-157-86/+76
* | Merge branch 'development'Daniel Gultsch2015-08-153-0/+48
|\ \
| * | Update license string with librariesAndreas Straub2015-08-151-0/+4
| * | Display error message if all contact keys purgedAndreas Straub2015-08-153-0/+44
| |/
* | Merge branch 'development'Daniel Gultsch2015-08-15188-1200/+5258
|\|
| * provide extra interface to close sockets. fixes #1330Daniel Gultsch2015-08-152-2/+11
| * show HTTP upload availability on Edit account screenhlad2015-08-143-0/+28
| * do not touch pictures that are already in the right formatDaniel Gultsch2015-08-116-51/+218
| * use same code that is used to open files for imagesDaniel Gultsch2015-08-111-4/+1