moparisthebest/Conversations
1
0
Fork 0
mirror of https://github.com/moparisthebest/Conversations synced 2024-11-07 01:35:03 -05:00
Code Issues Releases Wiki Activity
1,088 Commits 5 Branches 73 Tags 39 MiB
8a36958b88
Commit Graph

1088 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bahtiar `kalkin-` Gadimov
3e3451bcff Smarter nickname highlight insert in confernces 2014-08-31 17:24:52 +02:00
iNPUTmice
1ac5be4855 some code cleanup 2014-08-31 16:28:21 +02:00
Daniel Gultsch
8d456085e5 Merge pull request #391 from betheg/fix_typo 
fix forgotten spelling.
 2014-08-31 15:56:41 +02:00
Daniel Gultsch
5ab025d008 Merge pull request #398 from betheg/fix_res 
fix: warning: string 'publish_avatar' has no default translation.
 2014-08-31 15:56:13 +02:00
iNPUTmice
1cc16161ef require encrypted to be the same for messages to get merged 2014-08-31 15:54:53 +02:00
iNPUTmice
8f8d4e320d experimental message merging 2014-08-31 14:29:12 +02:00
Michael
733041aee4 fix: warning: string 'publish_avatar' has no default translation. 
also altered the types of resources from array to string-array in some res-files.
 2014-08-30 17:47:17 +02:00
Michael
969cba5ee6 Merge remote-tracking branch 'upstream/development' into fix_typo 2014-08-30 14:00:53 +02:00
Gayaz Yusipov
ec6220969d XEP-0172 2014-08-30 14:26:46 +04:00
iNPUTmice
9eafb10086 version bump to 0.7-alpha 2014-08-30 09:26:01 +02:00
iNPUTmice
c494f4f7ae Merge branch 'sm' into development 
Conflicts:
	src/eu/siacs/conversations/services/XmppConnectionService.java
 2014-08-30 09:24:58 +02:00
iNPUTmice
4435b0055e reset unsend messages to waiting 2014-08-30 09:22:16 +02:00
iNPUTmice
9075d3854d properly set stanza count on session resume 2014-08-30 09:22:16 +02:00
iNPUTmice
4a6a6c8403 basic message acking 2014-08-30 09:22:16 +02:00
iNPUTmice
9de77b190b proper namespaces for xep-0352 2014-08-30 09:22:05 +02:00
iNPUTmice
6d82a69ba3 send inactive or active on every connect and resume 2014-08-30 09:22:05 +02:00
iNPUTmice
265bd06250 added basic csi 2014-08-30 09:22:05 +02:00
iNPUTmice
9ad5c6925d version bump to 0.6 with changelogs 2014-08-30 08:51:55 +02:00
iNPUTmice
8840d082ba brought npe catcher back for kxml parser 2014-08-30 08:31:05 +02:00
Michael
3714947d5f Merge remote-tracking branch 'upstream/development' into fix_typo 2014-08-29 23:30:47 +02:00
iNPUTmice
5450a2ae46 fixed link to old resource 2014-08-29 14:05:10 +02:00
iNPUTmice
b0d777d9ca fixed npe 2014-08-29 12:14:10 +02:00
iNPUTmice
9be78cbbbe more swedish translations 2014-08-29 12:06:32 +02:00
iNPUTmice
33172246c9 fixed #389 2014-08-29 10:24:25 +02:00
Daniel Gultsch
37e87e7252 Merge pull request #394 from suraia/translation-de 
Fix some typos in the German translation.
 2014-08-29 10:14:00 +02:00
Michael Kuhn
fc7f57cdd6 Fix some typos in the German translation. 2014-08-28 22:54:40 +02:00
Michael
98dabe9ab4 fix forgotten spelling. 2014-08-28 16:49:52 +02:00
iNPUTmice
85b31b8d8b fixed spelling thanks @betheg 2014-08-28 11:01:24 +02:00
iNPUTmice
12cbd07693 formating in strings file 2014-08-28 10:53:44 +02:00
iNPUTmice
d8eeab0879 Merge branch 'development' of https://github.com/beriain/Conversations into development 
Conflicts:
	res/values-eu/strings.xml
 2014-08-28 10:48:25 +02:00
Aitor Beriain
9c8b6b16d5 Update strings.xml 2014-08-27 14:48:31 +02:00
iNPUTmice
431d4ed44b translated missing string in settings 2014-08-27 09:43:53 +02:00
iNPUTmice
16eb8c3952 added swedish translations by Anders Sandblad @andersruneson 2014-08-27 09:36:47 +02:00
iNPUTmice
d617f099a1 added missing string to german translation 2014-08-26 15:35:48 +02:00
Daniel Gultsch
df394937b7 Merge pull request #385 from rostovtsev/development 
russian translation for 0.6
 2014-08-26 15:34:01 +02:00
Ilia
b933a34a59 Updated to 0.6.1 
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.
 2014-08-26 17:26:03 +04:00
Daniel Gultsch
03e779bc18 Merge pull request #384 from wapolinar/typos 
Typos in readme.
 2014-08-26 15:08:46 +02:00
Wolfgang Apolinarski
28d5ff1189 Typos in readme. 2014-08-26 15:01:46 +02:00
iNPUTmice
902f6c57b1 removed deprecated strings from translations 2014-08-26 11:20:10 +02:00
Daniel Gultsch
3ed29e5a8b Merge pull request #376 from wapolinar/development 
Update strings.xml
 2014-08-25 20:25:29 +02:00
Daniel Gultsch
a9e962bf93 Merge pull request #377 from kruks23/translation2 
Update Spanish Translations
 2014-08-25 20:25:15 +02:00
kruks23
5e7450adfa Update Spanish Translations 2014-08-25 19:49:35 +02:00
iNPUTmice
450b911cb2 fixing duplicate private muc messages 2014-08-25 19:20:53 +02:00
wapolinar
03a387242c Update strings.xml 
Typo in a key for the German translation.
 2014-08-25 16:51:20 +02:00
iNPUTmice
07b422d4c8 fixed message hint 2014-08-25 15:43:50 +02:00
iNPUTmice
4e791c8a01 fixed faulty db creation on first install 2014-08-24 20:53:13 +02:00
Daniel Gultsch
dce001369d Merge branch 'development' of github.com:siacs/Conversations into development 2014-08-24 17:18:10 +02:00
Daniel Gultsch
74f8e655a2 Merge pull request #375 from kriztan/patch-2 
Update german translations
 2014-08-24 17:17:22 +02:00
kriztan
eae0a0aa2c Update strings.xml 2014-08-24 17:14:47 +02:00
Daniel Gultsch
a30bc8a3e2 use otr encrypiton instead of plain when contact has exactly one online presence and an otr fingerprint 2014-08-24 11:21:02 +02:00