mirrors/mostlymatter
1
0
Форкнуть 0
Код Задачи Запросы на слияние Действия Пакеты Проекты Релизы Вики Активность
10 203 коммитов 3 Ветки 0 Теги
687700a989810ec99bc6b52a1e3900a237a4cd54
Граф коммитов

10203 Коммитов

This Branch
This Branch
Все ветки
Автор SHA1 Сообщение Дата
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
Carlos Tadeu Panato Junior
7ed712f938 Restore config after finisht the test case (#9085) 2018-07-11 12:58:16 +02:00
Jesse Hallam
7c08ff9986 MM-11241: fix context site url header (#9079) 
* fix context's SiteURLHeader to use the subpath

This fixes various commands such as /open and /groupmsg, as well as
OAuth related redirects.

* MM-11246: also leverage GetSiteHeader() in completeSaml
 2018-07-11 10:13:37 +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
JoramWilander
1e1a5e5e85 Merge branch 'master' into plugins-2 2018-07-10 12:51:07 -04:00
Carlos Tadeu Panato Junior
9470564d35 Add preparatory upgrade code for 5.2.0 (#9047) 2018-07-10 17:00:52 +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
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
Jesús Espino
602fd0ffdd MM-11189: Do not close the connection abruptly on too big emojis (#9071) 2018-07-10 10:55:24 +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
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
Martin Kraft
8a02121767 MM-11110: Fixes CLI error message. (#9062) 2018-07-09 12:48:43 +02:00
Daniel Schalla
e8b8ef394b Blacklist System as Username (#9060) 
adapted tests
 2018-07-09 11:45:48 +01: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
Saturnino Abril
9e5ec7d09d [MM-10754] Remove unnecessary command_test route (#9050) 
* remove unnecessary command_test route

* replaced localhost with ts.URL
 2018-07-06 09:07:42 -04: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
Jesse Hallam
6b7a35b653 MM-11118: disallow deleting direct or group channels (#9054) 2018-07-05 09:17:43 +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
Carlos Tadeu Panato Junior
7c855c30db Uncomment upgrade for 5.1.0 (#9040) 2018-07-03 18:15:15 +02:00
George Goldberg
0e17babdd3 Make sure diagnostic ID is loaded before client config. (#9032) 2018-07-03 17:54:59 +02:00
Jesús Espino
c66b567a1d Adding RootId information to MessageExport (#9030) 2018-07-03 16:33:10 +02:00
Elias Nahum
e5703ce2a0 translations PR 20180702 (#9038) 2018-07-03 16:19:14 +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
George Goldberg
4ccb8b7cff Add note on 5.0->4.10 downgrade in upgrade.go (#9029) 2018-07-02 11:03:00 +01:00
JoramWilander
3848cb7e79 Merge branch 'master' into plugins-2 2018-06-30 12:24:04 -04:00
Joram Wilander
2362a5b7f7 Ignore | characters in postgres channel search (#9019) 2018-06-30 00:13:13 +02: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
Martin Kraft
56ba06c016 MM-10980: Conditionally filteres User json properties. (#9018) 2018-06-29 08:45:04 -04:00
George Goldberg
e51ae39766 Fix a really rare race condition in the migration scheduler. (#9000) 2018-06-29 09:27:06 +01:00
Jesse Hallam
912b140cc5 remove redundant checks in build.mk (#9015) 2018-06-29 10:15:01 +02:00
Jesse Hallam
57bf7203f3 subpath: rewrite manifest.json too (#9017) 2018-06-29 03:27:42 +05:30
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