summaryrefslogtreecommitdiffstats
path: root/api
Commit message (Collapse)AuthorAgeFilesLines
* PLT-602 combining welcome and verify email=Corey Hulen2015-10-132-5/+19
|
* Merge branch 'release-1.1.0' into PLT-586=Corey Hulen2015-10-121-1/+1
|\
| * Replaced change email verification email logo image with a static linkReed Garmsen2015-10-091-1/+1
| |
* | PLT-586 fixing issues with security alert=Corey Hulen2015-10-091-0/+2
|/
* Merge pull request #981 from mattermost/plt-517Christopher Speller2015-10-0852-52/+52
|\ | | | | PLT-517 Changing SpinPunch to Mattermost in copyright
| * Changing SpinPunch to Mattermost in copyrightChristopher Speller2015-10-0852-52/+52
| |
* | Merge pull request #978 from mattermost/plt-355Corey Hulen2015-10-082-108/+103
|\ \ | |/ |/| PLT-355 Fixing ability to dynamicly update members list.
| * Fixing ability to dynamicly update members list.Christopher Speller2015-10-082-108/+103
| |
* | Merge pull request #966 from mattermost/GIT-960Christopher Speller2015-10-081-1/+1
|\ \ | | | | | | GIT-960 show error when you cannot create a team
| * | GIT-960 show error when you cannot create a team=Corey Hulen2015-10-071-1/+1
| |/
* | Merge pull request #931 from rgarmsen2295/plt-112Christopher Speller2015-10-085-7/+87
|\ \ | | | | | | PLT-112 Improves email change verification process
| * | Added new email to email change notificationReed Garmsen2015-10-062-6/+7
| | |
| * | Resending the verification email now sends the appropriate version of the ↵Reed Garmsen2015-10-051-2/+2
| | | | | | | | | | | | email depending on whether it's a change or first signup
| * | Added better verification when a user changes his or her emailReed Garmsen2015-10-053-2/+25
| | |
| * | Initial cosmetic changes to the process of verifying a changed emailReed Garmsen2015-10-054-3/+59
| | |
* | | GIT-957 fixing email templates and logos=Corey Hulen2015-10-0710-12/+12
| |/ |/|
* | Fix user_added websocket event and update websocket channel access cache on ↵JoramWilander2015-10-072-19/+30
| | | | | | | | add/remove member.
* | Adding checkout for system admin role=Corey Hulen2015-10-061-1/+7
| |
* | Use http writer to automatically set content-type for file gets.JoramWilander2015-10-061-2/+1
|/
* Merge pull request #903 from mattermost/PLT-44Christopher Speller2015-10-053-8/+57
|\ | | | | PLT-44 allow team switching without the need to login
| * PLT-44 allow team switching without the need to login=Corey Hulen2015-10-013-8/+57
| |
* | Merge pull request #906 from teviot/teviot-patch-2Christopher Speller2015-10-021-0/+2
|\ \ | | | | | | Pass-through post creation time when importing posts
| * | Pass-through post creation time when importing postsTeviot Systems2015-10-021-0/+2
| |/
* | Merge pull request #881 from hmhealey/plt194Joram Wilander2015-10-023-44/+103
|\ \ | |/ |/| PLT-194 Changes to ChannelMember notification settings
| * Moved ChannelMember.NotifyLevel into ChannelMember.NotifyPropshmhealey2015-10-013-140/+17
| |
| * Replaced ChannelMember.MarkUnreadLevel with ChannelMember.NotifyPropshmhealey2015-10-012-37/+93
| |
| * Added additional test cases and fixed existing ones for ↵hmhealey2015-09-301-0/+82
| | | | | | | | ChannelMember.MarkUnreadLevel
| * Removed UI for quiet mode and added UI to set when a channel will be marked ↵hmhealey2015-09-301-8/+52
| | | | | | | | unread in the sidebar
| * Added 'default' option to channel notification settings that just uses the ↵hmhealey2015-09-301-6/+6
| | | | | | | | user's notification level
* | Merge pull request #866 from mattermost/PLT-345Christopher Speller2015-10-011-1/+23
|\ \ | | | | | | PLT-345 adding client side logging
| * | PLT-345 adding client side logging=Corey Hulen2015-09-291-1/+23
| | |
* | | Merge release branch 'release-1.0.0'Christopher Speller2015-09-306-25/+22
|\ \ \ | |_|/ |/| |
| * | Fixing some locations to use the IsTeamAdmin function which properly checks ↵Christopher Speller2015-09-306-11/+11
| | | | | | | | | | | | for system admin permissions.
| * | Fixing permissions for system admin. Fixes slack import for system admins.Christopher Speller2015-09-301-14/+11
| | |
* | | Added slight delay to TestEchoCommand to account for race conditionhmhealey2015-09-301-0/+3
| | |
* | | Merge pull request #863 from mattermost/PLT-475Christopher Speller2015-09-301-1/+1
|\ \ \ | |_|/ |/| | PLT-475 making sure session is properly removed
| * | PLT-475 making sure session is properly removed=Corey Hulen2015-09-291-1/+1
| | |
* | | Merge pull request #865 from mattermost/PLT-404Harrison Healey2015-09-291-9/+2
|\ \ \ | | | | | | | | PLT-404 adding basic error checking to config file.
| * | | PLT-404 adding basic error checking to config file.=Corey Hulen2015-09-291-9/+2
| |/ /
* | | Merge pull request #861 from mattermost/PLT-469Harrison Healey2015-09-291-1/+4
|\ \ \ | |/ / |/| | PLT-469 skip redirect if verified email required.
| * | PLT-469 skip redirect if verified email required.=Corey Hulen2015-09-291-1/+4
| | |
* | | Merge release branch 'release-1.0.0'Christopher Speller2015-09-291-2/+3
|\ \ \ | |/ / |/| / | |/
| * Fix images in welcome email.JoramWilander2015-09-281-2/+3
| |
* | Update the /join command to use the correct redirect URL, and update the ↵Justyn Shull2015-09-292-3/+4
| | | | | | | | test to match
* | Fixing some SSO errorsChristopher Speller2015-09-291-1/+4
| |
* | Properly revoke OAuth sessions when revoking all user sessions.JoramWilander2015-09-281-4/+8
| |
* | rebaseJack2015-09-2812-111/+202
|\|
| * Merge pull request #812 from hmhealey/plt256Corey Hulen2015-09-251-0/+14
| |\ | | | | | | PLT-256 Add headers to getFile api calls from IE/Edge to trigger file download
| | * Added headers to getFile requests from Microsoft browsers to trigger a downloadhmhealey2015-09-251-0/+14
| | |
| * | Fixing 1 more case=Corey Hulen2015-09-251-1/+7
| | |