summaryrefslogtreecommitdiffstats
path: root/api
Commit message (Expand)AuthorAgeFilesLines
* 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
* | Added default direct channels for previously existing usershmhealey2015-10-132-29/+45
* | Renamed show_hide preference to showhmhealey2015-10-132-9/+9
* | Re-added default direct channels for new usershmhealey2015-10-131-0/+42
* | Added api to get and set preferenceshmhealey2015-10-133-0/+240
* | Merge pull request #1022 from mattermost/release-1.1.0Corey Hulen2015-10-122-1/+3
|\|
| * 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
| |/
* / Fixed download links in Safarihmhealey2015-10-091-2/+2
|/
* Merge pull request #981 from mattermost/plt-517Christopher Speller2015-10-0852-52/+52
|\
| * Changing SpinPunch to Mattermost in copyrightChristopher Speller2015-10-0852-52/+52
* | Merge pull request #978 from mattermost/plt-355Corey Hulen2015-10-082-108/+103
|\ \ | |/ |/|
| * 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=Corey Hulen2015-10-071-1/+1
| |/
* | Merge pull request #931 from rgarmsen2295/plt-112Christopher Speller2015-10-085-7/+87
|\ \