Граф коммитов

531 Коммитов

Автор SHA1 Сообщение Дата
Chris
213a072b38 PLT-6403: Interactive messages (#7274)
* wip

* finish first pass

* requested changes

* add DoPostAction to Client4
2017-08-29 16:14:59 -05:00
Joram Wilander
82a8bd99cc Enforce channel display name limits on slash command (#7309) 2017-08-29 17:48:38 +08:00
Chris
ff50b0e138 add client4 apis needed for jira plugin (#7292) 2017-08-28 14:19:00 -05:00
George Goldberg
50fc6e1e9e PLT-???? Prepare file upload infrastructure for Data Retention. (#7266)
* Prepare file upload infrastructure for Data Retention.

This commit prepares the file upload infrastructure for the data
retention feature that is under construction. Changes are:

* Move file management code to utils to allow access to it from jobs.

* From now on, store all file uploads in a top level folder which is the
  date of the day on which they were uploaded.

This commit is based on Harrison Healey's branch, but updated to work
with the latest master.

* Use NewAppError
2017-08-25 10:38:13 -04:00
Jason Blais
26ec8ffc3e Rename SAML in the System Console to SAML 2.0 + access token string fixes (#7182)
* Update en.json

* Update en.json

* Update admin_sidebar.jsx

* Update saml_settings.jsx
2017-08-18 12:02:06 -07:00
Saturnino Abril
9097289c2c [PLT-3377] Open up a shortcuts dialog instead of printing help text (#7064)
* open up a shortcuts dialog instead of printing help text

* Updating UI for keyboard shortcuts modal

* update PR per PLT-7284

* fix typo error

* fix mixed up shortcut keys

* move to client side

* fix shortcuts list, remove unused function and revert server side code for autocompletion

* remove quick team switcher
2017-08-18 17:04:05 +08:00
Christopher Speller
fd1301779f Merge branch 'release-4.1' 2017-08-17 09:35:36 -07:00
George Goldberg
22459ee17a PLT-7302: Aggregate Elasticsearch indexes over a certain age. (#7224)
* PLT-7302: Aggregate Elasticsearch indexes over a certain age.

This is done by a scheduled daily job, in order to keep the shard count
to a sensible level in Elasticsearch.

* Use map[string]string instead of StringMap
2017-08-17 10:05:17 -04:00
Chris
b122381e87 PLT-1649: add response_url support for custom slash commands (#6739)
* add response_url support for custom slash commands

* pr suggestions

* pr update / suggestion

* test fix
2017-08-16 08:17:57 -04:00
enahum
7d3719b5c6 translations PR 20170814 (#7210) 2017-08-15 23:22:22 +08:00
Saturnino Abril
6ba6431548 Merge 4.0.3 into release-4.1 (#7169)
* fix dm custom slash command regression (#7008)

* point mattermost-redux to webapp-4.0 latest (#7040)

* If login is using mobile respond with JSON object (#7030)

* Allow regions to be set and honored for S3 driver. (#7010) (#7073)

This is necessary for certain users where
GetBucketLocation API is disabled using IAM
policies. There is a field AmazonS3Region
which we need to re-purpose and use to support
this properly.

Fixes https://github.com/mattermost/platform/issues/6999

* [PLT-7231/PLT-7306] Fix GitLab SSO failure with non-English locale and make config locales more forgiving (#7106)

* make config locales more forgiving by assigning default values

* fix error text

* update per comment

* Minor updates to team

* Another team update
2017-08-11 00:41:10 +08:00
enahum
70fe9e9e97 translations PR 20170807 (#7144)
* translations PR 20170807

* Fix pt-BR variable
2017-08-09 00:33:25 +08:00
Asaad Mahmood
9eb8d93a0d Updating user access token UI (#7091)
* Updating user access token UI

Updating help text

Updating tokenlistClass

Updating string for token

Updating translations

Updating translations

Updating translations

* Updating translations

* Minor UI fix

* Update manage_tokens_modal.jsx

* Update user_settings_security.jsx

* Update en.json

* Fix merge conflicts
2017-08-06 17:23:16 -07:00
Jonathan
178ccd16cb System Console: Email notification content setting (#7122)
* PLT-7195: Added new config option, new license feature, and config UI to system console. Still need to implement behaviour change in email batching code

* PLT-7195: Modified batch emails to respect email notification content type setting

* PLT-7195: Tweaking the colours a bit

* PLT-7195: Added support for email notification content type setting in immediate (non-batched) notification messages. Attempted to clean up the code somewhat. Unit tests coming in a future commit

* PLT-7195: Added unit tests for non-batched emails

* Checked license when applying email content settings

* Changed return type of getFormattedPostTime
2017-08-06 07:52:35 +08:00
Saturnino Abril
9f3713aa98 [PLT-7231/PLT-7306] Fix GitLab SSO failure with non-English locale and make config locales more forgiving (#7125) 2017-08-06 06:45:46 +08:00
William Gathoye
c973608ccb Fix issue 4161 (#6919)
* Fix issue 4161

* Minor tweaks

* Fix log title
2017-08-05 01:56:26 +08:00
Jonathan
28726460d7 PLT-7223: Update "Database schema cannot be upgraded" error message to indicate expected version (#7079)
* PLT-7223: Updated error message to include relevant schema versions

* PLT-7223: Removed unit test. It poisons database state, and there's no recovery mechanism, because the code under test causes an ungraceful exit, so we can't fix the database in a defer statement. This causes the next test execution or server start to fail.

* PLT-7223: Incorporated @crspeller's suggestions into error message string
2017-08-04 12:44:44 -04:00
David Meza
b54d134299 PLT-6484 Add /leave command to leave a channel (#6402)
* PLT-6484 Add /leave command to leave a channel

* Text changes requeted on review.

* PLT-6484 Display the right error message when trying to /leave town-square

* PLT-6484 Be able to execute /leave command in direct and group message channels with the same effect as clicking x

* PLT-6484 Refactor to create new leave_private_channel_modal.jsx

* PLT-6484 Remove previous leave private channel logic to use new leave_private_channel_modal.jsx

* Remove dot in command description. Change localized error when leaving Town square.

* disable /leave command in reply threads on the right-hand sidebar, since it is not obvious which channel you should leave
2017-08-03 08:59:42 -04:00
Joram Wilander
713673c888 PLT-7194 Add email when adding user access tokens (#7087)
* Add email when adding user access tokens

* Update en.json

* Update en.json
2017-08-03 08:51:52 -04:00
Corey Hulen
43c523e839 PLT-7130 adding more generic push notificaiton message. (#7044)
* PLT-7130 adding more generic push notificaiton message.

* Fixing strings
2017-08-03 08:38:17 -04:00
Joram Wilander
5da5c0bbfb PLT-6987 User access token UI (#7007)
* Add user access token UI

* Fix enter press and update mattermost-redux

* Updating UI for access token stuff (#7066)

* Revert segment key
2017-08-01 11:06:53 -04:00
Saturnino Abril
88f398ffdd Revert " #4755 Combining consecutive user join/leave system messages to single message and few other changes." (#7072)
* Revert "PLT-6603: Don't return all posts on invalid query. (#7061)"

This reverts commit 25a2013890.

* Revert " #4755 Combining consecutive user join/leave system messages to single message and few other changes. (#5945)"

This reverts commit 8a91235fb3.
2017-08-01 08:16:45 -04:00
Debanshu Kundu
8a91235fb3 #4755 Combining consecutive user join/leave system messages to single message and few other changes. (#5945)
fix 7 and 8

remove @ at "{username} joined the channel"

refactor and update test
2017-08-01 02:17:21 +08:00
Joram Wilander
59992ae4a4 PLT-6763 Implement user access tokens and new roles (server-side) (#6972)
* Implement user access tokens and new roles

* Update config.json

* Add public post permission to apiv3

* Remove old comment

* Fix model unit test

* Updates to store per feedback

* Updates per feedback from CS
2017-07-31 12:59:32 -04:00
Carlos Tadeu Panato Junior
251f000c68 [PLT-6710] /rename [text] slash command: Rename the channel (#6570)
* /rename [text] slash command: Rename the channel

* update strings per review
2017-07-31 12:54:34 -04:00
Chris
72f61ab96a make cli team / channel delete operations also delete webhooks and slash commands (#7028) 2017-07-31 11:52:45 -04:00
George Goldberg
ff0a790516 PLT-7040: Fix capitalisation of Elasticsearch in Config. (#7020) 2017-07-27 08:48:02 +01:00
George Goldberg
4132a02319 PLT-7183: User/Channel NotifyProps Bulk Import. (#7019) 2017-07-26 08:51:25 +01:00
Chris
345dd400bb PLT-6706: add /code command (#6936)
* add /code command

* return an error for empty /code message
2017-07-24 14:55:37 -04:00
Carlos Tadeu Panato Junior
816bfbeb91 [PLT-6708] /purpose [text] slash command: Edit the channel purpose (#6569)
* /purpose [text] slash command: Edit the channel purpose

* update command on server side to check for direct or group channels

* update stings and block the dialog when is DM or GM

* update per review

* remove duplicate websocker event and apply the same for /header command

* update per review

* update
2017-07-21 15:04:41 -04:00
George Goldberg
02abaabf1f PLT-7123: Add tutorial, flags and favorites to bulk importer. (#7000) 2017-07-21 09:23:27 -04:00
George Goldberg
6c6f2a1138 PLT-6595-Server: Job Management APIs. (#6931)
* PLT-6595-Server: Job Management APIs.

* MANAGE_JOBS Permission

* Fix test.
2017-07-20 08:25:35 -07:00
George Goldberg
fe368a7456 PLT-6595: API to purge Elasticsearch indexes. (#6971) 2017-07-19 09:43:05 +01:00
Christopher Speller
97f34e483b Merge branch 'release-4.0' 2017-07-18 15:45:23 -07:00
enahum
cd5703c027 translations PR 20170714 (#6938) 2017-07-15 01:10:44 +08:00
enahum
0a78d58895 translations PR 20170710 (#6902) 2017-07-12 22:14:03 +09:00
George Goldberg
83d53ea98c PLT-6475: Elasticsearch Indexing Worker. (#6879) 2017-07-11 09:09:15 +01:00
George Goldberg
39b071bc0e Add optional config parameter to test elasticsearch endpoint. (#6877) 2017-07-07 12:12:14 -04:00
George Goldberg
db2f6cf076 PLT-6976: Elasticsearch capitalisation and tests. (#6839)
* Fixes Elasticsearch to have consistent capitalisation everywhere
  across the code and UI (except the config file unfortunately).
* Adds basic unit tests for Elastichsearch.
* Adds a Elasticsearch docker image to the Makefile to enable testing
  the Elasticsearch feature.
2017-07-07 15:36:17 +01:00
George Goldberg
0495a51949 PLT-6916: Redesign the jobs package and Jobserver. (#6733)
This commit redesigns the jobserver to be based around an architecture
of "workers", which carry out jobs of a particular type, and "jobs"
which are a unit of work carried by a particular worker. It also
introduces "schedulers" which are responsible for scheduling jobs of a
particular type automatically (jobs can also be scheduled manually when
apropriate).

Workers may be run many times, either in instances of the platform
binary, or the standalone jobserver binary. In any mattermost cluster,
only one instance of platform OR jobserver must run the schedulers. At
the moment this is controlled by a config variable, but in future will
be controlled through the cluster leader election process.
2017-07-07 15:21:02 +01:00
JoramWilander
15ad24d160 Minor fix 2017-07-06 17:28:38 -04:00
enahum
d59cac0314 translations PR 20170703 (#6836)
* translations PR 20170703

* Fix bad merge
2017-07-05 16:21:54 -04:00
George Goldberg
65289f26e7 Fix some duplicate message IDs in Bulk Importer. (#6850) 2017-07-05 07:49:30 -07:00
Chris
5bd60a4d1e add /search command (#6741) 2017-07-05 09:26:31 +08:00
Joram Wilander
8ec8948c84 PLT-6554 Add config setting to control enabling API version 3 (#6835)
* Add config setting to control enabling API version 3

* Update help text for APIv3 config setting (#6843)

* Update configuration_settings.jsx

* Update en.json
2017-07-04 16:12:02 -04:00
Joram Wilander
5507154992 Add some basic sorting support for GET /users endpoint (#6801) 2017-06-30 12:07:23 -04:00
enahum
c2cef78f04 translations PR 20170626 (#6756)
* translations PR 20170626

* Include italian as UI option
2017-06-30 10:16:43 -04:00
Saturnino Abril
eea64f8049 [PLT-5864] Move teammate name display setting to the System Console (#6681)
* move teammate name display setting to the system console

* update all the likes of TeammateNameDisplay names

* fix gofmt error

* rebase and fix conflict
2017-06-30 09:06:59 +01:00
George Goldberg
f2898927f1 PLT-6474: Server: Add elasticsearch/test endpoint to API. (#6792) 2017-06-29 17:40:14 -04:00
AJ Moon
84d5f314a0 PLT-6882 Disable /invite_people when account creation is set to false (#6709)
* PLT-6882 Disable /invite_people when account creation is set to false

* Disable /invite_people when account creation or email notifications are set to false
2017-06-29 10:42:33 -04:00