summaryrefslogtreecommitdiffstats
path: root/i18n
Commit message (Collapse)AuthorAgeFilesLines
* Add ability to bulk import emoji (#9048)Joram Wilander2018-07-051-0/+16
| | | | | | | | * Add ability to bulk import emoji * Improve error handling * Update test config
* translations PR 20180702 (#9038)Elias Nahum2018-07-0314-8436/+1728
|
* add MaxLifetimeconns to server (#9004)Jerry Kurian2018-06-281-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 Espino2018-06-281-616/+88
| | | | | * Add English missed texts to i18n/en.json * Update en.json
* 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
| | | | | | | | | | | | * 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 Espino2018-06-211-2105/+761
| | | | | | * Sort translations * Added untranslated and removed unussed strings
* 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
| | | | | | | | * 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 Espino2018-06-161-3/+3
|
* Merge remote-tracking branch 'upstream/release-5.0' into ↵cpanato2018-06-151-0/+4
|\ | | | | | | release-5.0-merge-to-master-20180615
| * 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 ↵cpanato2018-06-147-345/+345
|\| | | | | | | release-5.0-merge-to-master-20180614-1
| * 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-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-10235: Make permissions reset CLI shcemes-aware. * Add i18n strings.
| * | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-2Martin Kraft2018-05-111-0/+4
| |\ \ \ \ \ \ \ \
| * | | | | | | | | MM-10140: API Implementation for Schemes related Endpoints (#8615)George Goldberg2018-05-031-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-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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-2Martin Kraft2018-05-0114-537/+1213
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into advanced-permissions-phase-2George Goldberg2018-04-271-0/+4
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2Martin Kraft2018-04-241-12/+8
| |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | MM-8796: Full implementation of "Schemes" in Store/Model/App layers. (#8357)George Goldberg2018-04-201-0/+80
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add Scheme model and stub store. * Port ChannelStore to be Scheme aware. * Make almost all the API/APP layer work with ChannelSchemes. Only thing still hacky is UpdateChannelMemberRoles(). * Add basic SchemeStore implementation. * Migrate UpdateChannelMemberRoles properly and fix tests. * Update store tests and mocks so they work. * Include creating default roles in Scheme create store function. * Implement role deletion and start scheme deletion. * Only use non-deleted roles for authorization. * Add GetByScheme method to Team store. * Add GetChannelsByScheme. * Update store mocks. * Implement scheme deletion in the store. * Rename is valid function. * Add offset and limit to queries to fetch teams and channels by scheme. * Fix queries. * Implement scheme awareness in Team store and add a migration. * Tidy up ChannelStore mapping functions and add exhaustive unit tests. * Add all missing i18n. * Proper tests for TeamStore internal functions and fix them. * Make additional TeamMember fields nullable. * Make new ChannelMember fields nullable. * Create new nullable columns without defaults. * Make new fields in large tables nullalble. * Fix empty list of TeamMembers. * Deduplicate SQL queries. * Fix spelling. * Fix review comment. * More review fixes. * More review fixes.
* | | | | | | | | | | | | | Push notification styling improvements (#8818)Elias Nahum2018-05-301-20/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Push notification styling improvements * Fix unit tests
* | | | | | | | | | | | | | MM-9547 Added config setting to control url autolinking schemes (#8862)Harrison Healey2018-05-301-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * MM-9547 Added config setting to control autolinking schemes * Renamed AutolinkingSchemes to CustomUrlSchemes
* | | | | | | | | | | | | | translations PR 20180528 (#8864)Elias Nahum2018-05-3014-94/+562
| | | | | | | | | | | | | |
* | | | | | | | | | | | | | MM-10731 Revert site url kill server (#8877)Christopher Speller2018-05-301-1/+1
| |_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Revert "MM-9983 Requiring SiteURL to be set. (#8769)" This reverts commit 0432f995ec27de9ee6cc2f5847d4a17fcc095a26. * Add log message for SiteURL not being set.
* | | | | | | | | | | | | [MM-1915] Add Deactivate Account - server side (#8699)Carlos Tadeu Panato Junior2018-05-281-0/+20
| |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | |
* | | | | | | | | | | | [MM-10645] Remove desktop duration notify props (#8851)Saturnino Abril2018-05-251-4/+0
| |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remove desktop duration notify props Signed-off-by: Saturnino Abril <saturnino.abril@gmail.com> * fix test Signed-off-by: Saturnino Abril <saturnino.abril@gmail.com>
* | | | | | | | | | | translations PR 20180522 (#8837)Elias Nahum2018-05-2414-118/+482
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * translations PR 20180522 * Fix italian translation
* | | | | | | | | | | MM-8622: Improved plugin error reporting (#8737)Jesse Hallam2018-05-231-0/+16
| |_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * allow `Wait()`ing on the supervisor In the event the plugin supervisor shuts down a plugin for crashing too many times, the new `Wait()` interface allows the `ActivatePlugin` to accept a callback function to trigger when `supervisor.Wait()` returns. If the supervisor shuts down normally, this callback is invoked with a nil error, otherwise any error reported by the supervisor is passed along. * improve plugin activation/deactivation logic Avoid triggering activation of previously failed-to-start plugins just becase something in the configuration changed. Now, intelligently compare the global enable bit as well as the each individual plugin's enabled bit. * expose store to manipulate PluginStatuses * expose API to fetch plugin statuses * keep track of whether or not plugin sandboxing is supported * transition plugin statuses * restore error on plugin activation if already active * don't initialize test plugins until successfully loaded * emit websocket events when plugin statuses change * skip pruning if already initialized * MM-8622: maintain plugin statuses in memory Switch away from persisting plugin statuses to the database, and maintain in memory instead. This will be followed by a cluster interface to query the in-memory status of plugin statuses from all cluster nodes. At the same time, rename `cluster_discovery_id` on the `PluginStatus` model object to `cluster_id`. * MM-8622: aggregate plugin statuses across cluster * fetch cluster plugin statuses when emitting websocket notification * address unit test fixes after rebasing * relax (poor) racey unit test re: supervisor.Wait() * make store-mocks