| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | changed message merger a bit | iNPUTmice | 2014-09-21 | 1 | -9/+10 |
| | | |||||
| * | fixed #454 - added fast srcolling to some lists | iNPUTmice | 2014-09-21 | 2 | -0/+2 |
| | | |||||
| * | Merge pull request #460 from betheg/receipts | Daniel Gultsch | 2014-09-20 | 6 | -6/+40 |
| |\ | | | | | indicates received messages with a tick. | ||||
| | * | indicates received messages with a tick. | Michael | 2014-09-20 | 6 | -6/+40 |
| | | | |||||
| * | | fixed presence splitting | iNPUTmice | 2014-09-20 | 13 | -31/+31 |
| | | | |||||
| * | | fixed #470 | iNPUTmice | 2014-09-20 | 4 | -43/+60 |
| |/ | |||||
| * | made xmppconnection service available in generators | iNPUTmice | 2014-09-20 | 5 | -4/+27 |
| | | |||||
| * | scroll fixes | iNPUTmice | 2014-09-19 | 2 | -10/+11 |
| | | |||||
| * | background daemon doesn't start automatically if there are no enabled ↵ | iNPUTmice | 2014-09-19 | 2 | -2/+13 |
| | | | | | accounts. fixed #443 fixed #442 | ||||
| * | fixed #462 | iNPUTmice | 2014-09-19 | 1 | -5/+5 |
| | | |||||
| * | Merge pull request #448 from betheg/add_break | Daniel Gultsch | 2014-09-19 | 4 | -7/+1 |
| |\ | | | | | add a forgotten break and remove some unused imports | ||||
| | * | add a forgotten break and remove some unused imports | Michael | 2014-09-13 | 4 | -7/+1 |
| | | | |||||
| * | | MUC: notify also on private messages | Michael | 2014-09-13 | 1 | -4/+6 |
| |/ | |||||
| * | add proper namespace in carbon | Michael | 2014-09-12 | 1 | -5/+8 |
| | | |||||
| * | check if market is available before starting to install openkey chain | iNPUTmice | 2014-09-11 | 1 | -2/+17 |
| | | |||||
| * | match color in contact details to the colors in the send button. also ↵ | iNPUTmice | 2014-09-11 | 3 | -13/+17 |
| | | | | | 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 |
| | | |||||
| * | IT'S CHRISTMAS ALREADY! | iNPUTmice | 2014-09-10 | 3 | -40/+128 |
| | | |||||
| * | version bump, changelog and one last minute change for OTR | iNPUTmice | 2014-09-09 | 2 | -2/+2 |
| | | |||||
| * | 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 | ||||
| | * | more openpgp bug fixes | iNPUTmice | 2014-09-03 | 1 | -3/+7 |
| | | | |||||
| | * | 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 | 21 | -95/+126 |
| | | | |||||
| * | | 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 | 6 | -39/+20 |
| | | | |||||
| * | | bug fixes for forcing encryption | iNPUTmice | 2014-09-08 | 1 | -1/+6 |
| | | | |||||
| * | | fixed sending offline pgp messages | iNPUTmice | 2014-09-08 | 3 | -8/+11 |
| | | | |||||
| * | | settings to force encryption and setting for not saving messages to disk. ↵ | iNPUTmice | 2014-09-08 | 5 | -46/+78 |
| | | | | | | | | | 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 | 3 | -13/+27 |
| | | | |||||
| * | | Merge branch 'development' of github.com:siacs/Conversations into development | iNPUTmice | 2014-09-07 | 2 | -3/+0 |
| |\ \ | |||||
| | * \ | Merge pull request #426 from betheg/remove_strings | Daniel Gultsch | 2014-09-07 | 2 | -3/+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 | 2 | -3/+0 |
| | | | | | | | | | | | | | | | | | edit_account_dialog.xml. | ||||
| * | | | | fixed #321 - delete otr fingerprints | iNPUTmice | 2014-09-07 | 2 | -3/+54 |
| |/ / / | |||||
| * | | | fixed #425 | iNPUTmice | 2014-09-07 | 1 | -1/+1 |
| | | | | |||||
| * | | | trying to avoid rejectedexection | iNPUTmice | 2014-09-07 | 1 | -1/+8 |
| |/ / | |||||
| * | | MUC: set the password from bookmarks. | Michael | 2014-09-07 | 4 | -3/+59 |
| | | | |||||
| * | | made shareing text with conferences possible again | iNPUTmice | 2014-09-07 | 1 | -24/+28 |
| | | | |||||
| * | | added missing breaks oO | iNPUTmice | 2014-09-07 | 1 | -0/+2 |
| | | | |||||
| * | | fixed npe | iNPUTmice | 2014-09-07 | 1 | -0/+3 |
| | | | |||||
| * | | Merge branch 'development' of github.com:siacs/Conversations into development | iNPUTmice | 2014-09-06 | 1 | -0/+8 |
| |\ \ | |||||
| | * | | MUC: set password from invite message. | Michael | 2014-09-05 | 1 | -0/+8 |
| | | | | |||||
| * | | | made otr a little bit more solid when there is no presence subscription | iNPUTmice | 2014-09-06 | 8 | -29/+55 |
| |/ / | |||||
| * | | warn user if no presence subscription exists | iNPUTmice | 2014-09-05 | 1 | -0/+34 |
| | | | |||||
| * | | improved logging for avatar fetches | iNPUTmice | 2014-09-05 | 1 | -21/+38 |
| | | | |||||
 |
index : conversations-plus | |
| improved conversations | lookshe |
| aboutsummaryrefslogtreecommitdiffstats |