summaryrefslogtreecommitdiffstats
path: root/api
Commit message (Collapse)AuthorAgeFilesLines
...
| * Fixing broken email templates=Corey Hulen2015-09-161-1/+0
| |
| * Fixing broken email templates=Corey Hulen2015-09-161-1/+1
| |
| * Fixing broken email templates=Corey Hulen2015-09-1610-19/+20
| |
* | Merge pull request #696 from mattermost/PLT-23Christopher Speller2015-09-161-7/+17
|\ \ | | | | | | PLT-23 error.html pulls files from static
| * | PLT-23 error.html pulls files from static=Corey Hulen2015-09-161-3/+3
| | |
| * | PLT-23 error.html pulls files from static=Corey Hulen2015-09-161-5/+15
| |/
* / Implement OAuth2 service provider functionality.JoramWilander2015-09-1611-71/+408
|/
* Adding config file timestamp to X-Version header=Corey Hulen2015-09-161-1/+2
|
* Removing old config stuff=Corey Hulen2015-09-152-35/+0
|
* PLT-93 cleaing up client side configs=Corey Hulen2015-09-1524-71/+101
|
* Merge branch 'master' into PLT-12-log=Corey Hulen2015-09-148-17/+30
|\
| * Merge pull request #679 from mattermost/fix-file-content-typeHarrison Healey2015-09-141-0/+1
| |\ | | | | | | Blank Content-Type for file GETs.
| | * Blank Content-Type for file GETs.JoramWilander2015-09-141-0/+1
| | |
| * | Merge pull request #677 from mattermost/plt-50Joram Wilander2015-09-141-1/+10
| |\ \ | | |/ | |/| PLT-50 Allowing channel names with underscores. Allow import of more slack channel names.
| | * Allowing underscores in channel names. Added conversion of some slack ↵Christopher Speller2015-09-141-1/+10
| | | | | | | | | | | | channel names into valid mattermost names.
| * | Merge pull request #648 from mattermost/PLT-12Christopher Speller2015-09-147-61/+91
| |\ \ | | |/ | |/| PLT-12: Work in progress for Admin Console UI
| | * Renaming ROLE_ADMIN to ROLE_TEAM_ADMIN=Corey Hulen2015-09-116-16/+16
| | |
| * | Set default Content-Type to application/json for all API requestsJoramWilander2015-09-121-0/+3
| | |
* | | PLT-12 adding log viewer=Corey Hulen2015-09-104-0/+97
| |/ |/|
* | merging=Corey Hulen2015-09-104-4/+356
|\|
| * Removed pointless attempt to verify a new user's usernamehmhealey2015-09-091-4/+1
| |
| * Adding ability to export data from mattermostChristopher Speller2015-09-043-0/+355
| |
* | Fixing unit test=Corey Hulen2015-09-101-4/+4
| |
* | PLT-12 UI framework for admin console=Corey Hulen2015-09-102-15/+19
| |
* | Adding unit tests for cmd line=Corey Hulen2015-09-041-1/+1
| |
* | Adding cmd line options=Corey Hulen2015-09-045-52/+78
|/
* Updating help text to fix typomishimi2015-09-021-1/+1
|
* 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