Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'upstream/release-5.1' into ↵ | cpanato | 2018-07-10 | 14 | -621/+697 |
|\ | | | | | | | release-5.1-daily-merge-20180710 | ||||
| * | translations PR 20180709 (#9082) | Elias Nahum | 2018-07-10 | 13 | -620/+672 |
| | | |||||
| * | MM-11229: Fix invite people slash command and add test case. (#9074) | George Goldberg | 2018-07-10 | 1 | -0/+4 |
| | | |||||
| * | MM-11228: Fix channel update/patch API endpoints. (#9073) | George Goldberg | 2018-07-10 | 1 | -0/+4 |
| | | |||||
| * | MM-11227: Fix group msg slash command. (#9070) | George Goldberg | 2018-07-10 | 1 | -0/+4 |
| | | |||||
| * | MM-11120 Adding setting to disable email invitations and rate limiting. (#9063) | Christopher Speller | 2018-07-10 | 1 | -0/+8 |
| | | | | | | | | | | | | | | | | | | | | * Adding setting to disable email invitations. * Adding a setting and rate limiting for email invite sending. * Modifying email rate limit to 20/user/hour * Adding EnableEmailInvitations to client side config and command. | ||||
| * | MM-11174: Fix /msg slash command. (#9059) | George Goldberg | 2018-07-10 | 1 | -0/+4 |
| | | |||||
| * | Update custom url schemes error message to reflect what we actually support ↵ | Harrison Healey | 2018-07-09 | 1 | -1/+1 |
| | | | | | | | | (#9061) | ||||
* | | Merge remote-tracking branch 'upstream/release-5.1' into ↵ | cpanato | 2018-07-06 | 1 | -0/+4 |
|\| | | | | | | | release-5.1-daily-merge-20180706 | ||||
| * | MM-11118: disallow deleting direct or group channels (#9054) | Jesse Hallam | 2018-07-05 | 1 | -0/+4 |
| | | |||||
* | | Add ability to bulk import emoji (#9048) | Joram Wilander | 2018-07-05 | 1 | -0/+16 |
|/ | | | | | | | | * Add ability to bulk import emoji * Improve error handling * Update test config | ||||
* | translations PR 20180702 (#9038) | Elias Nahum | 2018-07-03 | 14 | -8436/+1728 |
| | |||||
* | add MaxLifetimeconns to server (#9004) | Jerry Kurian | 2018-06-28 | 1 | -27/+31 |
| | | | | | | | | | | | | | | | | | | | | | Update e.json string names and remove console log reorder variables update db.setConnMaxLifetime to take in *settings.MaxLifetimeConns Add MaxLifetimeConns to test Update variable names like MaxLifetimeConns to ConnMaxLifetimeMilliseconds Update time passed to SetConnMaxLifetime Revert "Update time passed to SetConnMaxLifetime" This reverts commit dc1c1b6d5a6404d4ee11c65d4756c19f9316794f. update en.json Update supplier_test.go and docker.go ConnMaxLifetimeMilliseconds to 3600000 | ||||
* | Add english missed texts to i18n/en.json (#8987) | Jesús Espino | 2018-06-28 | 1 | -616/+88 |
| | | | | | * Add English missed texts to i18n/en.json * Update en.json | ||||
* | translations PR 20180625 (#8998) | Elias Nahum | 2018-06-27 | 14 | -26173/+11561 |
| | |||||
* | MM-11008: Fix translation and change the code to be auto-extracted (#9009) | Jesús Espino | 2018-06-26 | 1 | -0/+8 |
| | |||||
* | MM-10570: Make permissions reset command clear custom role assignments. (#8976) | George Goldberg | 2018-06-25 | 1 | -0/+60 |
| | |||||
* | MM-8810: Add CSV Compliance export (#8966) | Jesús Espino | 2018-06-22 | 1 | -9/+17 |
| | | | | | | | | | | | | * MM-8810: Add CSV Compliance export * Only allowing to schedule actiances export throught the cli * De-duplicating some code * Fixes on texts * Fixes on translations | ||||
* | Using i18n extract to generate the i18n/en.json file (#8980) | Jesús Espino | 2018-06-21 | 1 | -2105/+761 |
| | | | | | | * Sort translations * Added untranslated and removed unussed strings | ||||
* | fix typo in en.json and remove trailing spaces (#8975) | Carlos Tadeu Panato Junior | 2018-06-21 | 1 | -1/+1 |
| | |||||
* | MM-10233: Add scheme importing to bulk importer. (#8928) | George Goldberg | 2018-06-21 | 1 | -0/+72 |
| | |||||
* | translations PR 20180619 (#8963) | Elias Nahum | 2018-06-20 | 14 | -268/+164 |
| | |||||
* | Add missed translations (#8959) | Jesús Espino | 2018-06-19 | 1 | -0/+80 |
| | |||||
* | MM-6992 Added highlighting to elasticsearch results (#8861) | Harrison Healey | 2018-06-19 | 1 | -0/+4 |
| | | | | | | | | * MM-6992 Added highlighting to elasticsearch results * Added a unique type for post search matches * Fixed Elasticsearch matches not being sent through API | ||||
* | Small translation fixes (#8940) | Jesús Espino | 2018-06-16 | 1 | -3/+3 |
| | |||||
* | Merge remote-tracking branch 'upstream/release-5.0' into ↵ | cpanato | 2018-06-15 | 1 | -0/+4 |
|\ | | | | | | | release-5.0-merge-to-master-20180615 | ||||
| * | Add more oauth logging and note about GitLab ToS for login (#8949) | Joram Wilander | 2018-06-14 | 1 | -0/+4 |
| | | |||||
* | | Merge remote-tracking branch 'upstream/release-5.0' into ↵ | cpanato | 2018-06-14 | 7 | -345/+345 |
|\| | | | | | | | release-5.0-merge-to-master-20180614-1 | ||||
| * | translations PR 20180613 (#8947) | Elias Nahum | 2018-06-14 | 7 | -345/+345 |
| | | |||||
* | | MM-10790: Fix Slack Import logs that got broken in refactoring. (#8938) | George Goldberg | 2018-06-11 | 1 | -16/+0 |
|/ | |||||
* | translations PR 20180604 (#8909) | Elias Nahum | 2018-06-05 | 14 | -643/+2723 |
| | |||||
* | Merge branch 'advanced-permissions-phase-2' | George Goldberg | 2018-05-31 | 1 | -4/+168 |
|\ | |||||
| * | MM-8853: Adding MANAGE_EMOJIS and MANAGE_OTHERS_EMOJIS permissions (#8860) | Jesús Espino | 2018-05-29 | 1 | -4/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * MM-8853: Adding MANAGE_EMOJIS and MANAGE_OTHERS_EMOJIS permissions * MM-8853: Removing unnecesary emoji enterprise feature * Create emojis migration * Adding MANAGE_EMOJIS and MANAGE_OTHERS_EMOJIS always to system admins * Simplifing permissions checks * Revert "Simplifing permissions checks" This reverts commit e2cafc1905fc9e20125dd9a1552d2d0c7340ae59. | ||||
| * | Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2 | Martin Kraft | 2018-05-28 | 1 | -0/+20 |
| |\ | |||||
| * \ | Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2 | Martin Kraft | 2018-05-25 | 1 | -4/+0 |
| |\ \ | |||||
| * \ \ | Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2 | Martin Kraft | 2018-05-24 | 14 | -118/+498 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'master' into advanced-permissions-phase-2 | Martin Kraft | 2018-05-22 | 1 | -0/+4 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2 | Martin Kraft | 2018-05-22 | 1 | -1/+1 |
| |\ \ \ \ \ | |||||
| * | | | | | | MM-10235: Make permissions reset CLI shcemes-aware. (#8773) | George Goldberg | 2018-05-17 | 1 | -0/+12 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * MM-10235: Make permissions reset CLI shcemes-aware. * Add i18n strings. | ||||
| * | | | | | | MM-10615: Reset teams/channels to default scheme on delete scheme. (#8811) | George Goldberg | 2018-05-17 | 1 | -4/+4 |
| | | | | | | | |||||
| * | | | | | | MM-10591: Well known error for all scheme endpoints pre-migration. (#8812) | George Goldberg | 2018-05-17 | 1 | -0/+4 |
| | | | | | | | |||||
| * | | | | | | Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2 | Martin Kraft | 2018-05-16 | 14 | -386/+414 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2 | Martin Kraft | 2018-05-15 | 1 | -4/+0 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | MM-9728: Online migration for advanced permissions phase 2 (#8744) | George Goldberg | 2018-05-14 | 1 | -0/+48 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * MM-9728: Online migration for advanced permissions phase 2 * Add unit tests for new store functions. * Move migration specific code to own file. * Add migration state function test. * Style fixes. * Add i18n strings. * Fix mocks. * Add TestMain to migrations package tests. * Fix typo. * Fix review comments. * Fix up the "Check if migration is done" check to actually work. | ||||
| * | | | | | | | | Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2 | Martin Kraft | 2018-05-11 | 1 | -0/+4 |
| |\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | MM-10140: API Implementation for Schemes related Endpoints (#8615) | George Goldberg | 2018-05-03 | 1 | -0/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Implement basic scheme CRUD endpoints. * Get All Schemes (Paged) Endpoint and store plumbing. * Add get teams/channels for schemes. * Fix unit tests. * Review fixes. * More review fixes. | ||||
| * | | | | | | | | | Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2 | Martin Kraft | 2018-05-02 | 14 | -131/+183 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | MM-10182 & MM-10183: Adds channel scheme and team scheme API endpoint. (#8680) | Martin Kraft | 2018-05-02 | 1 | -0/+16 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * MM-10183: Adds channel scheme API endpoint. MM-10182: Adds team scheme API endpoint. MM-10182_3: Switch from scheme_id in path to body. * MM-10182/MM-10183: Changes path from 'schemes' to 'scheme'. * MM-10182: Fix merge error. | ||||
| * | | | | | | | | | | Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2 | Martin Kraft | 2018-05-01 | 14 | -537/+1213 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' into advanced-permissions-phase-2 | George Goldberg | 2018-04-27 | 1 | -0/+4 |
| |\ \ \ \ \ \ \ \ \ \ \ |