summaryrefslogtreecommitdiffstats
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into advanced-permissions-phase-1George Goldberg2018-02-1315-77/+419
|\
| * Merge branch 'master' into release-4.7Chris2018-02-1218-71/+423
| |\
| | * Add tests for the `platform server` command (#8231)Pierre de La Morinerie2018-02-121-2/+9
| | * Remove license globals entirely (#8229)Chris2018-02-0910-38/+197
| | * Eliminate utils.SetLicense calls (#8217)Chris2018-02-074-21/+19
| | * ABC-132: sign error page parameters (#8197)Chris2018-02-073-8/+111
| * | Added invite_id field to email invite url, along with validation of this fiel...Jonathan2018-02-123-0/+73
| * | minor addition to #8238Christopher Brown2018-02-092-5/+7
| * | Don't proxy same-site image urls (#8238)Chris2018-02-092-2/+16
* | | Updates migration tests to reflect front-end mapping changes. (#8237)Martin Kraft2018-02-131-1/+1
* | | Fix tests. (#8244)George Goldberg2018-02-121-6/+4
* | | XYZ-51: Unit tests for and changes to SetRolePermissionsFromConfig. (#8160)Martin Kraft2018-02-092-2/+5
* | | AllowEditPost and PostEditTimeLimit migration (#8208)Jesús Espino2018-02-094-12/+52
* | | Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-1Jesús Espino2018-02-0722-49/+141
|\ \ \ | | |/ | |/|
| * | PLT-7537: Move channel CLI command posts system message to channel. (#8161)Vordimous2018-02-072-4/+30
| * | XYZ-35: Added Support for GlobalRelay Compliance Export FormatJonathan2018-02-071-0/+1
| * | allow plugins to set command hints (#8214)Chris2018-02-071-0/+1
| * | Abort on critical error during server startup (#8204)Pierre de La Morinerie2018-02-074-7/+64
| |/
| * add App.License, remove utils.IsLicensed / utils.License calls (#8203)Chris2018-02-0615-38/+45
* | Merge branch 'master' into advanced-permissions-phase-1George Goldberg2018-02-0615-65/+429
|\|
| * handle RateLimiter initialization errors (#8199)Pierre de La Morinerie2018-02-053-9/+28
| * Add missing diagnostics for v4.7 (#8195)Jason Blais2018-02-051-1/+5
| * ABC-179: check email verification last (#8172)Jesse Hallam2018-02-051-5/+25
| * Update zoom plugin to latest (#8194)Joram Wilander2018-02-023-6/+6
| * Fix panic when invalid types used in post props (#8191)Joram Wilander2018-02-021-6/+6
| * ABC-153: don't use http redirects with 4xx/5xx status codes (#8178)Chris2018-02-021-1/+1
| * fix image url replacement for blank urls (#8184)Chris2018-02-012-1/+7
| * [PLT-8494] Add delete_team websocket event (#8167)Saturnino Abril2018-02-011-4/+8
| * User based rate limiting (#8152)Christopher Speller2018-01-315-30/+318
| * ABC-79: Optimize channel autocomplete query (#8163)Chris2018-01-311-0/+8
| * Moving to golang.org/x/crypto/acme/autocert for Let's Encrypt functionality. ...Christopher Speller2018-01-301-13/+28
| * Used a consistent tense for system messages (#8079)Harrison Healey2018-01-261-1/+1
* | XYZ-37: Advanced Permissions Phase 1 Backend. (#8159)George Goldberg2018-02-0611-53/+567
|/
* PLT-3658 Added support for Slack attachments in outgoing webhook response (#7...Joey Lee2018-01-261-2/+13
* XYZ-32: Increases size of position to 128 characters. (#8148)Martin Kraft2018-01-261-1/+1
* Add GET /emojis/name/{emoji_name} API endpoint (#8142)Joram Wilander2018-01-241-0/+16
* [ICU-621] Add ExperimentalGroupUnreadChannels setting (#8127)enahum2018-01-231-0/+1
* Merge branch 'release-4.6'Harrison Healey2018-01-233-33/+64
|\
| * Update diagnostics.go for 4.6 release (#8082)Jason Blais2018-01-101-27/+40
| * PLT-8522 Added separate messages for being removed from channel or team (#8078)Harrison Healey2018-01-102-6/+24
* | use markdown parsing to identify mentions (#8139)Chris2018-01-232-392/+338
* | set from_webhook if a builtin slash command overrides username or icon (#8143)Chris2018-01-231-3/+9
* | ABC-90 Add POST /emoji/search and GET /emoji/autocomplete API endpoints (#8125)Joram Wilander2018-01-231-2/+14
* | PLT-3383: image proxy support (#7991)Chris2018-01-224-5/+212
* | Add sort query parameter to GET /emojis (#8121)Joram Wilander2018-01-191-2/+2
* | Post a system message to the affected channel by CLI command (#7877) (#7968)Evgeniy2018-01-182-0/+56
* | Handle missed case with ExperimentalEnableDefaultChannelLeaveJoinMessages set...Joram Wilander2018-01-182-8/+10
* | Finally remove utils.Cfg (#8113)Chris2018-01-178-39/+26
* | ABC-22: Plugin sandboxing for linux/amd64 (#8068)Chris2018-01-151-0/+8
* | Remove global cfg vars (#8099)Chris2018-01-126-27/+186