summaryrefslogtreecommitdiffstats
path: root/api
Commit message (Collapse)AuthorAgeFilesLines
* Fix garbled mail subject (#3694)MARUYAMA Takayuki2016-08-041-1/+1
| | | | | | * Fix garbled mail subject * Notification email subject including full month
* PLT-2899 adding clustering of app servers (#3682)Corey Hulen2016-08-046-9/+106
| | | | | | | | | | | | | | | | | | * 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
* PLT-3506 Added flagged posts functionality (#3679)Joram Wilander2016-08-042-0/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 aaa05632c5d9eda35a048300a5bd7e99584c5b58. * Fixing the icon in search * Help text and white space improvements (#3730) * Updatng help text and some white spacing. * Updating help text
* PLT-3484 OAuth2 Service Provider (#3632)enahum2016-08-034-201/+588
| | | | | | | | | | | | | | * 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
* PLT-3702 Fixed outgoing webhook creation API to properly clear error flags ↵Harrison Healey2016-08-021-0/+2
| | | | for public channels (#3719)
* PLT-3408 Add SiteURL to config.json (#3692)Harrison Healey2016-08-022-10/+7
| | | | | | | | * 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
* PLT-3633 EE: Add Google and Office365 SSO through OAuth2 (#3660)Joram Wilander2016-07-292-9/+9
| | | | | | | | | | | | | | | | * 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
* PLT-3752 Changed email connection test to use the existing password if ↵Harrison Healey2016-07-291-0/+13
| | | | unchanged by client (#3685)
* Adding migration support to LDAP from other account types (#3655)Christopher Speller2016-07-261-5/+1
|
* Changing LDAP behavour so users disabled in LDAP server are disabled in ↵Christopher Speller2016-07-261-11/+17
| | | | Mattermost. (#3669)
* Add option to trigger outgoing webhook if first word starts with trigger ↵Pierre Rudloff2016-07-261-4/+11
| | | | word (#3611)
* PLT-1866/PLT-3509 Added links to download the native apps (#3651)Harrison Healey2016-07-221-0/+5
| | | | | | | | | | | | * 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
* PLT-3691 Fixing mobile session (#3652)Corey Hulen2016-07-211-1/+22
| | | | | | * PLT-3691 Fixing mobile session * Fixing unit tests
* PLT-2408 Adds here mention for online users (#3619)Joram Wilander2016-07-212-10/+39
| | | | | | | | | | * 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
* Fixed /join (#3647)David Lu2016-07-211-0/+5
|
* PLT-3629 fix uploading certificates if the files in the config do not exists ↵enahum2016-07-201-0/+11
| | | | (#3634)
* Restricting visibility of detailed_error message (#3629)Christopher Speller2016-07-191-0/+6
|
* PLT-914 Add mention notifications for replies on a comment thread (#3130)samogot2016-07-193-6/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
* Fix possible race condition in TestUserTyping test case (#3612)Joram Wilander2016-07-181-0/+2
|
* PLT-2241 Refactored statuses into a more real-time system (#3573)Joram Wilander2016-07-1811-127/+351
| | | | | | | | | | * 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
* Merge branch 'release-3.2' into 'master'Harrison Healey2016-07-151-10/+4
|\
| * Revert "Login error messages fix (#3525)"Christopher Speller2016-07-121-6/+4
| | | | | | | | This reverts commit 2e513c8fd4c6b1b428b83044c017836b0011d32b.
| * Revert "Letting email not validated error message through login. Changing ↵Christopher Speller2016-07-121-5/+1
| | | | | | | | | | | | invalid credentials error. (#3546)" This reverts commit 128e4f984ad565297ab1c7b8921d877d3a9c8f03.
* | Cleaning up old export code (#3601)Christopher Speller2016-07-152-310/+0
| |
* | made /shortcuts separate for mac (#3571)David Lu2016-07-142-2/+14
| |
* | Increased wait time for TestUserTyping event test case (#3587)Joram Wilander2016-07-141-1/+1
| |
* | PLT-2992 Added the ability to use different themes for each team (#3411)Harrison Healey2016-07-142-0/+74
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
* | PLT-3153 Converted slash command triggers to lowercase on save (#3577)David Lu2016-07-141-0/+2
| | | | | | | | | | | | * Converted slash command triggers to lowercase on save * Made slash commands case insensitive
* | PLT-3366 Holding down the ALT key and clicking on a message adds a new ↵samogot2016-07-141-0/+29
| | | | | | | | messages indicator (squashed) (#3374)
* | Removed system message on /msg success (#3579)David Lu2016-07-142-2/+2
| |
* | PLT-3584 Fix no team found when creating account (#3552)enahum2016-07-131-1/+3
| |
* | PLT-3384 Improve the "Verify Email" email (#3564)enahum2016-07-131-5/+9
| |
* | Fixed invalid password error when admin resets password (#3578)David Lu2016-07-131-1/+0
| |
* | Merged release-3.2 into masterHarrison Healey2016-07-123-4/+81
|\|
| * Some improvments to password handling (#3549)Christopher Speller2016-07-123-3/+76
| |
| * Letting email not validated error message through login. Changing invalid ↵Christopher Speller2016-07-121-1/+5
| | | | | | | | credentials error. (#3546)
| * PLT-3560 blocking adding to channel once user is removed (#3537)Corey Hulen2016-07-112-0/+24
| |
| * Fixed permissions when getting a file attachment to use the correct user id ↵Harrison Healey2016-07-081-1/+1
| | | | | | | | (#3535)
| * Login error messages fix (#3525)Christopher Speller2016-07-081-4/+6
| |
* | Added infrastructure for basic WebSocket API (#3432)Joram Wilander2016-07-1217-155/+408
| |
* | Merge release 3.2 into master (#3548)Harrison Healey2016-07-114-5/+31
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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)
* PLT-1465 Added password requirements (#3489)David Lu2016-07-067-115/+127
| | | | | | | | | | * Added password requirements * added tweaks * fixed error code * removed http.StatusNotAcceptable
* PLT-2863 adding remove user from team (#3429)Corey Hulen2016-07-063-5/+182
| | | | | | | | | | | | | | * 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
* PLT-3512 adding join/leave channel to the CLI (#3498)Corey Hulen2016-07-061-0/+169
| | | | | | | | | | | | | | * 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
* PLT-3502 Fix Team admins can't give "team admin" privilege to members (#3499)enahum2016-07-062-5/+18
|
* PLT-3346/PLT-3342/PLT-3360 EE: Add the ability to restrict channel ↵Joram Wilander2016-07-064-24/+469
| | | | | | | | management permissions (#3453) * EE: Add the ability to restrict channel management permissions * Always allow last user in a channel to delete that channel
* Fix connection leaks in push notifications, diagnostics and oauth (#3469)Joram Wilander2016-07-062-1/+14
|
* SAML support (#3494)enahum2016-07-054-7/+190
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
* Sanitize personal information out of license for non system admin users (#3487)Joram Wilander2016-07-051-1/+5
|
* PLT-3145 Custom Emojis (#3381)Harrison Healey2016-07-052-27/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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