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

340 Коммитов

Автор SHA1 Сообщение Дата
Corey Hulen
29a7e182a6 PLT-6079 Adding leader election (#7105) 2017-08-16 10:29:45 -07:00
Corey Hulen
0ab490845a PLT-6226 Fixing races with licensing (#7213)
* PLT-6226 Fixing races with licensing

* Fixing build issue

* Fixing licensing issue

* removing commented code
2017-08-16 09:51:45 -07: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
Joram Wilander
bbf6c81a06 Fix out-of-channel mentions for usernames with dashes (#7151) 2017-08-10 08:41:34 -04:00
Chris
ffbf8e51fe PLT-6358: Server HTTP client improvements (#6980)
* restrict untrusted, internal http connections by default

* command test fix

* more test fixes

* change setting from toggle to whitelist

* requested ui changes

* add isdefault diagnostic

* fix tests
2017-08-09 13:49:07 -07:00
George Goldberg
ab13de96a0 PLT-7288: Allow CLI to delete teams with no channels. (#7135) 2017-08-09 13:36:27 -07:00
Chris
ff0811e4a4 lint all the things (#7154)
* lint all the things

* remove extra echo
2017-08-09 13:35:49 -07:00
Chris
6b741c4cea testify (#7116) 2017-08-08 17:40:46 -05:00
Tejay Cardon
2105b10ccd FIXES PLT-6648 Add support for Server Side Encryption on S3 (#6467)
Help from Jason Blais on wording
Update storage_settings.jsx
Update en.json
2017-08-08 10:15:20 -04:00
Chris
2853b3a47b PLT-7263: truncate long issue descriptions (#7142)
* truncate long issue descriptions, add tests

* minor tweak to text template

* add license header

* remove tests for now (since dependency is blocked)

* remove second jira link
2017-08-08 08:41:33 -04: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
Chris
df1ff4ec97 PLT-7212: fix missing webhook post attachments (#7011)
* fix missing webhook post attachments

* make ProcessSlackAttachments return a new slice instead of modifying it
2017-08-03 16:25:47 -07: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
enahum
fa3dd6a84b If login is using mobile respond with JSON object (#7030) 2017-08-03 02:39:14 +08:00
Joram Wilander
4d45214394 Add more debugging info to server logs for failed OAuth requests (#7039) 2017-08-02 08:05:36 -07:00
Joram Wilander
2c5eefa17a Fix TestUpdateOAuthUserAttrs unit test (#7037) 2017-08-02 07:50:14 -07:00
George Goldberg
29be10ca2f PLT-7275: Configure replica/shard count for Elasticsearch indexes. (#7093) 2017-08-02 09:50:09 -04:00
Chris
65817e13c7 PLT-6965 jira integration (plus plugin scaffolding) (#6918)
* plugin scaffolding / jira integration

* add vendored testify packages

* webhook fix

* don't change i18n ids

* support configuration watching

* add basic jira plugin configuration to admin console

* fix eslint errors

* fix another eslint warning

* polish

* undo unintentional config.json commit >:(

* test fix

* add jira plugin diagnostics, remove dm support, add bot tag, generate web-safe secrets

* rebase, implement requested changes

* requested changes

* remove tests and minimize makefile change

* add missing license headers

* add missing comma

* remove bad line from Makefile
2017-08-02 01:36:54 -07: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
George Goldberg
25a2013890 PLT-6603: Don't return all posts on invalid query. (#7061)
If the query contains only * or invalid punctuation only components,
don't return all posts - instead return no results.

This also fixes PLT-6608
2017-07-31 11:45:35 -07: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
Harshavardhana
489602efe5 Allow regions to be set and honored for S3 driver. (#7010)
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
2017-07-31 12:22:52 -04:00
George Goldberg
c506c5cac6 PLT-6961: Add Elasticsearch settings to diagnostics. (#7021) 2017-07-31 11:53:44 -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
Jonathan
d01261a228 PLT-7177: Change the default email frequency to 15 minutes if batching is enabled on the server. (#7036)
* PLT-7177: Found default preference that needs to be changed

* PLT-7177: Front end behaves as desired

* PLT-7177: Changed default batching interval on server side

* PLT-7177: Added unit tests for new default interval

* PLT-7177: Removed unused import

* PLT-7177: Renamed constants to increase clarity
2017-07-31 11:51:43 -04:00
Chris
094c2f7308 fix away/offline/online commands repeating user message (#7060) 2017-07-31 11:26:54 -04:00
Christopher Speller
09b49c26dd PLT-5308 Caching layer part 2 (#6973)
* Adding Reaction store cache layer example

* Implementing reaction store in new caching system.

* Redis for reaction store

* Adding redis library

* Adding invalidation for DeleteAllWithEmojiName and other minor enhancements
2017-07-31 08:15:23 -07:00
Corey Hulen
22fa48f455 Don't send last view message for null channels (#7051) 2017-07-31 08:18:40 -04:00
Joram Wilander
da6e6ca0bf Fix TestCreateOAuthUser unit test (#7034) 2017-07-28 11:48:34 -06:00
Nick Frazier
cc3a95fdd9 Added websocket event and webapp handler for updating user roles (#6953) 2017-07-27 08:15:50 -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
f30c0b5d38 PLT-6596: Elasticsearch interface changes. (#6993) 2017-07-21 08:38:44 +08:00
Christopher Speller
58839cefb5 Upgrading server dependancies (#6984) 2017-07-20 15:22:49 -07: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
5f8a93fca6 PLT-6971: Fix Slack Import of non-ascii channel names. (#6969) 2017-07-19 13:57:28 -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
Saturnino Abril
21a3219b9b [PLT-6676] Make OutgoingWebhook to fire when post has no text content but only attachment (#6935)
* make OutgoingWebhook to fire when post has no text content but only attachment

* update per comment and modify payload & test
2017-07-18 15:43:31 -04:00
Joram Wilander
3e090162aa PLT-7126 Do not version detect on saml endpoints and remove config reloading (#6955)
* Do not version detect on saml endpoints and remove config reloading

* Update mattermost-redux
2017-07-18 06:22:49 +08:00
Joram Wilander
70bfcfb9d7 Only apply never edit policy setting when message changes (#6947) 2017-07-18 06:22:28 +08:00
Joram Wilander
10cde61958 Only apply edit policy setting if message changed (#6930) 2017-07-15 01:10:20 +08:00