summaryrefslogtreecommitdiffstats
path: root/i18n
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into advanced-permissions-phase-1Martin Kraft2018-03-2314-87/+1191
|\
| * Timezone feature (#8185)Chris Duarte2018-03-221-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| * translations PR 20180319 (#8479)Elias Nahum2018-03-2014-87/+1179
| |
* | Merge branch 'master' into advanced-permissions-phase-1George Goldberg2018-03-198-76/+80
|\|
| * Merge remote-tracking branch 'origin/release-4.8' into t0merge48masterDerrick Anderson2018-03-157-76/+76
| |\
| | * translations PR 20180314 (#8458)Elias Nahum2018-03-147-76/+76
| | |
| * | MM-9688: Better error message for plugin enabling in HA mode (#8433)Chris2018-03-131-0/+4
| | | | | | | | | | | | | | | | | | * better error message for plugin enabling in HA mode * wording update
* | | Merge branch 'master' into advanced-permissions-phase-1George Goldberg2018-03-1314-37/+373
|\| |
| * | Merge branch 'release-4.8' into merge-4.8JoramWilander2018-03-0814-37/+349
| |\|
| | * translations PR 20180306 (#8414)Elias Nahum2018-03-0714-37/+349
| | |
| * | MM-8840: Add GlobalRelay Configuration Settings (#8304)Jonathan2018-03-081-0/+24
| | | | | | | | | | | | | | | | | | | | | | | | * Added new GlobalRelay config settings * Adding default values to global relay config * Migrate global relay config tests to table driven tests
* | | Merge branch 'master' into advanced-permissions-phase-1George Goldberg2018-03-0214-529/+717
|\| |
| * | PLT-7567: Integration of Team Icons (#8284)Christian Hoff2018-03-011-0/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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/+12
| |/
| * Fix push notification content for file only messages (#8346)Joram Wilander2018-02-221-0/+4
| |
| * Adding saml migration command (#8263)Jesús Espino2018-02-211-0/+12
| | | | | | | | | | | | * Adding saml migration command * Texts fixed
| * MM-8681 Adding config settings necessary for using CloudFront. (#8307)Christopher Speller2018-02-201-0/+4
| | | | | | | | | | | | * Adding config settings nessisary for using CloudFront. * Adding new config settings to diagnostics.
| * Update en.json (#8332)Jason Blais2018-02-201-1/+1
| |
| * MM-9556 Added ability to upload files without a multipart request (#8306)Harrison Healey2018-02-201-0/+4
| | | | | | | | | | | | * MM-9556 Added ability to upload files without a multipart request * MM-9556 Handled some unusual test behaviour
| * translations PR 20180220 (#8334)enahum2018-02-2014-241/+345
| |
| * merge 4.7.1 to masterSaturnino Abril2018-02-1914-289/+293
| |\
| | * translations PR 20180215Elias Nahum2018-02-1514-61/+113
| | |
| | * Merge branch 'release-4.7' into icu753Derrick Anderson2018-02-1414-244/+196
| | |\
| | | * Merge branch 'translations-20180212' into release-4.7Derrick Anderson2018-02-1414-244/+192
| | | |\
| | | | * translations PR 20180212Elias Nahum2018-02-1214-244/+192
| | | | |
| | | * | XYZ-111: Check max users per team on re-join after leave a teamJesús Espino2018-02-131-0/+4
| | | |/
| | * / ICU-753 Added unit tests for messages with only push notificationsHarrison Healey2018-02-131-2/+2
| | |/
| | * revert master changesDerrick Anderson2018-02-121-20/+16
| | |
* | | Merge branch 'master' into advanced-permissions-phase-1George Goldberg2018-02-191-0/+4
|\| |
| * | [PLT-539] Update incoming webhooks to accept multipart/form-data content (#7873)Carlos Tadeu Panato Junior2018-02-161-0/+4
| |/
* | Merge branch 'master' into advanced-permissions-phase-1George Goldberg2018-02-137-46/+38
|\|
| * Merge branch 'master' into release-4.7Chris2018-02-121-16/+20
| |\
| | * Merge branch 'release-4.7'Derrick Anderson2018-02-086-34/+34
| | |\
| * | | Added invite_id field to email invite url, along with validation of this ↵Jonathan2018-02-121-12/+4
| | |/ | |/| | | | | | | field on the server (#8235)
| * | translations PR 20180205 (#8200)enahum2018-02-076-34/+34
| | |
* | | XYZ-76: Add license check to patchRoles endpoint. (#8224)George Goldberg2018-02-081-0/+4
| | |
* | | Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-1Jesús Espino2018-02-071-16/+24
|\ \ \ | | |/ | |/|
| * | PLT-7537: Move channel CLI command posts system message to channel. (#8161)Vordimous2018-02-071-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * [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-071-16/+12
| |/ | | | | | | | | | | | | | | | | * 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-061-0/+4
| | | | | | | | on/off (#8211)
* | Merge branch 'master' into advanced-permissions-phase-1George Goldberg2018-02-0614-148/+1136
|\|
| * translations PR 20180129 (#8164)enahum2018-01-3014-141/+1129
| |
| * Used a consistent tense for system messages (#8079)Harrison Healey2018-01-261-7/+7
| |
* | XYZ-37: Advanced Permissions Phase 1 Backend. (#8159)George Goldberg2018-02-061-0/+28
|/ | | | | | | | | | | | | | | | | | | | | | | | | | * 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.
* XYZ-32: Increases size of position to 128 characters. (#8148)Martin Kraft2018-01-261-1/+1
| | | | | | | | | | * 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.
* Fixed spelling error (#8153)der-test2018-01-261-1/+1
|
* Merge branch 'release-4.6'Harrison Healey2018-01-2314-89/+245
|\
| * translations PR 20180115 (#8107)enahum2018-01-213-13/+13
| |
| * translations PR 20180109 (#8069)enahum2018-01-1214-78/+234
| | | | | | | | | | | | * translations PR 20180109 * Fix french translation
* | PLT-3383: image proxy support (#7991)Chris2018-01-221-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | * 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