aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #466 from weiss/add-german-translationsDaniel Gultsch2014-09-191-0/+24
|\
| * Add missing German translationsHolger Weiß2014-09-191-0/+24
* | Merge branch 'development' of github.com:siacs/Conversations into developmentiNPUTmice2014-09-121-5/+8
|\ \
| * \ Merge pull request #445 from betheg/namespaceDaniel Gultsch2014-09-121-5/+8
| |\ \ | | |/ | |/|
| | * add proper namespace in carbonMichael2014-09-121-5/+8
| |/
* / fixed #446iNPUTmice2014-09-121-0/+1
|/
* Merge branch 'development'0.7.1iNPUTmice2014-09-1293-625/+948
|\
| * version bump to 0.7.1iNPUTmice2014-09-121-1/+1
| * updated swedish translations. thank you Anders SandbladiNPUTmice2014-09-121-6/+30
| * check if market is available before starting to install openkey chainiNPUTmice2014-09-111-2/+17
| * more formatingiNPUTmice2014-09-114-63/+64
| * added missing strings back. + formatingiNPUTmice2014-09-1159-489/+565
| * match color in contact details to the colors in the send button. also migrate...iNPUTmice2014-09-114-14/+20
| * missed show=chat for send button colorizationiNPUTmice2014-09-111-0/+4
| * pare body in type=normal messages as welliNPUTmice2014-09-112-15/+6
| * added something about delivery failed to readmeiNPUTmice2014-09-111-0/+25
| * IT'S CHRISTMAS ALREADY!iNPUTmice2014-09-1025-41/+205
| * started development on 0.8-alphaiNPUTmice2014-09-101-2/+2
| * added bookmarks to XEP listiNPUTmice2014-09-091-0/+1
| * added a list of XEPsiNPUTmice2014-09-091-0/+16
* | Merge branch 'master' of github.com:siacs/ConversationsiNPUTmice2014-09-122-0/+299
|\ \ | |/ |/|
| * Merge pull request #441 from svetlemodry/masterDaniel Gultsch2014-09-122-0/+299
| |\
| | * Created Czech strings.xml translation fileJaroslav Lichtblau2014-09-121-0/+260
| | * czech arrays.xml file createdJaroslav Lichtblau2014-09-111-0/+39
| |/
* | Merge pull request #435 from kruks23/translation40.7Daniel Gultsch2014-09-092-0/+38
|\ \ | |/ |/|
| * Update Spanish Translationskruks232014-09-092-0/+38
|/
* version bump, changelog and one last minute change for OTRiNPUTmice2014-09-094-3/+11
* Merge branch 'master' of github.com:siacs/ConversationsiNPUTmice2014-09-091-1/+1
|\
| * set openpgp-api-lib to a version that actually worksiNPUTmice2014-09-031-5/+8
| * more openpgp bug fixesiNPUTmice2014-09-032-8/+12
| * fixed pgp signature creationiNPUTmice2014-09-031-3/+19
| * fixed #406iNPUTmice2014-09-021-12/+8
| * rotate avatarsiNPUTmice2014-09-021-37/+55
| * fixed #403iNPUTmice2014-09-013-11/+18
* | don't reset images from sending to waitingiNPUTmice2014-09-091-1/+2
* | setting to increase font size. fixed #420iNPUTmice2014-09-0840-172/+229
* | hide encryption settings under 'expert options'iNPUTmice2014-09-082-58/+65
* | bumped openpgp-api to version 5iNPUTmice2014-09-081-8/+5
* | simplefied some code that might have been the source for some strange bugsiNPUTmice2014-09-081-25/+15
* | introduced downloadable interface. reverted some of the changes made to OTRiNPUTmice2014-09-087-40/+20
* | bug fixes for forcing encryptioniNPUTmice2014-09-081-1/+6
* | fixed sending offline pgp messagesiNPUTmice2014-09-084-9/+12
* | settings to force encryption and setting for not saving messages to disk. fix...iNPUTmice2014-09-087-46/+96
* | don't fail displayed or received messagesiNPUTmice2014-09-081-15/+17
* | warn on missing presence subscriptioniNPUTmice2014-09-084-13/+29
* | Merge branch 'development' of github.com:siacs/Conversations into developmentiNPUTmice2014-09-0714-124/+0
|\ \
| * \ Merge pull request #426 from betheg/remove_stringsDaniel Gultsch2014-09-0714-124/+0
| |\ \
| | * | deleted some unused string-resources and imports, also deleted edit_account_d...Michael2014-09-0714-124/+0
* | | | fixed #321 - delete otr fingerprintsiNPUTmice2014-09-078-17/+88
|/ / /
* | | fixed #425iNPUTmice2014-09-071-1/+1