Commit Graph

5642 Commits

Author SHA1 Message Date
Martin/Geno db8160e681
Merge branch 'master' into develop 2019-04-14 23:35:37 +02:00
Daniel Gultsch d04e2e99f3 use mediated invite on reinvite if user is not member 2019-04-11 08:57:20 +02:00
Daniel Gultsch bf7d50692c use styled warning for message error. fixes #3428 2019-04-08 16:32:41 +02:00
Daniel Gultsch 7ada794e6e version bump to 2.4.3 + changelog 2019-03-28 09:40:54 +01:00
Daniel Gultsch c6df5191ab pulled translations from transifex 2019-03-24 20:07:38 +01:00
Daniel Gultsch d390345073 show max file upload size in server info 2019-03-23 07:27:03 +01:00
Daniel Gultsch 6322d4c077 renamed button in recording dialog to 'attach' 2019-03-23 07:26:29 +01:00
Daniel Gultsch 74301831d2 do sent/received correct based on true counterpart introduces in f406631512 only for type=groupchat 2019-03-15 12:46:27 +01:00
Daniel Gultsch e998ea816e Merge branch 'master' of github.com:siacs/Conversations 2019-03-07 09:10:53 +01:00
Daniel Gultsch 46596e8652 fix backup creation for older installations
if your Conversations installation is older than December 2016 (version 1.15.0) the backup would
include historic data that a current installation is not able to read on restore.
This commits excludes that data from the backup.
If you had problems importing the backup you need to create a new backup after this patch
2019-03-07 09:08:37 +01:00
Licaon_Kter fca63a8858 Update backup info in Readme (#3393)
* Update backup info in Readme
2019-03-06 08:23:44 +00:00
Daniel Gultsch 016e394897 version bump to 2.4.2 + changelog 2019-03-03 15:04:54 +01:00
Daniel Gultsch a9b0e13179 fixed syntax errors in french translations 2019-03-03 08:52:05 +01:00
Daniel Gultsch ec0b9b9a72 pulled translations from transifex 2019-03-03 08:35:20 +01:00
Daniel Gultsch c7dea9dded fixed security exception when attempting to display image in notification 2019-03-03 08:32:54 +01:00
Daniel Gultsch 875f0b9943 find activity even if wrapped in context wrapper. fixes #3396 2019-03-03 08:31:46 +01:00
Daniel Gultsch f406631512 double check that muc message is ours if true jid is known 2019-03-02 08:36:36 +01:00
Daniel Gultsch a29a5fd491 copy intent extras in eventreceiver 2019-02-27 14:16:26 +01:00
Daniel Gultsch 417a6e8307 use proper theme in restore activity. fixes #3389 2019-02-25 20:26:52 +01:00
Daniel Gultsch a243cdb944 version bump to 2.4.1 + changelog 2019-02-23 10:34:51 +01:00
Daniel Gultsch 24a51d8715 do null check before splitting error message for processing 2019-02-23 10:24:08 +01:00
Daniel Gultsch b79a2447b2 bump version to 2.4.0 2019-02-22 18:19:49 +01:00
Daniel Gultsch 895a140ec5 pulled translations from transifex 2019-02-22 15:05:50 +01:00
Daniel Gultsch b4b4950a75 s/Jabber ID/XMPP address/
There are countless arguments on both sides of the Jabber ID vs XMPP address
debate which makes deciding between them a really tough decision.

Pro Jabber ID
* Jabber is easier pronounce
* We have always called it Jabber
* Jabber is more recognizable (This claim can not be backed up by Google Trends)
* Jabber ID has a nicer typography

Pro XMPP address
* People like the term address. People also liked 'Chat address' or
  'Conversations address'. Address is also used in Email address or other
  protocols. Even if people don’t understand the 'XMPP' part of the term they
  might understand the 'address' part and know what is going on.
* While people might have heard of Jabber rather than XMPP; people have heard
  of it in the 00s and associate it with something old. Depending on the
  target audience this is a good thing. And people who value sustainability
  know what XMPP is anyway.
* Jabber is a Cisco product. If we were to succeed in making 'Jabber' cool
  again we don’t want to share that success with Cisco. What has Cisco ever
  done for us? Aside from providing us with a venue for the XSF summit. And
  building nice aqueducts.
* The Cisco owned trademark is a damocles sword. While the XSF technically
  has the right to hand out sublicenses to use the term this can be a lengthy
  process. And automated filter system that for example monitor Google Play
  store descriptions don’t care that the XSF has the rights or that the terms
  of use are more nuanced. They just see a trademark and reject the
  publication. And we all know how impossible it is to speak to an actual
  human at Google.
2019-02-21 11:29:05 +01:00
Daniel Gultsch d95b904b5b show file too large instead of generic delivery failed 2019-02-20 21:44:06 +01:00
Daniel Gultsch 3fabb52293 after switching from forced foreground to foreground notification needs update 2019-02-16 11:58:16 +01:00
Daniel Gultsch 905d2ab432 explicitly set profile+level for encoder
some modern Androids (namely my Xiaomi Mi A1 after the update to Andorid 9) seem to require that
2019-02-16 11:40:51 +01:00
Daniel Gultsch bd5b8aff78 fixed typo. s/exits/exists/ 2019-02-15 20:35:32 +01:00
Daniel Gultsch cdaa61b6a3 fixed broken nl translation string for quicksy. good thing we have travis 2019-02-15 14:26:13 +01:00
Daniel Gultsch 009546d0cf increment version to 2.4.0-beta.2 2019-02-15 14:15:37 +01:00
Daniel Gultsch a658eb2d4b pulled translations from transifex 2019-02-15 14:13:11 +01:00
Daniel Gultsch f26a57ced4 fixed regression of search hint not updating in StartConversation screen 2019-02-15 14:07:39 +01:00
Daniel Gultsch 6b5e81df49 allow filtering in participant view. fixes #3371 2019-02-15 14:00:42 +01:00
Daniel Gultsch 5f543e8314 show notification when backup is done 2019-02-15 13:17:49 +01:00
Daniel Gultsch d79768e923 do not show 'manage permissions' submenu when only 'remove from room' is visible 2019-02-15 09:57:58 +01:00
Martin/Geno e140ab713e
Networkstack - let OS decide IPv4 or IPv6 2019-02-12 00:49:34 +01:00
Martin/Geno db12bae1a2
change default values 2019-02-12 00:49:33 +01:00
Martin/Geno 089f76f43c
rebrand + remove green background option 2019-02-12 00:49:28 +01:00
Martin/Geno 4e659b35d7
add .gitlab-ci 2019-02-11 21:30:02 +01:00
Daniel Gultsch 766cb8c088 extend max label size slightly 2019-02-10 20:07:57 +01:00
Martin 8cf190eb66 Fixed typo in Changelog.md (#3374) 2019-02-10 10:09:03 +00:00
Daniel Gultsch bebce313b2 print available stream features / mechanisms on incompat server 2019-02-09 20:21:29 +01:00
Daniel Gultsch ef09b0ab1a use the term channel in destroy dialog 2019-02-08 13:46:33 +01:00
Daniel Gultsch 4c8b1eb4bc version bump to 2.4.0-beta + changelog 2019-02-07 21:59:58 +01:00
Daniel Gultsch 310362130f catch activity not found when trying to open contact app 2019-02-07 21:39:30 +01:00
Daniel Gultsch bfaf10aa72 brought back 'moderated' config in advanced mode 2019-02-07 18:11:21 +01:00
Daniel Gultsch b648c482f3 allow corrections in all mucs 2019-02-07 18:11:07 +01:00
Daniel Gultsch ad64058d25 hide lock icon in channels; modify muc user context 2019-02-07 13:18:42 +01:00
Daniel Gultsch b6a501d24b rights managment in muc 2019-02-06 23:47:29 +01:00
Daniel Gultsch 32ef3755e2 show different room settings for channels and groups 2019-02-06 18:29:07 +01:00