Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | 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 | |
| | | | ||||||
| * | | Merge pull request #802 from mattermost/plt-291 | Corey Hulen | 2015-09-25 | 2 | -11/+6 | |
| |\ \ | | | | | | | | | PLT-291 Fixing 404 page props | |||||
| | * | | Fixing 404 page props | Christopher Speller | 2015-09-24 | 2 | -11/+6 | |
| | | | | ||||||
| * | | | Merge pull request #793 from hmhealey/plt367 | Joram Wilander | 2015-09-25 | 1 | -0/+3 | |
| |\ \ \ | | |_|/ | |/| | | PLT-367 Added a json response to the uploadProfileImage api call | |||||
| | * | | Added a json response to the uploadProfileImage api call | hmhealey | 2015-09-24 | 1 | -0/+3 | |
| | | | | ||||||
| * | | | Merge pull request #799 from mattermost/plt-31-2 | Harrison Healey | 2015-09-25 | 4 | -21/+8 | |
| |\ \ \ | | |/ / | |/| | | PLT-31 Added welcome email back in. | |||||
| | * | | Added welcome email back in. | JoramWilander | 2015-09-25 | 4 | -21/+8 | |
| | |/ | ||||||
| * | | Fixing merge | =Corey Hulen | 2015-09-24 | 1 | -4/+0 | |
| |\ \ | ||||||
| | * | | fixing issue | =Corey Hulen | 2015-09-24 | 1 | -1/+0 | |
| | | | | ||||||
| | * | | Removing default theme no longer in use | =Corey Hulen | 2015-09-24 | 1 | -3/+0 | |
| | |/ | ||||||
| * / | Removing old valet crud | =Corey Hulen | 2015-09-24 | 1 | -47/+0 | |
| |/ | ||||||
| * | Assiging first user system_admin role | =Corey Hulen | 2015-09-23 | 1 | -0/+13 | |
| | | ||||||
| * | Fixing state setting | =Corey Hulen | 2015-09-23 | 1 | -2/+2 | |
| | | ||||||
| * | Fixing merge | =Corey Hulen | 2015-09-23 | 7 | -87/+84 | |
| |\ | ||||||
| * | | PLT-349 adding team mgt to admin console | =Corey Hulen | 2015-09-23 | 5 | -27/+151 | |
| | | |