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

9162 Коммитов

Автор SHA1 Сообщение Дата
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
George Goldberg
5132c62d15 PLT-7309: Fix webook management when permitted for non-admins. (#7132) 2017-08-08 08:45:17 -04:00
George Goldberg
82407bd44a PLT-7313: Show help popover when search focused and empty. (#7134) 2017-08-08 08:44:12 -04:00
Saturnino Abril
bec6b90b8d bump mattermost-redux#e529791 at yarn.lock (#7141) 2017-08-08 08:42:27 -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
94117nl
2c8fe15cc8 Change "Cancel" button to "Close" (#7131) 2017-08-08 17:11:24 +08:00
George Goldberg
a4ce7371ca Revert "PLT-6609: Don't highlight #hashtag.dot when searching for #hashtag (#7109)" (#7147)
This reverts commit f4638aecec.
2017-08-08 09:58:28 +01:00
George Goldberg
f4638aecec PLT-6609: Don't highlight #hashtag.dot when searching for #hashtag (#7109) 2017-08-07 17:10:33 +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
Eric Sethna
2ab2baba58 Add beta tag to Elasticsearch (#7121)
* make Elasticsearch beta

* make Elasticsearch beta

* make Elasticsearch beta
2017-08-05 03:29:29 +08:00
Chris
efe477abf8 make suggestion box focus more robust, require more explicit enabling (#7123) 2017-08-04 14:07:08 -05:00
Chris
efdbb6ee54 fix some webhook attachments not truncating, lower short text to 300 chars (#7120) 2017-08-04 14:24:53 -04:00
Harrison Healey
fb2022fb1c PLT-6924 Added ability to disable file uploads/downloads on old mobile apps (#7117) 2017-08-04 11:05:33 -07:00
Harrison Healey
3998659236 PLT-7267 Refactored tracking of recent emojis to hide deleted emojis (#7102)
* Fixed local ESLint error

* PLT-7267 Refactored tracking of recent emojis to hide deleted emojis
2017-08-04 11:03:41 -07:00
Saturnino Abril
2c8a5ffd97 [PLT-2407] Improve ordering of uploaded attachments (#7022)
* improve ordering of uploaded attachments

* use LocalizationStore.getLocale() when comparing file names
2017-08-04 11:00:23 -07:00
William Gathoye
c973608ccb Fix issue 4161 (#6919)
* Fix issue 4161

* Minor tweaks

* Fix log title
2017-08-05 01:56:26 +08:00