Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into advanced-permissions-phase-1 | George Goldberg | 2018-03-02 | 8 | -217/+240 |
|\ | |||||
| * | PLT-7567: Integration of Team Icons (#8284) | Christian Hoff | 2018-03-01 | 2 | -13/+67 |
| | | | | | | | | | | | | | | | | | | | | * 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 | ||||
| * | [PLT-8186] add support for ec2 instance profile authentication (#8243) | Carlos Tadeu Panato Junior | 2018-02-28 | 1 | -0/+14 |
| | | |||||
| * | fix scheduled task race (#8355) | Chris | 2018-02-23 | 2 | -203/+57 |
| | | |||||
| * | MM-8681 Adding config settings necessary for using CloudFront. (#8307) | Christopher Speller | 2018-02-20 | 1 | -0/+20 |
| | | | | | | | | | | | | * Adding config settings nessisary for using CloudFront. * Adding new config settings to diagnostics. | ||||
| * | MM-8710: Web Hub optimizations (#8293) | Chris | 2018-02-20 | 2 | -0/+73 |
| | | | | | | | | | | | | | | | | | | | | | | | | * webhub optimizations * test fix * minor fix * big perf improvement to ToJson after precomputing * fix hub connection count | ||||
| * | MM-9556 Added ability to upload files without a multipart request (#8306) | Harrison Healey | 2018-02-20 | 1 | -1/+8 |
| | | | | | | | | | | | | * MM-9556 Added ability to upload files without a multipart request * MM-9556 Handled some unusual test behaviour | ||||
| * | merge 4.7.1 to master | Saturnino Abril | 2018-02-19 | 1 | -0/+1 |
| |\ | |||||
| | * | Add upgrade code from 4.7.0 to 4.7.1 | JoramWilander | 2018-02-16 | 1 | -0/+1 |
| | | | |||||
| | * | Remove bad field from ChannelMemberHistory model | JoramWilander | 2018-02-16 | 1 | -1/+0 |
| | | | |||||
| | * | Renamed file to match existing scheme | Jonathan Fritz | 2018-02-13 | 1 | -0/+0 |
| | | | |||||
| | * | Merge branch 'release-4.7' into XYZ-110 | Jonathan Fritz | 2018-02-13 | 9 | -180/+16 |
| | |\ | |||||
| | * | | Removed unused fields from ChannelMemberHistory table, introduced new ↵ | Jonathan Fritz | 2018-02-12 | 2 | -4/+15 |
| | | | | | | | | | | | | | | | | model.ChannelMemberHistoryResult object that includes those fields that are selected from a join on other tables | ||||
* | | | | Merge branch 'master' into advanced-permissions-phase-1 | George Goldberg | 2018-02-19 | 2 | -1/+10 |
|\| | | | |||||
| * | | | [PLT-539] Update incoming webhooks to accept multipart/form-data content (#7873) | Carlos Tadeu Panato Junior | 2018-02-16 | 1 | -0/+9 |
| | | | | |||||
| * | | | Merge release-4.7 with master in side branch | Derrick Anderson | 2018-02-13 | 1 | -1/+1 |
| |\ \ \ | | | |/ | | |/| | |||||
| | * | | Merge branch 'release-4.7' into rm-willnorris-proxy-support | Chris | 2018-02-12 | 9 | -183/+15 |
| | |\ \ | |||||
| | | * | | revert master changes | Derrick Anderson | 2018-02-12 | 9 | -183/+15 |
| | | |/ | |||||
| | * / | remove willnorris/imageproxy support | Christopher Brown | 2018-02-12 | 1 | -1/+1 |
| | |/ | |||||
* | | | MM-8827: Add ADD_REACTION, REMOVE_REACTION and REMOVE_OTHERS_REACTIONS ↵ | Jesús Espino | 2018-02-19 | 2 | -0/+27 |
| | | | | | | | | | | | | permissions (#8300) | ||||
* | | | Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-1 | Martin Kraft | 2018-02-14 | 2 | -4/+15 |
|\| | | |||||
| * | | XYZ-110: Cherrypicking changes from release-4.7 to master (#8254) | Jonathan | 2018-02-13 | 2 | -4/+15 |
| |/ | | | | | | | | | | | | | | | * Cherry-picking 7b2861de3a09cf00d00b0872cc537d54302c4bfa to master because enterprise/master has code in it that enterprise/release-4.7 does not, and I don't want enterprise/master to break the next time somebody merges enterprise/release-4.7 to enterprise/master * Renamed file to match existing scheme (cherry picked from commit 8c22c5c6c6f835a6e73faf19036bad2a51bb9127) | ||||
* | | Merge branch 'master' into advanced-permissions-phase-1 | George Goldberg | 2018-02-13 | 7 | -15/+106 |
|\| | |||||
| * | Merge branch 'release-4.7' | Derrick Anderson | 2018-02-09 | 2 | -2/+2 |
| |\ | |||||
| | * | Increase OAuth2 state parameter limit | JoramWilander | 2018-02-07 | 2 | -2/+2 |
| | | | |||||
| * | | fix client4 post sanitization (#8219) | Chris | 2018-02-08 | 3 | -8/+67 |
| | | | |||||
| * | | Eliminate utils.SetLicense calls (#8217) | Chris | 2018-02-07 | 1 | -0/+19 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * eliminate utils.SetLicense calls * test fix * another test fix * more test fixes | ||||
| * | | ABC-132: sign error page parameters (#8197) | Chris | 2018-02-07 | 1 | -5/+18 |
| | | | | | | | | | | | | | | | | | | * sign error page parameters * add comments | ||||
* | | | Updates migration tests to reflect front-end mapping changes. (#8237) | Martin Kraft | 2018-02-13 | 1 | -1/+5 |
| | | | |||||
* | | | AllowEditPost and PostEditTimeLimit migration (#8208) | Jesús Espino | 2018-02-09 | 2 | -2/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | * 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 | ||||
* | | | XYZ-80: Add CreateAt/UpdateAt/DeleteAt fields to roles table. (#8223) | George Goldberg | 2018-02-08 | 1 | -0/+3 |
| | | | |||||
* | | | XYZ-76: Add license check to patchRoles endpoint. (#8224) | George Goldberg | 2018-02-08 | 1 | -0/+35 |
| | | | |||||
* | | | Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-1 | Jesús Espino | 2018-02-07 | 5 | -4/+127 |
|\| | | |||||
| * | | PLT-7537: Move channel CLI command posts system message to channel. (#8161) | Vordimous | 2018-02-07 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * [PTL-7537] implement feature and test * [PTL-7537] Update feature to post the the room requiring a username flag to be used * [PTL-7537] update tests with username * update test to remove changes to the test helper struct * use the basic team and user | ||||
| * | | XYZ-35: Added Support for GlobalRelay Compliance Export Format | Jonathan | 2018-02-07 | 4 | -2/+77 |
| |/ | | | | | | | | | | | | | | | | | * Added username to ChannelMemberHistory struct in anticipation of supporting GlobalRelay in Compliance Export * Removed translation from debug output - this makes it complicated to use utils functions from tests in the enterprise repo * Added an advanced email function that allows for greater control over message details. Updated MessageExport config to support GlobalRelay. Added attachment support to InBucket unit tests * Moving templates in from enterprise to solve test issues * Added export format to diagnostics * Changed email attachment code to use FileBackend so that S3 storage is properly supported | ||||
| * | ICU-715 Change ExperimentalGroupUnreadChannels setting to allow for default ↵ | Harrison Healey | 2018-02-06 | 2 | -2/+48 |
| | | | | | | | | on/off (#8211) | ||||
* | | Merge branch 'master' into advanced-permissions-phase-1 | George Goldberg | 2018-02-06 | 64 | -1242/+480 |
|\| | |||||
| * | Uncomment upgrade code for 4.7 (#8201) | Joram Wilander | 2018-02-05 | 1 | -0/+1 |
| | | |||||
| * | ABC-173: introduce Normalize(Username|Email) (#8183) | Jesse Hallam | 2018-02-05 | 3 | -6/+38 |
| | | | | | | | | This centralizes the source of truth on the rules for username / email processing instead of scattering `strings.ToLower` invocations. | ||||
| * | [PLT-8494] Add delete_team websocket event (#8167) | Saturnino Abril | 2018-02-01 | 1 | -0/+1 |
| | | | | | | | | | | | | * add delete_team websocket event * add to PermanentDeleteTeam | ||||
| * | User based rate limiting (#8152) | Christopher Speller | 2018-01-31 | 1 | -1/+10 |
| | | |||||
| * | unnamed return (#8170) | Chris | 2018-01-30 | 62 | -1235/+430 |
| | | |||||
* | | XYZ-37: Advanced Permissions Phase 1 Backend. (#8159) | George Goldberg | 2018-02-06 | 8 | -219/+486 |
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | * 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. | ||||
* | PLT-3658 Added support for Slack attachments in outgoing webhook response ↵ | Joey Lee | 2018-01-26 | 1 | -6/+7 |
| | | | | (#7774) (#8102) | ||||
* | XYZ-32: Increases size of position to 128 characters. (#8148) | Martin Kraft | 2018-01-26 | 2 | -3/+3 |
| | | | | | | | | | | * XYZ-32: Changes type of 'position' column on 'users' table. * XYZ-32: Uncomment to run on CI and pre-release. * XYZ-32: Reverts translation changes. * XYZ-32: Fix for gofmt. | ||||
* | Add GET /emojis/name/{emoji_name} API endpoint (#8142) | Joram Wilander | 2018-01-24 | 1 | -1/+15 |
| | |||||
* | [ICU-621] Add ExperimentalGroupUnreadChannels setting (#8127) | enahum | 2018-01-23 | 1 | -0/+5 |
| | | | | | | * Add ExperimentalGroupUnreadChannels setting * track ExperimentalGroupUnreadChannels in diagnostics | ||||
* | Merge branch 'release-4.6' | Harrison Healey | 2018-01-23 | 1 | -3/+5 |
|\ | |||||
| * | PLT-8522 Added separate messages for being removed from channel or team (#8078) | Harrison Healey | 2018-01-10 | 1 | -3/+5 |
| | | |||||
* | | ABC-90 Add POST /emoji/search and GET /emoji/autocomplete API endpoints (#8125) | Joram Wilander | 2018-01-23 | 3 | -0/+74 |
| | | | | | | | | | | | | * Add POST /emoji/search and GET /emoji/autocomplete API endpoints * Add constant to be clearer |