1
0
Fork 1
Commit graph

4624 commits

Author SHA1 Message Date
Daniel Gultsch
1b6869c855 kill mam query when archiving conversation 2018-02-24 09:39:17 +01:00
Daniel Gultsch
36b05b3f81 Merge branch 'master' of github.com:siacs/Conversations 2018-02-23 23:12:13 +01:00
Daniel Gultsch
0974b4cbd0 MAM: look at total count for completness. parse fin correctly 2018-02-23 23:11:54 +01:00
Daniel Gultsch
79a4f1112b Merge pull request #2828 from af8a524db1/welcome_text_jabber
Use 'Jabber' instead of 'XMPP' in the welcome message
2018-02-22 22:17:29 +01:00
Marc Schink
691910d81d Use 'Jabber' instead of 'XMPP' in the welcome message 2018-02-22 22:04:03 +01:00
Daniel Gultsch
39485c1568 request disco items before disco#info on first connect
should make initial connect faster because code is not waiting for omemo code to run
2018-02-20 17:36:07 +01:00
Daniel Gultsch
13d05fc69e warn when attempting to write stanza to an unbound stream 2018-02-20 17:03:44 +01:00
Daniel Gultsch
68d67badfa mark error notifications as sensitve and local only. fixes #2795 2018-02-20 08:22:08 +01:00
Daniel Gultsch
8a5d833650 check if axolotl service is initialized before displaying keys 2018-02-19 17:26:38 +01:00
Daniel Gultsch
d51d4738e7 fixed handling of self address messages w/o remoteMsgId 2018-02-19 15:52:33 +01:00
Daniel Gultsch
33b0809ac9 update chat badge 2018-02-19 14:30:16 +01:00
Daniel Gultsch
1d9be034df do not allow insecure bind 2018-02-18 21:54:03 +01:00
Daniel Gultsch
a6aad82058 Merge pull request #2805 from af8a524db1/data_namespace
Use constant for 'jabberdata' namespace
2018-02-16 16:32:27 +01:00
Marc Schink
18024575a3 Make use of Namespace.DATA constant 2018-02-16 16:12:53 +01:00
Marc Schink
7fd25f8dc1 Namespace: Add constant for 'jabberdata' 2018-02-16 16:12:53 +01:00
Daniel Gultsch
2471684dee only allow a number of white listed headers according to http upload v0.5 2018-02-16 11:14:16 +01:00
Marc Schink
31d3a135d6 Don't add account if user cancels. Fixes #2797 2018-02-15 14:40:21 +01:00
Marc Schink
28cf463dce Pass invite XMPP URI along instead of JID 2018-02-14 17:03:43 +01:00
Marc Schink
ede1476bbe XmppUri: Add toString() method 2018-02-14 17:03:43 +01:00
Daniel Gultsch
7f42787edc Merge branch 'vikiCoder-master' 2018-02-14 12:48:43 +01:00
vikiCoder
2c9c25ab3c Fixes #2786 : Certificate dialogue not respecting dark theme solved 2018-02-14 16:19:26 +05:30
Daniel Gultsch
d96788baf7 null check on invite object 2018-02-13 15:20:30 +01:00
Daniel Gultsch
84538dac4a Merge pull request #2791 from ChaosKid42/roster_action_with_name
allow roster action with name
2018-02-12 20:27:49 +01:00
Christoph Scholz
d3bd68044d allow roster action with name 2018-02-12 20:00:42 +01:00
Daniel Gultsch
103789df5b version bump to 1.23.6 + changelog 2018-02-12 12:32:12 +01:00
Daniel Gultsch
2905cbc174 always copy firefoxe’s shared files 2018-02-12 12:31:59 +01:00
Daniel Gultsch
d05781cb9b integrate intent integrator to finish activity when needed 2018-02-12 11:22:51 +01:00
Daniel Gultsch
e0bf4d5280 http upload: do not crash on invalid slot responses 2018-02-11 17:54:59 +01:00
Daniel Gultsch
55e3e528a2 do not cross reference bookmarks and conversations 2018-02-10 19:06:31 +01:00
Daniel Gultsch
3bed4b1b11 always persist current nick (in bookmark and database) 2018-02-10 16:24:55 +01:00
Daniel Gultsch
b016238f94 don't cancel animation when switching accounts w/o init 2018-02-10 13:32:37 +01:00
Daniel Gultsch
85f8a98fd7 version bump to 1.23.5 + changelog 2018-02-10 12:53:50 +01:00
Daniel Gultsch
72944e1deb pulled translations from transifex 2018-02-10 12:21:36 +01:00
Daniel Gultsch
e78640a40a Merge pull request #2780 from linkmauve/patch-1
Fix the French translation for the add_back string
2018-02-10 12:19:18 +01:00
Daniel Gultsch
e953b75ed8 skip empty srv records 2018-02-10 12:16:18 +01:00
Daniel Gultsch
347578cc49 return to welcome activity after deleting last account 2018-02-10 10:45:33 +01:00
Daniel Gultsch
e93e5da4cb skip animations for startup activities 2018-02-09 22:19:13 +01:00
Daniel Gultsch
9e81681c0b add null checks to huawei settings code 2018-02-09 22:11:11 +01:00
Daniel Gultsch
0505f16b14 fixed ruby rendering script 2018-02-09 20:53:13 +01:00
Daniel Gultsch
5443cc848f do not put setup activites on stack twice 2018-02-09 20:09:58 +01:00
Daniel Gultsch
ee414526a1 fixing travis 2018-02-09 09:16:19 +01:00
Daniel Gultsch
5e09b67be8 bump build tools 2018-02-09 09:05:49 +01:00
linkmauve
a0e1aa04f5 Fix the French translation for the add_back string
It was translated to something like “add again”, which doesn’t carry the same meaning and can be confusing for users.

It would be useful to also check how it has been translated in other languages, and add a source comment for future translators.
2018-02-05 19:30:32 +01:00
Daniel Gultsch
c3bea896ad SM saftey checks 2018-02-02 16:52:40 +01:00
Daniel Gultsch
a90eb66d9c Merge pull request #2773 from kriztan/patch-1
fixed crash on receiving files
2018-02-02 09:33:22 +01:00
Christian Schneppe
65a421840b fixed crash on receiving files 2018-02-01 19:47:51 +01:00
Daniel Gultsch
5a3f5d3dcd discover file extension in original filename from pgp 2018-01-29 01:40:02 +01:00
Daniel Gultsch
3def51e2db do not explicitly request MAM archive for blocked contacts 2018-01-29 01:39:46 +01:00
Daniel Gultsch
b148b37ae4 support new http upload namespace 2018-01-28 14:17:42 +01:00
Daniel Gultsch
ab1c48611b direct link from settings to huaweis protected apps 2018-01-28 13:31:12 +01:00