summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | Merge pull request #756 from rgarmsen2295/plt-165Joram Wilander2015-09-231-8/+15
|\ \ \ \ \
| * | | | | Adds a check for email validity client-side when joining a team using a publi...Reed Garmsen2015-09-221-8/+15
* | | | | | Merge pull request #757 from chengweiv5/PLT-168Joram Wilander2015-09-231-3/+4
|\ \ \ \ \ \
| * | | | | | PLT-168: check email used to reset password strictlyChengwei Yang2015-09-231-3/+4
* | | | | | | Merge pull request #755 from rgarmsen2295/plt-164Christopher Speller2015-09-232-24/+27
|\ \ \ \ \ \ \
| * | | | | | | 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
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | 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 smil...hmhealey2015-09-221-4/+4
| * | | | | | Restored changes which remove emojify and switch to our own versionhmhealey2015-09-227-12/+165
* | | | | | | Merge pull request #758 from sjmog/readme-fixit332015-09-231-1/+1
|\ \ \ \ \ \ \
| * | | | | | | fix README typoSam Morgan2015-09-231-1/+1
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge pull request #748 from hmhealey/plt233Christopher Speller2015-09-231-8/+1
|\ \ \ \ \ \ \
| * | | | | | | Removed click handler from RHS [...] menuhmhealey2015-09-221-8/+1
* | | | | | | | Merge pull request #739 from rgarmsen2295/plt-39Christopher Speller2015-09-233-4/+17
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Minor changes to how resend status is passedReed Garmsen2015-09-213-7/+11
| * | | | | | | Added confirmation when users request another verification email; users are n...Reed Garmsen2015-09-212-2/+11
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge pull request #754 from mattermost/it33-patch-1Corey Hulen2015-09-221-19/+0
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | Removing CLA templates responseit332015-09-221-19/+0
|/ / / / / /
| | | | * | Adding new EnableIncomingWebhooks property to service settings in the admin c...=Corey Hulen2015-09-221-0/+34
| | | | * | Fixing merge conflict=Corey Hulen2015-09-224-7/+7
| | | | * | Fixing merge conflict=Corey Hulen2015-09-2231-102/+1285
| | | | |\ \ | |_|_|_|/ / |/| | | | |
* | | | | | Merge pull request #715 from mattermost/plt-27Joram Wilander2015-09-2231-102/+1284
|\ \ \ \ \ \
| * | | | | | Implement incoming webhooks.JoramWilander2015-09-2131-102/+1284
| | | | | * | Fixing bug in generating key length=Corey Hulen2015-09-224-12/+12
| | | | | * | Merge branch 'master' into PLT-11-email=Corey Hulen2015-09-223-10/+16
| | | | | |\ \ | |_|_|_|_|/ / |/| | | | | |
* | | | | | | Merge pull request #710 from jdeng/masterJoram Wilander2015-09-221-1/+2
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | fix conflictJack2015-09-22110-641/+9061
| |\ \ \ \ \ \
| * | | | | | | go fmtJack2015-09-171-1/+1
| * | | | | | | content type for getFileJack2015-09-171-1/+2
* | | | | | | | Merge pull request #747 from mattermost/revert-742-plt289Christopher Speller2015-09-221-0/+5
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | Revert "PLT-289 Properly removed lingering references to emojify"Christopher Speller2015-09-221-0/+5
|/ / / / / / /
* | | | | | | Merge pull request #746 from mattermost/revert-737-plt289Christopher Speller2015-09-226-165/+7
|\ \ \ \ \ \ \
| * | | | | | | Revert "PLT-289 Added parsing for named emojis to TextFormatting and removed ...Christopher Speller2015-09-226-165/+7
|/ / / / / / /
* | | | | | | Merge pull request #742 from hmhealey/plt289Christopher Speller2015-09-221-5/+0
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Properly removed lingering references to emojifyhmhealey2015-09-221-5/+0
* | | | | | | Merge pull request #737 from hmhealey/plt289Harrison Healey2015-09-226-7/+165
|\| | | | | |
| * | | | | | Added parsing for named emojis to TextFormatting and removed dependency on em...hmhealey2015-09-226-7/+165
| | |_|/ / / | |/| | | |
* | | | | | Merge pull request #725 from mattermost/it33-patch-3Corey Hulen2015-09-221-8/+13
|\ \ \ \ \ \
| * | | | | | Correcting typoit332015-09-211-1/+1
| * | | | | | Adjust CLA request templateit332015-09-191-8/+13
| | |_|/ / / | |/| | | |
* | | | | | Merge pull request #730 from mattermost/shorten-description-help-textCorey Hulen2015-09-221-1/+1
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Adjusting sentenceit332015-09-211-1/+1
| * | | | | Shorten description help textit332015-09-201-1/+1
| |/ / / /
| | | * | Adding service settings to admin console=Corey Hulen2015-09-2237-289/+623
| | | * | Adding team settings to admin console=Corey Hulen2015-09-2223-313/+344
generated by cgit v1.2.3-1-g7c22 (git 2.25.1) at 2024-10-30 15:48:26 +0000