summaryrefslogtreecommitdiffstats
path: root/web
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #771 from rgarmsen2295/plt-143Harrison Healey2015-09-245-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 Garmsen2015-09-232-6/+6
| | | | | | | | some text
| * Added support to drag and drop text into the main textbox or RHS textboxReed Garmsen2015-09-233-1/+16
| |
| * Small fix for react key warningReed Garmsen2015-09-232-3/+9
| |
* | Merge pull request #776 from mishimi/patch-5Harrison Healey2015-09-241-1/+1
|\ \ | | | | | | PLT-388 Added warning that @mentions from Slack are not imported
| * | PLT-388mishimi2015-09-241-1/+1
| | | | | | | | | Warning users that @mentions from Slack are currently not supported after import
* | | Merge pull request #765 from mattermost/PLT-349Christopher Speller2015-09-2411-138/+999
|\ \ \ | | | | | | | | PLT-349 adding team mgt to admin console
| * | | Fixing state setting=Corey Hulen2015-09-234-31/+100
| | | |
| * | | Fixing merge=Corey Hulen2015-09-2367-373/+1568
| |\ \ \
| * | | | PLT-349 adding team mgt to admin console=Corey Hulen2015-09-2311-131/+923
| | | | |
* | | | | Merge pull request #769 from hmhealey/plt334Joram Wilander2015-09-242-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 modehmhealey2015-09-232-1/+23
| | | | |
* | | | | Changed Markdown links to open in a new tabhmhealey2015-09-231-1/+1
| |_|/ / |/| | |
* | | | fixing segment bug=Corey Hulen2015-09-231-1/+1
| | | |
* | | | 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 fix
| * | | Markdown UI improvements with small description height fixAsaad Mahmood2015-09-233-0/+30
| | | |
* | | | Changing image settings to file settings=Corey Hulen2015-09-234-42/+42
| | | |
* | | | Merge branch 'master' into PLT-11-email=Corey Hulen2015-09-2362-329/+1495
|\ \ \ \ | |_|/ / |/| | / | | |/ | |/|
| * | Fix theme images 404ing.JoramWilander2015-09-231-1/+1
| | |
| * | Merge pull request #761 from mattermost/plt-356Harrison Healey2015-09-231-15/+36
| |\ \ | | | | | | | | PLT-356 Fix post not rendering properly in some cases.
| | * | Fix post not rendering properly in some cases.JoramWilander2015-09-231-15/+36
| | | |
| * | | Merge pull request #759 from mattermost/plt-242-3Harrison Healey2015-09-2338-186/+1154
| |\ \ \ | | |_|/ | |/| | PLT-242 Implement custom UI theme colors.
| | * | Implement UI theme colors.JoramWilander2015-09-2338-186/+1154
| | | |
| * | | Merge pull request #753 from hmhealey/plt341Corey Hulen2015-09-231-1/+12
| |\ \ \ | | |_|/ | |/| | PLT-341 Added CSS classes to markdown headings, links, and tables
| | * | Added CSS classes to markdown headings, links, and tableshmhealey2015-09-231-1/+12
| | | |
| * | | PLT-126: Change 'Private Messages' to 'Direct Messages'Chengwei Yang2015-09-236-10/+10
| |/ / | | | | | | | | | Signed-off-by: Chengwei Yang <yangchengwei@qiyi.com>
| * | Merge pull request #740 from asaadmahmoodspin/ui-improvementsJoram Wilander2015-09-236-8/+16
| |\ \ | | | | | | | | UI Modifications for multiple tickets
| | * | 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
| |\ \ \ | | | | | | | | | | 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 Garmsen2015-09-221-8/+15
| | | | | | | | | | | | | | | | | | | | public link
| * | | | Merge pull request #757 from chengweiv5/PLT-168Joram Wilander2015-09-231-3/+4
| |\ \ \ \ | | | | | | | | | | | | PLT-168: check email used to reset password strictly
| | * | | | PLT-168: check email used to reset password strictlyChengwei Yang2015-09-231-3/+4
| | |/ / / | | | | | | | | | | | | | | | Signed-off-by: Chengwei Yang <yangchengwei@qiyi.com>
| * | | | Merge pull request #755 from rgarmsen2295/plt-164Christopher Speller2015-09-232-24/+27
| |\ \ \ \ | | | | | | | | | | | | PLT-164 Post drafts containing only files are now recognized properly
| | * | | | 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
| |\ \ \ \ | | |_|_|/ | |/| | | 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 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 ↵hmhealey2015-09-221-4/+4
| | | | | | | | | | | | | | | | | | | | smilies accidentally occuring in urls
| | * | | Restored changes which remove emojify and switch to our own versionhmhealey2015-09-227-12/+165
| | | | |
| * | | | Merge pull request #748 from hmhealey/plt233Christopher Speller2015-09-231-8/+1
| |\ \ \ \ | | | | | | | | | | | | PLT-233 Removed click handler from RHS [...] menu
| | * | | | Removed click handler from RHS [...] menuhmhealey2015-09-221-8/+1
| | | | | |
| * | | | | Merge pull request #739 from rgarmsen2295/plt-39Christopher Speller2015-09-233-4/+17
| |\ \ \ \ \ | | |_|_|/ / | |/| | | | PLT-39 Clicking "Resend email" on the verification page now confirms email was sent
| | * | | | Minor changes to how resend status is passedReed Garmsen2015-09-213-7/+11
| | | | | |
| | * | | | Added confirmation when users request another verification email; users are ↵Reed Garmsen2015-09-212-2/+11
| | | |_|/ | | |/| | | | | | | | | | | | no longer redirected after requesting another verification email
* | | | | Adding new EnableIncomingWebhooks property to service settings in the admin ↵=Corey Hulen2015-09-221-0/+34
| | | | | | | | | | | | | | | | | | | | console.
generated by cgit v1.2.3-1-g7c22 (git 2.25.1) at 2024-10-31 01:11:23 +0000