aboutsummaryrefslogtreecommitdiffstats
path: root/src/main (follow)
Commit message (Expand)AuthorAgeFilesLines
...
* 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 developmentDaniel 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 detectedDaniel 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 transifexDaniel 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
| * changed color of 'whispered' prefixDaniel Gultsch2015-08-111-2/+1
| * put wake locks on out of band file transfersDaniel Gultsch2015-08-105-25/+32
| * report wrong file size in otr encrypted jingle file transfers to be compatibl...Daniel Gultsch2015-08-103-3/+10
| * provide more detailed error toasts for http file downloadDaniel Gultsch2015-08-102-38/+61
| * fixed image preview in notfications for images that arrived over jingleDaniel Gultsch2015-08-081-6/+4
| * decreased right hand side padding in contact keysDaniel Gultsch2015-08-081-1/+3
| * renamed multi-end / axolotl to OMEMODaniel Gultsch2015-08-088-26/+25
| * removed dead codeDaniel Gultsch2015-08-081-10/+0
| * don't request ack for iq stanzas before stream managment is initializedDaniel Gultsch2015-08-081-2/+2
| * Increase number of published prekeys for releaseAndreas Straub2015-08-071-1/+1
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 06:29:57 +0000