Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #776 from mishimi/patch-5 | Harrison Healey | 2015-09-24 | 1 | -1/+1 |
|\ | |||||
| * | PLT-388 | mishimi | 2015-09-24 | 1 | -1/+1 |
* | | Merge pull request #765 from mattermost/PLT-349 | Christopher Speller | 2015-09-24 | 24 | -171/+1279 |
|\ \ | |||||
| * | | Assiging first user system_admin role | =Corey Hulen | 2015-09-23 | 4 | -0/+51 |
| * | | Fixing state setting | =Corey Hulen | 2015-09-23 | 5 | -33/+102 |
| * | | Fixing merge | =Corey Hulen | 2015-09-23 | 83 | -489/+1669 |
| |\ \ | |||||
| * | | | PLT-349 adding team mgt to admin console | =Corey Hulen | 2015-09-23 | 22 | -162/+1150 |
* | | | | Merge pull request #769 from hmhealey/plt334 | Joram Wilander | 2015-09-24 | 2 | -1/+23 |
|\ \ \ \ | |_|_|/ |/| | | | |||||
| * | | | Restricted markdown output to only appear on one line when in singleline mode | hmhealey | 2015-09-23 | 2 | -1/+23 |
* | | | | Merge pull request #766 from mattermost/postpone-oauth-and-webhooks | Corey Hulen | 2015-09-23 | 1 | -5/+0 |
|\ \ \ \ | |||||
| * | | | | Removing OAuth and webhooks changes | it33 | 2015-09-23 | 1 | -5/+0 |
* | | | | | Merge pull request #770 from hmhealey/plt339 | Corey Hulen | 2015-09-23 | 1 | -1/+1 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | |||||
| * | | | | Changed Markdown links to open in a new tab | hmhealey | 2015-09-23 | 1 | -1/+1 |
|/ / / / | |||||
* | | | | Merge pull request #768 from mattermost/segment-fix | Corey Hulen | 2015-09-23 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | fixing segment bug | =Corey Hulen | 2015-09-23 | 1 | -1/+1 |
* | | | | | Merge pull request #767 from mattermost/segment-fix | Corey Hulen | 2015-09-23 | 1 | -1/+0 |
|\| | | | | |_|/ / |/| | | | |||||
| * | | | fixing segment bug | =Corey Hulen | 2015-09-23 | 1 | -1/+0 |
|/ / / | |||||
* | | | Merge pull request #762 from asaadmahmoodspin/ui-improvements | Harrison Healey | 2015-09-23 | 3 | -0/+30 |
|\ \ \ | |||||
| * | | | Markdown UI improvements with small description height fix | Asaad Mahmood | 2015-09-23 | 3 | -0/+30 |
* | | | | Merge pull request #752 from mattermost/PLT-11-email | Corey Hulen | 2015-09-23 | 61 | -1127/+3196 |
|\ \ \ \ | |||||
| * | | | | Changing image settings to file settings | =Corey Hulen | 2015-09-23 | 15 | -134/+134 |
| * | | | | Merge branch 'master' into PLT-11-email | =Corey Hulen | 2015-09-23 | 68 | -353/+1504 |
| |\ \ \ \ | |/ / / / |/| | | / | | |_|/ | |/| | | |||||
* | | | | Merge pull request #764 from mattermost/theme-image-fix | Corey Hulen | 2015-09-23 | 1 | -1/+1 |
|\ \ \ \ | |_|_|/ |/| | | | |||||
| * | | | Fix theme images 404ing. | JoramWilander | 2015-09-23 | 1 | -1/+1 |
|/ / / | |||||
* | | | Merge pull request #761 from mattermost/plt-356 | Harrison Healey | 2015-09-23 | 1 | -15/+36 |
|\ \ \ | |||||
| * | | | Fix post not rendering properly in some cases. | JoramWilander | 2015-09-23 | 1 | -15/+36 |
* | | | | Merge pull request #759 from mattermost/plt-242-3 | Harrison Healey | 2015-09-23 | 41 | -189/+1161 |
|\ \ \ \ | |_|_|/ |/| | | | |||||
| * | | | Implement UI theme colors. | JoramWilander | 2015-09-23 | 41 | -189/+1161 |
* | | | | Merge pull request #753 from hmhealey/plt341 | Corey Hulen | 2015-09-23 | 1 | -1/+12 |
|\ \ \ \ | |_|/ / |/| | | | |||||
| * | | | Added CSS classes to markdown headings, links, and tables | hmhealey | 2015-09-23 | 1 | -1/+12 |
* | | | | Merge pull request #760 from chengweiv5/PLT-126 | Harrison Healey | 2015-09-23 | 7 | -11/+11 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | PLT-126: Change 'Private Messages' to 'Direct Messages' | Chengwei Yang | 2015-09-23 | 7 | -11/+11 |
|/ / / | |||||
* | | | Merge pull request #740 from asaadmahmoodspin/ui-improvements | Joram Wilander | 2015-09-23 | 6 | -8/+16 |
|\ \ \ | |||||
| * | | | Removing click event for channel description popover | Asaad Mahmood | 2015-09-22 | 1 | -1/+1 |
| * | | | UI Modifications for multiple tickets | Asaad Mahmood | 2015-09-22 | 5 | -7/+15 |
* | | | | Merge pull request #756 from rgarmsen2295/plt-165 | Joram Wilander | 2015-09-23 | 1 | -8/+15 |
|\ \ \ \ | |||||
| * | | | | Adds a check for email validity client-side when joining a team using a publi... | Reed Garmsen | 2015-09-22 | 1 | -8/+15 |
* | | | | | Merge pull request #757 from chengweiv5/PLT-168 | Joram Wilander | 2015-09-23 | 1 | -3/+4 |
|\ \ \ \ \ | |||||
| * | | | | | PLT-168: check email used to reset password strictly | Chengwei Yang | 2015-09-23 | 1 | -3/+4 |
* | | | | | | Merge pull request #755 from rgarmsen2295/plt-164 | Christopher Speller | 2015-09-23 | 2 | -24/+27 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Functionalized draft checking | Reed Garmsen | 2015-09-22 | 1 | -24/+26 |
| * | | | | | | Post drafts are now displayed when they contain only files and no text | Reed Garmsen | 2015-09-22 | 1 | -2/+2 |
| * | | | | | | Small change to remove react warning | Reed Garmsen | 2015-09-22 | 1 | -0/+1 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Merge pull request #751 from hmhealey/plt344 | Christopher Speller | 2015-09-23 | 8 | -62/+203 |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | |||||
| * | | | | | Removed extra handling of markdown links when doing autolinking | hmhealey | 2015-09-22 | 1 | -31/+5 |
| * | | | | | Moved text formatting code to only occur inside of markdown text nodes | hmhealey | 2015-09-22 | 2 | -19/+33 |
| * | | | | | Changed hashtag regex to only accept hashtags that begin with a letter | hmhealey | 2015-09-22 | 1 | -1/+1 |
| * | | | | | Moved emoticon parsing to happen after url parsing so that we don't have smil... | hmhealey | 2015-09-22 | 1 | -4/+4 |
| * | | | | | Restored changes which remove emojify and switch to our own version | hmhealey | 2015-09-22 | 7 | -12/+165 |
* | | | | | | Merge pull request #758 from sjmog/readme-fix | it33 | 2015-09-23 | 1 | -1/+1 |
|\ \ \ \ \ \ |