aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #27 from siacs/developmentChristian S.2015-08-2412-208/+240
|\ | | | | copy commits
| * 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 ↵Daniel Gultsch2015-08-237-20/+18
| | | | | | | | | | | | check for error in callbacks
| * | 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-235-177/+212
| |\|
| | * Add error handling to OMEMO PEP codeAndreas Straub2015-08-231-116/+131
| | | | | | | | | | | | Log received errors and abort processing
| | * 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
| | |
* | | some little image preview changesChristian S2015-08-191-21/+21
| | |
* | | forked NotificationService from siacs/developmentChristian S2015-08-191-16/+18
| | |
* | | removed duplicatesChristian S2015-08-191-13/+0
| | |
* | | copy commitsChristian S2015-08-195-38/+53
|\| |
| * | 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 ↵Daniel Gultsch2015-08-191-0/+1
| | | | | | | | | | | | 32826ec29d28668b7f345ffcd45cd876dc980153
| * | 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-181-0/+13
|\ \ \ | | | | | | | | modified strings for subtitle typing info
| * | | add subtitle to ActionBar in chatviewsChristian S2015-08-183-4/+32
| | | | | | | | | | | | | | | | | | | | | | | | * display typing information in ActionBar as subtitle for single user chats * display participants in ActionBar as subtitle for conferences
* | | | 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-155-3/+29
|\| | |
| * | | Merge branch 'development'Daniel Gultsch2015-08-151-0/+10
| |\ \ \
| | * | | Display error message if all contact keys purgedAndreas Straub2015-08-151-0/+10
| | |/ /
| * | | Merge branch 'development'Daniel Gultsch2015-08-1574-901/+4637
| |\| |
| | * | provide extra interface to close sockets. fixes #1330Daniel Gultsch2015-08-152-2/+11
| | | |
| | * | show HTTP upload availability on Edit account screenhlad2015-08-141-0/+7
| | |/
| * | fixed npe in error message handlingDaniel Gultsch2015-07-211-1/+1
| | |
| * | and now do that properlyDaniel Gultsch2015-07-211-1/+1
| | |
| * | end otr session when receiving failed otr message warningsDaniel Gultsch2015-07-211-1/+7
| | |
| * | bugfix: also add no-permanent-storage to message hintsDaniel Gultsch2015-07-212-1/+2
| | |
| * | bugfix: changed condition of onOtrSessionEstablished being calledDaniel Gultsch2015-07-211-6/+6
| | | | | | | | | | | | | | | | | | fixed #1263 fixed #1260 fixed #1293
| * | bugfix: don't crash if aes key could not be set before jingle transferDaniel Gultsch2015-07-211-1/+4
| | |
| * | bugfix: use sendIqPacket method in service instead of invoking ↵Daniel Gultsch2015-07-211-3/+2
| | | | | | | | | | | | XmppConnection directly
| * | bugfix: accept status code 201 on http uploadDaniel Gultsch2015-07-211-1/+1
| | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-24 15:56:53 +0000