Граф коммитов

769 Коммитов

Автор SHA1 Сообщение Дата
Jesús Espino
6bf09e2c34 MM-11384: Add system install date information to the client config (#9218)
* MM-11384: Add system install date information to the client config

* Fixing translation text

* Fixes from Peer Review
2018-08-08 12:04:36 +02:00
Elias Nahum
9bf01f1401 translations PR 20180802 (Adds Romanian) (#9210)
* translations PR 20180802

* Fix romanian translation
2018-08-06 11:13:46 +02:00
Jesús Espino
61f98d92fa MM-11576: Allow to join and add members to archived channels (#9214) 2018-08-03 17:13:02 +02:00
der-test
f4fdd7835b Fixed inconsistencies (#9120)
* Fixed inconsistencies

See https://pre-release.mattermost.com/core/pl/339m9zipst8n7kc19fossntose

* Update en.json
2018-08-01 07:41:17 -04:00
Elias Nahum
be8b6177e3 translations PR 20180730 (#9191)
* translations PR 20180730

* Fix japanese
2018-08-01 07:40:19 -04:00
George Goldberg
185ed89978 MM-11243: Make Elasticsearch work after enabling without restart. (#9146)
* MM-11243: Make Elasticsearch work after enabling without restart.

* Also cope with config vars changing whilst enabled.
2018-07-26 15:50:38 +01:00
Jesse Hallam
8948b91d7a unpack prepacked plugins on plugins initialization (#9149)
* unpack prepackaged plugins on plugins initialization

* leverage utils.FindDir
2018-07-26 08:45:26 -04:00
Pradeep Murugesan
b3c2ecd9b9 added the custom icon and username for the outgoing webhook and its response (#9141)
* 8272 added the username and icon as part of the model and persisted the same

* 8272 added the custome icon and name when set to the web hook response

* 8272 changed the infinte loop to timeout after 5 seconds

* 8272  fixed review comments
2018-07-25 08:31:41 -04:00
Yusuke Nemoto
6104c37761 Break HTML blocks to individual strings (#8903)
* Modifying message and templates about mfa_change

* Modifying message and templates about password_change

* Modify message and template about password_reset

* Modify message and template about singin_change

* Modify message and template about email_info

* Modify message and template about change_username

* Modify message about change_email

* Add missing props

* Add argument

* Modify message and template about token_added

* Modify messages and template about notification_email

* Modify message and template about deactivate_email

* Fix style

* Remove unused message

* Remove br tags

* Modify message and code about invite_mail

* Add missing message
2018-07-20 12:52:20 -04:00
Jesús Espino
610ac5a53c MM-11003: Global Relay Export Refactor (#9136) 2018-07-20 17:13:35 +02:00
Jesús Espino
edb4443dfb Renamed translation in actiance export (#9132) 2018-07-20 12:25:24 +02:00
Pradeep Murugesan
ee1d037ca6 Support attachments in post and replies - Bulk import (#9124)
* 9006 - process the attachments of the post

* 9006 enabling the import of attachments in the reply post

* 9006 assert if the post and files are linked

* 9006 fixed the typo
2018-07-20 16:49:49 +08:00
Jesús Espino
17c0817361 Add missed plugin error translation (#9131) 2018-07-19 10:46:53 -07:00
Chris Duarte
3fcecd521a Support for Embeded chat (#9129)
* Add ucLive support

crazy testing

lovely logs

more cookie work arounds

Added Access-Control-Expose-Headers to user login

Add complete_saml_body template and revert loginWithSaml endpoint

Set Access-Control-Allow-Credentials to true in user login

Login via email instead of username

Clean up code

Add comment to give some context

Move faml logic into saml function

Communicate via chrome sendMessage api

Remove unused code

Add config to support multiple extensions

Clean up embedded complete_saml template

Fix indentation for templates

Added license header to extension.go

Add EnableExperimentalExtensions flag

Extension validated for email auth

Clean up api auth code

Remove complete_saml_body.html

* Add extension support in saml

* Clean up code

* Clean up extension validation
2018-07-18 14:56:38 -07:00
Elias Nahum
6b27b74f0c translations PR 20180718 (#9123) 2018-07-18 11:30:48 -04:00
Jason Blais
715de382d2 Update en.json (#9096) 2018-07-18 17:24:43 +02:00
George Goldberg
9d9fcd9ac5 MM-11172: Don't allow reacting in read-only town square. (#9106) 2018-07-16 13:04:52 +01:00
cpanato
adc56ae78d Merge remote-tracking branch 'upstream/release-5.1' into release-5.1-daily-merge-20180712 2018-07-12 19:50:16 +02:00
Elias Nahum
2e861c4df4 translations PR 20180711 (#9099) 2018-07-11 20:12:02 +02:00
cpanato
c042ffa460 Merge remote-tracking branch 'upstream/release-5.1' into release-5.1-daily-merge-20180710 2018-07-10 19:27:14 +02:00
Elias Nahum
0510580364 translations PR 20180709 (#9082) 2018-07-10 10:56:28 +02:00
George Goldberg
af615ffc24 MM-11229: Fix invite people slash command and add test case. (#9074) 2018-07-10 10:56:04 +02:00
George Goldberg
2d16a71af9 MM-11228: Fix channel update/patch API endpoints. (#9073) 2018-07-10 10:55:46 +02:00
George Goldberg
2df818b9c6 MM-11227: Fix group msg slash command. (#9070) 2018-07-10 10:54:49 +02:00
Christopher Speller
74e5d8ae66 MM-11120 Adding setting to disable email invitations and rate limiting. (#9063)
* Adding setting to disable email invitations.

* Adding a setting and rate limiting for email invite sending.

* Modifying email rate limit to 20/user/hour

* Adding EnableEmailInvitations to client side config and command.
2018-07-10 10:54:25 +02:00
George Goldberg
951e4ad984 MM-11174: Fix /msg slash command. (#9059) 2018-07-10 10:53:51 +02:00
Harrison Healey
28449dd95a Update custom url schemes error message to reflect what we actually support (#9061) 2018-07-09 19:32:42 +02:00
cpanato
a92f5addcc Merge remote-tracking branch 'upstream/release-5.1' into release-5.1-daily-merge-20180706 2018-07-06 10:57:40 +02:00
Joram Wilander
6299af0fa5 Add ability to bulk import emoji (#9048)
* Add ability to bulk import emoji

* Improve error handling

* Update test config
2018-07-05 09:08:49 -04:00
Jesse Hallam
6b7a35b653 MM-11118: disallow deleting direct or group channels (#9054) 2018-07-05 09:17:43 +02:00
Elias Nahum
e5703ce2a0 translations PR 20180702 (#9038) 2018-07-03 16:19:14 +02:00
Jerry Kurian
4b2a626354 add MaxLifetimeconns to server (#9004)
Update e.json string names and remove console log

reorder variables

update db.setConnMaxLifetime to take in *settings.MaxLifetimeConns

Add MaxLifetimeConns to test

Update variable names like MaxLifetimeConns to ConnMaxLifetimeMilliseconds

Update time passed to SetConnMaxLifetime

Revert "Update time passed to SetConnMaxLifetime"

This reverts commit dc1c1b6d5a6404d4ee11c65d4756c19f9316794f.

update en.json

Update supplier_test.go and docker.go ConnMaxLifetimeMilliseconds to 3600000
2018-06-28 09:45:20 -04:00
Jesús Espino
66dc9a5206 Add english missed texts to i18n/en.json (#8987)
* Add English missed texts to i18n/en.json
* Update en.json
2018-06-28 17:12:38 +05:30
Elias Nahum
1e6994a2ab translations PR 20180625 (#8998) 2018-06-27 06:58:46 -04:00
Jesús Espino
164e030d33 MM-11008: Fix translation and change the code to be auto-extracted (#9009) 2018-06-26 16:06:01 -04:00
George Goldberg
fc158fce90 MM-10570: Make permissions reset command clear custom role assignments. (#8976) 2018-06-25 14:34:59 +01:00
Jesús Espino
d9390244af MM-8810: Add CSV Compliance export (#8966)
* MM-8810: Add CSV Compliance export

* Only allowing to schedule actiances export throught the cli

* De-duplicating some code

* Fixes on texts

* Fixes on translations
2018-06-22 11:15:19 +02:00
Jesús Espino
a59ccaa8b3 Using i18n extract to generate the i18n/en.json file (#8980)
* Sort translations

* Added untranslated and removed unussed strings
2018-06-21 14:58:36 -04:00
Carlos Tadeu Panato Junior
0d741301a3 fix typo in en.json and remove trailing spaces (#8975) 2018-06-21 16:50:35 +02:00
George Goldberg
1f65f0e3d6 MM-10233: Add scheme importing to bulk importer. (#8928) 2018-06-21 12:02:35 +01:00
Elias Nahum
8e24dd78fb translations PR 20180619 (#8963) 2018-06-20 08:19:57 -04:00
Jesús Espino
344836dfb2 Add missed translations (#8959) 2018-06-19 19:40:26 +02:00
Harrison Healey
226d4b2ac8 MM-6992 Added highlighting to elasticsearch results (#8861)
* MM-6992 Added highlighting to elasticsearch results

* Added a unique type for post search matches

* Fixed Elasticsearch matches not being sent through API
2018-06-19 11:46:29 +02:00
Jesús Espino
f48d31c7a4 Small translation fixes (#8940) 2018-06-16 09:35:24 +02:00
cpanato
e38b18565e Merge remote-tracking branch 'upstream/release-5.0' into release-5.0-merge-to-master-20180615 2018-06-15 17:38:08 +02:00
Joram Wilander
85a75526c7 Add more oauth logging and note about GitLab ToS for login (#8949) 2018-06-14 19:27:00 +02:00
cpanato
8883f48788 Merge remote-tracking branch 'upstream/release-5.0' into release-5.0-merge-to-master-20180614-1 2018-06-14 18:46:19 +02:00
Elias Nahum
a6d815e05a translations PR 20180613 (#8947) 2018-06-14 09:00:15 +02:00
George Goldberg
e10665a5a5 MM-10790: Fix Slack Import logs that got broken in refactoring. (#8938) 2018-06-11 07:32:37 -07:00
Elias Nahum
3bae2f3b37 translations PR 20180604 (#8909) 2018-06-05 19:57:40 +02:00