summaryrefslogtreecommitdiffstats
path: root/web
Commit message (Collapse)AuthorAgeFilesLines
* 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
* | | | Merge pull request #715 from mattermost/plt-27Joram Wilander2015-09-2213-84/+544
|\ \ \ \ | |_|_|/ |/| | | PLT-27 Implement incoming webhooks.
| * | | Implement incoming webhooks.JoramWilander2015-09-2113-84/+544
| | | |
* | | | Revert "PLT-289 Properly removed lingering references to emojify"Christopher Speller2015-09-221-0/+5
| |_|/ |/| |
* | | Revert "PLT-289 Added parsing for named emojis to TextFormatting and removed ↵Christopher Speller2015-09-226-165/+7
| | | | | | | | | | | | emojify"
* | | Merge pull request #742 from hmhealey/plt289Christopher Speller2015-09-221-5/+0
|\ \ \ | | | | | | | | PLT-289 Properly removed lingering references to emojify
| * | | Properly removed lingering references to emojifyhmhealey2015-09-221-5/+0
| | | |
* | | | Merge pull request #737 from hmhealey/plt289Harrison Healey2015-09-226-7/+165
|\| | | | | | | | | | | PLT-289 Added parsing for named emojis to TextFormatting and removed emojify
| * | | Added parsing for named emojis to TextFormatting and removed dependency on ↵hmhealey2015-09-226-7/+165
| | |/ | |/| | | | | | | emojify
* | | Merge pull request #730 from mattermost/shorten-description-help-textCorey Hulen2015-09-221-1/+1
|\ \ \ | |/ / |/| | Shorten description help text
| * | Adjusting sentenceit332015-09-211-1/+1
| | |
| * | Shorten description help textit332015-09-201-1/+1
| |/ | | | | Currently it word wraps, this prevents word-wrapping
* | Merge pull request #734 from mattermost/plt-206Christopher Speller2015-09-214-3/+7
|\ \ | | | | | | PLT-206 Fix first channel load scrolling issue on Windows and iOS and add emoji to RHS.
| * | Fix first channel load scrolling issue on Windows and iOS and add emoji to RHS.JoramWilander2015-09-214-3/+7
| | |
* | | Merge pull request #736 from hmhealey/plt312Joram Wilander2015-09-211-1/+7
|\ \ \ | |/ / |/| | PLT-312 Added theme class to markdown links
| * | Added theme class to markdown linkshmhealey2015-09-211-1/+7
| | |
* | | Merge pull request #732 from mattermost/plt-243Joram Wilander2015-09-211-8/+13
|\ \ \ | | | | | | | | PLT-243 Adding new create channel modal to the more menu
| * | | Adding new create channel modal to the more menuChristopher Speller2015-09-211-8/+13
| |/ /
* / / Wrapped comment messages in divs like posts in the center panehmhealey2015-09-212-2/+2
|/ /
* | Merge pull request #722 from hmhealey/timestampJoram Wilander2015-09-213-3/+16
|\ \ | | | | | | Added a tooltip to post timestamps displaying the actual time the post was created
| * | Added a tooltip to post timestamps displaying the actual time the post was ↵hmhealey2015-09-193-3/+16
| |/ | | | | | | created
* | Merge pull request #731 from asaadmahmoodspin/new-channelChristopher Speller2015-09-212-6/+10
|\ \ | | | | | | Updating new channel UI
| * | Updating new channel UIAsaad Mahmood2015-09-212-6/+10
| |/
* | Cleaned up markdown formatting code and removed debug statementshmhealey2015-09-192-7/+9
| |
* | Deferred to marked.js's html sanitization when markdown is enabledhmhealey2015-09-191-2/+12
| |
* | Changed markdown link parsing to automatically add an explicit protocol to urlshmhealey2015-09-192-1/+16
| |
* | Prevented our url autolinking from breaking markdown linkshmhealey2015-09-191-6/+34
| |
* | Added marked library to text_formatting.jsxhmhealey2015-09-193-3/+13
| |
* | Removed underscores surrounding formatting tokens since they won't work with ↵hmhealey2015-09-191-8/+8
| | | | | | | | markdown
* | Removed unnecessary conversion of newlines to html line breakshmhealey2015-09-191-6/+4
|/
* merging=Corey Hulen2015-09-183-6/+14
|\
| * Merge pull request #699 from mattermost/PLT-92Joram Wilander2015-09-182-5/+13
| |\ | | | | | | PLT-92 Adding server side versioning to the binary
| | * moving to security tab=Corey Hulen2015-09-172-12/+11
| | |
| | * Making changes to versioning=Corey Hulen2015-09-171-5/+4
| | |
generated by cgit v1.2.3-1-g7c22 (git 2.25.1) at 2024-10-30 20:50:15 +0000