aboutsummaryrefslogtreecommitdiffstats
path: root/src (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #27 from siacs/developmentChristian S.2015-08-2413-208/+242
|\
| * 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
* | | 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
| |\|
| | * 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
* | | | added translation for undo stringChristian S.2015-08-161-0/+1
* | | | reduced image preview sizeChristian S.2015-08-161-1/+1
* | | | Merge branch 'siacs/development' into developmentChristian S2015-08-157-86/+76
|\ \ \ \ | | |/ / | |/| |
| * | | Merge branch 'depend_on_sm' into developmentDaniel Gultsch2015-08-157-86/+76
| |\ \ \ | | |_|/ | |/| |
| | * | fully depend on smDaniel Gultsch2015-08-157-86/+76
* | | | version 1.6.0Christian S2015-08-158-3/+88
|\| | |
| * | | 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
| | |/
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-13 15:00:57 +0000