aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu (follow)
Commit message (Collapse)AuthorAgeFilesLines
* highlight muc members by touching their name in muc details. fixed #503iNPUTmice2014-11-173-72/+105
|
* made tags searchableiNPUTmice2014-11-162-157/+180
|
* fixed regression of xmpp uris not workingiNPUTmice2014-11-162-14/+11
|
* Merge pull request #673 from SamWhited/developmentDaniel Gultsch2014-11-161-1/+1
|\ | | | | Fix fetching accounts by JIDs
| * Fix fetching accounts by JIDsSam Whited2014-11-161-1/+1
| | | | | | | | Fixes a crash when publishing an avatar
* | happy hanukkahiNPUTmice2014-11-168-23/+132
|/
* Merge branch 'development' of https://github.com/siacs/Conversations into ↵iNPUTmice2014-11-162-3/+3
|\ | | | | | | development
| * Don't escape passwords in SASLSam Whited2014-11-152-3/+3
| | | | | | | | Fixes #671
* | show full time stamp in connection established fieldiNPUTmice2014-11-161-1/+1
| |
* | better error checking in ssl switch overiNPUTmice2014-11-161-5/+9
|/
* made scan and show qr code more accessible in VerifyOtrActivityiNPUTmice2014-11-163-53/+186
|
* Merge branch 'master' into developmentiNPUTmice2014-11-161-5/+18
|\
| * close cursor for databaseiNPUTmice2014-11-161-5/+18
| |
| * made presences synchronizediNPUTmice2014-11-131-13/+27
| |
| * more npe checks in muc packet parseriNPUTmice2014-11-131-32/+35
| |
* | parse otr-fingerprint in qr codes and nfc. include otr fingerprint in ↵iNPUTmice2014-11-1611-69/+119
| | | | | | | | shareable uri where ever possible
* | Merge pull request #669 from SamWhited/scramcachingDaniel Gultsch2014-11-152-10/+51
|\ \ | | | | | | Cache SCRAM-SHA-1 keys for current session
| * | Cache SCRAM-SHA-1 keys for current sessionSam Whited2014-11-152-10/+51
| | |
* | | small modifications for changing an account status in XmppConnectioniNPUTmice2014-11-151-8/+6
|/ /
* | Merge pull request #668 from SamWhited/auth-pinningDaniel Gultsch2014-11-1517-280/+293
|\ \ | | | | | | 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-153-66/+18
| | |
| * | Add security error statusSam Whited2014-11-153-13/+21
| | |
| * | 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-1520-272/+755
|\ \ | | | | | | | | | | | | Conflicts: src/main/res/values/strings.xml
| * | handled more error casesiNPUTmice2014-11-152-5/+29
| | |
| * | better cleanup after unsuccesful transfersiNPUTmice2014-11-153-1/+35
| | |
| * | fixed description in notifications and conversation overviewiNPUTmice2014-11-157-50/+91
| | |
| * | fixed resending for files as welliNPUTmice2014-11-152-3/+4
| | |
| * | made file transfers cancelableiNPUTmice2014-11-156-21/+71
| | |
| * | adepted conversationadapter to deal with filesiNPUTmice2014-11-151-3/+21
| | |
| * | progress for ibb transfersiNPUTmice2014-11-155-13/+27
| | |
| * | some mime and pgp fixes for file transferiNPUTmice2014-11-156-73/+70
| | |
| * | support for pgp filesiNPUTmice2014-11-155-23/+38
| | |
| * | progress for http images as well. fixed open button for sent filesiNPUTmice2014-11-156-7/+38
| | |
| * | 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-1511-133/+326
| | |
* | | Merge branch 'feature/foreground_service' into developmentiNPUTmice2014-11-153-9/+41
|\ \ \ | | | | | | | | | | | | | | | | 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-153-9/+39
| |/ /
* | | Merge branch 'feature/otr_verification' into developmentiNPUTmice2014-11-156-122/+445
|\ \ \ | |/ / |/| |
| * | 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-103-113/+144
| | | |
| | * | initial smp supportiNPUTmice2014-11-106-62/+356
| | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-14 15:36:26 +0000