summaryrefslogtreecommitdiffstats
path: root/api
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | Merge pull request #1613 from florianorben/PLT-1326Corey Hulen2015-12-041-1/+1
|\| |
| * | PLT-1326: Enable channel posts of type join or leave not trigger unread notif...Florian Orben2015-12-041-1/+1
* | | Remove <> link replacementJoramWilander2015-12-041-4/+0
* | | Convert links in Slack attachment text to Markdown formatJoramWilander2015-12-031-1/+16
|/ /
* | PLT-902 switching to push proxy server=Corey Hulen2015-11-301-2/+14
* | Merge pull request #1537 from florianorben/PLT-1035Corey Hulen2015-11-301-0/+8
|\ \
| * | PLT-1035: Remove last data point in graphs on #statistics pageFlorian Orben2015-11-281-0/+8
* | | set correct http status code for login failures/wrong emailFlorian Orben2015-11-281-0/+1
|/ /
* | Merge pull request #1505 from mattermost/lib-upgradeChristopher Speller2015-11-261-6/+4
|\ \
| * | upgrading libs=Corey Hulen2015-11-231-6/+4
* | | Merge pull request #1502 from mattermost/disable-allChristopher Speller2015-11-241-3/+3
|\ \ \
| * | | Disabling the all mention=Corey Hulen2015-11-231-3/+3
| |/ /
* / / Added /loadtest url command to load arbitrary files as postshmhealey2015-11-232-0/+129
|/ /
* | Implementing Permalinks and jumping to post from search. PerformanceChristopher Speller2015-11-232-0/+38
* | Merge pull request #1448 from mattermost/PLT-975Joram Wilander2015-11-184-2/+175
|\ \
| * | fixing based on feedback=Corey Hulen2015-11-182-2/+7
| * | Adding perm delete channels by team=Corey Hulen2015-11-161-0/+4
| * | Fixing unit tests=Corey Hulen2015-11-162-0/+5
| * | Adding perm delete to cmd line=Corey Hulen2015-11-164-2/+161
* | | PLT-873: Change email invitation subjectAlex Garibay2015-11-171-1/+1
* | | Adding device type=Corey Hulen2015-11-161-3/+2
* | | Merge pull request #1437 from rgarmsen2295/plt-1086Harrison Healey2015-11-162-4/+7
|\ \ \ | |/ / |/| |
| * | Fixed unit test issuesReed Garmsen2015-11-131-1/+2
| * | Allow admins to change the display name for the default channelReed Garmsen2015-11-131-3/+5
* | | Merge release branch 'release-1.2'Christopher Speller2015-11-161-0/+8
|\ \ \ | |/ / |/| / | |/