summaryrefslogtreecommitdiffstats
path: root/api
Commit message (Collapse)AuthorAgeFilesLines
* Merging release branch 'release-0.7.0'Christopher Speller2015-09-013-10/+4
|\
| * MM-2056 fixes problem with creating team=Corey Hulen2015-08-313-10/+4
| |
* | Merge pull request #520 from zackify/masterJoram Wilander2015-08-311-1/+1
|\ \ | | | | | | Fix TLS warning due to insecure content
| * | fixed ssl warning on signup pageZach Silveira2015-08-291-1/+1
| |/
* | Merge pull request #523 from mattermost/it33-patch-6-1Christopher Speller2015-08-311-1/+1
|\ \ | | | | | | Updating text on "Find Teams" email
| * | Updating text on "Find Teams" emailit332015-08-301-1/+1
| |/ | | | | Making it clear that user requested email.
* | Merge pull request #522 from mattermost/it33-patch-1Christopher Speller2015-08-311-1/+1
|\ \ | | | | | | Updated marketing text on email sign-up
| * | Updated marketing text on email sign-upit332015-08-301-1/+1
| |/
* | Merge pull request #468 from nickago/MM-1848Christopher Speller2015-08-312-60/+89
|\ \ | |/ |/| Mm 1848 Add /echo command
| * Added unit testsnickago2015-08-261-1/+36
| |
| * Added semaphore for resource allocation to echo commandnickago2015-08-251-1/+20
| |
| * Created a /echo command that will post on the user's behalf afternickago2015-08-251-63/+38
| | | | | | | | a specified amount of time
* | Merge pull request #496 from mattermost/mm-2015Christopher Speller2015-08-282-1/+95
|\ \ | | | | | | MM-2015 Added the ability to create a team with SSO services and added the ability to turn off email sign up.
| * | Added the ability to create a team with SSO services and added the ability ↵JoramWilander2015-08-282-1/+95
| | | | | | | | | | | | to turn off email sign up.
* | | Merge pull request #511 from mattermost/MM-1698Christopher Speller2015-08-281-1/+1
|\ \ \ | | | | | | | | MM-1698 Fixes upgrade db from 0.6 for postgres
| * | | 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 getParentsPosts() query
| * | | 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-1 and PL-3 Restricting team creation
| * | | 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
|\ \ \ | | | | | | | | MM-1994 Improvements to import UI
| * | | Improvements to import UIChristopher Speller2015-08-261-14/+14
| |/ /
* | | Merge pull request #469 from mattermost/mm-1699Christopher Speller2015-08-276-3/+129
|\ \ \ | | | | | | | | MM-1699 Refactored post handling/updating on both the client and server
| * | | 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
|\ \ \ \ | |/ / / |/| | | MM-2000 Added links to the teams listed in the 'Find your teams' email
| * | | 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
|\ \ \ | |/ / |/| | MM-1945 Added a link to error page that returns users to the root page
| * | 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
|\ | | | | 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
| |
generated by cgit v1.2.3-1-g7c22 (git 2.25.1) at 2024-10-30 17:43:46 +0000