summaryrefslogtreecommitdiffstats
path: root/i18n
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into advanced-permissions-phase-1Martin Kraft2018-03-2314-87/+1191
|\
| * Timezone feature (#8185)Chris Duarte2018-03-221-0/+12
| * 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
* | | 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
* | | 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-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
| * MM-8681 Adding config settings necessary for using CloudFront. (#8307)Christopher Speller2018-02-201-0/+4
| * 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
| * 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 fiel...Jonathan2018-02-121-12/+4
| | |/ | |/|
| * | 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
| * | XYZ-35: Added Support for GlobalRelay Compliance Export FormatJonathan2018-02-071-16/+12
| |/
| * ICU-715 Change ExperimentalGroupUnreadChannels setting to allow for default o...Harrison Healey2018-02-061-0/+4
* | 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-32: Increases size of position to 128 characters. (#8148)Martin Kraft2018-01-261-1/+1
* 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
* | PLT-3383: image proxy support (#7991)Chris2018-01-221-0/+8
generated by cgit v1.2.3-1-g7c22 (git 2.25.1) at 2024-05-20 00:38:30 +0000