Commit graph

5724 commits

Author SHA1 Message Date
Daniel Gultsch 1a1d5c2a3e Merge branch 'master' of github.com:siacs/Conversations 2018-02-23 23:12:13 +01:00
Daniel Gultsch 7725cb8311 MAM: look at total count for completness. parse fin correctly 2018-02-23 23:11:54 +01:00
Daniel Gultsch a79b0f37ca
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 8713fc8a06 Use 'Jabber' instead of 'XMPP' in the welcome message 2018-02-22 22:04:03 +01:00
Daniel Gultsch f81e5e471e 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 e7094af9d5 warn when attempting to write stanza to an unbound stream 2018-02-20 17:03:44 +01:00
Daniel Gultsch 72cf702e75 mark error notifications as sensitve and local only. fixes #2795 2018-02-20 08:22:08 +01:00
Daniel Gultsch c35ac11a42 check if axolotl service is initialized before displaying keys 2018-02-19 17:26:38 +01:00
Daniel Gultsch 742727504f fixed handling of self address messages w/o remoteMsgId 2018-02-19 15:52:33 +01:00
Daniel Gultsch 3edcb2e7c7
update chat badge 2018-02-19 14:30:16 +01:00
Daniel Gultsch 014cf66c87 do not allow insecure bind 2018-02-18 21:54:03 +01:00
Daniel Gultsch 92d59e9741
Merge pull request #2805 from af8a524db1/data_namespace
Use constant for 'jabberdata' namespace
2018-02-16 16:32:27 +01:00
Marc Schink 17c6d8827c Make use of Namespace.DATA constant 2018-02-16 16:12:53 +01:00
Marc Schink 9af7b7ae1e Namespace: Add constant for 'jabberdata' 2018-02-16 16:12:53 +01:00
Daniel Gultsch a3f3cfa0bb only allow a number of white listed headers according to http upload v0.5 2018-02-16 11:14:16 +01:00
Marc Schink 3fa205d463 Don't add account if user cancels. Fixes #2797 2018-02-15 14:40:21 +01:00
Marc Schink 3b7d9b39f7 Pass invite XMPP URI along instead of JID 2018-02-14 17:03:43 +01:00
Marc Schink c7d2b65982 XmppUri: Add toString() method 2018-02-14 17:03:43 +01:00
Daniel Gultsch af778b0f4b Merge branch 'vikiCoder-master' 2018-02-14 12:48:43 +01:00
vikiCoder 88866d99fa Fixes #2786 : Certificate dialogue not respecting dark theme solved 2018-02-14 16:19:26 +05:30
Daniel Gultsch d3e755ceb1 null check on invite object 2018-02-13 15:20:30 +01:00
Daniel Gultsch 347389c497
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 9360f5c960 allow roster action with name 2018-02-12 20:00:42 +01:00
Daniel Gultsch 75a7686f63 version bump to 1.23.6 + changelog 2018-02-12 12:32:12 +01:00
Daniel Gultsch 6650c0bd57 always copy firefoxe’s shared files 2018-02-12 12:31:59 +01:00
Daniel Gultsch eed2d93145 integrate intent integrator to finish activity when needed 2018-02-12 11:22:51 +01:00
Daniel Gultsch 64928d0ff1 http upload: do not crash on invalid slot responses 2018-02-11 17:54:59 +01:00
Daniel Gultsch e2ac1db225 do not cross reference bookmarks and conversations 2018-02-10 19:06:31 +01:00
Daniel Gultsch 2eb2513615 always persist current nick (in bookmark and database) 2018-02-10 16:24:55 +01:00
Daniel Gultsch 64c956904d don't cancel animation when switching accounts w/o init 2018-02-10 13:32:37 +01:00
Daniel Gultsch cb1a5e3c68 version bump to 1.23.5 + changelog 2018-02-10 12:53:50 +01:00
Daniel Gultsch b3561e80f2 pulled translations from transifex 2018-02-10 12:21:36 +01:00
Daniel Gultsch 0e8e8be82c
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 f828b89cbd skip empty srv records 2018-02-10 12:16:18 +01:00
Daniel Gultsch facc56bc7b return to welcome activity after deleting last account 2018-02-10 10:45:33 +01:00
Daniel Gultsch 97406ecf51 skip animations for startup activities 2018-02-09 22:19:13 +01:00
Daniel Gultsch d33fca09cf add null checks to huawei settings code 2018-02-09 22:11:11 +01:00
Daniel Gultsch af81bb1958 fixed ruby rendering script 2018-02-09 20:53:13 +01:00
Daniel Gultsch 5335cda50c do not put setup activites on stack twice 2018-02-09 20:09:58 +01:00
Daniel Gultsch 4a98d330f0 fixing travis 2018-02-09 09:16:19 +01:00
Daniel Gultsch a7e1935909 bump build tools 2018-02-09 09:05:49 +01:00
linkmauve 4e373d82dc
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 012653f7ed SM saftey checks 2018-02-02 16:52:40 +01:00
Daniel Gultsch 9fcf8347f6
Merge pull request #2773 from kriztan/patch-1
fixed crash on receiving files
2018-02-02 09:33:22 +01:00
Christian Schneppe 40878350c7
fixed crash on receiving files 2018-02-01 19:47:51 +01:00
Daniel Gultsch bcd00bb517 discover file extension in original filename from pgp 2018-01-29 01:40:02 +01:00
Daniel Gultsch 2f1f9f2c2c do not explicitly request MAM archive for blocked contacts 2018-01-29 01:39:46 +01:00
Daniel Gultsch e48788e821 support new http upload namespace 2018-01-28 14:17:42 +01:00
Daniel Gultsch 4541ac8b7b direct link from settings to huaweis protected apps 2018-01-28 13:31:12 +01:00
Daniel Gultsch 3e9224bde9 add snooze button to notification 2018-01-28 13:14:30 +01:00