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

10085 Коммитов

This Branch
This Branch
Все ветки
Автор SHA1 Сообщение Дата
Jason Blais
5499450224 Update privacy policy for v5.1 (#9102) 2018-07-12 20:40:18 +02:00
Elias Nahum
2e861c4df4 translations PR 20180711 (#9099) 2018-07-11 20:12:02 +02: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
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
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
Martin Kraft
8a02121767 MM-11110: Fixes CLI error message. (#9062) 2018-07-09 12:48:43 +02:00
George Goldberg
a840fc285b MM-11194: Fix channel header slash command. (#9057) 2018-07-08 11:27:13 +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
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
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
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
Kenny Au
437f9f5b64 Gfycat integration (#8971) 
* Gfycat integration

* Added gfycat api credentials to config.
 2018-06-27 15:35:15 -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
Elias Nahum
1e6994a2ab translations PR 20180625 (#8998) 2018-06-27 06:58:46 -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
Jesús Espino
85aa3d664c MM-11034: Reply properly to incomming webhooks on errors (#9010) 2018-06-26 17:04:06 -04: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
Chris Duarte
41d2a9f435 Add Purpose as a searchable field (#8067) 
* Add Purpose as a searchable field

* Add New Index and Remove old for Channels

* Include Purpose in FullTextSearch Clause

* Move removeIndex for Channels into upgrade.go
 2018-06-26 13:47:39 -04:00
Jason Blais
3e9fe291f1 Update diagnostics.go (#8989) 2018-06-26 13:47:07 -04:00
Joram Wilander
cbf9571c68 MM-10700 - Updating default image preview size (#9002) (#9003) 2018-06-26 13:40:39 -04:00
George Goldberg
60359b4bae MM-10269: Make jobserver work without restart. (#9005) 2018-06-26 13:30:33 -04:00
Daniel Schalla
ecefa6cdd1 Implementation of File Exists Function; Delete FileInfos upon Permanent User Delete (#8958) 
Check if file was deleted on FS

Warning message if file couldnt be removed
 2018-06-25 12:12:59 -04:00
George Goldberg
fc158fce90 MM-10570: Make permissions reset command clear custom role assignments. (#8976) 2018-06-25 14:34:59 +01:00
Joram Wilander
1c194e5fbd Fix plugins serving after subpath changes (#8982) 2018-06-22 22:09:31 -04:00