Commit log

675bac7 Merge pull request #794 from svetlemodry/development

Click to expand commit body
Czech image transfer string fix

Daniel Gultsch created

64ebbae Merge pull request #797 from kruks23/translation

Click to expand commit body
Update spanish translations

Daniel Gultsch created

6dd75cb Update spanish translations

kruks23 created

c8cfd1b Czech image transfer string fix

Jaroslav Lichtblau created

a68cb5d Merge branch 'development' of https://github.com/siacs/Conversations into development

iNPUTmice created

627982d fixed #755

iNPUTmice created

11cb06e Merge pull request #789 from svetlemodry/development

Click to expand commit body
Czech translation updated

Daniel Gultsch created

7c4a306 Czech translation updated

Click to expand commit body
added missing strings

Jaroslav Lichtblau created

a8afc6a Merge pull request #787 from kriztan/patch-1

Click to expand commit body
Update german translations

Daniel Gultsch created

948112c Update german translations

kriztan created

f00e168 clean up conversation history after swtiching to a different conversation

iNPUTmice created

de952cc show error if jid couldn't be parsed in new contact dialog

iNPUTmice created

c30108e Merge branch 'development' of https://github.com/siacs/Conversations into development

iNPUTmice created

741a0c1 made scroling smoother + bug fixes for history loading

iNPUTmice created

80435ec smoothed out scrolling a bit

iNPUTmice created

5603440 Merge pull request #783 from SamWhited/quiet-hours

Click to expand commit body
Update summary in TimePreference change listener

Daniel Gultsch created

1a7ed4e properly detect images in share with

iNPUTmice created

fd4cf49 Merge branch 'issue756' of https://github.com/SamWhited/Conversations into SamWhited-issue756

iNPUTmice created

3f6638c properly count mam messages

iNPUTmice created

0b49875 Handle time comparisons using longs

Sam Whited created

6659339 Allow sending of any filetype via intent

Click to expand commit body
Fixes #756

Sam Whited created

f9c7830 Update summary in TimePreference change listener

Click to expand commit body
Ensures the summary is updated even if we change the time preference
programatically; also allows other places to stop the summary from being
updated by setting a new listener.

Sam Whited created

e2f50ab go through mam history page by page. load mam dynamically on scroll

iNPUTmice created

03ca971 Merge pull request #782 from SamWhited/quiet-hours

Click to expand commit body
Make some magic number constants final

Daniel Gultsch created

ea61142 Make some magic number constants final

Sam Whited created

ab2187d fixed crashing on unparsed jids

iNPUTmice created

183e31a Merge branch 'quiet-hours' of https://github.com/SamWhited/Conversations into SamWhited-quiet-hours

iNPUTmice created

e084266 migrated more jid parsing to use getAttributeAsJid. added error logging

iNPUTmice created

af0f8e8 Make silent notification when quiet hours are on

Click to expand commit body
Notify, just don't play a sound or vibrate
Also make the Java annoyingly verbose... I can't help myself... ahh!

Sam Whited created

25d8546 Merge branch 'quiet-hours' of https://github.com/SamWhited/Conversations into SamWhited-quiet-hours

iNPUTmice created

2bd4621 fixed history deletion. fixed #780

iNPUTmice created

a6cfbf2 Merge pull request #775 from kruks23/translation1

Click to expand commit body
Update spanish translations.

Daniel Gultsch created

1636024 Merge pull request #781 from drizzt/patch-1

Click to expand commit body
fixed typo in italian translation

Daniel Gultsch created

209e62d avoid npe on weird platform bugs

iNPUTmice created

9f6537a fixed typo in italian translation

Click to expand commit body
s/gallaria/galleria/

drizzt created

f8a496a run mam queries only when online

iNPUTmice created

a6d4b0a Add quiet hours feature

Sam Whited created

5cbae25 more patches for dns helper

iNPUTmice created

50410da possible dns fixes

iNPUTmice created

de06cb3 refactored the way certain messages are being found within a conversation

iNPUTmice created

fc293aa avoiding concurrent modification

iNPUTmice created

6148f04 fixed regression

iNPUTmice created

8998026 reverse through mam history when loading larger chuncks

iNPUTmice created

02a89f4 Merge branch 'feature/mam' into development

Click to expand commit body
Conflicts:
	src/main/java/eu/siacs/conversations/services/XmppConnectionService.java

iNPUTmice created

2368ba5 refactored phone contacts merger

iNPUTmice created

1ffdae8 Update spanish translations.

kruks23 created

b523518 various mam improvments

iNPUTmice created

f2510ae mark otr messages as no-store for mam

iNPUTmice created

1dcdc79 changed lastMessageReceived into lastMessageTransmitted to account for sent messages as well. (will trigger on sm ack)

iNPUTmice created

ccdb0fd save server id from mam messages. check for dups before adding mam

iNPUTmice created