summaryrefslogtreecommitdiffstats
path: root/model
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into advanced-permissions-phase-1Martin Kraft2018-03-234-0/+669
|\
| * Timezone feature (#8185)Chris Duarte2018-03-224-0/+666
| * add config for saml home realm discovery bypass (#8480)Chris2018-03-201-0/+3
* | Merge branch 'master' into advanced-permissions-phase-1George Goldberg2018-03-191-2/+2
|\|
| * update email test in the driver to be able to send the config in the body (#8...Carlos Tadeu Panato Junior2018-03-131-2/+2
* | Merge branch 'master' into advanced-permissions-phase-1George Goldberg2018-03-1319-111/+187
|\|
| * MM-8839: Adds ChannelType to compliance-related model. (#8424)Martin Kraft2018-03-092-0/+4
| * MM-9274- Sort Users in Channel by status (#8181)Stephen Kiers2018-03-091-2/+13
| * MM-8840: Add GlobalRelay Configuration Settings (#8304)Jonathan2018-03-082-14/+153
| * respect plugin manifest webapp bundle_path (#8393)Chris2018-03-071-0/+5
| * general cleanup (#8387)Chris2018-03-0715-108/+9
| * Add preparatory upgrade code for 4.9 (#8408)Joram Wilander2018-03-051-0/+1
| * MM-8604: emit config/license websocket events (#8371)Jesse Hallam2018-03-051-0/+2
* | Merge branch 'master' into advanced-permissions-phase-1George Goldberg2018-03-028-217/+240
|\|
| * PLT-7567: Integration of Team Icons (#8284)Christian Hoff2018-03-012-13/+67
| * [PLT-8186] add support for ec2 instance profile authentication (#8243)Carlos Tadeu Panato Junior2018-02-281-0/+14
| * fix scheduled task race (#8355)Chris2018-02-232-203/+57
| * MM-8681 Adding config settings necessary for using CloudFront. (#8307)Christopher Speller2018-02-201-0/+20
| * MM-8710: Web Hub optimizations (#8293)Chris2018-02-202-0/+73
| * MM-9556 Added ability to upload files without a multipart request (#8306)Harrison Healey2018-02-201-1/+8
| * merge 4.7.1 to masterSaturnino Abril2018-02-191-0/+1
| |\
| | * Add upgrade code from 4.7.0 to 4.7.1JoramWilander2018-02-161-0/+1
| | * Remove bad field from ChannelMemberHistory modelJoramWilander2018-02-161-1/+0
| | * Renamed file to match existing schemeJonathan Fritz2018-02-131-0/+0
| | * Merge branch 'release-4.7' into XYZ-110Jonathan Fritz2018-02-139-180/+16
| | |\
| | * | Removed unused fields from ChannelMemberHistory table, introduced new model.C...Jonathan Fritz2018-02-122-4/+15
* | | | Merge branch 'master' into advanced-permissions-phase-1George Goldberg2018-02-192-1/+10
|\| | |
| * | | [PLT-539] Update incoming webhooks to accept multipart/form-data content (#7873)Carlos Tadeu Panato Junior2018-02-161-0/+9
| * | | Merge release-4.7 with master in side branchDerrick Anderson2018-02-131-1/+1
| |\ \ \ | | | |/ | | |/|
| | * | Merge branch 'release-4.7' into rm-willnorris-proxy-supportChris2018-02-129-183/+15
| | |\ \
| | | * | revert master changesDerrick Anderson2018-02-129-183/+15
| | | |/
| | * / remove willnorris/imageproxy supportChristopher Brown2018-02-121-1/+1
| | |/
* | | MM-8827: Add ADD_REACTION, REMOVE_REACTION and REMOVE_OTHERS_REACTIONS permis...Jesús Espino2018-02-192-0/+27
* | | 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
| |/
* | 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
| * | ABC-132: sign error page parameters (#8197)Chris2018-02-071-5/+18
* | | 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
* | | 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
| * | XYZ-35: Added Support for GlobalRelay Compliance Export FormatJonathan2018-02-074-2/+77
| |/
| * ICU-715 Change ExperimentalGroupUnreadChannels setting to allow for default o...Harrison Healey2018-02-062-2/+48
* | Merge branch 'master' into advanced-permissions-phase-1George Goldberg2018-02-0664-1242/+480
|\|
generated by cgit v1.2.3-1-g7c22 (git 2.25.1) at 2024-05-20 00:16:19 +0000