summaryrefslogtreecommitdiffstats
path: root/api
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #1143 from mattermost/plt-803Corey Hulen2015-10-222-0/+34
|\
| * Prevent users from resetting their password when the user is using SSOJoramWilander2015-10-222-0/+34
* | Merge pull request #1142 from mattermost/plt-414Corey Hulen2015-10-221-9/+14
|\ \
| * | Refactoring direct channel creation to use transaction to avaoid state where ...Christopher Speller2015-10-221-9/+14
* | | Fixing code review issues=Corey Hulen2015-10-223-6/+5
* | | Fixing group code review issues=Corey Hulen2015-10-222-2/+3
* | | Addressing issues from group code review=Corey Hulen2015-10-221-20/+9
* | | Fixing merge conflict=Corey Hulen2015-10-223-7/+41
|\ \ \ | | |/ | |/|
| * | Merge pull request #1094 from trashcan/slash-shrugJoram Wilander2015-10-221-0/+29
| |\ \
| | * | Add a /shrug commandPat Lathem2015-10-161-0/+29
| * | | PLT-616: Enable playing of animated GIF in thumbnails and previewFlorian Orben2015-10-211-0/+10
| * | | PLT-350 allow ability to disable restricted team names=Corey Hulen2015-10-201-7/+2
| | |/ | |/|
* | | Merge branch 'master' into PLT-44=Corey Hulen2015-10-204-25/+147
|\| |
| * | Merge pull request #1113 from hmhealey/plt716Joram Wilander2015-10-202-5/+127
| |\ \
| | * | Added from:, in:, and channel: search modifiershmhealey2015-10-192-5/+127
| | |/
| * | Changed all goroutine functions to use '...AndForget' as the standard naming ...Reed Garmsen2015-10-193-20/+20
* | | Multi-session login=Corey Hulen2015-10-203-57/+75
* | | Adding multi-session cookie=Corey Hulen2015-10-202-34/+39
* | | Fixing merge conflicts=Corey Hulen2015-10-194-42/+520
|\| |
| * | Merge pull request #1108 from mattermost/plt-235Harrison Healey2015-10-194-42/+520
| |\ \
| | * | Generalized webhook post code and added it to outgoing webhooksJoramWilander2015-10-191-2/+40
| | * | Refactor to hit database less often.JoramWilander2015-10-191-81/+65
| | * | Remove special team logic.JoramWilander2015-10-191-29/+19
| | * | Fix minor style for gofmt.JoramWilander2015-10-191-1/+1
| | * | Add api unit tests for outgoing webhooks.JoramWilander2015-10-191-0/+181
| | * | Implement outgoing webhooks.JoramWilander2015-10-193-10/+295
| | |/
* | | Merging from master=Corey Hulen2015-10-193-24/+39
|\| |
| * | Small refactor of websocket code on client and serverJoramWilander2015-10-163-24/+39
| |/
* | Refactoring web classes to use multi-session=Corey Hulen2015-10-161-12/+38
* | Fixing merge=Corey Hulen2015-10-165-115/+129
|\|
| * Fixed preference test that was failinghmhealey2015-10-161-1/+2
| * Merge pull request #1079 from hmhealey/initprefsChristopher Speller2015-10-162-0/+69
| |\
| | * Added an initial call to get all user preferences on page loadhmhealey2015-10-152-0/+69
| | * Removed preference migration codehmhealey2015-10-153-99/+39
| * | Merge pull request #1078 from hmhealey/plt701Christopher Speller2015-10-163-100/+42
| |\ \
| | * | Removed preference migration codehmhealey2015-10-153-100/+42
| * | | Merge pull request #1049 from apaatsio/full-teams-dataJoram Wilander2015-10-162-15/+17
| |\ \ \ | | |_|/ | |/| |
| | * | Sanitize team dataAntti Ahti2015-10-141-0/+1
| | * | Fix typo (isTreamCreationAllowed -> isTeamCreationAllowed)Antti Ahti2015-10-141-7/+7
| | * | Use team display name in team switcher menuAntti Ahti2015-10-142-8/+9
| | |/
* | / Inital support for multi-tab loging=Corey Hulen2015-10-1623-50/+53
|/ /
* / Marking when user ran the unit tests=Corey Hulen2015-10-151-0/+2
|/
* Merge release branch 'release-1.1.0'Christopher Speller2015-10-142-5/+19
|\
| * PLT-602 combining welcome and verify email=Corey Hulen2015-10-132-5/+19
* | Made further changes based on feedbackhmhealey2015-10-132-14/+18
* | Removed Preference.AltIdhmhealey2015-10-132-47/+92
* | Made structural changes to server-side Preference code based on feedbackhmhealey2015-10-132-43/+42
* | Removed setting direct channels for a new user at creation timehmhealey2015-10-132-50/+42
* | Moved saving multiple user preferences into a database transactionhmhealey2015-10-131-9/+5
* | Fixed preference testshmhealey2015-10-131-18/+7
generated by cgit v1.2.3-1-g7c22 (git 2.25.1) at 2024-10-30 07:15:16 +0000