| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Update arrays.xml | Aitor Beriain | 2014-09-18 | 1 | -1/+15 |
| | | |||||
| * | Merge branch 'development' of github.com:siacs/Conversations into development | iNPUTmice | 2014-09-12 | 1 | -5/+8 |
| |\ | |||||
| | * | Merge pull request #445 from betheg/namespace | Daniel Gultsch | 2014-09-12 | 1 | -5/+8 |
| | |\ | | | | | | | add proper namespace in carbon | ||||
| | | * | add proper namespace in carbon | Michael | 2014-09-12 | 1 | -5/+8 |
| | |/ | |||||
| * / | fixed #446 | iNPUTmice | 2014-09-12 | 1 | -0/+1 |
| |/ | |||||
| * | Merge branch 'development'0.7.1 | iNPUTmice | 2014-09-12 | 93 | -625/+948 |
| |\ | |||||
| | * | version bump to 0.7.1 | iNPUTmice | 2014-09-12 | 1 | -1/+1 |
| | | | |||||
| | * | updated swedish translations. thank you Anders Sandblad | iNPUTmice | 2014-09-12 | 1 | -6/+30 |
| | | | |||||
| | * | check if market is available before starting to install openkey chain | iNPUTmice | 2014-09-11 | 1 | -2/+17 |
| | | | |||||
| | * | more formating | iNPUTmice | 2014-09-11 | 4 | -63/+64 |
| | | | |||||
| | * | added missing strings back. + formating | iNPUTmice | 2014-09-11 | 59 | -489/+565 |
| | | | |||||
| | * | match color in contact details to the colors in the send button. also ↵ | iNPUTmice | 2014-09-11 | 4 | -14/+20 |
| | | | | | | | | | migrated some other colors from hard coding to using resources | ||||
| | * | missed show=chat for send button colorization | iNPUTmice | 2014-09-11 | 1 | -0/+4 |
| | | | |||||
| | * | pare body in type=normal messages as well | iNPUTmice | 2014-09-11 | 2 | -15/+6 |
| | | | |||||
| | * | added something about delivery failed to readme | iNPUTmice | 2014-09-11 | 1 | -0/+25 |
| | | | |||||
| | * | IT'S CHRISTMAS ALREADY! | iNPUTmice | 2014-09-10 | 25 | -41/+205 |
| | | | |||||
| | * | started development on 0.8-alpha | iNPUTmice | 2014-09-10 | 1 | -2/+2 |
| | | | |||||
| | * | added bookmarks to XEP list | iNPUTmice | 2014-09-09 | 1 | -0/+1 |
| | | | |||||
| | * | added a list of XEPs | iNPUTmice | 2014-09-09 | 1 | -0/+16 |
| | | | |||||
| * | | Merge branch 'master' of github.com:siacs/Conversations | iNPUTmice | 2014-09-12 | 2 | -0/+299 |
| |\ \ | |/ |/| | |||||
| | * | Merge pull request #441 from svetlemodry/master | Daniel Gultsch | 2014-09-12 | 2 | -0/+299 |
| | |\ | | | | | | | Czech translation for Conversations | ||||
| | | * | Created Czech strings.xml translation file | Jaroslav Lichtblau | 2014-09-12 | 1 | -0/+260 |
| | | | | |||||
| | | * | czech arrays.xml file created | Jaroslav Lichtblau | 2014-09-11 | 1 | -0/+39 |
| | |/ | |||||
| * | | Merge pull request #435 from kruks23/translation40.7 | Daniel Gultsch | 2014-09-09 | 2 | -0/+38 |
| |\ \ | |/ |/| | Update Spanish Translations | ||||
| | * | Update Spanish Translations | kruks23 | 2014-09-09 | 2 | -0/+38 |
| |/ | |||||
| * | version bump, changelog and one last minute change for OTR | iNPUTmice | 2014-09-09 | 4 | -3/+11 |
| | | |||||
| * | Merge branch 'master' of github.com:siacs/Conversations | iNPUTmice | 2014-09-09 | 1 | -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 works | iNPUTmice | 2014-09-03 | 1 | -5/+8 |
| | | | |||||
| | * | more openpgp bug fixes | iNPUTmice | 2014-09-03 | 2 | -8/+12 |
| | | | |||||
| | * | fixed pgp signature creation | iNPUTmice | 2014-09-03 | 1 | -3/+19 |
| | | | |||||
| | * | fixed #406 | iNPUTmice | 2014-09-02 | 1 | -12/+8 |
| | | | |||||
| | * | rotate avatars | iNPUTmice | 2014-09-02 | 1 | -37/+55 |
| | | | | | | | | | | | Conflicts: src/eu/siacs/conversations/persistance/FileBackend.java | ||||
| | * | fixed #403 | iNPUTmice | 2014-09-01 | 3 | -11/+18 |
| | | | |||||
| * | | don't reset images from sending to waiting | iNPUTmice | 2014-09-09 | 1 | -1/+2 |
| | | | |||||
| * | | setting to increase font size. fixed #420 | iNPUTmice | 2014-09-08 | 40 | -172/+229 |
| | | | |||||
| * | | hide encryption settings under 'expert options' | iNPUTmice | 2014-09-08 | 2 | -58/+65 |
| | | | |||||
| * | | bumped openpgp-api to version 5 | iNPUTmice | 2014-09-08 | 1 | -8/+5 |
| | | | |||||
| * | | simplefied some code that might have been the source for some strange bugs | iNPUTmice | 2014-09-08 | 1 | -25/+15 |
| | | | |||||
| * | | introduced downloadable interface. reverted some of the changes made to OTR | iNPUTmice | 2014-09-08 | 7 | -40/+20 |
| | | | |||||
| * | | bug fixes for forcing encryption | iNPUTmice | 2014-09-08 | 1 | -1/+6 |
| | | | |||||
| * | | fixed sending offline pgp messages | iNPUTmice | 2014-09-08 | 4 | -9/+12 |
| | | | |||||
| * | | settings to force encryption and setting for not saving messages to disk. ↵ | iNPUTmice | 2014-09-08 | 7 | -46/+96 |
| | | | | | | | | | fixed #353 | ||||
| * | | don't fail displayed or received messages | iNPUTmice | 2014-09-08 | 1 | -15/+17 |
| | | | |||||
| * | | warn on missing presence subscription | iNPUTmice | 2014-09-08 | 4 | -13/+29 |
| | | | |||||
| * | | Merge branch 'development' of github.com:siacs/Conversations into development | iNPUTmice | 2014-09-07 | 14 | -124/+0 |
| |\ \ | |||||
| | * \ | Merge pull request #426 from betheg/remove_strings | Daniel Gultsch | 2014-09-07 | 14 | -124/+0 |
| | |\ \ | | | | | | | | | deleted some unused string-resources and imports, also deleted edit_account_dialog.xml. | ||||
| | | * | | deleted some unused string-resources and imports, also deleted ↵ | Michael | 2014-09-07 | 14 | -124/+0 |
| | | | | | | | | | | | | | | | | | edit_account_dialog.xml. | ||||
| * | | | | fixed #321 - delete otr fingerprints | iNPUTmice | 2014-09-07 | 8 | -17/+88 |
| |/ / / | |||||
| * | | | fixed #425 | iNPUTmice | 2014-09-07 | 1 | -1/+1 |
| | | | | |||||
| * | | | trying to avoid rejectedexection | iNPUTmice | 2014-09-07 | 1 | -1/+8 |
| |/ / | |||||
 |
index : conversations | |
| copy of conversations repo | lookshe |
| aboutsummaryrefslogtreecommitdiffstats |