aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * Merge pull request #782 from SamWhited/quiet-hoursDaniel Gultsch2014-12-151-3/+3
| |\ | | | | | | Make some magic number constants final
| | * Make some magic number constants finalSam Whited2014-12-151-3/+3
| | |
| * | fixed crashing on unparsed jidsiNPUTmice2014-12-151-4/+4
| | |
| * | Merge branch 'quiet-hours' of https://github.com/SamWhited/Conversations ↵iNPUTmice2014-12-151-68/+64
| |\| | | | | | | | | | into SamWhited-quiet-hours
| | * Make silent notification when quiet hours are onSam Whited2014-12-151-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 loggingiNPUTmice2014-12-154-32/+8
| | |
| * | Merge branch 'quiet-hours' of https://github.com/SamWhited/Conversations ↵iNPUTmice2014-12-154-29/+176
| |\| | | | | | | | | | into SamWhited-quiet-hours
| | * Add quiet hours featureSam Whited2014-12-144-29/+176
| | |
| * | fixed history deletion. fixed #780iNPUTmice2014-12-152-1/+11
| | |
| * | Merge pull request #775 from kruks23/translation1Daniel Gultsch2014-12-151-33/+33
| |\ \ | | | | | | | | Update spanish translations.
| | * | Update spanish translations.kruks232014-12-131-33/+33
| | | |
| * | | Merge pull request #781 from drizzt/patch-1Daniel Gultsch2014-12-151-1/+1
| |\ \ \ | | | | | | | | | | fixed typo in italian translation
| | * | | fixed typo in italian translationdrizzt2014-12-151-1/+1
| | | | | | | | | | | | | | | s/gallaria/galleria/
| * | | | avoid npe on weird platform bugsiNPUTmice2014-12-151-30/+30
| |/ / /
| * | | run mam queries only when onlineiNPUTmice2014-12-142-4/+31
| | | |
| * | | more patches for dns helperiNPUTmice2014-12-141-13/+19
| | |/ | |/|
| * | possible dns fixesiNPUTmice2014-12-142-3/+12
| | |
| * | refactored the way certain messages are being found within a conversationiNPUTmice2014-12-145-117/+193
| | |
| * | avoiding concurrent modificationiNPUTmice2014-12-132-6/+3
| | |
| * | fixed regressioniNPUTmice2014-12-131-3/+3
| | |
| * | reverse through mam history when loading larger chuncksiNPUTmice2014-12-135-22/+79
| | |
| * | Merge branch 'feature/mam' into developmentiNPUTmice2014-12-1317-75/+535
| |\ \ | | | | | | | | | | | | | | | | Conflicts: src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
| | * | various mam improvmentsiNPUTmice2014-12-136-39/+130
| | | |
| | * | mark otr messages as no-store for mamiNPUTmice2014-12-101-0/+1
| | | |
| | * | changed lastMessageReceived into lastMessageTransmitted to account for sent ↵iNPUTmice2014-12-104-22/+31
| | | | | | | | | | | | | | | | messages as well. (will trigger on sm ack)
| | * | save server id from mam messages. check for dups before adding mamiNPUTmice2014-12-103-5/+40
| | | |
| | * | added max history age (default 1w). automatically sort newly added mam messagesiNPUTmice2014-12-109-42/+103
| | | |
| | * | very basic mam supportiNPUTmice2014-12-109-8/+277
| | | |
| | * | store last message received date in conversationiNPUTmice2014-12-105-54/+48
| | |/
| * / refactored phone contacts mergeriNPUTmice2014-12-131-33/+38
| |/
| * removed unnecessary otr error responseiNPUTmice2014-12-102-12/+0
| |
| * recreate activity after theme has changed. fixed #764iNPUTmice2014-12-092-3/+20
| |
| * Merge pull request #767 from kruks23/translation3Daniel Gultsch2014-12-091-6/+6
| |\ | | | | | | Update spanish translations.
| | * Update spanish translations.kruks232014-12-091-6/+6
| | |
| * | Merge pull request #768 from betheg/asDaniel Gultsch2014-12-091-1/+3
| |\ \ | | | | | | | | gradle: fix Cannot set property outputFile on null object.
| | * | gradle: fix Cannot set property outputFile on null object.Michael2014-12-091-1/+3
| |/ /
| * | Merge pull request #710 from betheg/asDaniel Gultsch2014-12-093-17/+15
| |\ \ | | | | | | | | update android gradle plugin to 0.14.4
| | * | update gradle to 2.2.1 and android gradle plugin to 1.0.0Michael2014-12-092-2/+2
| | | |
| | * | update android gradle plugin to 1.0.0-rc4Michael2014-12-051-1/+1
| | | |
| | * | update android gradle plugin to 0.14.4Michael2014-11-223-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 parsingiNPUTmice2014-12-094-53/+2
| | | |
| * | | cleanup: removed stream compressioniNPUTmice2014-12-093-205/+0
| | | |
* | | | remaining part of my patchlookshe2015-01-034-7/+106
| | | |
* | | | added smilies from patch. remaining changes will follow laterlookshe2015-01-0320-0/+3001
|/ / /
* | | version bump to 0.9.3iNPUTmice2014-12-073-3/+5
| | |
* | | possible work around for some weird - possibly sdk - bugsiNPUTmice2014-12-071-4/+5
| |/ |/|
* | Merge pull request #752 from SamWhited/update-logoDaniel Gultsch2014-12-041-0/+0
|\ \ | | | | | | Update logo in art folder
| * | Update logo in art folderSam Whited2014-12-041-0/+0
|/ /
* | fixed digest-md5iNPUTmice2014-12-041-0/+4
| |
* | Merge branch 'development' of https://github.com/siacs/Conversations into ↵iNPUTmice2014-12-031-1/+1
|\ \ | | | | | | | | | development
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-13 17:26:30 +0000