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

166 Коммитов

Автор SHA1 Сообщение Дата
David Lu
96ca098f4b PLT-3473 Made shortcuts only work for CMD on OSX (#3479)
* checked for CMD key

* changed method of checking
2016-07-06 08:50:43 -04:00
Joram Wilander
5f7cb8cfbf PLT-3346/PLT-3342/PLT-3360 EE: Add the ability to restrict channel management permissions (#3453)
* EE: Add the ability to restrict channel management permissions

* Always allow last user in a channel to delete that channel
2016-07-06 08:23:24 -04:00
enahum
5f04dc4f45 SAML support (#3494)
* PLT-3073: Implement SAML/Okta Server side (EE) (#3422)

* PLT-3137 Support for SAML configuration

* PLT-3410 SAML Database Store

* PLT-3411 CLI to add Identity Provider Certificate and Service Provider Private Key

* PLT-3409 SAML Interface for EE

* PLT-3139 Handle SAML authentication server side

* Add localization messages

* PLT-3443 SAML Obtain SP metadata

* PLT-3142 Login & Switch to/from SAML

* Remove Certs for Database & Clean SAML Request

* Make required Username, FirstName and LastName

* PLT-3140 Add SAML to System Console (#3476)

* PLT-3140 Add SAML to System Console

* Move web_client functions to client.jsx

* Fix issues found by PM

* update package.json mattermost driver

* Fix text messages for SAML
2016-07-05 15:49:00 -04:00
Asaad Mahmood
f91b9d4a65 PLT-3418, PLT-2950, PLT-3375, PLT-3382, PLT-3446, PLT-3465: Multiple UI Improvements (#3449)
Improving help text margins

Updating changes for get link and create post files

Fixing icon for select team screen

Fixing styles for select team button

Adding improvements to posts UI

Adding improvement to post layout

Updating changes for post controls

Updating z-index for sidebar--right

Updating help text position

Fixing code for posts

Fixing css for post view

Pushing improvements for posts view

Updating changes for post view

Updating post layout

Fixing system time css

Updating header for system posts

Updating post css

Removing opacity and changing color for system messages

Simplifying root post and system post behaviour

Removing images from compact view

Updating help text for display

Updating embed preview text for advanced option

PLT-3490 - Fixing RHS issue on Edge
2016-07-05 15:46:36 -04:00
Thomas Balthazar
f4dd8e5796 PLT-1316/PLT-3280 Change client-side max file size limit (#3354)
* Change client-side max file size limit

It now relies on the value set in config.json.
Re-enable and tweak the max file size setting in system console.

* Update file upload error message
2016-07-05 15:37:21 -04:00
Harrison Healey
dc2f2a8001 PLT-3145 Custom Emojis (#3381)
* Reorganized Backstage code to use a view controller and separated it from integrations code

* Renamed InstalledIntegrations component to BackstageList

* Added EmojiList page

* Added AddEmoji page

* Added custom emoji to autocomplete and text formatter

* Moved system emoji to EmojiStore

* Stopped trying to get emoji before logging in

* Rerender posts when emojis change

* Fixed submit handler on backstage pages to properly support enter

* Removed debugging code

* Updated javascript driver

* Fixed unit tests

* Fixed backstage routes

* Added clientside validation to prevent users from creating an emoji with the same name as a system one

* Fixed AddEmoji page to properly redirect when an emoji is created successfully

* Fixed updating emoji list when an emoji is deleted

* Added type prop to BackstageList to properly support using a table for the list

* Added help text to EmojiList

* Fixed backstage on smaller screen sizes

* Disable custom emoji by default

* Improved restrictions on creating emojis

* Fixed non-admin users seeing the option to delete each other's emojis

* Fixing gofmt

* Fixed emoji unit tests

* Fixed trying to get emoji from the server when it's disabled
2016-07-05 11:58:18 -04:00
Asaad Mahmood
1f9eb4db6a Adding expand icon for RHS (#3386)
* Adding expand icon for RHS

Fixing errors

Adding back getTeamInviteLink with better functionality for mobile

Adding vertical align to post__link

Updating improvements for expand RHS stuff

* Improving transition on mobile

* Removing irrelevant changes
2016-06-29 16:04:37 -08:00
Joram Wilander
b97b3ae617 EE: Add the ability to restrict the user roles that can send team invites (#3442) 2016-06-29 14:16:17 -04:00
Harrison Healey
459eee85a9 PLT-3269 Moved formatting toggle behind EnableDeveloper setting (#3402)
* Force formatting to be enabled if testing is disabled

* Moved formatting toggle behind EnableDeveloper setting
2016-06-27 08:16:01 -04:00
Harrison Healey
6b22a8e816 PLT-3211 Fixed search highlighting for hashtags starting with "#in", "#from", or "#channel" (#3400)
* Fixed clicking hashtags/@mentions adding a # to the url

* Updated punctuation trimming regex for searching to better match the server

* Fixed search term splitting to not break up hashtags starting with a search flag (in, from, etc)
2016-06-22 18:32:59 -04:00
Christopher Speller
14510ce194 Adding webpack code splitting (#3377) 2016-06-22 10:30:01 -04:00
Asaad Mahmood
b130a32eac Multiple UI fixes (#3357)
* Multiple UI fixes

* Removing utils from tutorial file
2016-06-16 09:20:43 -08:00
Kevyn Bruyere
d6fdd93679 PLT-946 Add status icon to the left of the username in DM channel (#3258)
Add a StatusIcon component to be able to display a status icon from anywhere
2016-06-15 06:30:32 -06:00
David Lu
dbcf8572e5 Fixed @all not working as intended (#3335) 2016-06-15 08:13:47 -04:00
Harrison Healey
ba77aefe02 PLT-3202 Re-render timestamps when display settings switch between 12h and 24h (#3337)
* Made post timestamp switch from 12h to 24h without refreshing

* Made RHS post timestamps switch from 12h to 24h without refreshing
2016-06-15 08:13:17 -04:00
Harrison Healey
163d29f8fa Added text emoticons to autocomplete (#3312) 2016-06-15 08:02:22 -04:00
Joram Wilander
0f7a8f0fb5 Distinguish between static embeds and toggleable embeds (#3333) 2016-06-15 08:01:52 -04:00
JoramWilander
5af526c259 Merge branch 'release-3.1'
Conflicts:
	webapp/components/create_comment.jsx
2016-06-13 15:29:24 -04:00
enahum
18c53e03eb PLT-3221 Remove async call to get posts when creating a comment and editing a post (#3300)
PLT-3203 Commenting on the RHS while in permalink view makes the message not show up in the RHS
2016-06-09 11:28:57 -07:00
enahum
3a6694cc6b PLT-3203 Commenting on the RHS while in permalink view makes the message not show up in the RHS (#3282) 2016-06-07 17:43:36 -04:00
Harrison Healey
bde4326458 Properly removed hashtags and at mentions inside of markdown links (#3283) 2016-06-07 17:43:19 -04:00
David Lu
ea99cedb62 PLT-3185 Added support for DMs in Channel Switcher (#3260)
* Added support for DMs

* Checked username beginning characters
2016-06-06 13:54:23 -04:00
Joram Wilander
1e245f19c7 PLT-3114 Moved preview collapse out of pre-release features (#3206)
* Added user setting to auto collapse image previews

* Added slash commands for collapsing/expanding image previews

* Added translation strings for collapse setting

* Add default props for preview collapse setting
2016-06-06 10:41:54 -07:00
David Lu
2c42294bbc PLT-3101 Added message history (#3205)
* Added message history

* Minor logical changes

* Fixed indexes resetting

* Fixed double messages

* Fixed resetting main history when RHS opened
2016-06-06 13:01:35 -04:00
enahum
6cee1f87f2 PLT-2990 Clicking on a desktop notification from another team opens the team (#3253) 2016-06-06 09:46:09 -04:00
Asaad Mahmood
353216e05c PLT-3182 - Improving switch channels modal and some minor UI improvements (#3238)
* PLT-3182 - Improving switch channels modal and some minor UI improvements

Enabling link previews

Adding compact layout to RHS

Improving timestamps

* Adding update code for RHS components
2016-06-06 08:46:03 -04:00
Asaad Mahmood
7b99ac0a91 PLT-3177 - Fixing ordering for custom themes (#3226)
Fix for bot tag and webhook attachments

Adding theme styling for webhooks

Removing embed styling

Improving margins on compcat view for line breaks
2016-06-03 07:58:23 -04:00
Harrison Healey
0e677f35bb Removed hashtag/mention links that appear within text for markdown links (#3199) 2016-06-02 19:48:43 -03:00
David Lu
9509398d32 PLT-2962 Added channel switcher modal (#3216)
* Added channel switcher modal

* Fixed typos

* Added handling for duplicate channels
2016-06-02 19:45:38 -03:00
Asaad Mahmood
848a8663ed Multiple UI improvements (#3220)
* Multiple UI improvements

* Pushing time fix

* Fixing absolute time stamps on IOS
2016-06-02 12:34:47 -07:00
David Lu
4b06362172 Added scrolling, move out of navbar (#3163)
Added magic number, removed jqueryi
2016-06-01 13:05:48 -07:00
Harrison Healey
5f7ce2214a Improved internal links which use react-router (#3180) 2016-06-01 08:52:28 -04:00
Harrison Healey
f5ccfb362e Reorganized syntax highlighting code and added search term highlighting for code blocks with syntax highlighting (#3191) 2016-06-01 08:28:54 -04:00
David Lu
89717c2a77 Added maxlength for nicknames (#3186) 2016-05-31 16:20:27 -04:00
Harrison Healey
6e6257fcca Removed unnecessary wbrs (#3182) 2016-05-31 16:11:23 -04:00
Harrison Healey
9e1cf71bc3 Fixed emoticons consuming the preceeding whitespace (#3187) 2016-05-31 16:10:12 -04:00
Harrison Healey
4a326dd6ce PLT-1626/PLT-1424/PLT-1473/PLT-1483 Improved search highlighting (#3171)
* PLT-1626 Stopped breaking up hyphenated hashtags when highlighting search terms

* Made hashtag search highlighting case independent

* PLT-1424 Improved search highlighting when searching for CJK characters

* PLT-1473 Added search term highlighting to single-line code blocks

* PLT-1473 Added search term highlighting to code blocks that don't use syntax highlighting

* PLT-1483 Added proper highlighting of at mentions

* Fixing formatting
2016-05-31 10:37:59 -04:00
Harrison Healey
c5deb333db Added validation to make sure theme entries are colours (#3107)
* Added validation to make sure theme entries are colours

* Added serverside validation for theme
2016-05-31 08:15:33 -04:00
Joram Wilander
0dfac9875e Add license expiry messages (#3153) 2016-05-30 09:59:53 -04:00
Harrison Healey
fe5db12374 PLT-3080 Added ability to disable formatting for debugging and updated marked to fix errors (#3141)
* Removed injectIntl from user_settings_advanced.jsx

* Added setting to disable formatting for debugging

* Updated fork of marked
2016-05-30 07:57:44 -04:00
samogot
e1bebb2d77 PLT-2321 Move the toggle icon next to the link being previewed (#3071)
* PLT-2321 Move the toggle icon next to the link being previewed
only applicable to one-line messages started with link

* remove useless "Youtube" header when no title is available

* allow breaking long links instead of toggle

* simplify "/" to "/<wbr />" replacing
fix empty post without additional content body

* discard buggy "simplification"
2016-05-27 19:31:02 -04:00
Joram Wilander
6399a94ce2 PLT-2672 Refactored posts view with caching (#3054)
* Refactored posts view to use view controller design

* Add post view caching

* Required updates after rebase

* Fixed bug where current channel not set yet was causing breakage
2016-05-27 16:01:28 -04:00
David Lu
1736947f0e Added BOT in RHS (#3136)
Changed BOT to constant
2016-05-27 08:38:35 -07:00
Harrison Healey
1e7805b790 Fixed ESLint errors (#3134) 2016-05-27 09:56:41 -04:00
Harrison Healey
15e427e806 PLT-1458 Updated list autonumbering (#3126)
* Removed MattermostLexer since it was exactly the same as the default marked one

* Updated list autonumbering to always start numbering from the first item's number
2016-05-27 08:22:22 -04:00
Joram Wilander
6fecfcc7ca Refactor login, claim and create_team into views and add actions (#3110) 2016-05-26 09:46:18 -04:00
Harrison Healey
6092be8af1 Updated our fork of marked and prevented catastrophic backtracking (#3098) 2016-05-25 08:38:03 -07:00
Harrison Healey
3b5a5110c7 Revert "Updated our fork of marked and added more links to test-links.md (#3047)" (#3090)
This reverts commit c868620693.
2016-05-24 07:12:02 -07:00
David Lu
8e5c318590 Removed isTestDomain (#3069) 2016-05-24 08:39:11 -04:00
David Lu
6438c696b0 Added all keycodes (#3079) 2016-05-23 12:52:02 -07:00