Commit Graph

851 Commits

Author SHA1 Message Date
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
Druhin Bala
301e7eb1c4 MM-10699 Add channel renaming to CLI (#9094) 2018-07-18 11:49:48 +01:00
Joram Wilander
f2c1803905 Make plugin IDs case insensitive (#9117) 2018-07-16 16:56:55 -04:00
Joram Wilander
275731578e MM-10254 Add plugin APIs for getting/updating user statuses (#9101)
* Add plugin APIs for getting/updating user statuses

* Add and update tests

* Updates per feedback
2018-07-16 15:49:26 -04:00
George Goldberg
9d9fcd9ac5 MM-11172: Don't allow reacting in read-only town square. (#9106) 2018-07-16 13:04:52 +01:00
Chris Duarte
62c64594cc Add localized timestamp support for email notification (#8674)
* Add localized timestamp support for email notification

* Move localTime logic over to getFormattedPostTime
2018-07-13 14:10:34 -04:00
Jesse Hallam
17f211c393 MM-11292: clean up plugins GoDoc (#9109)
* clean up plugins GoDoc:

- eliminate plugin.NewBlankContext() as unnecessary
- export ValidIdRegex as a string vs. the less readable var
- add/update various documentation strings
- hide everything by default, except where used by client plugins or the mattermost-server. The exception to this rule are the `*(Args|Returns)` structs which must be public for go-plugin, but are now prefixed with `Z_` with a warning not to use.
- include a top-level example to get plugin authors started

This is not a breaking change for existing plugins compiled against
plugins-v2.

* remove commented out ServeHTTPResponseWriter

* update examples to match developer docs

* add missing plugin/doc.go license header
2018-07-13 10:29:50 -04:00
Joram Wilander
5ddb08dcb4 Avoid using app function so bulk loading does not fail when custom emojis are disabled (#9064) 2018-07-12 16:28:04 -04: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
Pradeep Murugesan
8cad7070ac GH-6278 hasReactions flag is set to true only if the post contains reactions (#9053) 2018-07-12 11:32:26 -04:00
Jason Blais
d0c6834e1d Add telemetry for ServiceSettings.EnableEmailInvitations (#9105) 2018-07-12 07:21:29 -07:00
Daniel Schalla
efa954622c Enhance Log Output from Permanent Delete (#9044)
use structured logging

Missed Structured Log

Using Err for Errors in Structured Logging
2018-07-12 07:18:23 -07:00
Pradeep Murugesan
06abe98ba9 GH-8964 enable notification for text and preText fields in Attachments (#9069) 2018-07-11 10:11:36 -04:00
Jesús Espino
5b63e87ab7 Deduplicating some code in app/status.go (#9095) 2018-07-11 21:56:35 +08:00
Elias Nahum
00abe3a136 push notifications follow teammate name display user or server setting (#9049)
* push notifications follow teammate name display user or server setting

* Feedback review
2018-07-11 15:01:49 +02:00
JoramWilander
6c7dc2d29c Merge branch 'plugins-2' 2018-07-10 15:01:43 -04: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
Joram Wilander
6daf82073d Don't panic if plugin manifest does not have settings (#9086) 2018-07-10 07:52:57 -07:00
Carlos Tadeu Panato Junior
dccd95bc67 fix TestInvitePeopleProvider test (#9084) 2018-07-10 15:43:06 +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
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
Christopher Speller
e3c26a0e89 Adding ability for plugin system to respect the defaults listed in the plugin manifest. (#9066) 2018-07-09 07:25:57 -07:00
George Goldberg
a840fc285b MM-11194: Fix channel header slash command. (#9057) 2018-07-08 11:27:13 +02:00
JoramWilander
b78b216a3c Merge branch 'master' into plugins-2 2018-07-07 12:04:18 -04:00
Daniel Schalla
359f12db33 First batch of new plugin api methods (#9022)
update api mocks

Generated new hooks

ChannelHasJoinedChannel Implementation

User Left Team/Channel Hook; User Joined Team Hook Implementation

Update RPC Client and Mocks

gofmt

go tests fix

Add Config API Methods

codegne

Add Channel Has Been Created Hook

Fix ChannelHasBeenCreated hook

fix missing context param

fix duplicate hooks; remove redudandcy
2018-07-06 15:32:55 -07:00
Christopher Speller
4c1ddcff10 MM-10703 Adding blank request context to plugin hooks for future use. (#9043)
* Adding blank request context to plugin hooks for future use.

* Rename RequestContext to Context

* Adding context to ServeHTTP and ExecuteCommand

* Fixing import cycle in test.
2018-07-06 09:07:09 -04: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
George Goldberg
0896b5c64e MM-11106: Allow systeadmin webook to post to read only town square. (#9051) 2018-07-06 10:07:36 +02:00
Joram Wilander
7bfb5aec26 Add back enable/disable WS events (#9052) 2018-07-05 07:23:55 -07:00
Declan Freeman-Gleason
4de50ddfc3 MM-10603: Ignore Redirects and Other Changes when Displaying Link Previews (#9025)
* Don't use redirected URL in link preview.

* Only show preview if OG data is provided.
2018-07-05 09:45:08 -04: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
Asaad Mahmood
8d3ea1bbf6 MM-10766 - Replacing default profile image font (#8955)
* Updating default profile pic font

* Updating profile image font

* Updating test

* Use new default font if configured for old one

* Update OFL.txt
2018-07-05 09:18:26 +02:00
Christopher Speller
83a3ac089c MM-11029 Adding plugin logging functionality. (#9034)
* Capturing stdout, stderr of plugins in logs.

* Cleanup go-plugin debug logs.

* Adding logging to plugin API

* Generating mocks.

* godoc convention
2018-07-03 09:58:28 -07:00
George Goldberg
0e17babdd3 Make sure diagnostic ID is loaded before client config. (#9032) 2018-07-03 17:54:59 +02:00
Jason Blais
8821fee6c2 Disable Gfycat by default during Beta and move default keys to server (#9027)
* Update default.json

* Update diagnostics.go

* Added default Gfycat API credentials to server

* Fixed default Gfycat credentials
2018-07-03 11:26:08 +02:00
JoramWilander
3848cb7e79 Merge branch 'master' into plugins-2 2018-06-30 12:24:04 -04:00
Jesse Hallam
4245797cb2 redirect, vs. proxy, 80->443 without LE enabled (#9020)
The code incorrectly got refactored to proxy instead of forward, deviating from the behaviour when LE is enabled.
2018-06-29 17:17:35 -04:00
George Goldberg
c371ae4db1 Make import compatible with scheme-roles. (#9028)
This doesn't introduce new fields as we would then break backwards
compatability with old "roles" fields. We can add custom fields if/when
we go to "version 2" of the bulk import format.
2018-06-29 17:50:06 +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
Joram Wilander
2114e96f00 Reset status to away after web conn disconnect if necessary (#8988) 2018-06-27 14:19:06 -07:00
JoramWilander
88c5e469ca Merge branch 'master' into plugins-2 2018-06-27 16:56:50 -04:00
Sudheer
9abd74c5e3 MM-10910 fix join and open channel commands to work with tilde (#8984)
* MM-10910 fix join and open channel commands to work with tilde

* Fix lint

* Add basic tests for command_join
2018-06-27 15:08:58 +02:00
Joram Wilander
d7976549a0 MM-9674 Add plugin API for publishing custom WebSocket events (#8999)
* Add plugin API for publishing custom WebSocket events

* Add clearer payload comment

* Update comment
2018-06-27 08:46:38 -04:00
Joram Wilander
0d91bf323e Lock bulk importing to master database node (#9012) 2018-06-27 10:08:40 +01:00
Emil Velikov
f17c15c9d8 Simplify oauth (#8972)
* Remove unused OauthProvider::GetIdentifier

Signed-off-by: Emil Velikov <emil.velikov@collabora.com>

* Reuse gitlab's getAuthData() instead of open-coding it

Signed-off-by: Emil Velikov <emil.velikov@collabora.com>

* Remove OauthProvider::GetAuthDataFromJson interface

The data is already available via GetUserFromJson().AuthData

Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
2018-06-26 17:23:13 -07:00
Jesse Hallam
2d7cd02abc MM-10833: send down computed channel props (#8953)
* MM-10833: send down computed channel props

This allows channel headers to reference channel mentions for a client
that doesn't already know about the channels in question.

We intentionally don't send down the props for the autocomplete and
search endpoints since they aren't used in that context, and would add
unnecessary overhead.

* update channel props on patch

* revert to treating channel purpose as plaintext
2018-06-26 16:46:57 -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