Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | split search keywords by whitespaces and imply AND operatior | iNPUTmice | 2014-11-17 | 1 | -1/+11 |
| | |||||
* | highlight muc members by touching their name in muc details. fixed #503 | iNPUTmice | 2014-11-17 | 3 | -72/+105 |
| | |||||
* | made tags searchable | iNPUTmice | 2014-11-16 | 2 | -157/+180 |
| | |||||
* | fixed regression of xmpp uris not working | iNPUTmice | 2014-11-16 | 2 | -14/+11 |
| | |||||
* | Merge pull request #673 from SamWhited/development | Daniel Gultsch | 2014-11-16 | 1 | -1/+1 |
|\ | | | | | Fix fetching accounts by JIDs | ||||
| * | Fix fetching accounts by JIDs | Sam Whited | 2014-11-16 | 1 | -1/+1 |
| | | | | | | | | Fixes a crash when publishing an avatar | ||||
* | | happy hanukkah | iNPUTmice | 2014-11-16 | 8 | -23/+132 |
|/ | |||||
* | Merge branch 'development' of https://github.com/siacs/Conversations into ↵ | iNPUTmice | 2014-11-16 | 2 | -3/+3 |
|\ | | | | | | | development | ||||
| * | Don't escape passwords in SASL | Sam Whited | 2014-11-15 | 2 | -3/+3 |
| | | | | | | | | Fixes #671 | ||||
* | | show full time stamp in connection established field | iNPUTmice | 2014-11-16 | 1 | -1/+1 |
| | | |||||
* | | better error checking in ssl switch over | iNPUTmice | 2014-11-16 | 1 | -5/+9 |
|/ | |||||
* | made scan and show qr code more accessible in VerifyOtrActivity | iNPUTmice | 2014-11-16 | 3 | -53/+186 |
| | |||||
* | Merge branch 'master' into development | iNPUTmice | 2014-11-16 | 1 | -5/+18 |
|\ | |||||
| * | close cursor for database | iNPUTmice | 2014-11-16 | 1 | -5/+18 |
| | | |||||
| * | made presences synchronized | iNPUTmice | 2014-11-13 | 1 | -13/+27 |
| | | |||||
| * | more npe checks in muc packet parser | iNPUTmice | 2014-11-13 | 1 | -32/+35 |
| | | |||||
* | | parse otr-fingerprint in qr codes and nfc. include otr fingerprint in ↵ | iNPUTmice | 2014-11-16 | 11 | -69/+119 |
| | | | | | | | | shareable uri where ever possible | ||||
* | | Merge pull request #669 from SamWhited/scramcaching | Daniel Gultsch | 2014-11-15 | 2 | -10/+51 |
|\ \ | | | | | | | Cache SCRAM-SHA-1 keys for current session | ||||
| * | | Cache SCRAM-SHA-1 keys for current session | Sam Whited | 2014-11-15 | 2 | -10/+51 |
| | | | |||||
* | | | small modifications for changing an account status in XmppConnection | iNPUTmice | 2014-11-15 | 1 | -8/+6 |
|/ / | |||||
* | | Merge pull request #668 from SamWhited/auth-pinning | Daniel Gultsch | 2014-11-15 | 17 | -280/+293 |
|\ \ | | | | | | | Auth mechanism pinning | ||||
| * | | Set security error status on TLS cert mismatch | Sam Whited | 2014-11-15 | 1 | -6/+7 |
| | | | |||||
| * | | Remove extra status wrapper method | Sam Whited | 2014-11-15 | 2 | -6/+1 |
| | | | |||||
| * | | Add incompatible server status | Sam Whited | 2014-11-15 | 3 | -66/+18 |
| | | | |||||
| * | | Add security error status | Sam Whited | 2014-11-15 | 3 | -13/+21 |
| | | | |||||
| * | | Make account status an enum | Sam Whited | 2014-11-15 | 13 | -200/+215 |
| | | | |||||
| * | | Add auth method pinning | Sam Whited | 2014-11-15 | 6 | -16/+58 |
| | | | |||||
* | | | fixed some disco / carbon related bugs | iNPUTmice | 2014-11-15 | 1 | -29/+43 |
|/ / | |||||
* | | Merge branch 'feature/file_transfer' into development | iNPUTmice | 2014-11-15 | 20 | -272/+755 |
|\ \ | | | | | | | | | | | | | Conflicts: src/main/res/values/strings.xml | ||||
| * | | handled more error cases | iNPUTmice | 2014-11-15 | 2 | -5/+29 |
| | | | |||||
| * | | better cleanup after unsuccesful transfers | iNPUTmice | 2014-11-15 | 3 | -1/+35 |
| | | | |||||
| * | | fixed description in notifications and conversation overview | iNPUTmice | 2014-11-15 | 7 | -50/+91 |
| | | | |||||
| * | | fixed resending for files as well | iNPUTmice | 2014-11-15 | 2 | -3/+4 |
| | | | |||||
| * | | made file transfers cancelable | iNPUTmice | 2014-11-15 | 6 | -21/+71 |
| | | | |||||
| * | | adepted conversationadapter to deal with files | iNPUTmice | 2014-11-15 | 1 | -3/+21 |
| | | | |||||
| * | | progress for ibb transfers | iNPUTmice | 2014-11-15 | 5 | -13/+27 |
| | | | |||||
| * | | some mime and pgp fixes for file transfer | iNPUTmice | 2014-11-15 | 6 | -73/+70 |
| | | | |||||
| * | | support for pgp files | iNPUTmice | 2014-11-15 | 5 | -23/+38 |
| | | | |||||
| * | | progress for http images as well. fixed open button for sent files | iNPUTmice | 2014-11-15 | 6 | -7/+38 |
| | | | |||||
| * | | copy non local files to private storage first | iNPUTmice | 2014-11-15 | 3 | -23/+77 |
| | | | |||||
| * | | bug fixes and various improvements for file transfer | iNPUTmice | 2014-11-15 | 5 | -19/+30 |
| | | | |||||
| * | | basic arbitrary file transfer | iNPUTmice | 2014-11-15 | 11 | -133/+326 |
| | | | |||||
* | | | Merge branch 'feature/foreground_service' into development | iNPUTmice | 2014-11-15 | 3 | -9/+41 |
|\ \ \ | | | | | | | | | | | | | | | | | Conflicts: src/main/res/values/strings.xml | ||||
| * | | | added low priority and removed date in foreground noticfication | iNPUTmice | 2014-11-15 | 1 | -0/+2 |
| | | | | |||||
| * | | | turn on foreground service in expert settings | iNPUTmice | 2014-11-15 | 3 | -9/+39 |
| |/ / | |||||
* | | | Merge branch 'feature/otr_verification' into development | iNPUTmice | 2014-11-15 | 6 | -122/+445 |
|\ \ \ | |/ / |/| | | |||||
| * | | check if account is online before doing smpfeature/otr_verification | iNPUTmice | 2014-11-12 | 1 | -11/+24 |
| | | | |||||
| * | | Merge branch 'feature/otr_verification' of ↵ | iNPUTmice | 2014-11-11 | 1 | -1/+0 |
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | https://github.com/siacs/Conversations into feature/otr_verification Conflicts: src/main/java/eu/siacs/conversations/ui/VerifyOTRActivity.java | ||||
| | * | | small bug fix | iNPUTmice | 2014-11-10 | 1 | -8/+3 |
| | | | | |||||
| | * | | added snackbar to indicate smp. more error handling in verify activity | iNPUTmice | 2014-11-10 | 3 | -113/+144 |
| | | | |