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

9069 Коммитов

Автор SHA1 Сообщение Дата
lindalumitchell
eec79e042e PLT-7356 and 7378 Reduce size of emoji test posts (#7291)
* PLT-7356 Split emoji test 1 into smaller test files

Prevent test files from splitting into multiple posts.

Reducing the number of emoji in each file (test-emoticons1.md through test-emoticons4.md) so each post is <4000 characters. Adding two new files to accommodate the emoji overflow: test-emoticons5.md and test-emoticons6.md

* PLT-7356 Split emoji test 2 into smaller test files

Prevent test files from splitting into multiple posts.

Reducing the number of emoji in each file (test-emoticons1.md through test-emoticons4.md) so each post is <4000 characters. Adding two new files to accommodate the emoji overflow: test-emoticons5.md and test-emoticons6.md

* PLT-7378 Split emoji test 3 into smaller test files

Prevent test files from splitting into multiple posts.

Reducing the number of emoji in each file (test-emoticons1.md through test-emoticons4.md) so each post is <4000 characters. Adding two new files to accommodate the emoji overflow: test-emoticons5.md and test-emoticons6.md

* PLT-7378 Split emoji test 4 into smaller test files

Prevent test files from splitting into multiple posts.

Reducing the number of emoji in each file (test-emoticons1.md through test-emoticons4.md) so each post is <4000 characters. Adding two new files to accommodate the emoji overflow: test-emoticons5.md and test-emoticons6.md

* PLT-7356 and 7378 Create test-emoticons5.md

Prevent test files from splitting into multiple posts.

Reducing the number of emoji in each file (test-emoticons1.md through test-emoticons4.md) so each post is <4000 characters. Adding two new files to accommodate the emoji overflow: test-emoticons5.md and test-emoticons6.md

* PLT-7356 and 7378 Create test-emoticons6.md

Prevent test files from splitting into multiple posts.

Reducing the number of emoji in each file (test-emoticons1.md through test-emoticons4.md) so each post is <4000 characters. Adding two new files to accommodate the emoji overflow: test-emoticons5.md and test-emoticons6.md
2017-08-25 10:43:06 -04:00
Corey Hulen
1c268dfd72 PLT-7318 fixing focus issue with IPad (#7287)
* PLT-7318 fixing focus issue with IPad

* Fixing for RHS
2017-08-25 10:42:04 -04: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
atp
99acf61068 PLT-5478: Hide collapse/expand arrow for image links when no image is available (#7216) 2017-08-25 10:31:30 -04:00
Asaad Mahmood
1a71589dce PLT-7224 - Updating post textbox UI (#7153)
* PLT-7224 - Updating post textbox UI

* Updating post textbox spacing

* Updating emoji icon
2017-08-25 10:29:31 -04:00
Harrison Healey
086365fb84 PLT-7417/PLT-7425 (#7278)
PLT-7417/PLT-7425 Update config.json defaults and removed admin console link settings
2017-08-25 10:24:52 -04:00
enahum
a360ac6dbd Fix log error message for UpdateLastActivityAtIfNeeded (#7282) 2017-08-25 15:15:23 +01:00
Chris
d13f192964 add attachments to rhs search results (#7290) 2017-08-25 15:08:03 +01:00
George Goldberg
1a2a02440c Other Packages: NewLocAppError -> NewAppError (#7283) 2017-08-25 18:04:37 +08:00
Saturnino Abril
f6e0310b50 [PLT-7390] Add Type = 'O' in getting open teams at sql store (#7207)
* add Type = 'O' in getting open teams at sql store

* updated PR
2017-08-24 00:19:15 +08:00
Corey Hulen
7dad3965a6 Switch hook debug msg to info (#7272) 2017-08-22 15:57:02 -07:00
Corey Hulen
f9632497a4 Fixing logging errors for Franz (#7273) 2017-08-22 15:10:31 -07:00
Sudheer
1f899c873e Fixed not being able to scroll down in message preview mode when using (#7194)
only couple of sentences in edit mode.
2017-08-22 12:34:34 -07:00
Alex White
6b27ae2bac Hiding the rogue webkit file input button (#7130) 2017-08-22 12:33:22 -07:00
Corey Hulen
b0e367b192 Fixing race in update channel (#7269)
* Fixing race in update channel

* Switching to struct copy
2017-08-22 10:20:54 -07:00
David Meza
1ce079d2d0 Add a + next to direct message on sidebar to open 'Direct Messages' modal (#7159)
* Add a + next to direct message on sidebar to open 'Direct Messages' modal

* Change + cick to display direct message modal without group message.
2017-08-22 08:13:46 -04:00
Carlos Tadeu Panato Junior
12a9180807 [PLT-1015] Make all Mattermost system emails Multi-Part, with both a HTML and Plain Text version. (#5698)
* Implementation to Make all Mattermost system emails Multi-Part, with both a HTML and Plain Text version

* update lib

* update code per review

* update to use the mattermost repo
2017-08-21 11:31:13 -07:00
Chris
65ccd4afb2 make hooks optional, short circuit if unimplemented (#7263) 2017-08-21 11:48:07 -05:00
Christopher Speller
5872a294aa Updating client dependancies. (#7253) 2017-08-21 10:18:40 -04:00
Sudheer
b2e53086b3 PLT-5747: Fixed inconsistent on-hover, tooltip, and active states for buttons. (#7174)
* Fixed LHS Team Sidebar on hover highlight.
 * Fixed LHS Main Menu on hover tooltip to show "Main menu".
 * Added On-hover highlight for Favorite button in channel heading.
 * Added active state for channel members icon.
   * Added active class based on internal react state with new changeCss rule.
 * Changed cursor to pointer on hovering a theme.
 * Fixed Invite New Member Add Button to have text-underline on hover.
2017-08-21 10:12:40 -04:00
atp
2986c38469 PLT-7256: Fix email rate selection when batching is disabled (#7202) 2017-08-21 10:00:40 -04:00
Saturnino Abril
22efdbe6fb fix expand/collapse arrows for youtube videos (#7240) 2017-08-21 08:06:34 -04:00
Jason Blais
d7b055f428 Minor string changes for JIRA setting (#7264)
* Update settings.jsx

* Update en.json
2017-08-21 08:04:33 -04:00
Chris
1222e6cd41 make config.json play nicely with version control (#7221) 2017-08-20 23:47:14 -05:00
Corey Hulen
4a8afebcdb Adding debugging for webhook (#7199)
* Adding debugging for webhook

* Fixing build error

* Moving error down
2017-08-18 15:58:26 -07:00
Corey Hulen
2b3f7d0bc3 Fixing bad merge (#7259) 2017-08-18 13:26:12 -07:00
Christopher Speller
2461c55d0d Ignoring primary key duplication errors on status saveorupdate (#7255) 2017-08-18 12:45:48 -07:00
Christopher Speller
17098fb2a3 Adding check for file write or minio/s3 bucket before server start. (#7254) 2017-08-18 12:22:29 -07:00
Asaad Mahmood
b60cc5b28e Multiple bug fixes (#7243)
* PLT-7320 - Fixing alignment of x icon

* PLT-7357 - Fixing close icon in compact view

* PLT-7322 - Fixing overflow for delete token modal

* PLT-7351 - Fixing flag icon alignment

* PLT-7393 - Fixing cursor on upload button

* PLT-7392 - Fixing scrollbar in admin console

* PLT-7376 - Fixing hover effect for mobile nav
2017-08-18 12:21:34 -07:00
Chris
f720288c10 windows support for plugin ipc (#7251)
* windows support for plugin ipc

* unix test fix
2017-08-18 12:21:01 -07:00
George Goldberg
42c6686602 PLT-7217: CLI command to change channel public/private type. (#7225)
This adds a channel modify CLI command, with the one property that it
can modify being the channel public/private type.
2017-08-18 12:14:52 -07:00
Joram Wilander
e40fd0b3b5 Remove temporary cookie code (#7218) 2017-08-18 12:09:01 -07:00
Christian Arnold
339b30e1da Added missing string for translation (#7203) 2017-08-18 12:08:00 -07:00
n1aba
13d76a0cb2 PLT-6451 Migrate installed_oauth_app.jsx to be pure and use Redux (#7190)
* Migrate installed_oauth_app.jsx to be pure and use Redux, add test

* Fix behavior for the error case
2017-08-18 12:06:32 -07:00
Harrison Healey
6df51f8617 PLT-7397 Added loadImage function instead of Image.prototype.load (#7184) 2017-08-18 12:03:04 -07: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
n1aba
f40f41ed53 PLT-6443 Migrate add_oauth_app.jsx to be pure and use Redux (#7232)
* Migrate add_oauth_app.jsx to be pure and use Redux, add tests

* Remove unused flux code for OAuthApps
2017-08-18 09:42:10 -04: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
96eab12027 Updating server dependancies. (#7246) 2017-08-17 17:19:06 -07:00
Chris
2c895ee66e webhook merge fix (#7250) 2017-08-17 15:07:47 -07:00
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