Daniel Gultsch
|
bc87f59600
|
version bump
|
2014-05-13 17:57:10 +02:00 |
|
|
Daniel Gultsch
|
a3d241020a
|
Merge branch 'beriain-development' into development
|
2014-05-13 17:22:45 +02:00 |
|
|
Daniel Gultsch
|
c0f5b26d1a
|
Merge branch 'development' of https://github.com/beriain/Conversations into beriain-development
|
2014-05-13 17:22:06 +02:00 |
|
|
Daniel Gultsch
|
71545f4f66
|
code cleanup
|
2014-05-13 17:11:27 +02:00 |
|
|
Beriain
|
efac008ffb
|
Fix
|
2014-05-13 16:52:35 +02:00 |
|
|
Beriain
|
8d27d0c44a
|
Merge https://github.com/siacs/Conversations into development
|
2014-05-13 16:46:03 +02:00 |
|
|
Beriain
|
1150f47add
|
Update basque translation and include preferences
|
2014-05-13 16:42:26 +02:00 |
|
|
Daniel Gultsch
|
84e79040df
|
static method for providing content uri
|
2014-05-13 15:37:11 +02:00 |
|
|
Daniel Gultsch
|
7e66731960
|
ensure that iq response is being send out for jingle packets. remove jingle connection from manager after termination
|
2014-05-13 14:49:09 +02:00 |
|
|
Daniel Gultsch
|
3cd369fb7b
|
german translation
|
2014-05-13 13:51:13 +02:00 |
|
|
Daniel Gultsch
|
f38c7b22fd
|
further translations
|
2014-05-13 11:23:11 +02:00 |
|
|
Daniel Gultsch
|
ad9b9b9096
|
fixed npe in tag writer
|
2014-05-13 10:23:26 +02:00 |
|
|
Daniel Gultsch
|
cce12af766
|
fixed french language
|
2014-05-13 10:18:59 +02:00 |
|
|
Daniel Gultsch
|
32d2efd459
|
Merge pull request #88 from BenoitBouvarel/development
Translation into French
|
2014-05-12 23:29:26 +02:00 |
|
|
Daniel Gultsch
|
dee1ba3bdd
|
Merge pull request #101 from kruks23/development
Preferences Spanish Translations
|
2014-05-12 23:28:19 +02:00 |
|
|
kruks23
|
ae768598fe
|
Preferences Spanish Translations
|
2014-05-12 23:22:47 +02:00 |
|
|
alvar
|
cb706e9e82
|
Fix a typo in catalan translation
|
2014-05-12 23:15:18 +02:00 |
|
|
alvar
|
d07139d3c4
|
Translation into catalan language
|
2014-05-12 23:14:58 +02:00 |
|
|
Daniel Gultsch
|
ecea4a5cd2
|
fixed parsing error on missing %s
|
2014-05-12 23:12:01 +02:00 |
|
|
Beriain
|
3858715ccf
|
Update basque translation
|
2014-05-12 17:19:00 +02:00 |
|
|
Beriain
|
75f7695087
|
Merge https://github.com/siacs/Conversations into development
|
2014-05-12 17:09:32 +02:00 |
|
|
Daniel Gultsch
|
4be8280beb
|
marked version 0.2 - skipping beta
|
2014-05-12 15:40:03 +02:00 |
|
|
Daniel Gultsch
|
2fe9bbecdb
|
added changelog entry
|
2014-05-12 15:05:32 +02:00 |
|
|
Daniel Gultsch
|
3455d10a4a
|
Better error handling if attach file doesnt work (on permission denied)
and unified encrypted and unencrypted file attachment
|
2014-05-12 14:59:46 +02:00 |
|
|
iNPUTmice
|
4d0bf7971e
|
transfered preferences descritpions into strings.xml
|
2014-05-11 13:55:15 +02:00 |
|
|
Daniel Gultsch
|
20dfc32e2b
|
Merge pull request #93 from kruks23/development
Spanish Translation
|
2014-05-10 11:46:44 +02:00 |
|
|
kruks23
|
fcc021aa94
|
Delete styles.xml
|
2014-05-10 11:26:53 +02:00 |
|
|
kruks23
|
1f32089ec0
|
Merge remote-tracking branch 'origin/development' into development
Conflicts:
res/values-es/arrays.xml
res/values-es/strings.xml
|
2014-05-10 11:23:56 +02:00 |
|
|
kruks23
|
3d913c2e0e
|
Translation into spanish.
|
2014-05-10 11:23:04 +02:00 |
|
|
iNPUTmice
|
8632954e61
|
fixed possible npe and possible exception
|
2014-05-10 11:03:32 +02:00 |
|
|
kruks23
|
38d3da6c2b
|
#79 First translation into spanish.
|
2014-05-10 10:50:57 +02:00 |
|
|
Daniel Gultsch
|
ef0bc6714a
|
added dialog for otr file transfer
|
2014-05-09 21:20:34 +02:00 |
|
|
Daniel Gultsch
|
f0eb80eb5c
|
Merge branch 'development' of github.com:siacs/Conversations into development
|
2014-05-09 20:57:08 +02:00 |
|
|
Daniel Gultsch
|
b6fa18a595
|
version 0.2 alpha and changelog
|
2014-05-09 20:56:51 +02:00 |
|
|
Daniel Gultsch
|
95504f5505
|
Merge pull request #91 from the-solipsist/patch-1
Corrected spelling of "formerly" in README.md
|
2014-05-09 20:50:48 +02:00 |
|
|
Daniel Gultsch
|
3b8446e6d5
|
link to openkeychain from contact details
|
2014-05-09 20:47:03 +02:00 |
|
|
Daniel Gultsch
|
a14a28973a
|
nicer descriptions in notificaton for images and encrypted messages
|
2014-05-09 20:46:43 +02:00 |
|
|
the-solipsist
|
536d4cca6d
|
Corrected spelling of "formerly" in README.me
|
2014-05-09 01:23:13 +02:00 |
|
|
Daniel Gultsch
|
b0a0863ba2
|
Merge pull request #89 from dschuermann/fix-otr-message
Improve OTR fingerprint dialog and fix german sentence
|
2014-05-08 20:08:49 +02:00 |
|
|
Dominik Schürmann
|
8a2da100d5
|
Improve OTR fingerprint dialog and fix german sentence
|
2014-05-08 19:03:32 +02:00 |
|
|
Dominik Schürmann
|
30aea38713
|
Merge pull request #2 from siacs/development
2
|
2014-05-08 18:46:37 +02:00 |
|
|
Daniel Gultsch
|
c555a9d03c
|
sending text message after returing from pending intent
|
2014-05-08 17:31:53 +02:00 |
|
|
Daniel Gultsch
|
7fa61564b8
|
better flow after returning from openkeychain for various actions
|
2014-05-08 16:52:19 +02:00 |
|
|
Beriain
|
42c07bf4ae
|
Update basque translation
|
2014-05-08 15:59:32 +02:00 |
|
|
Dominik Schürmann
|
1b2ce1a309
|
Merge pull request #1 from siacs/development
pull
|
2014-05-08 14:40:03 +02:00 |
|
|
Daniel Gultsch
|
99a56a2bde
|
offer to announce pgp key if pgp encryption is selected from menu
|
2014-05-08 14:35:21 +02:00 |
|
|
Daniel Gultsch
|
0ed29c1c77
|
more informative dialog if contact doesn't announce public key
|
2014-05-08 14:23:09 +02:00 |
|
|
Daniel Gultsch
|
dc73a25ae4
|
code cleanup
|
2014-05-08 11:53:00 +02:00 |
|
|
Daniel Gultsch
|
0d8bf660db
|
fixed download button on pgp images
|
2014-05-08 10:14:12 +02:00 |
|
|
Daniel Gultsch
|
f4330b3a48
|
Merge pull request #87 from dschuermann/development
Use git submodule with openpgp-api-lib only
|
2014-05-07 20:06:12 +02:00 |
|