Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | 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 | 10 | -137/+992 | |
|\ \ \ | | | | | | | | | PLT-349 adding team mgt to admin console | |||||
| * | | | Fixing state setting | =Corey Hulen | 2015-09-23 | 4 | -31/+100 | |
| | | | | ||||||
| * | | | Fixing merge | =Corey Hulen | 2015-09-23 | 41 | -352/+1204 | |
| |\ \ \ | ||||||
| * | | | | PLT-349 adding team mgt to admin console | =Corey Hulen | 2015-09-23 | 10 | -130/+916 | |
| | | | | | ||||||
* | | | | | Merge pull request #769 from hmhealey/plt334 | Joram Wilander | 2015-09-24 | 1 | -0/+16 | |
|\ \ \ \ \ | |_|_|/ / |/| | | | | 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 | 1 | -0/+16 | |
| | |/ / | |/| | | ||||||
* / | | | Changed Markdown links to open in a new tab | hmhealey | 2015-09-23 | 1 | -1/+1 | |
|/ / / | ||||||
* | | | Changing image settings to file settings | =Corey Hulen | 2015-09-23 | 4 | -42/+42 | |
| | | | ||||||
* | | | Merge branch 'master' into PLT-11-email | =Corey Hulen | 2015-09-23 | 37 | -310/+1162 | |
|\ \ \ | |/ / |/| / | |/ | ||||||
| * | 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 | 16 | -177/+827 | |
| |\ \ | | | | | | | | | PLT-242 Implement custom UI theme colors. | |||||
| | * | | Implement UI theme colors. | JoramWilander | 2015-09-23 | 16 | -177/+827 | |
| | | | | ||||||
| * | | | 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 | |
| | | | | ||||||
| * | | | PLT-126: Change 'Private Messages' to 'Direct Messages' | Chengwei Yang | 2015-09-23 | 6 | -10/+10 | |
| |/ / | | | | | | | | | | Signed-off-by: Chengwei Yang <yangchengwei@qiyi.com> | |||||
| * | | Merge pull request #740 from asaadmahmoodspin/ui-improvements | Joram Wilander | 2015-09-23 | 5 | -8/+15 | |
| |\ \ | | | | | | | | | 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 | 4 | -7/+14 | |
| | | | | ||||||
| * | | | 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 | 6 | -53/+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 | |
| | | | | | ||||||
| | * | | | 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 ↵ | hmhealey | 2015-09-22 | 1 | -4/+4 | |
| | | | | | | | | | | | | | | | | | | | | smilies accidentally occuring in urls | |||||
| | * | | | Restored changes which remove emojify and switch to our own version | hmhealey | 2015-09-22 | 5 | -3/+165 | |
| | | | | | ||||||
| * | | | | Merge pull request #748 from hmhealey/plt233 | Christopher Speller | 2015-09-23 | 1 | -8/+1 | |
| |\ \ \ \ | | | | | | | | | | | | | PLT-233 Removed click handler from RHS [...] menu | |||||
| | * | | | | Removed click handler from RHS [...] menu | hmhealey | 2015-09-22 | 1 | -8/+1 | |
| | |/ / / | ||||||
| * | | | | Merge pull request #739 from rgarmsen2295/plt-39 | Christopher Speller | 2015-09-23 | 2 | -3/+12 | |
| |\ \ \ \ | | |_|/ / | |/| | | | PLT-39 Clicking "Resend email" on the verification page now confirms email was sent | |||||
| | * | | | Minor changes to how resend status is passed | Reed Garmsen | 2015-09-21 | 2 | -5/+8 | |
| | | | | | ||||||
| | * | | | Added confirmation when users request another verification email; users are ↵ | Reed Garmsen | 2015-09-21 | 1 | -1/+7 | |
| | | |/ | | |/| | | | | | | | | | no longer redirected after requesting another verification email | |||||
* | | | | Adding new EnableIncomingWebhooks property to service settings in the admin ↵ | =Corey Hulen | 2015-09-22 | 1 | -0/+34 | |
| | | | | | | | | | | | | | | | | console. | |||||
* | | | | Fixing merge conflict | =Corey Hulen | 2015-09-22 | 11 | -84/+414 | |
|\| | | | ||||||
| * | | | Merge pull request #715 from mattermost/plt-27 | Joram Wilander | 2015-09-22 | 11 | -84/+414 | |
| |\ \ \ | | |_|/ | |/| | | PLT-27 Implement incoming webhooks. | |||||
| | * | | Implement incoming webhooks. | JoramWilander | 2015-09-21 | 11 | -84/+414 | |
| | | | | ||||||
* | | | | Fixing bug in generating key length | =Corey Hulen | 2015-09-22 | 3 | -8/+8 | |
| | | | | ||||||
* | | | | Merge branch 'master' into PLT-11-email | =Corey Hulen | 2015-09-22 | 1 | -1/+1 | |
|\| | | | ||||||
| * | | | Revert "PLT-289 Added parsing for named emojis to TextFormatting and removed ↵ | Christopher Speller | 2015-09-22 | 5 | -165/+3 | |
| | | | | | | | | | | | | | | | | emojify" |