summaryrefslogtreecommitdiffstats
path: root/api
Commit message (Expand)AuthorAgeFilesLines
* PLT-7 adding loc db calls for oauth table=Corey Hulen2016-01-2012-103/+109
* PLT-7 adding loc db calls for oauth table=Corey Hulen2016-01-203-15/+17
* PLT-7 adding loc db calls for webhooks table=Corey Hulen2016-01-204-17/+17
* PLT-7 adding loc db calls for team table=Corey Hulen2016-01-205-37/+39
* PLT-7 adding loc for db calls audits and prefs=Corey Hulen2016-01-207-45/+50
* PLT-7 Adding translation function to context=Corey Hulen2016-01-194-7/+9
* PLT-7 adding server side libraries=Corey Hulen2016-01-191-0/+3
* Merge branch 'master' into fix-droid=Corey Hulen2016-01-141-1/+1
|\
| * Fix old l4g referencesJoramWilander2016-01-141-1/+1
* | Fixing android push=Corey Hulen2016-01-141-3/+10
|/
* Final updatesJoramWilander2016-01-142-7/+16
* Add some unit testsJoramWilander2016-01-141-9/+20
* Added license validation and settingsJoramWilander2016-01-144-6/+111
* Merge pull request #1876 from mattermost/release-1.4Corey Hulen2016-01-121-1/+1
|\
| * Support old oauth routesJoramWilander2016-01-121-1/+1
* | Upgrade logging package=Corey Hulen2016-01-1119-19/+19
|/
* Merge pull request #1824 from hmhealey/plt1525Joram Wilander2016-01-113-10/+61
|\
| * Added the ability to get more channel members from getChannelExtraInfohmhealey2016-01-063-10/+61
* | Merge pull request #1813 from mattermost/PLT-1558Harrison Healey2016-01-062-5/+12
|\ \ | |/ |/|
| * PLT-1558 adding session length to config file=Corey Hulen2016-01-052-5/+12
* | Merge pull request #1816 from mattermost/PLT-1607Christopher Speller2016-01-061-0/+1
|\ \
| * | PLT-1607 adding more debugging info for email and push notifications=Corey Hulen2016-01-051-0/+1
* | | Merge pull request #1814 from mattermost/PLT-1485aChristopher Speller2016-01-061-0/+9
|\ \ \
| * | | PLT-1485 Adding last view channel sticky=Corey Hulen2016-01-051-0/+9
* | | | Merge pull request #1809 from mattermost/PLT-1557Christopher Speller2016-01-062-7/+56
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/|
| * | PLT-1557 revoking sessions from same device=Corey Hulen2016-01-052-7/+56
| |/
* | Fixing Import=Corey Hulen2016-01-051-0/+1
* | Moving to constnt=Corey Hulen2016-01-051-1/+1
* | Fixing error message=Corey Hulen2016-01-051-1/+1
|/
* Merge pull request #1745 from mattermost/plt-1118Christopher Speller2016-01-044-22/+465
|\
| * Add ability to switch between SSO and email accountJoramWilander2015-12-174-22/+465
* | Merge pull request #1800 from asaadmahmoodspin/ui-improvementsJoram Wilander2016-01-041-1/+1
|\ \
| * | Multiple UI ImprovementsAsaad Mahmood2016-01-041-1/+1
* | | Merge pull request #1763 from benburkert/non-s3-regionChristopher Speller2016-01-041-2/+16
|\ \ \ | |/ / |/| |
| * | support unofficial S3 regionsBen Burkert2015-12-211-2/+16
| |/
* | Correct mail templates to show 'You've been invited to [teamname] team' rathe...Hjf2882015-12-282-2/+2
* | Fixed TestGetFile unit testhmhealey2015-12-181-4/+3
* | Added additional information to getFileInfo api callhmhealey2015-12-181-26/+10
|/
* Some refactoringChristopher Speller2015-12-162-20/+85
* Merge pull request #1729 from hmhealey/plt886Joram Wilander2015-12-151-0/+6
|\
| * Added serverside file size check for post attachmentshmhealey2015-12-151-0/+6
* | Merge pull request #1726 from mattermost/PLT-1447Christopher Speller2015-12-151-2/+2
|\ \
| * | PLT-1447 fixing sending name in push notifications=Corey Hulen2015-12-141-2/+2
| |/
* | Merge branch 'release-1.3'Christopher Speller2015-12-141-0/+2
|\ \ | |/ |/|
| * Fixing cacheing issue on IE and EdgeChristopher Speller2015-12-141-0/+2
* | Merge pull request #1707 from mattermost/plt-1495Christopher Speller2015-12-141-0/+1
|\ \
| * | Include SiteURL in props for invite emailJoramWilander2015-12-111-0/+1
* | | Merge pull request #1712 from rgarmsen2295/plt-1263Harrison Healey2015-12-1412-135/+41
|\ \ \
| * | | Fixed broken unsubscribe instructionsReed Garmsen2015-12-1112-135/+41
| |/ /
* / / Updated emails in unit tests to include '+'Reed Garmsen2015-12-1311-121/+121
|/ /