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

9579 Коммитов

Автор SHA1 Сообщение Дата
Corey Hulen
4d243e9256 Fixing bad merge (#7247) 2017-08-17 12:45:51 -07:00
Christopher Speller
fd1301779f Merge branch 'release-4.1' 2017-08-17 09:35:36 -07:00
Asaad Mahmood
d41f1695e9 Minor UI improvements (#7137)
* PLT-7303 - Fixing manage members button

* Revert "PLT-7303 - Fixing manage members button"

This reverts commit 7dcb68a8e333a2c95444d417ed9a244c9c30aa99.

* PLT-7303 - Redesigning channel members popover

* Updating font size and positioning
2017-08-17 10:07:34 -04: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
Saturnino Abril
4e92d18017 set ephemeral message ("message deleted") without ("Only visible to you") visible to users other than the owner (#7201) 2017-08-17 10:14:59 +01:00
Chris
f80d50adbd PLT-7407: Back-end plugin mechanism (#7177)
* begin backend plugin wip

* flesh out rpcplugin. everything done except for minor supervisor stubs

* done with basic plugin infrastructure

* simplify tests

* remove unused test lines
2017-08-16 17:23:38 -05:00
Corey Hulen
4f85ed985d Fixing licensing (#7226) 2017-08-16 11:28:48 -07:00
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
Harrison Healey
32265df8be PLT-7353 Fixed being unable to use quotes in links (#7171) 2017-08-16 11:04:29 -04:00
George Goldberg
30cfc1aa3e PLT-7368: Don't clear search box on ESC in Chrome. (#7215) 2017-08-16 09:18:36 -04:00
Jason Blais
cc3d8a9180 Add note that users can be searched by token ID in the Users page (#7222)
* Update en.json

* Update custom_integrations_settings.jsx

* Update logs.jsx
2017-08-16 10:18:06 -03: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
Saturnino Abril
5cd45c9394 add emoji to recently used section when reacting to a post in RHS (#7217) 2017-08-16 16:59:05 +08:00
Joram Wilander
0033e3e37b PLT-7408 Move webhook handling into api4 package to fix EnableAPIv3 config setting (#7219)
* Move webhook handling into api4 package to fix EnableAPIv3 config setting

* Fix unit test
2017-08-16 04:25:36 +08:00
enahum
7d3719b5c6 translations PR 20170814 (#7210) 2017-08-15 23:22:22 +08:00
Saturnino Abril
8e646763e7 [PLT-7180] Fix delete/edit not showing on DotMenu at parent post of RHS (#7214)
* fix delete/edit not showing on DotMenu at parent post of RHS

* remove unnecessary shouldComponentUpdate
2017-08-15 23:20:19 +08:00
Saturnino Abril
fcd56927df disable intermittently failing test at TestGetAllTeams temporarily (#7211) 2017-08-15 23:03:39 +08:00
Harrison Healey
1a270744a7 PLT-7398 Removed flex-basis from search box (#7204) 2017-08-15 20:28:28 +08:00
Jonathan
e1e2566c67 PLT-7375: Email batching not on by default for accounts that have never touched their email settings (#7206)
* PLT-7375: Send batched emails if batching is enabled and user has not explicitly set their email interval preference

* PLT-7375: Reverting 4cf316fcd

* PLT-7375: Send batched emails if batching is enabled and user has not explicitly set their email interval preference

* PLT-7375: EnableEmailBatching was accidentally flipped to true in 10dcdeca4b, causing config_test.go::TestConfigFromEnviroVars to fail

* PLT-7375: EnableEmailBatching was accidentally flipped to true in 10dcdeca4b, causing config_test.go::TestConfigFromEnviroVars to fail

* PLT-7375: Reverted accidental changes to config

* PLT-7375: Manually fixing config.
2017-08-15 09:20:03 +08:00
Christopher Speller
c66bb2349e Adding default of EN to localization store (#7208) 2017-08-15 08:48:08 +08:00
Saturnino Abril
4cf316fcd3 [PLT-7342] Add function and tests to specifically determine @all & @channel (#7181)
* add function and tests to specifically determine @all & @channel

* uodate per comments - regex and tests
2017-08-12 02:01:11 +08:00
George Goldberg
638c38cc0d PLT-7336: Fix team API endpoints. 2017-08-11 18:20:10 +01:00
George Goldberg
e7053b971b PLT-6609: Fix hashtag highlighting of search results (#7175)
* PLT-6609: Don't highlight #hashtag.dot when searching for #hashtag

* Fix bug that broke pre-release.
2017-08-11 23:52:24 +08:00
Asaad Mahmood
44b976886f PLT-7323/PLT-7334 CSS fixes (#7155)
* PLT-7334 - Channel header cuts off list

* PLT-7323 - Fixing alignment for attachments

* PLT-7323 - Fixing close button for attachments

* Changed header description to use margin instead of padding
2017-08-11 22:39:05 +08:00
Joram Wilander
33d3818e1f Add character limit to channel header edit modal (#7179) 2017-08-11 21:51:40 +08:00
Corey Hulen
48741434aa PLT-7360 Adding SSE to compliance (#7165)
* Adding SSE to E20

* Fixing UI bug

* Fixing loc strings
2017-08-11 09:44:28 +08:00
Joram Wilander
3ff4719d46 Update mattermost-redux to webapp-4.1 branch (#7170) 2017-08-11 00:41:59 +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
Joram Wilander
5f823d703d Fix arrow keys when viewing images (#7161) 2017-08-11 00:40:44 +08:00
Joram Wilander
bbf6c81a06 Fix out-of-channel mentions for usernames with dashes (#7151) 2017-08-10 08:41:34 -04:00
Joram Wilander
70157ef0e3 Fix pinned posts not updating when list empty (#7164) 2017-08-10 12:33:52 +01: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
KenmyZhang
504582b824 when session id is invalid,the function "revokeSession" should return (#7127) 2017-08-09 13:36:59 -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
Jonathan
9309ad9d7a PLT-7301: Removed props mutation that was causing JS error, now passing locale as a prop directly instead of fetching it out of the user object (#7162) 2017-08-09 13:33:31 -07:00
Chris
58b2bcd907 reset post attachments on post prop change (#7158) 2017-08-09 13:24:45 -05:00
Jonathan
fd6856b674 PLT-7206: Remove the "Delete Channel" option for private channels if you're the last channel member and policy setting restricts channel deletion (#7050)
* PLT-7206: UI changes. Removed last user in channel loophole, refactored code to clean it up, added differentiated support for public and private channels, added unit tests. Still need to implement server-side checks

* PLT-7206: All helper methods in channel_utils.jsx now accept the same three boolean variables in the same order and use the same boolean logic to check their values.

* PLT-7206: Added unit tests for showManagementOptions(...)

* PLT-7206: Fixed test case descriptions

* Added unit tests for showCreateOption(...)

* PLT-7206: Added unit tests for canManageMembers(...)

* PLT-7206: Removed last person in channel loophole from server-side code

* PLT-7206: Reverted config.json

* PLT-7206: Fixed double negatives in unit test names

* PLT-7206: PR feedback - Removed confusing comment and unused variable
2017-08-09 09:34:09 -04:00
JoramWilander
d780ac6e27 Update unit test 2017-08-09 09:33:30 -04:00
JoramWilander
311335b62c Another team update 2017-08-09 09:22:57 -04:00
Chris
6b741c4cea testify (#7116) 2017-08-08 17:40:46 -05:00
JoramWilander
1885d2ec2a Minor updates to team 2017-08-08 16:20:07 -04:00
Saturnino Abril
c42510a7f4 add preparatory upgrade code for 4.2 (#7157) 2017-08-08 16:13:55 -04:00
enahum
70fe9e9e97 translations PR 20170807 (#7144)
* translations PR 20170807

* Fix pt-BR variable
2017-08-09 00:33:25 +08:00
Saturnino Abril
e359e28018 [PLT-7317] Fix emoji picker preview (#7136)
* fix emoji picker preview

* make use of sprite-sheet CSS for all system emojis
2017-08-08 23:48:41 +08:00
Harrison Healey
6964ae61dc Added unit tests for getFile headers (#7045)
* Added unit tests for getFile headers

* Fixed exe type test to run correctly on multiple platforms

* Make sure we close the body on all Client4 calls

* Changed Response.Response field to Response.Header

* Clarified type of Response.Header
2017-08-08 23:47:17 +08: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
George Goldberg
7683e751ab PLT-7311 Don't allow empty search in searchbar. (#7133) 2017-08-08 08:54:23 -04:00
Saturnino Abril
dcaed2c8e3 uncomment upgrade for 4.1 (#7128) 2017-08-08 08:48:01 -04:00