moparisthebest/Conversations
1
0
Fork 0
mirror of https://github.com/moparisthebest/Conversations synced 2024-11-05 16:55:03 -05:00
Code Issues Releases Wiki Activity
1,806 Commits 5 Branches 73 Tags 39 MiB
6659339eff
Commit Graph

1806 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sam Whited
6659339eff Allow sending of any filetype via intent 
Fixes #756
 2014-12-15 22:31:55 -05:00
iNPUTmice
e2f50ab855 go through mam history page by page. load mam dynamically on scroll 2014-12-15 23:06:29 +01:00
Daniel Gultsch
03ca971e2e Merge pull request #782 from SamWhited/quiet-hours 
Make some magic number constants final
 2014-12-15 19:28:21 +01:00
Sam Whited
ea61142d7e Make some magic number constants final 2014-12-15 11:39:18 -05:00
iNPUTmice
ab2187dbdf fixed crashing on unparsed jids 2014-12-15 17:36:16 +01:00
iNPUTmice
183e31ade1 Merge branch 'quiet-hours' of https://github.com/SamWhited/Conversations into SamWhited-quiet-hours 2014-12-15 17:35:29 +01:00
iNPUTmice
e084266595 migrated more jid parsing to use getAttributeAsJid. added error logging 2014-12-15 17:29:17 +01:00
Sam Whited
af0f8e87bb Make silent notification when quiet hours are on 
Notify, just don't play a sound or vibrate
Also make the Java annoyingly verbose... I can't help myself... ahh!
 2014-12-15 11:23:50 -05:00
iNPUTmice
25d8546ae8 Merge branch 'quiet-hours' of https://github.com/SamWhited/Conversations into SamWhited-quiet-hours 2014-12-15 17:16:49 +01:00
iNPUTmice
2bd4621245 fixed history deletion. fixed #780 2014-12-15 17:14:27 +01:00
Daniel Gultsch
a6cfbf2f2d Merge pull request #775 from kruks23/translation1 
Update spanish translations.
 2014-12-15 16:57:56 +01:00
Daniel Gultsch
16360242d1 Merge pull request #781 from drizzt/patch-1 
fixed typo in italian translation
 2014-12-15 16:57:48 +01:00
iNPUTmice
209e62d68b avoid npe on weird platform bugs 2014-12-15 16:55:38 +01:00
drizzt
9f6537acdc fixed typo in italian translation 
s/gallaria/galleria/
 2014-12-15 14:19:18 +01:00
iNPUTmice
f8a496a5f1 run mam queries only when online 2014-12-14 23:23:56 +01:00
Sam Whited
a6d4b0aec5 Add quiet hours feature 2014-12-14 15:07:41 -05:00
iNPUTmice
5cbae25808 more patches for dns helper 2014-12-14 19:02:29 +01:00
iNPUTmice
50410dad33 possible dns fixes 2014-12-14 18:31:52 +01:00
iNPUTmice
de06cb38d1 refactored the way certain messages are being found within a conversation 2014-12-14 18:10:46 +01:00
iNPUTmice
fc293aaede avoiding concurrent modification 2014-12-13 22:17:27 +01:00
iNPUTmice
6148f04d7b fixed regression 2014-12-13 20:05:46 +01:00
iNPUTmice
899802646c reverse through mam history when loading larger chuncks 2014-12-13 15:32:11 +01:00
iNPUTmice
02a89f4ce2 Merge branch 'feature/mam' into development 
Conflicts:
	src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
 2014-12-13 13:55:24 +01:00
iNPUTmice
2368ba518d refactored phone contacts merger 2014-12-13 13:52:57 +01:00
kruks23
1ffdae80a6 Update spanish translations. 2014-12-13 13:24:17 +01:00
iNPUTmice
b523518e4b various mam improvments 2014-12-13 12:25:52 +01:00
iNPUTmice
f2510ae9f6 mark otr messages as no-store for mam 2014-12-10 14:08:06 +01:00
iNPUTmice
1dcdc79a71 changed lastMessageReceived into lastMessageTransmitted to account for sent messages as well. (will trigger on sm ack) 2014-12-10 14:08:06 +01:00
iNPUTmice
ccdb0fd971 save server id from mam messages. check for dups before adding mam 2014-12-10 14:08:06 +01:00
iNPUTmice
0ab530932a added max history age (default 1w). automatically sort newly added mam messages 2014-12-10 14:08:06 +01:00
iNPUTmice
4a94389f05 very basic mam support 2014-12-10 14:08:06 +01:00
iNPUTmice
34558cc277 store last message received date in conversation 2014-12-10 14:08:06 +01:00
iNPUTmice
2b958e51df removed unnecessary otr error response 2014-12-10 14:07:56 +01:00
iNPUTmice
05d1f46c15 recreate activity after theme has changed. fixed #764 2014-12-09 20:22:21 +01:00
Daniel Gultsch
ae3bd9c9e9 Merge pull request #767 from kruks23/translation3 
Update spanish translations.
 2014-12-09 20:16:25 +01:00
Daniel Gultsch
135563e941 Merge pull request #768 from betheg/as 
gradle: fix Cannot set property outputFile on null object.
 2014-12-09 20:14:56 +01:00
Michael
338fd9e7b3 gradle: fix Cannot set property outputFile on null object. 2014-12-09 19:25:59 +01:00
kruks23
920067b8ed Update spanish translations. 2014-12-09 18:33:13 +01:00
Daniel Gultsch
16e3c07cf1 Merge pull request #710 from betheg/as 
update android gradle plugin to 0.14.4
 2014-12-09 14:33:36 +01:00
iNPUTmice
78370094e9 cleanup: removed unused emoticon parsing 2014-12-09 14:21:35 +01:00
iNPUTmice
9d52f62767 cleanup: removed stream compression 2014-12-09 14:14:15 +01:00
Michael
0193cdb194 update gradle to 2.2.1 and android gradle plugin to 1.0.0 2014-12-09 11:12:33 +01:00
iNPUTmice
5acd471880 version bump to 0.9.3 2014-12-07 21:42:50 +01:00
iNPUTmice
490f40b196 possible work around for some weird - possibly sdk - bugs 2014-12-07 21:14:13 +01:00
Michael
c36d564b69 update android gradle plugin to 1.0.0-rc4 2014-12-05 23:26:58 +01:00
Daniel Gultsch
8616a62b3a Merge pull request #752 from SamWhited/update-logo 
Update logo in art folder
 2014-12-04 15:46:59 +01:00
Sam Whited
0fe32877be Update logo in art folder 2014-12-04 09:35:38 -05:00
iNPUTmice
9c9e22c020 fixed digest-md5 2014-12-04 12:33:56 +01:00
iNPUTmice
873702946a Merge branch 'development' of https://github.com/siacs/Conversations into development 2014-12-03 23:29:56 +01:00
iNPUTmice
2274c38726 close cursors after querying phone db 2014-12-03 23:29:35 +01:00