summaryrefslogtreecommitdiffstats
path: root/i18n
Commit message (Expand)AuthorAgeFilesLines
...
* Merge remote-tracking branch 'upstream/release-5.1' into release-5.1-daily-me...cpanato2018-07-1214-304/+616
|\
| * translations PR 20180711 (#9099)Elias Nahum2018-07-1114-304/+616
* | Merge remote-tracking branch 'upstream/release-5.1' into release-5.1-daily-me...cpanato2018-07-1014-621/+697
|\|
| * translations PR 20180709 (#9082)Elias Nahum2018-07-1013-620/+672
| * MM-11229: Fix invite people slash command and add test case. (#9074)George Goldberg2018-07-101-0/+4
| * MM-11228: Fix channel update/patch API endpoints. (#9073)George Goldberg2018-07-101-0/+4
| * MM-11227: Fix group msg slash command. (#9070)George Goldberg2018-07-101-0/+4
| * MM-11120 Adding setting to disable email invitations and rate limiting. (#9063)Christopher Speller2018-07-101-0/+8
| * MM-11174: Fix /msg slash command. (#9059)George Goldberg2018-07-101-0/+4
| * Update custom url schemes error message to reflect what we actually support (...Harrison Healey2018-07-091-1/+1
* | Merge remote-tracking branch 'upstream/release-5.1' into release-5.1-daily-me...cpanato2018-07-061-0/+4
|\|
| * MM-11118: disallow deleting direct or group channels (#9054)Jesse Hallam2018-07-051-0/+4
* | Add ability to bulk import emoji (#9048)Joram Wilander2018-07-051-0/+16
|/
* translations PR 20180702 (#9038)Elias Nahum2018-07-0314-8436/+1728
* add MaxLifetimeconns to server (#9004)Jerry Kurian2018-06-281-27/+31
* Add english missed texts to i18n/en.json (#8987)Jesús Espino2018-06-281-616/+88
* translations PR 20180625 (#8998)Elias Nahum2018-06-2714-26173/+11561
* MM-11008: Fix translation and change the code to be auto-extracted (#9009)Jesús Espino2018-06-261-0/+8
* MM-10570: Make permissions reset command clear custom role assignments. (#8976)George Goldberg2018-06-251-0/+60
* MM-8810: Add CSV Compliance export (#8966)Jesús Espino2018-06-221-9/+17
* Using i18n extract to generate the i18n/en.json file (#8980)Jesús Espino2018-06-211-2105/+761
* fix typo in en.json and remove trailing spaces (#8975)Carlos Tadeu Panato Junior2018-06-211-1/+1
* MM-10233: Add scheme importing to bulk importer. (#8928)George Goldberg2018-06-211-0/+72
* translations PR 20180619 (#8963)Elias Nahum2018-06-2014-268/+164
* Add missed translations (#8959)Jesús Espino2018-06-191-0/+80
* MM-6992 Added highlighting to elasticsearch results (#8861)Harrison Healey2018-06-191-0/+4
* Small translation fixes (#8940)Jesús Espino2018-06-161-3/+3
* Merge remote-tracking branch 'upstream/release-5.0' into release-5.0-merge-to...cpanato2018-06-151-0/+4
|\
| * Add more oauth logging and note about GitLab ToS for login (#8949)Joram Wilander2018-06-141-0/+4
* | Merge remote-tracking branch 'upstream/release-5.0' into release-5.0-merge-to...cpanato2018-06-147-345/+345
|\|
| * translations PR 20180613 (#8947)Elias Nahum2018-06-147-345/+345
* | MM-10790: Fix Slack Import logs that got broken in refactoring. (#8938)George Goldberg2018-06-111-16/+0
|/
* translations PR 20180604 (#8909)Elias Nahum2018-06-0514-643/+2723
* Merge branch 'advanced-permissions-phase-2'George Goldberg2018-05-311-4/+168
|\
| * MM-8853: Adding MANAGE_EMOJIS and MANAGE_OTHERS_EMOJIS permissions (#8860)Jesús Espino2018-05-291-4/+0
| * Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2Martin Kraft2018-05-281-0/+20
| |\
| * \ Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2Martin Kraft2018-05-251-4/+0
| |\ \
| * \ \ Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2Martin Kraft2018-05-2414-118/+498
| |\ \ \
| * \ \ \ Merge branch 'master' into advanced-permissions-phase-2Martin Kraft2018-05-221-0/+4
| |\ \ \ \
| * \ \ \ \ Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2Martin Kraft2018-05-221-1/+1
| |\ \ \ \ \
| * | | | | | MM-10235: Make permissions reset CLI shcemes-aware. (#8773)George Goldberg2018-05-171-0/+12
| * | | | | | MM-10615: Reset teams/channels to default scheme on delete scheme. (#8811)George Goldberg2018-05-171-4/+4
| * | | | | | MM-10591: Well known error for all scheme endpoints pre-migration. (#8812)George Goldberg2018-05-171-0/+4
| * | | | | | Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2Martin Kraft2018-05-1614-386/+414
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2Martin Kraft2018-05-151-4/+0
| |\ \ \ \ \ \ \
| * | | | | | | | MM-9728: Online migration for advanced permissions phase 2 (#8744)George Goldberg2018-05-141-0/+48
| * | | | | | | | Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2Martin Kraft2018-05-111-0/+4
| |\ \ \ \ \ \ \ \
| * | | | | | | | | MM-10140: API Implementation for Schemes related Endpoints (#8615)George Goldberg2018-05-031-0/+8
| * | | | | | | | | Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2Martin Kraft2018-05-0214-131/+183
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | MM-10182 & MM-10183: Adds channel scheme and team scheme API endpoint. (#8680)Martin Kraft2018-05-021-0/+16