aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #448 from betheg/add_breakDaniel Gultsch2014-09-194-7/+1
|\ | | | | add a forgotten break and remove some unused imports
| * add a forgotten break and remove some unused importsMichael2014-09-134-7/+1
| |
* | Merge pull request #447 from betheg/private_notifyDaniel Gultsch2014-09-191-4/+6
|\ \ | | | | | | MUC: notify also on private messages
| * | MUC: notify also on private messagesMichael2014-09-131-4/+6
| |/
* | Merge pull request #453 from Elinvention/developmentDaniel Gultsch2014-09-192-0/+299
|\ \ | | | | | | Created Italian translation
| * | Created Italian translationElia Argentieri2014-09-142-0/+299
| |/
* | Merge pull request #467 from qooob/developmentDaniel Gultsch2014-09-193-44/+70
|\ \ | | | | | | Localization update to 0.7.1
| * | Updated localizationIlia Rostovtsev2014-09-191-40/+66
| | | | | | | | | Localization update in compliance with Conversations 0.7.1
| * | TypoesIlia Rostovtsev2014-09-191-3/+3
| | | | | | | | | Fixing typos
| * | Updated usernameIlia Rostovtsev2014-09-191-1/+1
| |/ | | | | Changing URL of my account, in accordance with updated username
* | Merge pull request #465 from beriain/developmentDaniel Gultsch2014-09-192-4/+43
|\ \ | | | | | | Update basque translation
| * | Update strings.xmlAitor Beriain2014-09-181-3/+28
| | |
| * | Update arrays.xmlAitor Beriain2014-09-181-1/+15
| |/
* | Merge pull request #466 from weiss/add-german-translationsDaniel Gultsch2014-09-191-0/+24
|\ \ | |/ |/| Add missing German translations
| * 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 carbon
| | * 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 ↵iNPUTmice2014-09-114-14/+20
| | | | | | | | migrated some other colors from hard coding to using resources
| * 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
| |\ | | | | | | Czech translation for Conversations
| | * 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 Translations
| * 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
|\ | | | | | | | | | | | | Conflicts: src/eu/siacs/conversations/crypto/PgpEngine.java src/eu/siacs/conversations/persistance/FileBackend.java src/eu/siacs/conversations/ui/ShareWithActivity.java
| * 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
| | | | | | | | | | Conflicts: src/eu/siacs/conversations/persistance/FileBackend.java
| * 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
| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-26 13:29:58 +0000