summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | | 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
|\ \ \
| * | | 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
|\ \ \ \ | |/ / / |/| | |
| * | | Added theme class to markdown linkshmhealey2015-09-211-1/+7
* | | | Merge pull request #732 from mattermost/plt-243Joram Wilander2015-09-211-8/+13
|\ \ \ \
| * | | | Adding new create channel modal to the more menuChristopher Speller2015-09-211-8/+13
| |/ / /
* | | | Merge pull request #733 from hmhealey/plt310Joram Wilander2015-09-212-2/+2
|\ \ \ \
| * | | | Wrapped comment messages in divs like posts in the center panehmhealey2015-09-212-2/+2
| |/ / /
* | | | Merge pull request #708 from hmhealey/plt173Christopher Speller2015-09-2143-11/+7183
|\ \ \ \ | |/ / / |/| | |
| * | | Added constants for EXIF orientationshmhealey2015-09-211-9/+31
| * | | PLT-173 Changed thumbnails and previews to generate correctly for images with...hmhealey2015-09-181-11/+64
| * | | PLT-173 Added graphics-go and goexif libraries for image manipulationhmhealey2015-09-1742-0/+7097
| | |/ | |/|
* | | 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 cr...hmhealey2015-09-193-3/+16
* | | | Merge pull request #729 from mattermost/rename-handleJoram Wilander2015-09-212-4/+4
|\ \ \ \