Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | PLT-602 combining welcome and verify email | =Corey Hulen | 2015-10-13 | 2 | -5/+19 |
| | |||||
* | Merge branch 'release-1.1.0' into PLT-586 | =Corey Hulen | 2015-10-12 | 1 | -1/+1 |
|\ | |||||
| * | Replaced change email verification email logo image with a static link | Reed Garmsen | 2015-10-09 | 1 | -1/+1 |
| | | |||||
* | | PLT-586 fixing issues with security alert | =Corey Hulen | 2015-10-09 | 1 | -0/+2 |
|/ | |||||
* | Merge pull request #981 from mattermost/plt-517 | Christopher Speller | 2015-10-08 | 52 | -52/+52 |
|\ | | | | | PLT-517 Changing SpinPunch to Mattermost in copyright | ||||
| * | Changing SpinPunch to Mattermost in copyright | Christopher Speller | 2015-10-08 | 52 | -52/+52 |
| | | |||||
* | | Merge pull request #978 from mattermost/plt-355 | Corey Hulen | 2015-10-08 | 2 | -108/+103 |
|\ \ | |/ |/| | PLT-355 Fixing ability to dynamicly update members list. | ||||
| * | Fixing ability to dynamicly update members list. | Christopher Speller | 2015-10-08 | 2 | -108/+103 |
| | | |||||
* | | Merge pull request #966 from mattermost/GIT-960 | Christopher Speller | 2015-10-08 | 1 | -1/+1 |
|\ \ | | | | | | | GIT-960 show error when you cannot create a team | ||||
| * | | GIT-960 show error when you cannot create a team | =Corey Hulen | 2015-10-07 | 1 | -1/+1 |
| |/ | |||||
* | | Merge pull request #931 from rgarmsen2295/plt-112 | Christopher Speller | 2015-10-08 | 5 | -7/+87 |
|\ \ | | | | | | | PLT-112 Improves email change verification process | ||||
| * | | Added new email to email change notification | Reed Garmsen | 2015-10-06 | 2 | -6/+7 |
| | | | |||||
| * | | Resending the verification email now sends the appropriate version of the ↵ | Reed Garmsen | 2015-10-05 | 1 | -2/+2 |
| | | | | | | | | | | | | email depending on whether it's a change or first signup | ||||
| * | | Added better verification when a user changes his or her email | Reed Garmsen | 2015-10-05 | 3 | -2/+25 |
| | | | |||||
| * | | Initial cosmetic changes to the process of verifying a changed email | Reed Garmsen | 2015-10-05 | 4 | -3/+59 |
| | | | |||||
* | | | GIT-957 fixing email templates and logos | =Corey Hulen | 2015-10-07 | 10 | -12/+12 |
| |/ |/| | |||||
* | | Fix user_added websocket event and update websocket channel access cache on ↵ | JoramWilander | 2015-10-07 | 2 | -19/+30 |
| | | | | | | | | add/remove member. | ||||
* | | Adding checkout for system admin role | =Corey Hulen | 2015-10-06 | 1 | -1/+7 |
| | | |||||
* | | Use http writer to automatically set content-type for file gets. | JoramWilander | 2015-10-06 | 1 | -2/+1 |
|/ | |||||
* | Merge pull request #903 from mattermost/PLT-44 | Christopher Speller | 2015-10-05 | 3 | -8/+57 |
|\ | | | | | PLT-44 allow team switching without the need to login | ||||
| * | PLT-44 allow team switching without the need to login | =Corey Hulen | 2015-10-01 | 3 | -8/+57 |
| | | |||||
* | | Merge pull request #906 from teviot/teviot-patch-2 | Christopher Speller | 2015-10-02 | 1 | -0/+2 |
|\ \ | | | | | | | Pass-through post creation time when importing posts | ||||
| * | | Pass-through post creation time when importing posts | Teviot Systems | 2015-10-02 | 1 | -0/+2 |
| |/ | |||||
* | | Merge pull request #881 from hmhealey/plt194 | Joram Wilander | 2015-10-02 | 3 | -44/+103 |
|\ \ | |/ |/| | PLT-194 Changes to ChannelMember notification settings | ||||
| * | Moved ChannelMember.NotifyLevel into ChannelMember.NotifyProps | hmhealey | 2015-10-01 | 3 | -140/+17 |
| | | |||||
| * | Replaced ChannelMember.MarkUnreadLevel with ChannelMember.NotifyProps | hmhealey | 2015-10-01 | 2 | -37/+93 |
| | | |||||
| * | Added additional test cases and fixed existing ones for ↵ | hmhealey | 2015-09-30 | 1 | -0/+82 |
| | | | | | | | | ChannelMember.MarkUnreadLevel | ||||
| * | Removed UI for quiet mode and added UI to set when a channel will be marked ↵ | hmhealey | 2015-09-30 | 1 | -8/+52 |
| | | | | | | | | unread in the sidebar | ||||
| * | Added 'default' option to channel notification settings that just uses the ↵ | hmhealey | 2015-09-30 | 1 | -6/+6 |
| | | | | | | | | user's notification level | ||||
* | | Merge pull request #866 from mattermost/PLT-345 | Christopher Speller | 2015-10-01 | 1 | -1/+23 |
|\ \ | | | | | | | PLT-345 adding client side logging | ||||
| * | | PLT-345 adding client side logging | =Corey Hulen | 2015-09-29 | 1 | -1/+23 |
| | | | |||||
* | | | Merge release branch 'release-1.0.0' | Christopher Speller | 2015-09-30 | 6 | -25/+22 |
|\ \ \ | |_|/ |/| | | |||||
| * | | Fixing some locations to use the IsTeamAdmin function which properly checks ↵ | Christopher Speller | 2015-09-30 | 6 | -11/+11 |
| | | | | | | | | | | | | for system admin permissions. | ||||
| * | | Fixing permissions for system admin. Fixes slack import for system admins. | Christopher Speller | 2015-09-30 | 1 | -14/+11 |
| | | | |||||
* | | | Added slight delay to TestEchoCommand to account for race condition | hmhealey | 2015-09-30 | 1 | -0/+3 |
| | | | |||||
* | | | Merge pull request #863 from mattermost/PLT-475 | Christopher Speller | 2015-09-30 | 1 | -1/+1 |
|\ \ \ | |_|/ |/| | | PLT-475 making sure session is properly removed | ||||
| * | | PLT-475 making sure session is properly removed | =Corey Hulen | 2015-09-29 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #865 from mattermost/PLT-404 | Harrison Healey | 2015-09-29 | 1 | -9/+2 |
|\ \ \ | | | | | | | | | PLT-404 adding basic error checking to config file. | ||||
| * | | | PLT-404 adding basic error checking to config file. | =Corey Hulen | 2015-09-29 | 1 | -9/+2 |
| |/ / | |||||
* | | | Merge pull request #861 from mattermost/PLT-469 | Harrison Healey | 2015-09-29 | 1 | -1/+4 |
|\ \ \ | |/ / |/| | | PLT-469 skip redirect if verified email required. | ||||
| * | | PLT-469 skip redirect if verified email required. | =Corey Hulen | 2015-09-29 | 1 | -1/+4 |
| | | | |||||
* | | | Merge release branch 'release-1.0.0' | Christopher Speller | 2015-09-29 | 1 | -2/+3 |
|\ \ \ | |/ / |/| / | |/ | |||||
| * | Fix images in welcome email. | JoramWilander | 2015-09-28 | 1 | -2/+3 |
| | | |||||
* | | Update the /join command to use the correct redirect URL, and update the ↵ | Justyn Shull | 2015-09-29 | 2 | -3/+4 |
| | | | | | | | | test to match | ||||
* | | Fixing some SSO errors | Christopher Speller | 2015-09-29 | 1 | -1/+4 |
| | | |||||
* | | Properly revoke OAuth sessions when revoking all user sessions. | JoramWilander | 2015-09-28 | 1 | -4/+8 |
| | | |||||
* | | rebase | Jack | 2015-09-28 | 12 | -111/+202 |
|\| | |||||
| * | Merge pull request #812 from hmhealey/plt256 | Corey Hulen | 2015-09-25 | 1 | -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 download | hmhealey | 2015-09-25 | 1 | -0/+14 |
| | | | |||||
| * | | Fixing 1 more case | =Corey Hulen | 2015-09-25 | 1 | -1/+7 |
| | | |