summaryrefslogtreecommitdiffstats
path: root/i18n
Commit message (Expand)AuthorAgeFilesLines
* 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
|\
| * [MM-1915] Add Deactivate Account - server side (#8699)Carlos Tadeu Panato Junior2018-05-281-0/+20
* | Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2Martin Kraft2018-05-251-4/+0
|\|
| * [MM-10645] Remove desktop duration notify props (#8851)Saturnino Abril2018-05-251-4/+0
* | Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2Martin Kraft2018-05-2414-118/+498
|\|
| * translations PR 20180522 (#8837)Elias Nahum2018-05-2414-118/+482
| * MM-8622: Improved plugin error reporting (#8737)Jesse Hallam2018-05-231-0/+16
* | Merge branch 'master' into advanced-permissions-phase-2Martin Kraft2018-05-221-0/+4
|\|
| * MM-10352: Add locking incoming webhooks to a single channel. (#8835)George Goldberg2018-05-221-0/+4
* | Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2Martin Kraft2018-05-221-1/+1
|\|
| * MM-9983 Requiring SiteURL to be set. (#8769)Christopher Speller2018-05-181-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
|\|
| * Update email notification subject line and contents for Group Messages (#8689)Ugurcan Turkdogan2018-05-151-6/+30
| * Merge remote-tracking branch 'origin/release-4.10' into merge410rc5Derrick Anderson2018-05-1514-380/+384
| |\
| | * translations PR 20180511 (#8774)Elias Nahum2018-05-1414-380/+380
| | * [MM-10458] Change system response to "Could not find the channel" - bug fix (...Carlos Tadeu Panato Junior2018-05-111-0/+4
* | | Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2Martin Kraft2018-05-151-4/+0
|\| |
| * | MM-9739: deprecate the now unused Channels.ExtraUpdateAt (#8762)Jesse Hallam2018-05-141-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-4998 Adding LoginIdAttribute to allow LDAP users to change their login ID ...Christopher Speller2018-05-101-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-8622: improved plugin error handling (#8692)Jesse Hallam2018-05-011-3/+3
| * translations PR 20180430 (#8696)Elias Nahum2018-05-0114-128/+180
* | MM-10182 & MM-10183: Adds channel scheme and team scheme API endpoint. (#8680)Martin Kraft2018-05-021-0/+16
* | Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2Martin Kraft2018-05-0114-537/+1213
|\|
| * translations PR 20180424 (#8662)Elias Nahum2018-04-3014-529/+1205
| * [MM-10354] Add feature to remove team icon (#8684)Saturnino Abril2018-04-301-0/+8
| * Fixing some merge conflicts with structured logging. (#8685)Christopher Speller2018-04-271-8/+0
* | Merge branch 'master' into advanced-permissions-phase-2George Goldberg2018-04-271-0/+4
|\|
| * MM-10232, MM-10259: Improve error handling from invalid json (#8668)Jesse Hallam2018-04-261-0/+4
* | Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2Martin Kraft2018-04-241-12/+8
|\|
| * add api to convert a channel from public to private and restrict that to syst...Saturnino Abril2018-04-231-12/+8
* | MM-8796: Full implementation of "Schemes" in Store/Model/App layers. (#8357)George Goldberg2018-04-201-0/+80
|/
* MM-9779: Incorporate a Token into the invitations system (#8604)Jesús Espino2018-04-181-2/+2
* MM-10121: CLI command to reset permissions system to default state. (#8637)George Goldberg2018-04-181-0/+8
* MM-10020: avoid duplicating unique indexes (#8587)Jesse Hallam2018-04-161-16/+0
* [MM-9904] Add /invite slash command to invite users to a channel (#8482)Carlos Tadeu Panato Junior2018-04-161-0/+48
* Merge remote-tracking branch 'origin/release-4.9' into merge49rc5Derrick Anderson2018-04-1313-321/+217
|\
| * translations PR 20180411 (#8606)Elias Nahum2018-04-1213-321/+217
* | Fix error handling when requesting profile image for bad user ID (#8618)Joram Wilander2018-04-131-0/+4
* | MM-8180 Improve error message for testing smtp connections (#8608)Joram Wilander2018-04-121-2/+6
* | Fix mute channel when not a member and adding unit tests (#8609)Elias Nahum2018-04-121-0/+8
|/
* Minor text changes to /open, /join and /mute slash commands (#8569)Jason Blais2018-04-041-3/+3
* revert default ephemeral post message for out of channel mention (#8571)Saturnino Abril2018-04-041-10/+2