Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of github.com:siacs/Conversations | Daniel Gultsch | 2016-01-12 | 1 | -2/+2 |
|\ | |||||
| * | Merge pull request #1647 from SamWhited/TorStringFix | Daniel Gultsch | 2016-01-12 | 1 | -2/+2 |
| |\ | | | | | | | s/TOR/Tor/g | ||||
| | * | s/TOR/Tor/g | Sam Whited | 2016-01-12 | 1 | -2/+2 |
| |/ | |||||
* / | pulled translations from transifex | Daniel Gultsch | 2016-01-12 | 25 | -75/+117 |
|/ | |||||
* | version bump to 1.9.0-beta.2 | Daniel Gultsch | 2016-01-12 | 2 | -2/+3 |
| | |||||
* | move some ssl socket modifiers into a seperate helper class | Daniel Gultsch | 2016-01-12 | 2 | -56/+67 |
| | |||||
* | Merge branch 'master' of https://github.com/moparisthebest/Conversations ↵ | Daniel Gultsch | 2016-01-12 | 2 | -116/+226 |
|\ | | | | | | | into moparisthebest-master | ||||
| * | Implement XEP-0368: SRV records for XMPP over TLS | moparisthebest | 2016-01-11 | 2 | -104/+220 |
| | | |||||
| * | reworked that loop that iterates over various serversreworked_host_finder_loop | Daniel Gultsch | 2016-01-11 | 1 | -16/+10 |
| | | |||||
* | | use match_parent as height in conversations overview | Daniel Gultsch | 2016-01-12 | 1 | -2/+2 |
| | | |||||
* | | Revert "Add additional warnings to OMEMO purge key function" | Daniel Gultsch | 2016-01-12 | 2 | -28/+2 |
| | | | | | | | | This reverts commit 3bea5b25cd5496cd3f14a66c208b34d0c8e48b03. | ||||
* | | Add additional warnings to OMEMO purge key function | Andreas Straub | 2016-01-12 | 2 | -2/+28 |
|/ | | | | | | People continue to press the "don't press this" button. Maybe adding some warnings indicating that this button will not fix their problems will help... | ||||
* | new art renders | Daniel Gultsch | 2016-01-11 | 25 | -0/+0 |
| | |||||
* | Merge branch 'logo_fixes' of https://github.com/fiaxh/Conversations into ↵ | Daniel Gultsch | 2016-01-11 | 1 | -338/+361 |
|\ | | | | | | | logo_fixes | ||||
| * | Cleaned up logo | fiaxh | 2016-01-11 | 1 | -327/+364 |
| | | |||||
* | | don't use the word phone in strings | Daniel Gultsch | 2016-01-11 | 1 | -6/+5 |
| | | |||||
* | | Merge branch 'master' of github.com:siacs/Conversations | Daniel Gultsch | 2016-01-11 | 1 | -19/+33 |
|\ \ | |||||
| * | | Clean up Conversations logo SVG | Andreas Straub | 2016-01-10 | 1 | -19/+33 |
| |/ | | | | | | | | | | | | | | | | | The previous version of the logo had some wonky alignments and other artifacts in some places on the dashed line. This commit provides a new version of the logo with perfect alignments. It also includes a single path for the dashed line, which can be used to ease further modifications to the logo. | ||||
* | | pulled translations from transifex | Daniel Gultsch | 2016-01-11 | 25 | -63/+14 |
| | | |||||
* | | add changelog for 1.9.0 | Daniel Gultsch | 2016-01-11 | 1 | -1/+6 |
| | | |||||
* | | ask to be excluded from battery optimization | Daniel Gultsch | 2016-01-11 | 7 | -242/+361 |
|/ | |||||
* | bump version code for beta | Daniel Gultsch | 2016-01-09 | 1 | -2/+2 |
| | |||||
* | let the user decide on whether or not to compress pictures | Daniel Gultsch | 2016-01-09 | 4 | -13/+41 |
| | |||||
* | automatically adjust image compression to keep files under 512MiB | Daniel Gultsch | 2016-01-09 | 2 | -8/+15 |
| | |||||
* | added Config.java variable to change the default notification behaviour to ↵ | Daniel Gultsch | 2016-01-08 | 2 | -1/+3 |
| | | | | always | ||||
* | don't show snackbar when notifications are disabled or paused | Daniel Gultsch | 2016-01-08 | 2 | -11/+0 |
| | |||||
* | show per conference notification settings in details activity | Daniel Gultsch | 2016-01-08 | 12 | -17/+114 |
| | |||||
* | show icon in conversations overview when notifications are disabled | Daniel Gultsch | 2016-01-08 | 17 | -76/+109 |
| | |||||
* | Merge pull request #1641 from fiaxh/uuid-fix | Daniel Gultsch | 2016-01-08 | 1 | -1/+1 |
|\ | | | | | Correct uuid check according to RFC 4122 | ||||
| * | Correct uuid check according to RFC 4122 | fiaxh | 2016-01-05 | 1 | -1/+1 |
| | | |||||
* | | avoid duplicate messages when sending files to mucs. fixes #1635 | Daniel Gultsch | 2016-01-06 | 1 | -2/+10 |
| | | |||||
* | | added missing synchronize when pushing messages from mam backlog | Daniel Gultsch | 2016-01-04 | 1 | -1/+3 |
| | | |||||
* | | null check in getOriginalPath | Daniel Gultsch | 2016-01-04 | 2 | -1/+3 |
|/ | |||||
* | version bump to 1.8.4 and changelog1.8.4 | Daniel Gultsch | 2016-01-04 | 2 | -2/+7 |
| | |||||
* | Allow entering a JID from 'choose contact'. thanks @singpolyma | Daniel Gultsch | 2016-01-04 | 7 | -63/+230 |
| | | | | | fixes #1611 fixes #1602 | ||||
* | only report error after third unsuccesful attempt to connect | Daniel Gultsch | 2016-01-04 | 1 | -1/+1 |
| | |||||
* | properly rotate avatars | Daniel Gultsch | 2016-01-04 | 4 | -52/+48 |
| | |||||
* | show trust keys activties if own keys are undecided | Daniel Gultsch | 2016-01-04 | 1 | -4/+5 |
| | |||||
* | add obb url to unencrypted messages | Daniel Gultsch | 2016-01-03 | 1 | -0/+1 |
| | |||||
* | edit account activity was still showing the omemo key with leading 0x05. ↵ | Daniel Gultsch | 2016-01-03 | 1 | -2/+2 |
| | | | | fixes #1631 | ||||
* | removed xhtml body. fixes #1594 | Daniel Gultsch | 2016-01-01 | 1 | -12/+0 |
| | |||||
* | use actual message timestamp instead of delay when updating last seen. fixes ↵ | Daniel Gultsch | 2015-12-31 | 2 | -7/+8 |
| | | | | #1618 | ||||
* | Fix OMEMO session creating loggin | Andreas Straub | 2015-12-31 | 1 | -1/+1 |
| | | | | | Now prints the correct JID to the log when finding devices without sessions. | ||||
* | version bump and changelog1.8.3 | Daniel Gultsch | 2015-12-29 | 2 | -2/+9 |
| | |||||
* | handle null names in getColorForName | Daniel Gultsch | 2015-12-29 | 1 | -1/+1 |
| | |||||
* | strip leading 0x05 off omemo fingerprints | Daniel Gultsch | 2015-12-27 | 1 | -4/+7 |
| | |||||
* | lower case all fingerprints. fixes #1521 | Daniel Gultsch | 2015-12-27 | 1 | -1/+2 |
| | |||||
* | dedublicate bookmarks | Daniel Gultsch | 2015-12-27 | 1 | -3/+7 |
| | |||||
* | fixed stuck at omemo encryption when x509 verification is being used | Daniel Gultsch | 2015-12-27 | 1 | -7/+7 |
| | |||||
* | register context menu long click listener on message text. fixes #1614 | Daniel Gultsch | 2015-12-27 | 1 | -1/+1 |
| |