Commit Graph

1093 Commits

Author SHA1 Message Date
enahum
4dcbe4bf09 fix OAuth provider when running test multiple times (#3782) 2016-08-11 08:47:12 -08:00
enahum
b523f98675 PLT-3879 Fix OAuth provider routes (#3780) 2016-08-10 14:20:31 -05:00
enahum
6b0e3d62fb PLT-3865 Fix OAuth provider routes (#3768) 2016-08-09 10:43:54 -05:00
Harrison Healey
0afa28de09 Changed autodetection of SiteURL (#3764)
* Changed autoconfiguration of SiteURL to be done on every request

* Added SiteURL to system console
2016-08-09 08:53:22 -05:00
MARUYAMA Takayuki
953b14ab22 Fix garbled mail subject (#3694)
* Fix garbled mail subject

* Notification email subject including full month
2016-08-04 13:27:15 -04:00
Corey Hulen
59d971dc75 PLT-2899 adding clustering of app servers (#3682)
* PLT-2899 adding clustering of app servers

* PLT-2899 base framework

* PLT-2899 HA backend

* PLT-2899 Fixing config file

* PLT-2899 adding config syncing

* PLT-2899 set System console to readonly when clustering enabled.

* PLT-2899 Fixing publish API

* PLT-2899 fixing strings
2016-08-04 13:25:37 -04:00
Joram Wilander
0184d6059b PLT-3506 Added flagged posts functionality (#3679)
* Added flagged posts functionality

* UI Improvements to flags (#3697)

* Added flag functionality for mobile

* Updating flagged text (#3699)

* Add back button to RHS thread when coming from flagged posts

* Updating position of flags (#3708)

* Plt 3506 - Reverting flag position (#3724)

* Revert "Updating position of flags (#3708)"

This reverts commit aaa05632c5.

* Fixing the icon in search

* Help text and white space improvements (#3730)

* Updatng help text and some white spacing.

* Updating help text
2016-08-04 10:38:09 -05:00
enahum
5bc3cea6fe PLT-3484 OAuth2 Service Provider (#3632)
* PLT-3484 OAuth2 Service Provider

* PM text review for OAuth 2.0 Service Provider

* PLT-3484 OAuth2 Service Provider UI tweaks (#3668)

* Tweaks to help text

* Pushing OAuth improvements (#3680)

* Re-arrange System Console for OAuth 2.0 Provider
2016-08-03 13:19:27 -04:00
Harrison Healey
790dd91e7d PLT-3702 Fixed outgoing webhook creation API to properly clear error flags for public channels (#3719) 2016-08-02 17:47:16 -04:00
Harrison Healey
c4a3118e9f PLT-3408 Add SiteURL to config.json (#3692)
* PLT-3408 Changed serverside code to get the service's URL from config.json

* PLT-3408 Changed most clientside code to use the SiteURL config setting instead of window.location

* PLT-3408 Changed default SiteURL to be autodetected
2016-08-02 16:37:09 -04:00
Joram Wilander
3f8dda6f5a PLT-3633 EE: Add Google and Office365 SSO through OAuth2 (#3660)
* EE: Add Google and Office365 SSO through OAuth2

* Add localization strings

* Text tweaks for PLT-3633

* Added sign-up button for Office 365

* Updated some error messages and a bit of licensing

* Updated sign-in method section in user settings to include Google and Office365

* Added more localization strings
2016-07-29 14:58:37 -04:00
Harrison Healey
56fd348123 PLT-3752 Changed email connection test to use the existing password if unchanged by client (#3685) 2016-07-29 10:09:22 -04:00
Christopher Speller
f5375254f9 Adding migration support to LDAP from other account types (#3655) 2016-07-26 17:39:51 -04:00
Christopher Speller
528890dba0 Changing LDAP behavour so users disabled in LDAP server are disabled in Mattermost. (#3669) 2016-07-26 12:39:35 -04:00
Pierre Rudloff
564dffec35 Add option to trigger outgoing webhook if first word starts with trigger word (#3611) 2016-07-26 08:04:28 -04:00
Harrison Healey
9c2c941449 PLT-1866/PLT-3509 Added links to download the native apps (#3651)
* PLT-1866 Added configurable links for native app downloads

* PLT-1866 Added native app download link to main menu

* PLT-3509 Added native app link to tutorial

* PLT-3509 Added native app link to welcome email

* PLT-3509 Made link to apps in welcome email conditional on being set
2016-07-22 10:53:57 -04:00
Corey Hulen
946302d9a2 PLT-3691 Fixing mobile session (#3652)
* PLT-3691 Fixing mobile session

* Fixing unit tests
2016-07-21 12:36:11 -04:00
Joram Wilander
bfa04c0ab0 PLT-2408 Adds here mention for online users (#3619)
* Added @here mention that notifies online users

* Fixed existing race condition that would sometime cause clients to miss mention count changes

* Added missing localization strings

* Prevent @here from mentioning the user who posted it
2016-07-21 10:00:09 -04:00
David Lu
f0e9ec2dd1 Fixed /join (#3647) 2016-07-21 09:16:20 -04:00
enahum
86d496c9b7 PLT-3629 fix uploading certificates if the files in the config do not exists (#3634) 2016-07-20 13:01:10 -08:00
Christopher Speller
24bef929dc Restricting visibility of detailed_error message (#3629) 2016-07-19 08:40:13 -08:00
samogot
f31e8e09f5 PLT-914 Add mention notifications for replies on a comment thread (#3130)
* PLT-914 Add mention notifications for replies on a comment thread

* remove useless store method
fix highlighting comments posted before th user write something to thread

* refactor out isCommentMention function after rebase

* change comment bar highlighting to replay icon mention highlighting

* settings and always visible highlight

* fix unit tests for new settings

* change highlight behaviour
- if any message in comment thread generates mention - all thread is highlighted
- remove always visible highlightion

* fix bug about the textarea in the center channel not clearing

* fix default settings value notify_props.comments

* do not highlight own comments if there is no other user's messages in thread

* refactor out ReactDOM.findDOMNode

* refactor out using of UserStore from component
2016-07-19 08:27:23 -04:00
Joram Wilander
4d3b831fd4 Fix possible race condition in TestUserTyping test case (#3612) 2016-07-18 11:20:32 -04:00
Joram Wilander
c0ab2636d6 PLT-2241 Refactored statuses into a more real-time system (#3573)
* Refactored statuses into a more real-time system

* Updated package.json with correct commit and fixed minor bug

* Minor updates to statuses based on feedback

* When setting status online, update only LastActivityAt if status already exists
2016-07-18 11:10:03 -04:00
Harrison Healey
f7b3731b2b Merge branch 'release-3.2' into 'master' 2016-07-15 12:26:32 -04:00
Christopher Speller
942ae4c527 Cleaning up old export code (#3601) 2016-07-15 11:20:39 -04:00
David Lu
34077a407b made /shortcuts separate for mac (#3571) 2016-07-14 11:57:06 -08:00
Joram Wilander
c67729d7b6 Increased wait time for TestUserTyping event test case (#3587) 2016-07-14 09:06:15 -08:00
Harrison Healey
caabfbcdd5 PLT-2992 Added the ability to use different themes for each team (#3411)
* Cleaned up user_settings_theme.jsx and import_theme_modal.jsx

* Made ImportThemeModal use a callback to return the theme to the user settings modal instead of saving it directly

* Moved user theme from model to preferences

* Added serverside API to delete preferences TODO update package with client stuff

* Changed constants.jsx so that Preferences and ActionTypes can be imported on their own

* Updated ThemeProps migration code to properly rename solarized code themes

* Fixed warnings thrown by AppDispatcher

* Added clientside UI to support team-specific themes

* Removed debugging code from test

* Fixed setting a user's theme when they haven't set their theme before
2016-07-14 10:08:36 -04:00
David Lu
8e810bc2eb PLT-3153 Converted slash command triggers to lowercase on save (#3577)
* Converted slash command triggers to lowercase on save

* Made slash commands case insensitive
2016-07-14 10:05:25 -04:00
samogot
9b9facd3d2 PLT-3366 Holding down the ALT key and clicking on a message adds a new messages indicator (squashed) (#3374) 2016-07-14 08:19:27 -04:00
David Lu
2e7e0d09b8 Removed system message on /msg success (#3579) 2016-07-14 08:17:24 -04:00
enahum
8346bfec37 PLT-3584 Fix no team found when creating account (#3552) 2016-07-13 09:13:13 -08:00
enahum
0a6bdceccb PLT-3384 Improve the "Verify Email" email (#3564) 2016-07-13 09:03:46 -08:00
David Lu
1df0488932 Fixed invalid password error when admin resets password (#3578) 2016-07-13 12:44:26 -04:00
Christopher Speller
4775631ed4 Revert "Login error messages fix (#3525)"
This reverts commit 2e513c8fd4.
2016-07-12 15:18:25 -04:00
Christopher Speller
7c8654171e Revert "Letting email not validated error message through login. Changing invalid credentials error. (#3546)"
This reverts commit 128e4f984a.
2016-07-12 15:17:46 -04:00
Harrison Healey
954e251188 Merged release-3.2 into master 2016-07-12 10:52:43 -04:00
Christopher Speller
c976c2881c Some improvments to password handling (#3549) 2016-07-12 10:09:04 -04:00
Christopher Speller
128e4f984a Letting email not validated error message through login. Changing invalid credentials error. (#3546) 2016-07-12 10:08:54 -04:00
Joram Wilander
ad343a0f4a Added infrastructure for basic WebSocket API (#3432) 2016-07-12 09:36:27 -04:00
Harrison Healey
9481a4f0ef Merge release 3.2 into master (#3548)
* Bumping version to: 3.2.0-rc1

* PLT-2863 fixing bad merge that broke this PR (#3523)

* PLT-2863 adding remove user from team

* PLT-2863 adding the client side UI

* Fixing trailing space

* Fixing reported issues

* Adding documentatino

* Switching to final javascript driver

* Fixing bad merge

* Fixing bad merge

* PLT-3538 Fix Login page doesn't show SAML option if gitlab is enabled (#3524)

* Login error messages fix (#3525)

* daily translations 20160708 (#3533)

* Fixed permissions when getting a file attachment to use the correct user id (#3535)

* PLT-3575 Fix Cannot upload certificates with .cer file extension on SAML (#3534)

* PLT-3560 blocking adding to channel once user is removed (#3537)

* Always allow system admins to see the Integrations sidebar (#3536)

* Plt 3475 - Post control improvements (#3538)

* Adding class to post when dropdown is active.

* plt-3475 - Post controls improvements

* daily translations 20160711 (#3544)
2016-07-11 14:21:51 -04:00
Corey Hulen
dd99252278 PLT-3560 blocking adding to channel once user is removed (#3537) 2016-07-11 08:37:20 -04:00
Harrison Healey
2d1c0924ee Fixed permissions when getting a file attachment to use the correct user id (#3535) 2016-07-08 17:03:28 -04:00
Christopher Speller
2e513c8fd4 Login error messages fix (#3525) 2016-07-08 09:17:14 -04:00
David Lu
683f713319 PLT-1465 Added password requirements (#3489)
* Added password requirements

* added tweaks

* fixed error code

* removed http.StatusNotAcceptable
2016-07-06 14:54:54 -08:00
Corey Hulen
d5f243dad6 PLT-2863 adding remove user from team (#3429)
* PLT-2863 adding remove user from team

* PLT-2863 adding the client side UI

* Fixing trailing space

* Fixing reported issues

* Adding documentatino

* Switching to final javascript driver
2016-07-06 13:40:59 -08:00
Corey Hulen
b1520d0b94 PLT-3512 adding join/leave channel to the CLI (#3498)
* PLT-3512 adding join/leave channel to the CLI

* PLT-3512 adding list channels to the CLI

* PLT-3512 adding restore channel

* Adding make run-cli command

* Updating txt

* Fixing txt purposed by PMs
2016-07-06 14:11:21 -04:00
enahum
9d0f9169df PLT-3502 Fix Team admins can't give "team admin" privilege to members (#3499) 2016-07-06 13:57:32 -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