Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | sent read marker to full jid | iNPUTmice | 2014-11-19 | 2 | -9/+10 | |
| | ||||||
* | some saftey checks before registering listeners in XmppActivity | iNPUTmice | 2014-11-19 | 1 | -1/+12 | |
| | ||||||
* | put error notification into notification service | iNPUTmice | 2014-11-18 | 3 | -46/+42 | |
| | ||||||
* | simplified message merge condition | iNPUTmice | 2014-11-18 | 1 | -43/+13 | |
| | ||||||
* | synchronized message list in conversation fragment | iNPUTmice | 2014-11-18 | 1 | -113/+118 | |
| | ||||||
* | show dynamic tags in contacts activity as well | iNPUTmice | 2014-11-18 | 1 | -33/+26 | |
| | ||||||
* | properly remove conversations context menu | iNPUTmice | 2014-11-18 | 2 | -41/+20 | |
| | ||||||
* | disabled broken conversations context menu | iNPUTmice | 2014-11-18 | 1 | -3/+3 | |
| | ||||||
* | better usage of synchronized in some places | iNPUTmice | 2014-11-18 | 3 | -82/+80 | |
| | ||||||
* | better exception handling in XmppConnection.connect. (never return without ↵ | iNPUTmice | 2014-11-18 | 1 | -39/+15 | |
| | | | | throwing exception. use finally to release wake lock. use status.server_not_found instead of status.offline when necessary | |||||
* | context menu for conversations. fixed #630 | iNPUTmice | 2014-11-18 | 1 | -9/+45 | |
| | ||||||
* | clear avatar cache with new roster push from server | iNPUTmice | 2014-11-17 | 1 | -0/+2 | |
| | ||||||
* | avoided some null pointers | iNPUTmice | 2014-11-17 | 3 | -24/+35 | |
| | ||||||
* | context menu for muc participants + refactor trueCounterpart to use Jid class | iNPUTmice | 2014-11-17 | 7 | -38/+102 | |
| | ||||||
* | synchronized around cache clear in avatar service | iNPUTmice | 2014-11-17 | 1 | -9/+15 | |
| | ||||||
* | Use `Locale.US' for string comparisons in search | Sam Whited | 2014-11-17 | 2 | -6/+14 | |
| | ||||||
* | trim search before searching | iNPUTmice | 2014-11-17 | 1 | -2/+2 | |
| | ||||||
* | Merge branch 'development' of https://github.com/siacs/Conversations into ↵ | iNPUTmice | 2014-11-17 | 1 | -2/+3 | |
|\ | | | | | | | development | |||||
| * | Fix linter suppression | Sam Whited | 2014-11-17 | 1 | -2/+3 | |
| | | ||||||
* | | 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 | |
| | | |