summaryrefslogtreecommitdiffstats
path: root/app
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into advanced-permissions-phase-1George Goldberg2018-02-194-64/+156
|\
| * always return non-nil client license (#8317)Chris2018-02-161-3/+5
| * XYZ-114 Adding mandatory membership to town-square in bulk-import (#8274)Jesús Espino2018-02-151-0/+6
| * gofmtDerrick Anderson2018-02-132-2/+2
| * Merge release-4.7 with master in side branchDerrick Anderson2018-02-133-63/+147
| |\
| | * Merge branch 'release-4.7' into rm-willnorris-proxy-supportChris2018-02-1220-427/+213
| | |\
| | | * revert master changesDerrick Anderson2018-02-1218-423/+71
| | | * Merge branch 'release-4.7' into icu669Derrick Anderson2018-02-1222-76/+517
| | | |\
| | | * | Fixed typo in unit testHarrison Healey2018-02-121-1/+1
| | | * | ICU-669 Handle relative links betterHarrison Healey2018-02-092-12/+19
| | | * | ICU-669 Ensured all URLs returned from OpenGraph are absoluteHarrison Healey2018-02-082-4/+135
| | * | | remove willnorris/imageproxy supportChristopher Brown2018-02-122-63/+9
| | | |/ | | |/|
* | | | MM-8827: Add ADD_REACTION, REMOVE_REACTION and REMOVE_OTHERS_REACTIONS permis...Jesús Espino2018-02-191-0/+10
* | | | MM-9618: Don't change default role permissions for policy. (#8303)George Goldberg2018-02-191-6/+6
* | | | Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-1Martin Kraft2018-02-141-10/+10
|\| | |
| * | | XYZ-110: Cherrypicking changes from release-4.7 to master (#8254)Jonathan2018-02-131-10/+10
| |/ /
* | | 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
generated by cgit v1.2.3-1-g7c22 (git 2.25.1) at 2024-06-28 21:01:13 +0000