1cc1616
require encrypted to be the same for messages to get merged
iNPUTmice created
Commit log
8f8d4e3
experimental message merging
iNPUTmice created
fb3c754
Merge pull request #1 from Flowdalic/flow
Click to expand commit body
Add my Real-name to the Copyright statement
Dominik Schürmann created
733041a
fix: warning: string 'publish_avatar' has no default translation.
Click to expand commit body
also altered the types of resources from array to string-array in some res-files.
Michael created
d15482c
Add my Real-name to the Copyright statement
Click to expand commit body
of ParcelFileDescriptorUtil.
Florian Schmaus created
969cba5
Merge remote-tracking branch 'upstream/development' into fix_typo
Michael created
ec62209
XEP-0172
Gayaz Yusipov created
9eafb10
version bump to 0.7-alpha
iNPUTmice created
c494f4f
Merge branch 'sm' into development
Click to expand commit body
Conflicts: src/eu/siacs/conversations/services/XmppConnectionService.java
iNPUTmice created
4435b00
reset unsend messages to waiting
iNPUTmice created
9075d38
properly set stanza count on session resume
iNPUTmice created
4a6a6c8
basic message acking
iNPUTmice created
9de77b1
proper namespaces for xep-0352
iNPUTmice created
6d82a69
send inactive or active on every connect and resume
iNPUTmice created
265bd06
added basic csi
iNPUTmice created
9ad5c69
version bump to 0.6 with changelogs
iNPUTmice created
8840d08
brought npe catcher back for kxml parser
iNPUTmice created
3714947
Merge remote-tracking branch 'upstream/development' into fix_typo
Michael created
5450a2a
fixed link to old resource
iNPUTmice created
b0d777d
fixed npe
iNPUTmice created
9be78cb
more swedish translations
iNPUTmice created
3317224
fixed #389
iNPUTmice created
37e87e7
Merge pull request #394 from suraia/translation-de
Click to expand commit body
Fix some typos in the German translation.
Daniel Gultsch created
fc7f57c
Fix some typos in the German translation.
Michael Kuhn created
98dabe9
fix forgotten spelling.
Michael created
85b31b8
fixed spelling thanks @betheg
iNPUTmice created
12cbd07
formating in strings file
iNPUTmice created
d8eeab0
Merge branch 'development' of https://github.com/beriain/Conversations into development
Click to expand commit body
Conflicts: res/values-eu/strings.xml
iNPUTmice created
9c8b6b1
Update strings.xml
Aitor Beriain created
431d4ed
translated missing string in settings
iNPUTmice created
16eb8c3
added swedish translations by Anders Sandblad @andersruneson
iNPUTmice created
d617f09
added missing string to german translation
iNPUTmice created
df39493
Merge pull request #385 from rostovtsev/development
Click to expand commit body
russian translation for 0.6
Daniel Gultsch created
b933a34
Updated to 0.6.1
Click to expand commit body
1. Different bug fixed. 2. Added new __<string name="general">Общие</string>__, guys you must add this to your _Conversation_ code, because now, if you go to settings, you can't change the label General - it's hard-coded for all languages.
Ilia created
03e779b
Merge pull request #384 from wapolinar/typos
Click to expand commit body
Typos in readme.
Daniel Gultsch created
28d5ff1
Typos in readme.
Wolfgang Apolinarski created
902f6c5
removed deprecated strings from translations
iNPUTmice created
3ed29e5
Merge pull request #376 from wapolinar/development
Click to expand commit body
Update strings.xml
Daniel Gultsch created
a9e962b
Merge pull request #377 from kruks23/translation2
Click to expand commit body
Update Spanish Translations
Daniel Gultsch created
5e7450a
Update Spanish Translations
kruks23 created
450b911
fixing duplicate private muc messages
iNPUTmice created
03a3872
Update strings.xml
Click to expand commit body
Typo in a key for the German translation.
wapolinar created
07b422d
fixed message hint
iNPUTmice created
4e791c8
fixed faulty db creation on first install
iNPUTmice created
dce0013
Merge branch 'development' of github.com:siacs/Conversations into development
Daniel Gultsch created
74f8e65
Merge pull request #375 from kriztan/patch-2
Click to expand commit body
Update german translations
Daniel Gultsch created
eae0a0a
Update strings.xml
kriztan created
a30bc8a
use otr encrypiton instead of plain when contact has exactly one online presence and an otr fingerprint
Daniel Gultsch created
e0b7593
jump right into edit account if now accounts are configured
Daniel Gultsch created
d504dae
changed workflow on inital avatar publication
Daniel Gultsch created