summaryrefslogtreecommitdiffstats
path: root/model
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-1Martin Kraft2018-02-142-4/+15
|\
| * XYZ-110: Cherrypicking changes from release-4.7 to master (#8254)Jonathan2018-02-132-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-1George Goldberg2018-02-137-15/+106
|\|
| * Merge branch 'release-4.7'Derrick Anderson2018-02-092-2/+2
| |\
| | * Increase OAuth2 state parameter limitJoramWilander2018-02-072-2/+2
| | |
| * | fix client4 post sanitization (#8219)Chris2018-02-083-8/+67
| | |
| * | Eliminate utils.SetLicense calls (#8217)Chris2018-02-071-0/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * eliminate utils.SetLicense calls * test fix * another test fix * more test fixes
| * | ABC-132: sign error page parameters (#8197)Chris2018-02-071-5/+18
| | | | | | | | | | | | | | | | | | * sign error page parameters * add comments
* | | Updates migration tests to reflect front-end mapping changes. (#8237)Martin Kraft2018-02-131-1/+5
| | |
* | | AllowEditPost and PostEditTimeLimit migration (#8208)Jesús Espino2018-02-092-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 Goldberg2018-02-081-0/+3
| | |
* | | XYZ-76: Add license check to patchRoles endpoint. (#8224)George Goldberg2018-02-081-0/+35
| | |
* | | Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-1Jesús Espino2018-02-075-4/+127
|\| |
| * | PLT-7537: Move channel CLI command posts system message to channel. (#8161)Vordimous2018-02-071-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 FormatJonathan2018-02-074-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 Healey2018-02-062-2/+48
| | | | | | | | on/off (#8211)
* | Merge branch 'master' into advanced-permissions-phase-1George Goldberg2018-02-0664-1242/+480
|\|
| * Uncomment upgrade code for 4.7 (#8201)Joram Wilander2018-02-051-0/+1
| |
| * ABC-173: introduce Normalize(Username|Email) (#8183)Jesse Hallam2018-02-053-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 Abril2018-02-011-0/+1
| | | | | | | | | | | | * add delete_team websocket event * add to PermanentDeleteTeam
| * User based rate limiting (#8152)Christopher Speller2018-01-311-1/+10
| |
| * unnamed return (#8170)Chris2018-01-3062-1235/+430
| |
* | XYZ-37: Advanced Permissions Phase 1 Backend. (#8159)George Goldberg2018-02-068-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 Lee2018-01-261-6/+7
| | | | (#7774) (#8102)
* XYZ-32: Increases size of position to 128 characters. (#8148)Martin Kraft2018-01-262-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 Wilander2018-01-241-1/+15
|
* [ICU-621] Add ExperimentalGroupUnreadChannels setting (#8127)enahum2018-01-231-0/+5
| | | | | | * Add ExperimentalGroupUnreadChannels setting * track ExperimentalGroupUnreadChannels in diagnostics
* Merge branch 'release-4.6'Harrison Healey2018-01-231-3/+5
|\
| * PLT-8522 Added separate messages for being removed from channel or team (#8078)Harrison Healey2018-01-101-3/+5
| |
* | ABC-90 Add POST /emoji/search and GET /emoji/autocomplete API endpoints (#8125)Joram Wilander2018-01-233-0/+74
| | | | | | | | | | | | * Add POST /emoji/search and GET /emoji/autocomplete API endpoints * Add constant to be clearer
* | PLT-3383: image proxy support (#7991)Chris2018-01-226-13/+766
| | | | | | | | | | | | | | | | | | | | | | | | * 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
* | Add sort query parameter to GET /emojis (#8121)Joram Wilander2018-01-192-0/+13
| |
* | Post a system message to the affected channel by CLI command (#7877) (#7968)Evgeniy2018-01-181-27/+29
| |
* | [PLT-7793] Add /users/tokens/search endpoint (#8088)Adrian Carolli2018-01-113-0/+64
| | | | | | | | | | | | | | | | * Add /users/tokens/search endpoint + tests * Fix check-style * Unnecessary deletion
* | [XYZ-6] Add sampledata platform command (#8027)Jesús Espino2018-01-112-2/+6
| | | | | | | | | | | | | | | | * Add fake dependency * [XYZ-6] Add sampledata platform command * Creating EMOJI_NAME_MAX_LENGTH as a constant and using it where needed
* | Add EnableDefaultChannelLeaveJoinMessages config setting (#7961)Chris Duarte2018-01-101-56/+61
| |
* | [PLT-6936] Translate AppError.Message automatically by default (#8063)Jesús Espino2018-01-081-0/+12
| |
* | [PLT-7793] Added /users/tokens endpoint (#8038)Adrian Carolli2018-01-051-4/+21
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | * Added /users/tokens/all endpoint - UserAccessStore now has getAll method - Added tests - Added route - Added handler * Remove space fix check-style * Remove blank space check-style * Fixes for make check-style * Remove extra code that is un-needed in user_test.go * Rename endpoint + grammar - Renamed /users/tokens/all to /users/tokens - Renamed getUserAccessTokens to getUserAccessTokensForUser - Renamed getAllUserAccessTokens to getUserAccessTokens - Minor Grammar changes * Add localization for sql_user_access_token.get_all * Fix minor plural spelling
* Uncomment upgrade for 4.6 (#8045)Derrick Anderson2018-01-051-0/+1
| | | | | | * Uncomment upgrade for 4.6 * add 4.6 version
* rename DefaultTeamName to ExperimentalPrimaryTeam (#8039)Chris Duarte2018-01-051-3/+3
|
* Add admin update endpoint that can update authservice and authdata (#7842)Chris Duarte2018-01-042-0/+36
| | | | | | | | | | * add admin update endpoint that can upate authservice and authdata * Control only SystemAdmin access * Refactored AdminUpdate endpoint to only be able to update AuthData, AuthService and Password by User.Id * Refactor to move `PUT /api/v4/users/{user_id}/auth`. Created a struct to hold UserAuth info.
* [PLT-8173] Strip the post_ prefix on incoming webhook overrides. (#8019)Jesse Hallam2018-01-032-18/+18
|
* Add color properties to config to white label login buttons (#7826)Chris Duarte2018-01-021-0/+47
|
* [PLT-8173] Add username and profile picture to webhook set up pages (#8002)Jesse Hallam2018-01-022-9/+39
|
* UCHAT-60 change default notification settings for new users (#7845)Chris Duarte2017-12-211-7/+4
| | | | | | * UCHAT-60 change default notification settings for new users * 1. Turn off "Case sensitive first name" in Words that trigger mentions. 2. Send Desktop Notifications for "Only for mentions and direct messages".
* Set default for DefaultTeamName setting if not present in config (#7987)Joram Wilander2017-12-191-0/+4
|
* Allow default team to be configured (#7846)Chris Duarte2017-12-191-0/+1
|
* PLT-6896 per-paging for logs (#7903)Yusuke Nemoto2017-12-131-1/+1
| | | | | | | | | | * PLT-6896 Read logs from last * Getting rid of file.Stats * remove deprecated value * Make non-reassigned value constant
* add config option to hide tutorial screens (#7840)Chris Duarte2017-12-081-0/+5
|
* PLT-6217-bis Fixes system message posted to Town Square when a user joins a ↵Tsilavina Razafinirina2017-12-081-7/+22
| | | | | | | | team #7863 (#7864) * Adds new string post message when a user has joined a team (#6483) * Simplifies long if statement in post.go (#6483)