summaryrefslogtreecommitdiffstats
path: root/model
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into advanced-permissions-phase-1Martin Kraft2018-03-234-0/+669
|\
| * Timezone feature (#8185)Chris Duarte2018-03-224-0/+666
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add supported timezones into config Remove Timezone list creation in favor of timezone from configs Add Timezone field to Users table Clean up format of SupportedTimezones in config * Remove unwanted change * Add test for updating user timezone * Add empty map[string]string if Timezone is null * Add EnableTimezoneSelection config * Revert back to map[string]string for ClientConfig * Refactor SupportedTimezones into timezones.json * Include timezones.json in TestConfigFlag * Add timezone api endpoint * Bump varchar size to 256 and setMaxSize in user_store * Refactor LoadConfig to LoadConfig and LoadTimezoneConfig * Remove unnecessary argument in LoadConfig, mail_test * Add test for timezone endpoint * Add license header * Refactor timezones endpoint to system.go * Add system base route to timezone endpoint * db timezone upgrade in db v4.9 * Avoid saving SupportedTimezones to config.json * Add timezonePath support in config * Remove EnableTimezoneSelection from config * Use return statement without return parameter * Refactor test for SupportedTimezones * Check for supportedTimezone != nil instead of using len * Decouple SupportedTimezones out of Config * Fix failing test * Add LastTeamIconUpdate back in upgrade.go * Write timezone config in config_flag_test * Add code fallback for default timezone support
| * 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 ↵Carlos Tadeu Panato Junior2018-03-131-2/+2
| | | | | | | | | | (#8453) Signed-off-by: cpanato <ctadeu@gmail.com>
* | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * sort by lastActivity * added status ordering to Users * sort offline before dnd * remove data not needed * added seperate call for when order=‘status’ is on GetUser request * remove PrintLn * styling fix * remove mistake * mistake 2 * better comment * explicit if statemnt * writing tests * removed manually added mocks * generated mock * ICU-668 Added unit tests * style fix * sort by lastActivity * added status ordering to Users * sort offline before dnd * remove data not needed * added seperate call for when order=‘status’ is on GetUser request * remove PrintLn * styling fix * remove mistake * mistake 2 * better comment * explicit if statemnt * writing tests * removed manually added mocks * generated mock * ICU-668 Added unit tests * style fix * reverse dnd and offline * Fixed app.SaveStatusAndBroadcast * Fixed incorrect merge * Fixing incorrect merge again
| * MM-8840: Add GlobalRelay Configuration Settings (#8304)Jonathan2018-03-082-14/+153
| | | | | | | | | | | | | | | | * Added new GlobalRelay config settings * Adding default values to global relay config * Migrate global relay config tests to table driven tests
| * 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-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 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
| | | | | | | | | | | | * Adding config settings nessisary for using CloudFront. * Adding new config settings to diagnostics.
| * MM-8710: Web Hub optimizations (#8293)Chris2018-02-202-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 Healey2018-02-201-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 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 ↵Jonathan Fritz2018-02-122-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-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 ↵Jesús Espino2018-02-192-0/+27
| | | | | | | | | | | | permissions (#8300)
* | | 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
|\|
generated by cgit v1.2.3-1-g7c22 (git 2.25.1) at 2024-06-11 20:52:01 +0000