summaryrefslogtreecommitdiffstats
path: root/api
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #1448 from mattermost/PLT-975Joram Wilander2015-11-184-2/+175
|\
| * fixing based on feedback=Corey Hulen2015-11-182-2/+7
| * Adding perm delete channels by team=Corey Hulen2015-11-161-0/+4
| * Fixing unit tests=Corey Hulen2015-11-162-0/+5
| * Adding perm delete to cmd line=Corey Hulen2015-11-164-2/+161
* | PLT-873: Change email invitation subjectAlex Garibay2015-11-171-1/+1
* | Adding device type=Corey Hulen2015-11-161-3/+2
* | Merge pull request #1437 from rgarmsen2295/plt-1086Harrison Healey2015-11-162-4/+7
|\ \ | |/ |/|
| * Fixed unit test issuesReed Garmsen2015-11-131-1/+2
| * Allow admins to change the display name for the default channelReed Garmsen2015-11-131-3/+5
* | Merge release branch 'release-1.2'Christopher Speller2015-11-161-0/+8
|\ \ | |/ |/|
| * adding skip=Corey Hulen2015-11-151-0/+4
| * Fixing outgoing hook=Corey Hulen2015-11-151-0/+4
* | Added ChannelExtra.MemberCount field to reflect the actual member count when ...hmhealey2015-11-122-1/+10
* | Omit unneeded fields from user object in getProfiles service and remove ImgCo...JoramWilander2015-11-091-0/+1
|/
* Simplified unit testJoramWilander2015-11-061-6/+0
* Fix unit testJoramWilander2015-11-061-2/+2
* Add tutorial pref for new users by defaultJoramWilander2015-11-061-0/+5
* Merge pull request #1332 from mattermost/plt-560Christopher Speller2015-11-061-1/+1
|\
| * Prevent SSO users from changing their emailJoramWilander2015-11-061-1/+1
* | PLT-857: Support for Incoming Webhooks - Try #2Florian Orben2015-11-051-3/+11
|/
* Update email cssJoramWilander2015-11-051-1/+1
* Don't send welcome emails for users signing up from an email invite, update e...JoramWilander2015-11-053-7/+12
* Changed post searching to ignore requests to return everything by searching f...hmhealey2015-11-042-1/+8
* Merge pull request #1289 from mattermost/plt-516-2Joram Wilander2015-11-042-3/+24
|\
| * Updated getStatuses unit testgsJoramWilander2015-11-031-1/+7
| * Multiple fixes to major performance issues with teams with 50+ usersJoramWilander2015-11-031-2/+17
* | Merge pull request #1285 from mattermost/plt-824Joram Wilander2015-11-042-0/+143
|\ \ | |/ |/|
| * Adding ability to fetch posts around a specifc postChristopher Speller2015-11-032-0/+143
* | Merge pull request #1263 from yuvipanda/add-meCorey Hulen2015-11-021-0/+30
|\ \ | |/ |/|
| * PLT-394: Add a /me commandYuviPanda2015-11-011-0/+30
* | Go fmt and rename file with 'enviroment' in filenamePat Lathem2015-10-301-1/+1
* | Fix spelling of environmentPat Lathem2015-10-303-24/+24
|/
* Merge pull request #1211 from mattermost/PLT-340Joram Wilander2015-10-303-56/+33
|\
| * Merge branch 'master' into PLT-340=Corey Hulen2015-10-281-0/+6
| |\
| * | PLT-340=Corey Hulen2015-10-273-56/+33
* | | Fixed nil pointer when failing to upload an oversized imagehmhealey2015-10-291-1/+1
* | | Fixing 200 error bug=Corey Hulen2015-10-292-2/+2
* | | Merge pull request #1214 from mattermost/outgoing-hook-fixCorey Hulen2015-10-281-4/+4
|\ \ \
| * | | Pass in iter vars to closure properlyJoramWilander2015-10-281-4/+4
* | | | Merge pull request #1199 from hmhealey/plt600Corey Hulen2015-10-284-38/+150
|\ \ \ \ | |_|_|/ |/| | |
| * | | Added Channel.Purpose on the serverhmhealey2015-10-273-7/+119
| * | | Renamed Channel.Description to Channel.Header on the serverhmhealey2015-10-274-37/+37
* | | | PLT-25 fixing issues with stats page=Corey Hulen2015-10-271-0/+6
| |_|/ |/| |
* | | Merge branch 'master' into PLT-25=Corey Hulen2015-10-265-60/+134
|\| |
| * | Merge pull request #1164 from hmhealey/plt778Corey Hulen2015-10-262-33/+49
| |\ \
| | * | Moved logic for searching for posts by multiple users/channels into the sql q...hmhealey2015-10-261-0/+3
| | * | Changed post searching to allow searching by multiple users/channelshmhealey2015-10-232-33/+46
| * | | Prevented image files larger than 4k resolution from being uploadedhmhealey2015-10-262-5/+29
| | |/ | |/|
| * | Merge pull request #1179 from florianorben/issue-827Christopher Speller2015-10-261-21/+54
| |\ \