aboutsummaryrefslogtreecommitdiffstats
path: root/src/main (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #668 from SamWhited/auth-pinningDaniel Gultsch2014-11-1518-280/+295
|\ | | | | Auth mechanism pinning
| * Set security error status on TLS cert mismatchSam Whited2014-11-151-6/+7
| |
| * Remove extra status wrapper methodSam Whited2014-11-152-6/+1
| |
| * Add incompatible server statusSam Whited2014-11-154-66/+19
| |
| * Add security error statusSam Whited2014-11-154-13/+22
| |
| * Make account status an enumSam Whited2014-11-1513-200/+215
| |
| * Add auth method pinningSam Whited2014-11-156-16/+58
| |
* | fixed some disco / carbon related bugsiNPUTmice2014-11-151-29/+43
|/
* Merge branch 'feature/file_transfer' into developmentiNPUTmice2014-11-1523-275/+772
|\ | | | | | | | | Conflicts: src/main/res/values/strings.xml
| * handled more error casesiNPUTmice2014-11-153-5/+30
| |
| * better cleanup after unsuccesful transfersiNPUTmice2014-11-153-1/+35
| |
| * fixed description in notifications and conversation overviewiNPUTmice2014-11-158-50/+93
| |
| * fixed resending for files as welliNPUTmice2014-11-152-3/+4
| |
| * made file transfers cancelableiNPUTmice2014-11-158-22/+76
| |
| * adepted conversationadapter to deal with filesiNPUTmice2014-11-152-3/+23
| |
| * progress for ibb transfersiNPUTmice2014-11-155-13/+27
| |
| * some mime and pgp fixes for file transferiNPUTmice2014-11-157-73/+71
| |
| * support for pgp filesiNPUTmice2014-11-155-23/+38
| |
| * progress for http images as well. fixed open button for sent filesiNPUTmice2014-11-157-8/+40
| |
| * copy non local files to private storage firstiNPUTmice2014-11-153-23/+77
| |
| * bug fixes and various improvements for file transferiNPUTmice2014-11-155-19/+30
| |
| * basic arbitrary file transferiNPUTmice2014-11-1513-136/+332
| |
* | Merge branch 'feature/foreground_service' into developmentiNPUTmice2014-11-159-9/+50
|\ \ | | | | | | | | | | | | Conflicts: src/main/res/values/strings.xml
| * | added low priority and removed date in foreground noticficationiNPUTmice2014-11-151-0/+2
| | |
| * | turn on foreground service in expert settingsiNPUTmice2014-11-159-9/+48
| |/
* | Merge branch 'feature/otr_verification' into developmentiNPUTmice2014-11-1510-182/+655
|\ \ | |/ |/|
| * check if account is online before doing smpfeature/otr_verificationiNPUTmice2014-11-121-11/+24
| |
| * Merge branch 'feature/otr_verification' of ↵iNPUTmice2014-11-111-1/+0
| |\ | | | | | | | | | | | | | | | | | | https://github.com/siacs/Conversations into feature/otr_verification Conflicts: src/main/java/eu/siacs/conversations/ui/VerifyOTRActivity.java
| | * small bug fixiNPUTmice2014-11-101-8/+3
| | |
| | * added snackbar to indicate smp. more error handling in verify activityiNPUTmice2014-11-105-113/+158
| | |
| | * initial smp supportiNPUTmice2014-11-1010-122/+552
| | |
| * | use auto register for verify otr listenersiNPUTmice2014-11-111-9/+0
| | |
| * | small bug fixiNPUTmice2014-11-111-8/+3
| | |
| * | added snackbar to indicate smp. more error handling in verify activityiNPUTmice2014-11-115-113/+158
| | |
| * | initial smp supportiNPUTmice2014-11-1110-122/+552
| | |
* | | Merge pull request #665 from SamWhited/issue71Daniel Gultsch2014-11-158-381/+729
|\ \ \ | | | | | | | | Add SCRAM-SHA1 support
| * | | Improve auth error handling and state machineSam Whited2014-11-155-40/+43
| | | |
| * | | Add SCRAM-SHA1 supportSam Whited2014-11-149-381/+726
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Factor out GS2 tokanization into own class Add authentication exception class Fixes #71
* | | | Merge pull request #666 from SamWhited/localefixesDaniel Gultsch2014-11-152-3/+3
|\ \ \ \ | | | | | | | | | | Spelling fixes
| * | | | Spelling fixes in Italian translationSam Whited2014-11-141-2/+2
| | | | |
| * | | | Spelling fix in German translationSam Whited2014-11-141-1/+1
| |/ / /
* / / / Make licenses info untranslatableSam Whited2014-11-141-1/+1
|/ / /
* | | Added check for empty from on group chat packetKevin Rauwolf2014-11-141-0/+3
| | |
* | | Merge branch 'development' of https://github.com/siacs/Conversations into ↵iNPUTmice2014-11-141-5/+10
|\ \ \ | | | | | | | | | | | | development
| * \ \ Merge pull request #653 from kriztan/patch-2Daniel Gultsch2014-11-141-5/+10
| |\ \ \ | | | | | | | | | | Update German language
| | * | | Update German languagekriztan2014-11-121-24/+0
| | | | | | | | | | | | | | | deleted 'pref_about_message'
| | * | | Update German languagekriztan2014-11-121-5/+34
| | |/ /
* | / / fixed possible npe when loading null counterpart into messageiNPUTmice2014-11-141-1/+6
|/ / /
* | | made presences synchronizediNPUTmice2014-11-131-13/+27
| | |
* | | more npe checks in muc packet parseriNPUTmice2014-11-131-31/+34
| | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-04 08:40:50 +0000