summaryrefslogtreecommitdiffstats
path: root/api
Commit message (Expand)AuthorAgeFilesLines
...
* | Merge pull request #496 from mattermost/mm-2015Christopher Speller2015-08-282-1/+95
|\ \
| * | Added the ability to create a team with SSO services and added the ability to...JoramWilander2015-08-282-1/+95
* | | Merge pull request #511 from mattermost/MM-1698Christopher Speller2015-08-281-1/+1
|\ \ \
| * | | Fixing bug where the err msg gets gobbled up=Corey Hulen2015-08-271-1/+1
* | | | Merge pull request #486 from asubset/masterJoram Wilander2015-08-281-2/+2
|\ \ \ \ | |/ / / |/| | |
| * | | fix GetParentPosts() queryJason Rossman2015-08-271-2/+2
* | | | MM-2033 fixes img showing infinity progress=Corey Hulen2015-08-271-0/+1
| |/ / |/| |
* | | Merge pull request #474 from mattermost/PL-4Christopher Speller2015-08-271-0/+42
|\ \ \
| * | | Fixes PL-3 Restrict team creation to specific domains=Corey Hulen2015-08-251-9/+36
| * | | Fixes PL-1 added ability to disable team creation=Corey Hulen2015-08-251-0/+15
| |/ /
* | | Merge pull request #484 from mattermost/mm-1994Corey Hulen2015-08-271-14/+14
|\ \ \
| * | | Improvements to import UIChristopher Speller2015-08-261-14/+14
| |/ /
* | | Merge pull request #469 from mattermost/mm-1699Christopher Speller2015-08-276-3/+129
|\ \ \
| * | | Refactored post handling/updating on both the client and server.JoramWilander2015-08-276-3/+129
* | | | Merge pull request #487 from rgarmsen2295/mm-2000Christopher Speller2015-08-272-3/+3
|\ \ \ \ | |/ / / |/| | |
| * | | Added links to the teams listed in the 'Find your teams' emailReed Garmsen2015-08-262-3/+3
| |/ /
* | | Merge pull request #470 from nickago/MM-1945Joram Wilander2015-08-272-4/+18
|\ \ \ | |/ / |/| |
| * | Added a link to error page that returns users to the root pagenickago2015-08-252-4/+18
| |/
* / Fixes mm-1912 move get file info into its own web service call=Corey Hulen2015-08-242-7/+78
|/
* Fixing audit log to wait for confirm=Corey Hulen2015-08-201-11/+11
* Fixing build=Corey Hulen2015-08-201-7/+11
* Merge pull request #406 from mattermost/mm-1281Christopher Speller2015-08-191-0/+2
|\
| * Track channel creator in DB and show in channel intro message.JoramWilander2015-08-191-0/+2
* | Merge pull request #394 from mattermost/mm-1410Joram Wilander2015-08-195-2/+374
|\ \
| * | Requiring team admin to import and fixing a few style issuesChristopher Speller2015-08-192-7/+4
| * | Implemention of slack import feature.Christopher Speller2015-08-195-2/+377
| |/
* / Added a message deleted indicator when a post is deleted to let the user know...JoramWilander2015-08-191-2/+1
|/
* Merge pull request #385 from mattermost/mm-1623Christopher Speller2015-08-182-5/+37
|\
| * when user roles are updated, the relevant session roles are updated as wellJoramWilander2015-08-172-5/+37
* | added google sign-in functionality to the client, with minor model modificationsJoramWilander2015-08-141-13/+40
* | initial server implementation for using google as a single-sign-on oauth serviceJoramWilander2015-08-141-0/+6
|/
* Merge pull request #370 from hmhealey/mm1812Christopher Speller2015-08-142-0/+35
|\
| * Removed isEmailEnabledSynchronous and switched the email disabled warnings to...hmhealey2015-08-131-5/+0
| * Added ConfigStore that is populated from the serverhmhealey2015-08-131-0/+16
| * Added initial api to allow clientside code to query serverside configurationhmhealey2015-08-112-0/+24
* | fixed channel counts etag to only update when appropriateJoramWilander2015-08-111-1/+1
* | change getChannel api service to not register as user activityJoramWilander2015-08-111-1/+1
* | add etag cache testing to api GetChannelCounts unit testJoramWilander2015-08-111-0/+7
* | added api unit test for GetChannelCountsJoramWilander2015-08-111-0/+34
* | added getChannelCounts service and refactored the client to more intelligentl...JoramWilander2015-08-111-0/+17
* | added getChannel api service and use that over getChannels where appropriate ...JoramWilander2015-08-112-2/+55
|/
* Changed post drafts to maintain a store a unique id for each file upload to f...hmhealey2015-08-101-1/+7
* Drawing all images onto a white background, thus removing transparencynickago2015-08-041-0/+8
* Merge pull request #278 from mattermost/mm-1702Corey Hulen2015-08-023-9/+83
|\
| * Moving the handing of extra_info etag before the extra info is retrieved from...Christopher Speller2015-07-301-10/+14
| * Adding etag to channel extra_info api call.Christopher Speller2015-07-293-4/+74
* | Merge pull request #273 from mattermost/mm-1355Corey Hulen2015-08-022-3/+55
|\ \
| * | Merge branch 'master' into mm-1355=Corey Hulen2015-07-302-9/+2
| |\|
| * | Fixing code review feedback=Corey Hulen2015-07-301-1/+6
| * | Merge branch 'master' into mm-1355=Corey Hulen2015-07-2912-21/+32
| |\ \