Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | inject ui callback into running mam query | iNPUTmice | 2014-12-20 | 2 | -2/+5 | |
| | ||||||
* | Merge branch 'development' of https://github.com/siacs/Conversations into ↵ | iNPUTmice | 2014-12-17 | 1 | -12/+7 | |
|\ | | | | | | | development | |||||
| * | Merge pull request #783 from SamWhited/quiet-hours | Daniel Gultsch | 2014-12-17 | 1 | -12/+7 | |
| |\ | | | | | | | Update summary in TimePreference change listener | |||||
| | * | Handle time comparisons using longs | Sam Whited | 2014-12-16 | 1 | -12/+7 | |
| | | | ||||||
* | | | made scroling smoother + bug fixes for history loading | iNPUTmice | 2014-12-17 | 2 | -6/+11 | |
| | | | ||||||
* | | | smoothed out scrolling a bit | iNPUTmice | 2014-12-17 | 1 | -18/+21 | |
|/ / | ||||||
* / | properly count mam messages | iNPUTmice | 2014-12-17 | 1 | -2/+5 | |
|/ | ||||||
* | go through mam history page by page. load mam dynamically on scroll | iNPUTmice | 2014-12-15 | 2 | -28/+74 | |
| | ||||||
* | Merge pull request #782 from SamWhited/quiet-hours | Daniel Gultsch | 2014-12-15 | 1 | -3/+3 | |
|\ | | | | | Make some magic number constants final | |||||
| * | Make some magic number constants final | Sam Whited | 2014-12-15 | 1 | -3/+3 | |
| | | ||||||
* | | Merge branch 'quiet-hours' of https://github.com/SamWhited/Conversations ↵ | iNPUTmice | 2014-12-15 | 1 | -68/+64 | |
|\| | | | | | | | into SamWhited-quiet-hours | |||||
| * | Make silent notification when quiet hours are on | Sam Whited | 2014-12-15 | 1 | -68/+64 | |
| | | | | | | | | | | Notify, just don't play a sound or vibrate Also make the Java annoyingly verbose... I can't help myself... ahh! | |||||
* | | Merge branch 'quiet-hours' of https://github.com/SamWhited/Conversations ↵ | iNPUTmice | 2014-12-15 | 1 | -27/+48 | |
|\| | | | | | | | into SamWhited-quiet-hours | |||||
| * | Add quiet hours feature | Sam Whited | 2014-12-14 | 1 | -27/+48 | |
| | | ||||||
* | | fixed history deletion. fixed #780 | iNPUTmice | 2014-12-15 | 1 | -0/+10 | |
| | | ||||||
* | | run mam queries only when online | iNPUTmice | 2014-12-14 | 2 | -4/+31 | |
|/ | ||||||
* | refactored the way certain messages are being found within a conversation | iNPUTmice | 2014-12-14 | 1 | -81/+70 | |
| | ||||||
* | avoiding concurrent modification | iNPUTmice | 2014-12-13 | 1 | -2/+2 | |
| | ||||||
* | reverse through mam history when loading larger chuncks | iNPUTmice | 2014-12-13 | 2 | -11/+65 | |
| | ||||||
* | Merge branch 'feature/mam' into development | iNPUTmice | 2014-12-13 | 2 | -31/+272 | |
|\ | | | | | | | | | Conflicts: src/main/java/eu/siacs/conversations/services/XmppConnectionService.java | |||||
| * | various mam improvments | iNPUTmice | 2014-12-13 | 2 | -35/+115 | |
| | | ||||||
| * | changed lastMessageReceived into lastMessageTransmitted to account for sent ↵ | iNPUTmice | 2014-12-10 | 2 | -14/+19 | |
| | | | | | | | | messages as well. (will trigger on sm ack) | |||||
| * | added max history age (default 1w). automatically sort newly added mam messages | iNPUTmice | 2014-12-10 | 2 | -31/+42 | |
| | | ||||||
| * | very basic mam support | iNPUTmice | 2014-12-10 | 2 | -3/+164 | |
| | | ||||||
| * | store last message received date in conversation | iNPUTmice | 2014-12-10 | 1 | -20/+4 | |
| | | ||||||
* | | refactored phone contacts merger | iNPUTmice | 2014-12-13 | 1 | -33/+38 | |
|/ | ||||||
* | removed unnecessary otr error response | iNPUTmice | 2014-12-10 | 1 | -8/+0 | |
| | ||||||
* | more safety checks for listener counts | iNPUTmice | 2014-12-03 | 1 | -88/+29 | |
| | ||||||
* | safety net in joinMuc | iNPUTmice | 2014-12-03 | 1 | -4/+6 | |
| | ||||||
* | cleaned up avatar / tile creation | iNPUTmice | 2014-12-03 | 1 | -20/+6 | |
| | ||||||
* | fixed npe for broken bookmarks | iNPUTmice | 2014-11-29 | 1 | -7/+8 | |
| | ||||||
* | fix for concurrency issue | iNPUTmice | 2014-11-29 | 1 | -1/+1 | |
| | ||||||
* | add an listener for the muc roster update. | Michael | 2014-11-23 | 1 | -0/+42 | |
| | | | | | this is for the ConferenceDetailsActivity to show precence updates immediately. | |||||
* | MUC: set from when join muc. | Michael | 2014-11-21 | 1 | -0/+1 | |
| | ||||||
* | import fixes | iNPUTmice | 2014-11-20 | 1 | -0/+2 | |
| | ||||||
* | Merge branch 'development' of https://github.com/siacs/Conversations into ↵ | iNPUTmice | 2014-11-20 | 1 | -3/+0 | |
|\ | | | | | | | development | |||||
| * | Remove broken / unused imports | Sam Whited | 2014-11-19 | 1 | -3/+0 | |
| | | ||||||
* | | brought ad hoc conferences back. fixed #688 fixed #367 | iNPUTmice | 2014-11-20 | 2 | -33/+140 | |
|/ | ||||||
* | sent read marker to full jid | iNPUTmice | 2014-11-19 | 1 | -7/+8 | |
| | ||||||
* | put error notification into notification service | iNPUTmice | 2014-11-18 | 2 | -4/+42 | |
| | ||||||
* | better usage of synchronized in some places | iNPUTmice | 2014-11-18 | 1 | -76/+78 | |
| | ||||||
* | context menu for muc participants + refactor trueCounterpart to use Jid class | iNPUTmice | 2014-11-17 | 1 | -1/+1 | |
| | ||||||
* | synchronized around cache clear in avatar service | iNPUTmice | 2014-11-17 | 1 | -9/+15 | |
| | ||||||
* | 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 | 1 | -10/+4 | |
|/ | ||||||
* | parse otr-fingerprint in qr codes and nfc. include otr fingerprint in ↵ | iNPUTmice | 2014-11-16 | 1 | -8/+7 | |
| | | | | shareable uri where ever possible | |||||
* | Make account status an enum | Sam Whited | 2014-11-15 | 2 | -98/+98 | |
| | ||||||
* | Merge branch 'feature/file_transfer' into development | iNPUTmice | 2014-11-15 | 2 | -37/+74 | |
|\ | | | | | | | | | Conflicts: src/main/res/values/strings.xml | |||||
| * | fixed description in notifications and conversation overview | iNPUTmice | 2014-11-15 | 2 | -44/+24 | |
| | |