Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | added rendered versions of new icons | iNPUTmice | 2014-11-18 | 8 | -0/+0 | |
| | ||||||
* | Merge branch 'qooob-development' into development | iNPUTmice | 2014-11-18 | 4 | -230/+532 | |
|\ | ||||||
| * | Merge branch 'development' of https://github.com/qooob/Conversations into ↵ | iNPUTmice | 2014-11-18 | 4 | -230/+532 | |
|/| | | | | | | | qooob-development | |||||
| * | Update README.md | Ilia Rostovtsev | 2014-11-18 | 1 | -2/+2 | |
| | | ||||||
| * | Updated launcher icon: Bigger circles | Ilia Rostovtsev | 2014-11-18 | 1 | -113/+78 | |
| | | ||||||
| * | Notification icon: Solid version | Ilia Rostovtsev | 2014-11-18 | 1 | -115/+52 | |
| | | ||||||
| * | Notification icon: Dashed-solid version | Ilia Rostovtsev | 2014-11-18 | 1 | -0/+400 | |
| | | | | | | Keeping this icon in case it's needed later | |||||
* | | context menu for conversations. fixed #630 | iNPUTmice | 2014-11-18 | 3 | -9/+57 | |
|/ | ||||||
* | bump to version 0.9-alpha to differentiate stack traces. no feature freeze ↵ | iNPUTmice | 2014-11-17 | 1 | -2/+2 | |
| | | | | or anything else | |||||
* | 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 | 8 | -39/+106 | |
| | ||||||
* | synchronized around cache clear in avatar service | iNPUTmice | 2014-11-17 | 2 | -9/+19 | |
| | ||||||
* | Merge pull request #681 from SamWhited/searchlocalefix | Daniel Gultsch | 2014-11-17 | 2 | -6/+14 | |
|\ | | | | | Use `Locale.US' for string comparisons in search | |||||
| * | Use `Locale.US' for string comparisons in search | Sam Whited | 2014-11-17 | 2 | -6/+14 | |
| | | ||||||
* | | Merge pull request #680 from ferdev1/patch-2 | Daniel Gultsch | 2014-11-17 | 1 | -2/+2 | |
|\ \ | |/ |/| | Fix string 2 | |||||
| * | Update strings.xml | ferdev1 | 2014-11-17 | 1 | -2/+2 | |
| | | ||||||
* | | 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 | |||||
| * | Merge pull request #679 from SamWhited/lintfix | Daniel Gultsch | 2014-11-17 | 1 | -2/+3 | |
| |\ | | | | | | | Fix broken SuppressLint | |||||
| | * | 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 | |
| | | ||||||
* | | slightly modified logo / launcher icon | iNPUTmice | 2014-11-17 | 11 | -416/+37 | |
|/ | ||||||
* | Merge branch 'development' of https://github.com/siacs/Conversations into ↵ | iNPUTmice | 2014-11-17 | 1 | -1/+1 | |
|\ | | | | | | | development | |||||
| * | Merge pull request #675 from ferdev1/patch-1 | Daniel Gultsch | 2014-11-17 | 1 | -1/+1 | |
| |\ | | | | | | | Fix string | |||||
| | * | Fix string | ferdev1 | 2014-11-16 | 1 | -1/+1 | |
| | | | ||||||
* | | | highlight muc members by touching their name in muc details. fixed #503 | iNPUTmice | 2014-11-17 | 4 | -73/+106 | |
|/ / | ||||||
* | | 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 | 13 | -24/+162 | |
|/ | ||||||
* | Merge branch 'development' of https://github.com/siacs/Conversations into ↵ | iNPUTmice | 2014-11-16 | 2 | -3/+3 | |
|\ | | | | | | | development | |||||
| * | Merge pull request #672 from SamWhited/development | Daniel Gultsch | 2014-11-16 | 2 | -3/+3 | |
| |\ | | | | | | | Don't escape passwords in SASL | |||||
| | * | Don't escape passwords in SASL | Sam Whited | 2014-11-15 | 2 | -3/+3 | |
| |/ | | | | | | | Fixes #671 | |||||
* | | Merge branch 'master' into development | iNPUTmice | 2014-11-16 | 2 | -2/+5 | |
|\ \ | | | | | | | | | | | | | Conflicts: src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java | |||||
| * | | version bump to 0.8.40.8.4 | iNPUTmice | 2014-11-16 | 2 | -2/+5 | |
| | | | ||||||
| * | | 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/+10 | |
| | | | | | | | | | | | | | | | Conflicts: src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java | |||||
* | | | 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 | 6 | -58/+214 | |
| | | ||||||
* | | 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 | |
| | | | ||||||
* | | | Merge pull request #670 from kruks23/translation9 | Daniel Gultsch | 2014-11-15 | 1 | -3/+38 | |
|\ \ \ | | | | | | | | | Update Spanish Translations |