summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | 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 #758 from sjmog/readme-fixit332015-09-231-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | fix README typo
| * | | | | | fix README typoSam Morgan2015-09-231-1/+1
| | |_|/ / / | |/| | | |
* | | | | | 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 #754 from mattermost/it33-patch-1Corey Hulen2015-09-221-19/+0
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | Removing CLA templates response
| * | | | | Removing CLA templates responseit332015-09-221-19/+0
|/ / / / / | | | | | | | | | | Clutters the rest of the instructions...
| | | | * Adding new EnableIncomingWebhooks property to service settings in the admin ↵=Corey Hulen2015-09-221-0/+34
| | | | | | | | | | | | | | | | | | | | console.
| | | | * 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
|\ \ \ \ \ | | | | | | | | | | | | PLT-27 Implement incoming webhooks.
| * | | | | 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
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | content type for getFile()
| * | | | | 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"
| * | | | | | 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 …
| * | | | | | 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 #725 from mattermost/it33-patch-3Corey Hulen2015-09-221-8/+13
|\ \ \ \ \ | | | | | | | | | | | | Adjust CLA request template
| * | | | | 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
|\ \ \ \ \ | |_|/ / / |/| | | | 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
| | | * Adding service settings to admin console=Corey Hulen2015-09-2237-289/+623
| | | |
| | | * Adding team settings to admin console=Corey Hulen2015-09-2223-313/+344
| | | |
| | | * Adding SQL settings to admin console=Corey Hulen2015-09-229-19/+608
| | | |
| | | * Fixing unit tests=Corey Hulen2015-09-217-86/+75
| | | |
| | | * Adding rate limiter settings to the admin console=Corey Hulen2015-09-217-42/+317
| | | |
| | | * Adding privacy to admin console=Corey Hulen2015-09-215-4/+175
| | | |
| | | * Fixing eslint errors=Corey Hulen2015-09-212-4/+2
| | | |
| | | * Adding image properties=Corey Hulen2015-09-2112-98/+524
| | | |
| | | * Fixing broken signup pages=Corey Hulen2015-09-219-14/+24
| | | |
| | | * Fixing button=Corey Hulen2015-09-211-0/+1
| | | |
| | | * Adding email to admin console=Corey Hulen2015-09-2123-344/+554
| |_|/ |/| |
* | | 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.
generated by cgit v1.2.3-1-g7c22 (git 2.25.1) at 2024-07-14 01:22:59 +0000