aboutsummaryrefslogtreecommitdiffstats
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 'development'Christian S2015-08-2445-505/+823
| | | |\ | |_|_|/ |/| | |
* | | | version 1.6.3Christian S2015-08-241-1/+1
* | | | Merge pull request #27 from siacs/developmentChristian S.2015-08-2415-211/+254
|\| | |
| * | | 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
| |/ / /
* | | | replaced ... with …Christian S2015-08-192-4/+4
* | | | some little image preview changesChristian S2015-08-194-24/+25
* | | | forked NotificationService from siacs/developmentChristian S2015-08-191-16/+18
* | | | removed duplicatesChristian S2015-08-191-13/+0
* | | | removed duplicate stringChristian S2015-08-191-1/+0
* | | | copy commitsChristian S2015-08-1917-193/+450
|\| | |
| * | | 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
* | | | Merge pull request #23 from kriztan/SubtitleChristian S.2015-08-1821-0/+33
|\ \ \ \
| * | | | add subtitle to ActionBar in chatviewsChristian S2015-08-1823-4/+52
* | | | | added German translation for undo stringChristian S.2015-08-161-2/+3