moparisthebest/Conversations
1
0
Fork 0
mirror of https://github.com/moparisthebest/Conversations synced 2024-11-25 02:02:16 -05:00
Code Issues Releases Wiki Activity
3,637 Commits 5 Branches 73 Tags 39 MiB
3cdf5f9afc
Commit Graph

3637 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Daniel Gultsch
5f63c397fa Merge pull request #1649 from dhiru1602/master 
use batch transactions when writing roster
 2016-01-13 10:56:29 +01:00
Dheeraj CVR
ffb49c7217 use batch transactions when writing roster 
Fixes https://github.com/siacs/Conversations/issues/1648
 2016-01-13 11:56:35 +04:00
Daniel Gultsch
3e9fd0185a throw security exception instead of going to next srv entry 2016-01-12 23:42:47 +01:00
Daniel Gultsch
da298cfe59 Merge branch 'master' of github.com:siacs/Conversations 2016-01-12 23:41:35 +01:00
Daniel Gultsch
38c936b8ef Merge pull request #1647 from SamWhited/TorStringFix 
s/TOR/Tor/g
 2016-01-12 22:58:51 +01:00
Sam Whited
a6b729df43 s/TOR/Tor/g 2016-01-12 15:41:39 -06:00
Daniel Gultsch
d122d224bb pulled translations from transifex 2016-01-12 16:43:38 +01:00
Daniel Gultsch
64420f79e5 version bump to 1.9.0-beta.2 2016-01-12 16:39:04 +01:00
Daniel Gultsch
893751a1d2 move some ssl socket modifiers into a seperate helper class 2016-01-12 16:33:15 +01:00
Daniel Gultsch
5f1e30288a Merge branch 'master' of https://github.com/moparisthebest/Conversations into moparisthebest-master 2016-01-12 15:35:50 +01:00
Daniel Gultsch
921d567dcb use match_parent as height in conversations overview 2016-01-12 15:35:23 +01:00
Daniel Gultsch
da6076028f Revert "Add additional warnings to OMEMO purge key function" 
This reverts commit 3bea5b25cd.
 2016-01-12 09:48:49 +01:00
Andreas Straub
3bea5b25cd Add additional warnings to OMEMO purge key function 
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...
 2016-01-12 09:33:54 +01:00
moparisthebest
217f6603c0 Implement XEP-0368: SRV records for XMPP over TLS 2016-01-11 17:25:16 -05:00
Daniel Gultsch
20ec9ff2c6 reworked that loop that iterates over various servers 2016-01-11 19:05:25 +01:00
Daniel Gultsch
a85bba0010 new art renders 2016-01-11 18:29:02 +01:00
Daniel Gultsch
6af02b2cc5 Merge branch 'logo_fixes' of https://github.com/fiaxh/Conversations into logo_fixes 2016-01-11 16:03:56 +01:00
fiaxh
000bec2c7b Cleaned up logo 2016-01-11 15:57:24 +01:00
Daniel Gultsch
7f1de73784 don't use the word phone in strings 2016-01-11 15:34:26 +01:00
Daniel Gultsch
07a5ccf4d7 Merge branch 'master' of github.com:siacs/Conversations 2016-01-11 14:28:15 +01:00
Daniel Gultsch
4d38ba906f pulled translations from transifex 2016-01-11 11:19:41 +01:00
Daniel Gultsch
616241be11 add changelog for 1.9.0 2016-01-11 11:17:57 +01:00
Daniel Gultsch
c296d6f446 ask to be excluded from battery optimization 2016-01-11 11:17:45 +01:00
Andreas Straub
41afd552e9 Clean up Conversations logo SVG 
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.
 2016-01-10 20:17:33 +01:00
Daniel Gultsch
95db6db935 bump version code for beta 2016-01-09 16:45:10 +01:00
Daniel Gultsch
4ab8fe13de let the user decide on whether or not to compress pictures 2016-01-09 16:17:39 +01:00
Daniel Gultsch
708d7c5b98 automatically adjust image compression to keep files under 512MiB 2016-01-09 16:16:18 +01:00
Daniel Gultsch
6acb80a83a added Config.java variable to change the default notification behaviour to always 2016-01-08 22:07:23 +01:00
Daniel Gultsch
9dce42ac7f don't show snackbar when notifications are disabled or paused 2016-01-08 21:35:20 +01:00
Daniel Gultsch
a3e136b550 show per conference notification settings in details activity 2016-01-08 21:30:46 +01:00
Daniel Gultsch
0bb3ae37f0 show icon in conversations overview when notifications are disabled 2016-01-08 14:41:55 +01:00
Daniel Gultsch
5dd5685885 Merge pull request #1641 from fiaxh/uuid-fix 
Correct uuid check according to RFC 4122
 2016-01-08 00:17:21 +01:00
Daniel Gultsch
c59eb75a59 avoid duplicate messages when sending files to mucs. fixes #1635 2016-01-06 12:59:13 +01:00
fiaxh
62d0eebe5c Correct uuid check according to RFC 4122 2016-01-05 20:07:29 +01:00
Daniel Gultsch
c3e2d2cfba added missing synchronize when pushing messages from mam backlog 2016-01-04 20:14:29 +01:00
Daniel Gultsch
fb97f9d18f null check in getOriginalPath 2016-01-04 20:14:08 +01:00
Daniel Gultsch
abdb8bfb65 version bump to 1.8.4 and changelog 2016-01-04 17:36:46 +01:00
Daniel Gultsch
501034fe0e Allow entering a JID from 'choose contact'. thanks @singpolyma 
fixes #1611
fixes #1602
 2016-01-04 17:27:54 +01:00
Daniel Gultsch
fdb6b0e30d only report error after third unsuccesful attempt to connect 2016-01-04 15:33:11 +01:00
Daniel Gultsch
f815a7cd26 properly rotate avatars 2016-01-04 15:17:02 +01:00
Daniel Gultsch
95bf0630f0 show trust keys activties if own keys are undecided 2016-01-04 12:11:58 +01:00
Daniel Gultsch
c116f735dc add obb url to unencrypted messages 2016-01-03 19:39:06 +01:00
Daniel Gultsch
a319446d41 edit account activity was still showing the omemo key with leading 0x05. fixes #1631 2016-01-03 19:38:48 +01:00
Daniel Gultsch
d875061407 removed xhtml body. fixes #1594 2016-01-01 16:52:32 +01:00
Daniel Gultsch
73e2389eee use actual message timestamp instead of delay when updating last seen. fixes #1618 2015-12-31 18:06:11 +01:00
Andreas Straub
58d213f291 Fix OMEMO session creating loggin 
Now prints the correct JID to the log when finding devices without
sessions.
 2015-12-31 15:48:43 +01:00
Daniel Gultsch
42fb9539f8 version bump and changelog 2015-12-29 12:54:58 +01:00
Daniel Gultsch
cfccf5e90d handle null names in getColorForName 2015-12-29 10:32:54 +01:00
Daniel Gultsch
7bb67ee660 strip leading 0x05 off omemo fingerprints 2015-12-27 18:37:31 +01:00
Daniel Gultsch
703d95fcf8 lower case all fingerprints. fixes #1521 2015-12-27 18:37:12 +01:00