summaryrefslogtreecommitdiffstats
path: root/api
Commit message (Expand)AuthorAgeFilesLines
* 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
|/ /
* | Merge pull request #1677 from hmhealey/plt1244Corey Hulen2015-12-111-18/+35
|\ \
| * | Changed serverside mention parsing to support usernames containing periodshmhealey2015-12-091-18/+35
| |/
* | Merge pull request #1652 from hmhealey/plt1319Corey Hulen2015-12-113-1/+110
|\ \
| * | Moved logic for making direct channels visible to both members on post to the...hmhealey2015-12-072-0/+107
| * | Added preference_changed web socket eventhmhealey2015-12-071-1/+3
* | | Fixed issue with Team Settings modal saving items instead of cancelling; chan...Reed Garmsen2015-12-102-2/+2
* | | Merge pull request #1648 from npcode/notification-email-local-timezoneChristopher Speller2015-12-102-3/+3
|\ \ \ | |_|/ |/| |
| * | Use local timezone for notification emailYi EungJun2015-12-082-3/+3
* | | fixing typo=Corey Hulen2015-12-091-1/+1
* | | Updating the push message=Corey Hulen2015-12-081-1/+5
* | | Merge pull request #1646 from mattermost/PLT-1302Joram Wilander2015-12-081-4/+4
|\ \ \
| * | | PLT-1302 fixing hiding email adddress=Corey Hulen2015-12-071-4/+4
| | |/ | |/|
* / | Return 100 channel users in extra info callJoramWilander2015-12-071-1/+1
|/ /
* | Merge pull request #1629 from mattermost/PLT-1369Christopher Speller2015-12-071-1/+2
|\ \
| * | Fixing message=Corey Hulen2015-12-041-23/+1
| * | PLT-1369 send core message=Corey Hulen2015-12-041-1/+24
* | | Merge pull request #1616 from florianorben/PLT-1380Christopher Speller2015-12-071-1/+33
|\ \ \ | |/ / |/| |
| * | PLT-1380: Post system message when user updates channel headerFlorian Orben2015-12-041-1/+33