iNPUTmice
|
2c9b2e6bf8
|
fixed #406
|
2014-09-02 11:27:43 +02:00 |
|
iNPUTmice
|
f888b167c6
|
rotate avatars
|
2014-09-02 11:19:05 +02:00 |
|
Daniel Gultsch
|
6045bcc2eb
|
Merge pull request #408 from emdete/unicode_emoticons
add all whitespaces in regex
|
2014-09-02 10:39:13 +02:00 |
|
M. Dietrich
|
a7b3aa343e
|
add all whitespaces in regex
|
2014-09-02 01:18:25 +02:00 |
|
Daniel Gultsch
|
6291ebf1a3
|
Merge pull request #380 from emdete/unicode_emoticons
add translation from ascii to unicode emoticons
|
2014-09-01 23:58:00 +02:00 |
|
M. Dietrich
|
546082147a
|
transform ascii to emoticons (on display only)
|
2014-09-01 23:48:42 +02:00 |
|
iNPUTmice
|
a7881754f5
|
fixed #403
|
2014-09-01 13:51:49 +02:00 |
|
Daniel Gultsch
|
0ffdb03aa3
|
Merge pull request #402 from emdete/remove_poormans_tostring
optimize string operations a bit
|
2014-09-01 10:58:26 +02:00 |
|
M. Dietrich
|
2acf510ea9
|
optimize string operations a bit
|
2014-09-01 10:40:45 +02:00 |
|
iNPUTmice
|
271b0f9c58
|
updated readme
|
2014-08-31 22:37:34 +02:00 |
|
iNPUTmice
|
3558fa5f5b
|
deleted unnecessary log
|
2014-08-31 21:02:14 +02:00 |
|
Daniel Gultsch
|
e30599b993
|
Merge pull request #401 from jelmer/dutch-updates
Update Dutch translations.
|
2014-08-31 19:50:56 +02:00 |
|
Jelmer Vernooij
|
86b85062ad
|
Update Dutch translations.
|
2014-08-31 19:45:54 +02:00 |
|
iNPUTmice
|
94389ac22a
|
show merged time and status in message adapter
|
2014-08-31 18:55:15 +02:00 |
|
iNPUTmice
|
bda7724e31
|
improvements for merge conditions
|
2014-08-31 18:21:46 +02:00 |
|
iNPUTmice
|
28fa48704d
|
add missing blank before nick
|
2014-08-31 17:48:00 +02:00 |
|
Daniel Gultsch
|
4793081c2c
|
Merge pull request #400 from xsrc/development
Smarter nickname highlight insert in confernces
|
2014-08-31 17:40:29 +02:00 |
|
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 |
|
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 |