Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #2272 from mimi89999/patch-3HEADmaster | Daniel Gultsch | 2017-01-31 | 1 | -1/+1 |
|\ | | | | | Correct a typo in the README | ||||
| * | Correct a typo in the README | Michel Le Bihan | 2017-01-31 | 1 | -1/+1 |
|/ | |||||
* | Merge pull request #2260 from alexara/patch-1 | Daniel Gultsch | 2017-01-26 | 1 | -7/+7 |
|\ | | | | | Fixed typos in the readme | ||||
| * | Update README.md | Daniel Gultsch | 2017-01-26 | 1 | -1/+1 |
| | | |||||
| * | Merge branch 'master' into patch-1 | Daniel Gultsch | 2017-01-26 | 9 | -11/+70 |
| |\ | |/ |/| | |||||
* | | Merge pull request #2259 from mabkenar/patch-2 | Daniel Gultsch | 2017-01-26 | 1 | -1/+1 |
|\ \ | | | | | | | small typo fix | ||||
| * | | small typo fix | Masoud Abkenar | 2017-01-26 | 1 | -1/+1 |
| | | | |||||
* | | | add explicit encryption hints to outgoing messages | Daniel Gultsch | 2017-01-26 | 2 | -1/+9 |
| | | | |||||
* | | | use base64 encoding for file names uploaded with http | Daniel Gultsch | 2017-01-26 | 2 | -2/+22 |
| | | | |||||
* | | | pulled translation from transifex | Daniel Gultsch | 2017-01-26 | 4 | -7/+38 |
|/ / | |||||
| * | Fixed typos in the readme | alexara | 2017-01-26 | 1 | -7/+7 |
|/ | |||||
* | reset messagesLoaded when changing retention settings | Daniel Gultsch | 2017-01-25 | 7 | -18/+15 |
| | |||||
* | add database and file migrations for 1.16.0 | Daniel Gultsch | 2017-01-25 | 3 | -11/+59 |
| | |||||
* | share uri for bookmark direclty from Start Conversation | Daniel Gultsch | 2017-01-25 | 2 | -1/+24 |
| | |||||
* | transcode videos before sharing. change storage location | Daniel Gultsch | 2017-01-24 | 9 | -28/+131 |
| | |||||
* | configurable local message retention period. (untested) | Daniel Gultsch | 2017-01-23 | 11 | -25/+114 |
| | |||||
* | cleaning up crypto targets when conference member is getting removed | Daniel Gultsch | 2017-01-22 | 2 | -0/+29 |
| | |||||
* | change behaviour of back button to close finish activity. fixes #704 | Daniel Gultsch | 2017-01-22 | 1 | -1/+2 |
| | |||||
* | Merge branch 'master' of github.com:siacs/Conversations | Daniel Gultsch | 2017-01-22 | 1 | -0/+1 |
|\ | |||||
| * | Merge pull request #2230 from AnBuKu/patch-1 | Daniel Gultsch | 2017-01-22 | 1 | -0/+1 |
| |\ | | | | | | | Added XEP-0384 | ||||
| | * | Added XEP-0384 | AnBuKu | 2017-01-10 | 1 | -0/+1 |
| | | | | | | | | | Maybe style [XEP-0384: OMEMO Encryption](http://xmpp.org/extensions/xep-0384.html) would be better for user's convenience; of course for other XEP's as well | ||||
* | | | make sure to set open conversations after connection with background service | Daniel Gultsch | 2017-01-22 | 1 | -0/+2 |
| | | | |||||
* | | | make sure to properly stop tagwriter | Daniel Gultsch | 2017-01-22 | 3 | -2/+11 |
| | | | |||||
* | | | upgrade dependency to ShortcutBadger | Daniel Gultsch | 2017-01-22 | 1 | -1/+1 |
| | | | |||||
* | | | don't quote text when '>' is followed by numeber | Daniel Gultsch | 2017-01-21 | 2 | -2/+17 |
| | | | |||||
* | | | fixed some issues around ibb | Daniel Gultsch | 2017-01-20 | 4 | -18/+61 |
| | | | |||||
* | | | version bump to 1.15.5 + changelog1.15.5 | Daniel Gultsch | 2017-01-20 | 2 | -2/+6 |
| | | | |||||
* | | | pulled translations from transifex | Daniel Gultsch | 2017-01-20 | 4 | -17/+77 |
|/ / | |||||
* | | write text in bold when highlighted in received muc message | Daniel Gultsch | 2017-01-20 | 2 | -1/+9 |
| | | |||||
* | | disable automatic foreground enabler. fixes #2239 | Daniel Gultsch | 2017-01-20 | 1 | -1/+1 |
| | | |||||
* | | modified highlight nick behaviour to better work with quotes | Daniel Gultsch | 2017-01-20 | 1 | -7/+14 |
| | | |||||
* | | fixed regression introduced in previous commit. | Daniel Gultsch | 2017-01-20 | 1 | -3/+6 |
| | | |||||
* | | don't prematurly mark conversation as read during activity start. fixes #2245 | Daniel Gultsch | 2017-01-20 | 1 | -2/+5 |
| | | |||||
* | | fixed pgp encrypted text quick sharing. fixes #2237 | Daniel Gultsch | 2017-01-17 | 2 | -5/+52 |
| | | |||||
* | | Merge pull request #2233 from SamWhited/scram-sha-2 | Daniel Gultsch | 2017-01-16 | 4 | -212/+263 |
|\ \ | | | | | | | Add SCRAM-SHA-2 support | ||||
| * | | Add SCRAM-SHA-2 support | Sam Whited | 2017-01-15 | 4 | -212/+263 |
| | | | |||||
* | | | fixed behaviour with non-default encryption masks | Daniel Gultsch | 2017-01-16 | 1 | -18/+34 |
| | | | |||||
* | | | version bump to 1.15.4 + changelog1.15.4 | Daniel Gultsch | 2017-01-16 | 2 | -2/+5 |
| | | | |||||
* | | | pulled translations from transifex | Daniel Gultsch | 2017-01-15 | 2 | -0/+95 |
|/ / | |||||
* | | Merge branch 'master' of github.com:siacs/Conversations | Daniel Gultsch | 2017-01-15 | 1 | -1/+1 |
|\ \ | |||||
| * | | fixed subheading of domain hosting faq entry | Daniel Gultsch | 2017-01-13 | 1 | -1/+1 |
| | | | |||||
* | | | refactored whispermessage processing | Daniel Gultsch | 2017-01-15 | 2 | -23/+26 |
| | | | |||||
* | | | fixed linkifier | Daniel Gultsch | 2017-01-15 | 1 | -1/+7 |
| | | | |||||
* | | | pulled translations from transifex | Daniel Gultsch | 2017-01-14 | 8 | -9/+99 |
| | | | |||||
* | | | partially improved logging for receiving omemo messages | Daniel Gultsch | 2017-01-14 | 4 | -19/+28 |
|/ / | |||||
* | | update readme to refer to domain hosting | Daniel Gultsch | 2017-01-13 | 1 | -1/+6 |
| | | |||||
* | | pulled translations from transifex | Daniel Gultsch | 2017-01-12 | 24 | -75/+222 |
| | | |||||
* | | show doze warning when push is running on prosody | Daniel Gultsch | 2017-01-12 | 4 | -2/+10 |
| | | |||||
* | | refactor getServerIdentity() to parse disco result directly | Daniel Gultsch | 2017-01-12 | 1 | -34/+21 |
| | | |||||
* | | don't include 'before' reference in mam queries bound by timestamp | Daniel Gultsch | 2017-01-12 | 1 | -1/+3 |
| | |