Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Allow sending of any filetype via intent | Sam Whited | 2014-12-15 | 2 | -25/+37 |
| | | | | Fixes #756 | ||||
* | go through mam history page by page. load mam dynamically on scroll | iNPUTmice | 2014-12-15 | 5 | -43/+108 |
| | |||||
* | 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 |
| | | |||||
* | | fixed crashing on unparsed jids | iNPUTmice | 2014-12-15 | 1 | -4/+4 |
| | | |||||
* | | 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! | ||||
* | | migrated more jid parsing to use getAttributeAsJid. added error logging | iNPUTmice | 2014-12-15 | 4 | -32/+8 |
| | | |||||
* | | Merge branch 'quiet-hours' of https://github.com/SamWhited/Conversations ↵ | iNPUTmice | 2014-12-15 | 4 | -29/+176 |
|\| | | | | | | | into SamWhited-quiet-hours | ||||
| * | Add quiet hours feature | Sam Whited | 2014-12-14 | 4 | -29/+176 |
| | | |||||
* | | fixed history deletion. fixed #780 | iNPUTmice | 2014-12-15 | 2 | -1/+11 |
| | | |||||
* | | Merge pull request #775 from kruks23/translation1 | Daniel Gultsch | 2014-12-15 | 1 | -33/+33 |
|\ \ | | | | | | | Update spanish translations. | ||||
| * | | Update spanish translations. | kruks23 | 2014-12-13 | 1 | -33/+33 |
| | | | |||||
* | | | Merge pull request #781 from drizzt/patch-1 | Daniel Gultsch | 2014-12-15 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | fixed typo in italian translation | ||||
| * | | | fixed typo in italian translation | drizzt | 2014-12-15 | 1 | -1/+1 |
| | | | | | | | | | | | | s/gallaria/galleria/ | ||||
* | | | | avoid npe on weird platform bugs | iNPUTmice | 2014-12-15 | 1 | -30/+30 |
|/ / / | |||||
* | | | run mam queries only when online | iNPUTmice | 2014-12-14 | 2 | -4/+31 |
| | | | |||||
* | | | more patches for dns helper | iNPUTmice | 2014-12-14 | 1 | -13/+19 |
| |/ |/| | |||||
* | | possible dns fixes | iNPUTmice | 2014-12-14 | 2 | -3/+12 |
| | | |||||
* | | refactored the way certain messages are being found within a conversation | iNPUTmice | 2014-12-14 | 5 | -117/+193 |
| | | |||||
* | | avoiding concurrent modification | iNPUTmice | 2014-12-13 | 2 | -6/+3 |
| | | |||||
* | | fixed regression | iNPUTmice | 2014-12-13 | 1 | -3/+3 |
| | | |||||
* | | reverse through mam history when loading larger chuncks | iNPUTmice | 2014-12-13 | 5 | -22/+79 |
| | | |||||
* | | Merge branch 'feature/mam' into development | iNPUTmice | 2014-12-13 | 17 | -75/+535 |
|\ \ | | | | | | | | | | | | | Conflicts: src/main/java/eu/siacs/conversations/services/XmppConnectionService.java | ||||
| * | | various mam improvments | iNPUTmice | 2014-12-13 | 6 | -39/+130 |
| | | | |||||
| * | | mark otr messages as no-store for mam | iNPUTmice | 2014-12-10 | 1 | -0/+1 |
| | | | |||||
| * | | changed lastMessageReceived into lastMessageTransmitted to account for sent ↵ | iNPUTmice | 2014-12-10 | 4 | -22/+31 |
| | | | | | | | | | | | | messages as well. (will trigger on sm ack) | ||||
| * | | save server id from mam messages. check for dups before adding mam | iNPUTmice | 2014-12-10 | 3 | -5/+40 |
| | | | |||||
| * | | added max history age (default 1w). automatically sort newly added mam messages | iNPUTmice | 2014-12-10 | 9 | -42/+103 |
| | | | |||||
| * | | very basic mam support | iNPUTmice | 2014-12-10 | 9 | -8/+277 |
| | | | |||||
| * | | store last message received date in conversation | iNPUTmice | 2014-12-10 | 5 | -54/+48 |
| |/ | |||||
* / | refactored phone contacts merger | iNPUTmice | 2014-12-13 | 1 | -33/+38 |
|/ | |||||
* | removed unnecessary otr error response | iNPUTmice | 2014-12-10 | 2 | -12/+0 |
| | |||||
* | recreate activity after theme has changed. fixed #764 | iNPUTmice | 2014-12-09 | 2 | -3/+20 |
| | |||||
* | Merge pull request #767 from kruks23/translation3 | Daniel Gultsch | 2014-12-09 | 1 | -6/+6 |
|\ | | | | | Update spanish translations. | ||||
| * | Update spanish translations. | kruks23 | 2014-12-09 | 1 | -6/+6 |
| | | |||||
* | | Merge pull request #768 from betheg/as | Daniel Gultsch | 2014-12-09 | 1 | -1/+3 |
|\ \ | | | | | | | gradle: fix Cannot set property outputFile on null object. | ||||
| * | | gradle: fix Cannot set property outputFile on null object. | Michael | 2014-12-09 | 1 | -1/+3 |
|/ / | |||||
* | | Merge pull request #710 from betheg/as | Daniel Gultsch | 2014-12-09 | 3 | -17/+15 |
|\ \ | | | | | | | update android gradle plugin to 0.14.4 | ||||
| * | | update gradle to 2.2.1 and android gradle plugin to 1.0.0 | Michael | 2014-12-09 | 2 | -2/+2 |
| | | | |||||
| * | | update android gradle plugin to 1.0.0-rc4 | Michael | 2014-12-05 | 1 | -1/+1 |
| | | | |||||
| * | | update android gradle plugin to 0.14.4 | Michael | 2014-11-22 | 3 | -17/+15 |
| | | | | | | | | | | | | | | | to work with AS >= 0.9.0 plugin >= 0.14.0 is required also update gradle to 2.2. | ||||
* | | | cleanup: removed unused emoticon parsing | iNPUTmice | 2014-12-09 | 4 | -53/+2 |
| | | | |||||
* | | | cleanup: removed stream compression | iNPUTmice | 2014-12-09 | 3 | -205/+0 |
| | | | |||||
* | | | version bump to 0.9.30.9.3 | iNPUTmice | 2014-12-07 | 3 | -3/+5 |
| | | | |||||
* | | | possible work around for some weird - possibly sdk - bugs | iNPUTmice | 2014-12-07 | 1 | -4/+5 |
| |/ |/| | |||||
* | | Merge pull request #752 from SamWhited/update-logo | Daniel Gultsch | 2014-12-04 | 1 | -0/+0 |
|\ \ | | | | | | | Update logo in art folder | ||||
| * | | Update logo in art folder | Sam Whited | 2014-12-04 | 1 | -0/+0 |
|/ / | |||||
* | | fixed digest-md5 | iNPUTmice | 2014-12-04 | 1 | -0/+4 |
| | | |||||
* | | Merge branch 'development' of https://github.com/siacs/Conversations into ↵ | iNPUTmice | 2014-12-03 | 1 | -1/+1 |
|\ \ | | | | | | | | | | development |