summaryrefslogtreecommitdiffstats
path: root/api
Commit message (Collapse)AuthorAgeFilesLines
...
| * 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
| | |
| * | Merge pull request #802 from mattermost/plt-291Corey Hulen2015-09-252-11/+6
| |\ \ | | | | | | | | PLT-291 Fixing 404 page props
| | * | Fixing 404 page propsChristopher Speller2015-09-242-11/+6
| | | |
| * | | Merge pull request #793 from hmhealey/plt367Joram Wilander2015-09-251-0/+3
| |\ \ \ | | |_|/ | |/| | PLT-367 Added a json response to the uploadProfileImage api call
| | * | Added a json response to the uploadProfileImage api callhmhealey2015-09-241-0/+3
| | | |
| * | | Merge pull request #799 from mattermost/plt-31-2Harrison Healey2015-09-254-21/+8
| |\ \ \ | | |/ / | |/| | PLT-31 Added welcome email back in.
| | * | Added welcome email back in.JoramWilander2015-09-254-21/+8
| | |/
| * | Fixing merge=Corey Hulen2015-09-241-4/+0
| |\ \
| | * | fixing issue=Corey Hulen2015-09-241-1/+0
| | | |
| | * | Removing default theme no longer in use=Corey Hulen2015-09-241-3/+0
| | |/
| * / Removing old valet crud=Corey Hulen2015-09-241-47/+0
| |/
| * Assiging first user system_admin role=Corey Hulen2015-09-231-0/+13
| |
| * Fixing state setting=Corey Hulen2015-09-231-2/+2
| |
| * Fixing merge=Corey Hulen2015-09-237-87/+84
| |\
| * | PLT-349 adding team mgt to admin console=Corey Hulen2015-09-235-27/+151
| | |
* | | set transparent png background to whiteJack2015-09-241-1/+10
| | |
* | | use github.com/disintegration/imagingJack2015-09-232-48/+20
| |/ |/|
* | Changing image settings to file settings=Corey Hulen2015-09-236-83/+83
| |
* | Merge branch 'master' into PLT-11-email=Corey Hulen2015-09-232-4/+1
|\ \ | |/ |/|
| * Merge pull request #759 from mattermost/plt-242-3Harrison Healey2015-09-231-3/+0
| |\ | | | | | | PLT-242 Implement custom UI theme colors.
| | * Implement UI theme colors.JoramWilander2015-09-231-3/+0
| | |
| * | PLT-126: Change 'Private Messages' to 'Direct Messages'Chengwei Yang2015-09-231-1/+1
| |/ | | | | | | Signed-off-by: Chengwei Yang <yangchengwei@qiyi.com>
* | Fixing merge conflict=Corey Hulen2015-09-225-14/+283
|\|
| * Merge pull request #715 from mattermost/plt-27Joram Wilander2015-09-225-14/+283
| |\ | | | | | | PLT-27 Implement incoming webhooks.
| | * Implement incoming webhooks.JoramWilander2015-09-215-14/+283
| | |
* | | Merge branch 'master' into PLT-11-email=Corey Hulen2015-09-221-1/+2
|\| |
| * | fix conflictJack2015-09-226-19/+218
| |\ \
generated by cgit v1.2.3-1-g7c22 (git 2.25.1) at 2024-10-30 07:35:09 +0000