Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | plt-363 - Adding organisation theme | Asaad Mahmood | 2015-09-24 | 9 | -31/+58 |
| | |||||
* | Merge pull request #771 from rgarmsen2295/plt-143 | Harrison Healey | 2015-09-24 | 5 | -4/+25 |
|\ | | | | | PLT-143 Support for text drag and drop | ||||
| * | Text cursor now focuses on the textbox after performing a drag and drop of ↵ | Reed Garmsen | 2015-09-23 | 2 | -6/+6 |
| | | | | | | | | some text | ||||
| * | Added support to drag and drop text into the main textbox or RHS textbox | Reed Garmsen | 2015-09-23 | 3 | -1/+16 |
| | | |||||
| * | Small fix for react key warning | Reed Garmsen | 2015-09-23 | 2 | -3/+9 |
| | | |||||
* | | Merge pull request #776 from mishimi/patch-5 | Harrison Healey | 2015-09-24 | 1 | -1/+1 |
|\ \ | | | | | | | PLT-388 Added warning that @mentions from Slack are not imported | ||||
| * | | PLT-388 | mishimi | 2015-09-24 | 1 | -1/+1 |
| | | | | | | | | | Warning users that @mentions from Slack are currently not supported after import | ||||
* | | | Merge pull request #765 from mattermost/PLT-349 | Christopher Speller | 2015-09-24 | 24 | -171/+1279 |
|\ \ \ | | | | | | | | | PLT-349 adding team mgt to admin console | ||||
| * | | | 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 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | PLT-334 Restricted markdown output to only appear on one line when in singleline mode | ||||
| * | | | | 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 | ||||
| * | | | | | Removing OAuth and webhooks changes | it33 | 2015-09-23 | 1 | -5/+0 |
| | | | | | | | | | | | | | | | | | | While OAuth2 and webhooks are in the codebase, the UI was only partly finished and we foresee enough time for testing before shipping Oct 2 so we're postponing these to the Oct 16 release. | ||||
* | | | | | | Merge pull request #770 from hmhealey/plt339 | Corey Hulen | 2015-09-23 | 1 | -1/+1 |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | PLT-339 Changed Markdown links to open in a new tab | ||||
| * | | | | | 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 | ||||
| * | | | | | 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 | ||||
| * | | | | 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 | ||||
| * | | | | 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 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | PLT-11 Cleaned up config file and added ability to makes changes from the admin console. | ||||
| * | | | | 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. | ||||
| * | | | 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 |
|\ \ \ | | | | | | | | | PLT-356 Fix post not rendering properly in some cases. | ||||
| * | | | 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 |
|\ \ \ \ | |_|_|/ |/| | | | PLT-242 Implement custom UI theme colors. | ||||
| * | | | 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 |
|\ \ \ \ | |_|/ / |/| | | | PLT-341 Added CSS classes to markdown headings, links, and tables | ||||
| * | | | 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' | ||||
| * | | | PLT-126: Change 'Private Messages' to 'Direct Messages' | Chengwei Yang | 2015-09-23 | 7 | -11/+11 |
|/ / / | | | | | | | | | | Signed-off-by: Chengwei Yang <yangchengwei@qiyi.com> | ||||
* | | | Merge pull request #740 from asaadmahmoodspin/ui-improvements | Joram Wilander | 2015-09-23 | 6 | -8/+16 |
|\ \ \ | | | | | | | | | UI Modifications for multiple tickets | ||||
| * | | | 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 |
|\ \ \ \ | | | | | | | | | | | PLT-165 Prevents users from signing up via a public link using a non-valid email address | ||||
| * | | | | Adds a check for email validity client-side when joining a team using a ↵ | Reed Garmsen | 2015-09-22 | 1 | -8/+15 |
| | | | | | | | | | | | | | | | | | | | | public link | ||||
* | | | | | 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 | ||||
| * | | | | | PLT-168: check email used to reset password strictly | Chengwei Yang | 2015-09-23 | 1 | -3/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Chengwei Yang <yangchengwei@qiyi.com> | ||||
* | | | | | | Merge pull request #755 from rgarmsen2295/plt-164 | Christopher Speller | 2015-09-23 | 2 | -24/+27 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | PLT-164 Post drafts containing only files are now recognized properly | ||||
| * | | | | | | 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 |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | PLT-344 Restore emoticon handling to text_formatting.jsx and fix it's interaction with other formatting | ||||
| * | | | | | Removed extra handling of markdown links when doing autolinking | hmhealey | 2015-09-22 | 1 | -31/+5 |
| | | | | | |