summaryrefslogtreecommitdiffstats
path: root/web/react
Commit message (Collapse)AuthorAgeFilesLines
* Fixing merge conflict=Corey Hulen2015-09-2211-84/+414
|\
| * Merge pull request #715 from mattermost/plt-27Joram Wilander2015-09-2211-84/+414
| |\ | | | | | | PLT-27 Implement incoming webhooks.
| | * Implement incoming webhooks.JoramWilander2015-09-2111-84/+414
| | |
* | | Fixing bug in generating key length=Corey Hulen2015-09-223-8/+8
| | |
* | | Merge branch 'master' into PLT-11-email=Corey Hulen2015-09-221-1/+1
|\| |
| * | Revert "PLT-289 Added parsing for named emojis to TextFormatting and removed ↵Christopher Speller2015-09-225-165/+3
| | | | | | | | | | | | emojify"
| * | Merge pull request #737 from hmhealey/plt289Harrison Healey2015-09-225-3/+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-225-3/+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
* | | Adding service settings to admin console=Corey Hulen2015-09-2212-30/+438
| | |
* | | Adding team settings to admin console=Corey Hulen2015-09-225-2/+306
| | |
* | | Adding SQL settings to admin console=Corey Hulen2015-09-225-8/+592
| | |
* | | Adding rate limiter settings to the admin console=Corey Hulen2015-09-213-0/+284
| | |
* | | Adding privacy to admin console=Corey Hulen2015-09-213-0/+175
| | |
* | | Fixing eslint errors=Corey Hulen2015-09-212-4/+2
| | |
* | | Adding image properties=Corey Hulen2015-09-213-0/+429
| | |
* | | 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-2113-261/+431
|/ /
* | 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-211-5/+5
|\ \ | | | | | | Updating new channel UI
| * | Updating new channel UIAsaad Mahmood2015-09-211-5/+5
| |/
* | 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
| | |
| | * Merge branch 'master' into PLT-92=Corey Hulen2015-09-174-36/+100
| | |\
| | * | Adding version to UI=Corey Hulen2015-09-161-0/+13
| | | |
| | * | PLT-92 Adding server side versioning to the binary=Corey Hulen2015-09-161-5/+2
| | | |
| * | | Fixed incorrect check if a url starts with an explicit protocolhmhealey2015-09-181-1/+1
| | | |
* | | | Moving logout item=Corey Hulen2015-09-171-6/+6
| | | |
* | | | PLT-11 adding config for logs to UI=Corey Hulen2015-09-1716-292/+207
| | | |
* | | | PLT-11 Adding ability to save config file=Corey Hulen2015-09-178-131/+489
|/ / /
generated by cgit v1.2.3-1-g7c22 (git 2.25.1) at 2024-10-30 23:39:32 +0000