summaryrefslogtreecommitdiffstats
path: root/api
Commit message (Collapse)AuthorAgeFilesLines
* fix GetParentPosts() queryJason Rossman2015-08-271-2/+2
|
* 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
|\ | | | | MM-1281 Track channel creator in DB and show in channel intro message
| * 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
|\ \ | | | | | | MM-1410 Initial implementaiton of import from Slack
| * | 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 ↵JoramWilander2015-08-191-2/+1
|/ | | | know what's happening.
* Merge pull request #385 from mattermost/mm-1623Christopher Speller2015-08-182-5/+37
|\ | | | | MM-1623 when user roles are updated, the relevant session roles are updated as well
| * 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
|\ | | | | MM-1812 Provide warnings on team invite screens when email is disabled
| * Removed isEmailEnabledSynchronous and switched the email disabled warnings ↵hmhealey2015-08-131-5/+0
| | | | | | | | to use ConfigStore
| * 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 ↵JoramWilander2015-08-111-0/+17
| | | | | | | | intelligently pull channel data
* | added getChannel api service and use that over getChannels where appropriate ↵JoramWilander2015-08-112-2/+55
|/ | | | on client
* Changed post drafts to maintain a store a unique id for each file upload to ↵hmhealey2015-08-101-1/+7
| | | | fix issues with duplicate file names
* 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
|\ | | | | MM-1702 Adding etag to channel extra_info api call.
| * Moving the handing of extra_info etag before the extra info is retrieved ↵Christopher Speller2015-07-301-10/+14
| | | | | | | | from the database
| * 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
|\ \ | | | | | | Fixes mm-1355 adds rate limiting apis
| * | 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
| |\ \
| * | | Fixes mm-1355 adds rate limiting apis=Corey Hulen2015-07-292-2/+49
| | | |
* | | | Merge pull request #305 from nickago/MM-1681Corey Hulen2015-08-0214-46/+47
|\ \ \ \ | | | | | | | | | | MM-1681 Fixed regression of static images not displaying in emails
| * | | | Changed all templates to use site url instead of team url for finding the ↵nickago2015-07-3114-46/+47
| | | | | | | | | | | | | | | | | | | | 'static' directory
* | | | | Merge pull request #274 from mattermost/mm-1497Corey Hulen2015-08-021-3/+10
|\ \ \ \ \ | | | | | | | | | | | | MM-1497 image thumbnails now scale appropriately so there is no whitespace
| * | | | | image thumbnails now scale appropriately so there is no whitespace, also ↵JoramWilander2015-07-311-3/+10
| |/ / / / | | | | | | | | | | | | | | | generalized some thumbnail loading code
* | | | | Merge pull request #303 from nickago/MM-1642Christopher Speller2015-07-311-1/+1
|\ \ \ \ \ | |/ / / / |/| | | | MM-1642 Updated the password error
| * | | | Updated error message for an incorrect passwordnickago2015-07-301-1/+1
| | | | |
* | | | | Merge pull request #271 from hmhealey/mm1656Joram Wilander2015-07-311-2/+5
|\ \ \ \ \ | | | | | | | | | | | | MM-1656 Updated file UI
| * | | | | Changed file API to not write response data on a HEAD requesthmhealey2015-07-291-1/+4
| | | | | |
| * | | | | Allow file access apis to respond to HEAD requestshmhealey2015-07-291-1/+1
| |/ / / /
* | | | | Merge pull request #283 from mattermost/mm-1787Christopher Speller2015-07-311-5/+4
|\ \ \ \ \ | | | | | | | | | | | | MM-1787 Fixing links for signup from team invite link.
| * | | | | Removing nickname parameter from FireAndForgetVerifyEmailChristopher Speller2015-07-301-3/+2
| | | | | |
| * | | | | Fixing links for signup from team invite link. Enter now advances ↵Christopher Speller2015-07-301-5/+5
| | |_|_|/ | |/| | | | | | | | | | | | | signup_user_complete screen. Signin now link now redirects properly.
* | | | | Merge pull request #285 from hmhealey/mm1738Joram Wilander2015-07-301-4/+17
|\ \ \ \ \ | | | | | | | | | | | | MM-1787 Fixed team API to properly provide team names for the Find My Team email
| * | | | | Fixed team API to properly provide team names for the Find My Team emailhmhealey2015-07-291-4/+17
| |/ / / /
* | | | | Merge pull request #272 from rgarmsen2295/mm-1463Christopher Speller2015-07-301-4/+33
|\ \ \ \ \ | |/ / / / |/| | | | MM-1463 Adds back username initials being included in user's default profile picture
| * | | | Made font type a field in the config fileReed Garmsen2015-07-291-1/+1
| | | | |