summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | Fixing state setting=Corey Hulen2015-09-235-33/+102
| * | | | | | Fixing merge=Corey Hulen2015-09-2383-489/+1669
| |\ \ \ \ \ \
| * | | | | | | PLT-349 adding team mgt to admin console=Corey Hulen2015-09-2322-162/+1150
* | | | | | | | Merge pull request #769 from hmhealey/plt334Joram Wilander2015-09-242-1/+23
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | Restricted markdown output to only appear on one line when in singleline modehmhealey2015-09-232-1/+23
| | | | | | * | set transparent png background to whiteJack2015-09-241-1/+10
| | | | | | * | godep fixJack2015-09-236-0/+1656
| | | | | | * | add imagingJack2015-09-239-0/+1984
| | | | | | * | godep saveJack2015-09-2346-5388/+8
| | | | | | * | use github.com/disintegration/imagingJack2015-09-233-54/+26
| |_|_|_|_|/ / |/| | | | | |
* | | | | | | Merge pull request #766 from mattermost/postpone-oauth-and-webhooksCorey Hulen2015-09-231-5/+0
|\ \ \ \ \ \ \
| * | | | | | | Removing OAuth and webhooks changesit332015-09-231-5/+0
* | | | | | | | Merge pull request #770 from hmhealey/plt339Corey Hulen2015-09-231-1/+1
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | Changed Markdown links to open in a new tabhmhealey2015-09-231-1/+1
|/ / / / / / /
* | | | | | | Merge pull request #768 from mattermost/segment-fixCorey Hulen2015-09-231-1/+1
|\ \ \ \ \ \ \
| * | | | | | | fixing segment bug=Corey Hulen2015-09-231-1/+1
* | | | | | | | Merge pull request #767 from mattermost/segment-fixCorey Hulen2015-09-231-1/+0
|\| | | | | | | | |_|/ / / / / |/| | | | | |
| * | | | | | fixing segment bug=Corey Hulen2015-09-231-1/+0
|/ / / / / /
* | | | | | Merge pull request #762 from asaadmahmoodspin/ui-improvementsHarrison Healey2015-09-233-0/+30
|\ \ \ \ \ \
| * | | | | | Markdown UI improvements with small description height fixAsaad Mahmood2015-09-233-0/+30
* | | | | | | Merge pull request #752 from mattermost/PLT-11-emailCorey Hulen2015-09-2361-1127/+3196
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | Changing image settings to file settings=Corey Hulen2015-09-2315-134/+134
| * | | | | | Merge branch 'master' into PLT-11-email=Corey Hulen2015-09-2368-353/+1504
| |\ \ \ \ \ \ | |/ / / / / / |/| | | / / / | | |_|/ / / | |/| | | |
* | | | | | Merge pull request #764 from mattermost/theme-image-fixCorey Hulen2015-09-231-1/+1
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Fix theme images 404ing.JoramWilander2015-09-231-1/+1
|/ / / / /
* | | | | Merge pull request #761 from mattermost/plt-356Harrison Healey2015-09-231-15/+36
|\ \ \ \ \
| * | | | | Fix post not rendering properly in some cases.JoramWilander2015-09-231-15/+36
* | | | | | Merge pull request #759 from mattermost/plt-242-3Harrison Healey2015-09-2341-189/+1161
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Implement UI theme colors.JoramWilander2015-09-2341-189/+1161
* | | | | | Merge pull request #753 from hmhealey/plt341Corey Hulen2015-09-231-1/+12
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Added CSS classes to markdown headings, links, and tableshmhealey2015-09-231-1/+12
* | | | | | Merge pull request #760 from chengweiv5/PLT-126Harrison Healey2015-09-237-11/+11
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | PLT-126: Change 'Private Messages' to 'Direct Messages'Chengwei Yang2015-09-237-11/+11
|/ / / / /
* | | | | Merge pull request #740 from asaadmahmoodspin/ui-improvementsJoram Wilander2015-09-236-8/+16
|\ \ \ \ \
| * | | | | Removing click event for channel description popoverAsaad Mahmood2015-09-221-1/+1
| * | | | | UI Modifications for multiple ticketsAsaad Mahmood2015-09-225-7/+15
* | | | | | Merge pull request #756 from rgarmsen2295/plt-165Joram Wilander2015-09-231-8/+15
|\ \ \ \ \ \
| * | | | | | Adds a check for email validity client-side when joining a team using a publi...Reed Garmsen2015-09-221-8/+15
* | | | | | | Merge pull request #757 from chengweiv5/PLT-168Joram Wilander2015-09-231-3/+4
|\ \ \ \ \ \ \
| * | | | | | | PLT-168: check email used to reset password strictlyChengwei Yang2015-09-231-3/+4
* | | | | | | | Merge pull request #755 from rgarmsen2295/plt-164Christopher Speller2015-09-232-24/+27
|\ \ \ \ \ \ \ \
| * | | | | | | | Functionalized draft checkingReed Garmsen2015-09-221-24/+26
| * | | | | | | | Post drafts are now displayed when they contain only files and no textReed Garmsen2015-09-221-2/+2
| * | | | | | | | Small change to remove react warningReed Garmsen2015-09-221-0/+1
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge pull request #751 from hmhealey/plt344Christopher Speller2015-09-238-62/+203
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | Removed extra handling of markdown links when doing autolinkinghmhealey2015-09-221-31/+5
| * | | | | | | Moved text formatting code to only occur inside of markdown text nodeshmhealey2015-09-222-19/+33
| * | | | | | | Changed hashtag regex to only accept hashtags that begin with a letterhmhealey2015-09-221-1/+1
| * | | | | | | Moved emoticon parsing to happen after url parsing so that we don't have smil...hmhealey2015-09-221-4/+4
| * | | | | | | Restored changes which remove emojify and switch to our own versionhmhealey2015-09-227-12/+165