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

9090 Коммитов

Автор SHA1 Сообщение Дата
Jonathan
bb2ca558bb PLT-7220: Jumping to a GM from a flagged messages doesn't add the GM to your LHS (#7319)
* Ensured that DM/GM channel is added to LHS when jump link is clicked in RHS

* Moved sidebar channel loading logic into global_actions so that it happens after the users' channels have been loaded

* Fixing checkstyle issues
2017-08-30 16:26:36 -04:00
Asaad Mahmood
9e3b74b4ef Minor bug fixes (#7305)
* PLT-7063 - Changing search bar bg and color

* PLT-7064 - Adjusting info popover styling

* PLT-7124 - Fixing sidebar with webrtc call ongoing

* PLT-7400 - Fixing semi transparent options list

* PLT-7491 - Showing send button on mobile
2017-08-30 16:19:15 -04:00
Jonathan
4660127fd0 PLT-7206: Remove the "Delete Channel" option for private channels if you're the last channel member and policy setting restricts channel deletion (#7314)
* Removed restriction that prevented last occupant of a channel from leaving. Any user can now leave any channel, except for the default Town Square channel

* Also removed last user leave limitation from navbar
2017-08-30 14:25:19 -04:00
Saturnino Abril
651dd33b29 set to default value with config is missing (#7320) 2017-08-30 13:54:16 -04:00
Jonathan
4c1f467442 PLT-7379: Timestamp on deleted, ephemeral, or pending post is a permalink (#7295)
* Removed permalink from system messages, general cleanup

* Removed permalink from deleted messages

* Removed permalink from pending messages

* Fixed post_info tests

* Changed permalink logic to remove permalinks from ephemeral messages, but leave them in place for system messages.

* Fixed check style
2017-08-30 20:06:29 +08:00
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
59798c1375 Fix permalink loading for non-loaded posts (#7310) 2017-08-29 13:13:03 -04:00
Jonathan
f1d1ce4e7e Show loading message if a team has been selected, in addition to showing it while loading the list of available teams. (#7307) 2017-08-29 10:48:19 -04:00
atp
6a312b2ad4 PLT-3638: Fix re-opening of collapsed preview on refresh (#7301)
In this change, user action for toggling the preview is stored in the browser localstorage. Hence If there us a preview visibility value is present
in the localstorage, that will be given the preference compared to the overall preview setting.
2017-08-29 10:47:32 -04:00
Joram Wilander
257edc9ea3 Experimental implementation for webapp plugins (#7185)
* Start of experimental implementation for webapp plugins

* Updates to webapp plugin architecture

* Update pluggable test

* Remove debug code
2017-08-29 09:54:02 -04:00
Joram Wilander
82a8bd99cc Enforce channel display name limits on slash command (#7309) 2017-08-29 17:48:38 +08:00
Joram Wilander
ce77d836fc Fix yarn.lock getting changed by make run (#7311) 2017-08-28 21:53:06 -07:00
Chris
ff50b0e138 add client4 apis needed for jira plugin (#7292) 2017-08-28 14:19:00 -05:00
Chris
6215c9159a add plugin http handler (#7289) 2017-08-28 11:27:18 -05:00
Chris Duarte
510b1a18f5 Manage version configurations client versions (#7220)
* Add config values for client versions. Return client versions in ping response.

* Manage client version through System Console.

* Added client versions to diagnostics

* Added translations messages en.json file.

* Hide Client Versions on System Console.
2017-08-28 12:22:54 -04:00
enahum
9e95af7809 PLT-7221 differentiate between RN and Classic sessions (#7303) 2017-08-28 08:31:28 -07:00
enahum
871b7eaa66 Include post_id and root_id to handle actions from the PN (#7286) 2017-08-28 11:54:23 -03:00
Corey Hulen
1709b94227 PLT-5745 Cleaning up duplicate calls (#7298)
* PLT-5745 Cleaning up duplicate calls

* Fixing missing calls

* Fixing broken test
2017-08-28 10:08:37 -04:00
Joram Wilander
a12cf549cf Set charset for OAuth2 authorize page (#7304) 2017-08-28 10:04:52 -04:00
Stan Hu
f9837c3ac0 Use path.Join to form log filename (#7293)
Omitting the trailing backslash in the directory could cause
Mattermost to crash due to permission issues.
2017-08-28 07:42:16 -04:00
Saturnino Abril
c81d0f120a update test snapshot for post_info (#7297) 2017-08-25 13:48:24 -07:00
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