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

970 Коммитов

Автор SHA1 Сообщение Дата
George Goldberg
fadcdd271a Merge branch 'master' into advanced-permissions-phase-1 2018-03-13 13:36:23 +00:00
Harrison Healey
4e26594fcb Removed mssola/user_agent library (#8417) 
* Removed mssola/user_agent library

* Changed user agent tests to use t.Run
 2018-03-12 10:21:20 -04:00
Stephen Kiers
302dae5bb9 MM-9274- Sort Users in Channel by status (#8181) 
* sort by lastActivity

* added status ordering to Users

* sort offline before dnd

* remove data not needed

* added seperate call for when order=‘status’ is on GetUser request

* remove PrintLn

* styling fix

* remove mistake

* mistake 2

* better comment

* explicit if statemnt

* writing tests

* removed manually added mocks

* generated mock

* ICU-668 Added unit tests

* style fix

* sort by lastActivity

* added status ordering to Users

* sort offline before dnd

* remove data not needed

* added seperate call for when order=‘status’ is on GetUser request

* remove PrintLn

* styling fix

* remove mistake

* mistake 2

* better comment

* explicit if statemnt

* writing tests

* removed manually added mocks

* generated mock

* ICU-668 Added unit tests

* style fix

* reverse dnd and offline

* Fixed app.SaveStatusAndBroadcast

* Fixed incorrect merge

* Fixing incorrect merge again
 2018-03-09 07:48:30 -05:00
Chris
e8943936c5 general cleanup (#8387) 2018-03-07 12:36:40 -06:00
Jesús Espino
b66e4bc932 MM-8830 Consistent Incomming/Outgoing webhooks permissions (#8335) 2018-03-07 14:54:47 +00:00
Joram Wilander
4a1802c039 MM-9664 Add invalidation metrics for store caches (#8340) 
* Add invalidation metrics for store caches

* Increment session invalidation metric

* Fix tests
 2018-03-05 10:35:26 -05:00
Jesse Hallam
fbff94f3be MM-8604: emit config/license websocket events (#8371) 2018-03-05 12:18:22 +00:00
George Goldberg
901acc9703 Merge branch 'master' into advanced-permissions-phase-1 2018-03-02 15:55:03 +00:00
Christian Hoff
2b3b6051d2 PLT-7567: Integration of Team Icons (#8284) 
* PLT-7567: Integration of Team Icons

* PLT-7567: Read replica workaround, upgrade logic moved, more concrete i18n key

* PLT-7567: Read replica workaround, corrections

* PLT-7567: upgrade correction
 2018-03-01 19:11:44 +00:00
Carlos Tadeu Panato Junior
6e024c45b5 [PLT-8186] add support for ec2 instance profile authentication (#8243) 2018-02-28 23:12:11 +00:00
Derrick Anderson
4538857ae3 Merge remote-tracking branch 'origin/release-4.7' into merge47intomaster 2018-02-23 15:14:01 -05:00
Chris
d44ef7ea67 Remove global site url (#8343) 
* remove global site url

* missed one

* revert mysterious change
 2018-02-22 18:23:32 -06:00
Joram Wilander
659ce8c600 Change log level of 404s to DEBUG (#8339) 2018-02-21 09:20:10 -05:00
Christopher Speller
75d9a3a3b9 MM-8681 Adding config settings necessary for using CloudFront. (#8307) 
* Adding config settings nessisary for using CloudFront.

* Adding new config settings to diagnostics.
 2018-02-20 12:49:45 -08:00
Harrison Healey
babd795d79 MM-9556 Added ability to upload files without a multipart request (#8306) 
* MM-9556 Added ability to upload files without a multipart request

* MM-9556 Handled some unusual test behaviour
 2018-02-20 10:41:00 -05:00
Harrison Healey
f85d910592 Added t.Helper to CheckXStatus test functions (#8305) 2018-02-20 08:51:01 -05:00
George Goldberg
f8289eb286 Merge branch 'master' into advanced-permissions-phase-1 2018-02-19 11:19:39 +00:00
Jesús Espino
8891fa2a5e MM-8827: Add ADD_REACTION, REMOVE_REACTION and REMOVE_OTHERS_REACTIONS permissions (#8300) 2018-02-19 11:13:29 +00:00
George Goldberg
0e718a632a MM-9618: Don't change default role permissions for policy. (#8303) 2018-02-19 10:16:45 +00:00
Carlos Tadeu Panato Junior
8c3a7b75de [PLT-539] Update incoming webhooks to accept multipart/form-data content (#7873) 2018-02-16 08:29:12 -08:00
Derrick Anderson
4e4535bda9 Merge release-4.7 with master in side branch 2018-02-13 23:20:27 -05:00
Joram Wilander
a43928cca8 ABC-176 Prevent changing PluginSettings.EnableUploads through the API (#8249) 
* Prevent changing PluginSettings.EnableUploads through the API

* Contain api4 test case in it's own test
 2018-02-13 14:05:18 -05:00
Joram Wilander
5c560db810 ABC-176 Prevent changing PluginSettings.EnableUploads through the API (#8249) 
* Prevent changing PluginSettings.EnableUploads through the API

* Contain api4 test case in it's own test
 2018-02-13 11:08:49 -05:00
George Goldberg
5c101253c5 Merge branch 'master' into advanced-permissions-phase-1 2018-02-13 13:46:01 +00:00
Chris
fbef16f863 Merge branch 'release-4.7' into rm-willnorris-proxy-support 2018-02-12 18:36:39 -06:00
Derrick Anderson
c209e44574 revert master changes 2018-02-12 16:01:02 -05:00
Christopher Brown
141cfd2f9b remove willnorris/imageproxy support 2018-02-12 13:05:01 -06:00
Chris
1ae680aefa Merge branch 'master' into release-4.7 2018-02-12 12:02:54 -06:00
Martin Kraft
9325430859 XYZ-73: Removes EnableOnlyAdminIntegrations uses. (#8245) 2018-02-12 18:49:29 +01:00
Jonathan
9707ac3aaf Added invite_id field to email invite url, along with validation of this field on the server (#8235) 2018-02-12 09:16:17 -05:00
George Goldberg
1edcabbc9b Fix tests. (#8244) 2018-02-12 14:52:42 +01:00
Chris
a4e9499714 Add /v4/image api (#8230) 
* add image api

* i suppose i should add a test...

* only redirect to image proxy
 2018-02-09 13:59:17 -06:00
Chris
0daac7e4fc Add /v4/image api (#8230) 
* add image api

* i suppose i should add a test...

* only redirect to image proxy
 2018-02-09 11:56:11 -08:00
Chris
a6309aaf48 Remove license globals entirely (#8229) 
* remove license globals entirely

* fix infinite recursion

* test fix
 2018-02-09 10:04:48 -06:00
Jesús Espino
0aa7ecd5e8 AllowEditPost and PostEditTimeLimit migration (#8208) 
* AllowEditPost and PostEditTimeLimit migration

* Not set EDIT_POST permission to sysadmin_role if ALLOW_EDIT_POST is configured to NEVER

* Remove a bit of code duplication
 2018-02-09 10:31:01 -05:00
George Goldberg
fa5cba9cc7 XYZ-76: Add license check to patchRoles endpoint. (#8224) 2018-02-08 17:07:40 +01:00
Chris
0f703a3368 Eliminate utils.SetLicense calls (#8217) 
* eliminate utils.SetLicense calls

* test fix

* another test fix

* more test fixes
 2018-02-07 16:20:51 -06:00
Chris
eff65aa05c ABC-132: sign error page parameters (#8197) 
* sign error page parameters

* add comments
 2018-02-07 12:05:46 -05:00
Jesús Espino
a04b02081a Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-1 2018-02-07 18:05:23 +01:00
Jesús Espino
121712ce5d Remove fmt.Println trace on api4 tests (#8212) 2018-02-07 03:42:55 -06:00
Pierre de La Morinerie
809a16458f Abort on critical error during server startup (#8204) 
Only a handful of critical errors are present in the codebase.
They all occur during server startup (in `app.StartServer()`).

Currently, when one of these critical error occurs, it is simpled
mentionned in the logs – then the error is discarded, and the app
attempts to continue the execution (and probably fails pretty quickly in
a weird way).

Rather than continuing operations in an unknow state, these errors should
trigger a clean exit.

This commit rewrites critical startup errors to be correctly
propagated, logged, and then terminate the command execution.
Additionnaly, it makes the server return a proper error code to the
shell.
 2018-02-07 02:11:15 -06:00
Chris
1ec295f88c add App.License, remove utils.IsLicensed / utils.License calls (#8203) 2018-02-06 17:25:49 -06:00
George Goldberg
7941c30117 Merge branch 'master' into advanced-permissions-phase-1 2018-02-06 17:25:53 +00:00
George Goldberg
e1cd646135 XYZ-37: Advanced Permissions Phase 1 Backend. (#8159) 
* XYZ-13: Update Permission and Role structs to new design.

* XYZ-10: Role store.

* XYZ-9/XYZ-44: Roles API endpoints and WebSocket message.

* XYZ-8: Switch server permissions checks to store backed roles.

* XYZ-58: Proper validation of roles where required.

* XYZ-11/XYZ-55: Migration to store backed roles from policy config.

* XYZ-37: Update unit tests to work with database roles.

* XYZ-56: Remove the "guest" role.

* Changes to SetDefaultRolesFromConfig.

* Short-circuit the store if nothing has changed.

* Address first round of review comments.

* Address second round of review comments.
 2018-02-06 15:34:08 +00:00
Christopher Speller
1262d25473 User based rate limiting (#8152) 2018-01-31 09:49:15 -08:00
Chris
e0ee73ef99 ABC-79: Optimize channel autocomplete query (#8163) 
* optimize channel autocomplete query

* move to new autocomplete endpoint
 2018-01-31 09:26:40 -05:00
Joram Wilander
3918ed6c58 Add GET /emojis/name/{emoji_name} API endpoint (#8142) 2018-01-24 08:50:11 -05:00
Joram Wilander
4f4a765e7d ABC-90 Add POST /emoji/search and GET /emoji/autocomplete API endpoints (#8125) 
* Add POST /emoji/search and GET /emoji/autocomplete API endpoints

* Add constant to be clearer
 2018-01-23 08:04:44 -08:00
Chris
599991ea73 PLT-3383: image proxy support (#7991) 
* image proxy support

* go vet fix, remove mistakenly added coverage file

* fix test compile error

* add validation to config settings and documentation to model functions

* add message_source field to post
 2018-01-22 15:32:50 -06:00
Joram Wilander
a844577535 Add sort query parameter to GET /emojis (#8121) 2018-01-19 09:37:59 -05:00