aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* update travis.ymlMichael2015-08-241-4/+2
* update android sdk and support library.Michael2015-08-241-6/+5
* Merge branch 'master' into developmentDaniel Gultsch2015-08-233-2/+5
|\
| * version bump to 1.6.3 and changelogDaniel Gultsch2015-08-232-2/+5
| * 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-232-1/+4
|\|
| * version bump to 1.6.2 and changelogDaniel Gultsch2015-08-232-2/+5
* | 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-238-178/+218
|\|
| * added changelog for 1.6.1Daniel Gultsch2015-08-231-0/+3
| * version bump to 1.6.1Daniel Gultsch2015-08-231-2/+2
| * 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 pull request #1348 from betheg/zxingDaniel Gultsch2015-08-231-2/+2
|\ \
| * | update zxing to v3.2.1Michael2015-08-231-2/+2
|/ /
* | 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
|\|
| * increased version codeDaniel Gultsch2015-08-161-1/+1
| * 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
* | version bump to 1.7.0-alpha to start new development cycleDaniel Gultsch2015-08-151-2/+2
* | Merge branch 'depend_on_sm' into developmentDaniel Gultsch2015-08-157-86/+76
|\ \ | |/ |/|
| * fully depend on smDaniel Gultsch2015-08-157-86/+76
* | version bump to 1.6.0Daniel Gultsch2015-08-151-2/+2
* | 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-15201-1239/+6933
|\|
| * provide extra interface to close sockets. fixes #1330Daniel Gultsch2015-08-152-2/+11
| * Merge pull request #1329 from hlad/server_info_http_uploadDaniel Gultsch2015-08-153-0/+28
| |\
| | * show HTTP upload availability on Edit account screenhlad2015-08-143-0/+28
| |/
| * version bump to 1.6.0-beta.2Daniel Gultsch2015-08-111-2/+2
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-16 19:38:08 +0000