summaryrefslogtreecommitdiffstats
path: root/web/react/components
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | | Merge pull request #739 from rgarmsen2295/plt-39Christopher Speller2015-09-231-3/+11
| | |\ \ \ \ | | | |_|/ / | | |/| | | PLT-39 Clicking "Resend email" on the verification page now confirms email was sent
| | | * | | Minor changes to how resend status is passedReed Garmsen2015-09-211-5/+7
| | | | | |
| | | * | | Added confirmation when users request another verification email; users are ↵Reed Garmsen2015-09-211-1/+7
| | | | |/ | | | |/| | | | | | | | | | | no longer redirected after requesting another verification email
* | | / | PLT-349 adding team mgt to admin console=Corey Hulen2015-09-236-128/+819
|/ / / /
* | | | Adding new EnableIncomingWebhooks property to service settings in the admin ↵=Corey Hulen2015-09-221-0/+34
| | | | | | | | | | | | | | | | console.
* | | | Fixing merge conflict=Corey Hulen2015-09-229-28/+315
|\| | |
| * | | Merge pull request #715 from mattermost/plt-27Joram Wilander2015-09-229-28/+315
| |\ \ \ | | |_|/ | |/| | PLT-27 Implement incoming webhooks.
| | * | Implement incoming webhooks.JoramWilander2015-09-219-28/+315
| | | |
* | | | 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-223-0/+3
| | | | | | | | | | | | | | | | emojify"
| * | | Merge pull request #737 from hmhealey/plt289Harrison Healey2015-09-223-3/+0
| |\ \ \ | | | | | | | | | | 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-223-3/+0
| | | |/ | | |/| | | | | | | | | 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-2211-28/+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-219-255/+414
|/ /
* | Fix first channel load scrolling issue on Windows and iOS and add emoji to RHS.JoramWilander2015-09-214-3/+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
| |/
* / Added marked library to text_formatting.jsxhmhealey2015-09-191-2/+2
|/
* merging=Corey Hulen2015-09-181-0/+11
|\
| * Merge pull request #699 from mattermost/PLT-92Joram Wilander2015-09-181-0/+11
| |\ | | | | | | 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
| | | |
* | | | Moving logout item=Corey Hulen2015-09-171-6/+6
| | | |
* | | | PLT-11 adding config for logs to UI=Corey Hulen2015-09-1715-292/+184
| | | |
* | | | PLT-11 Adding ability to save config file=Corey Hulen2015-09-175-130/+403
|/ / /
* | | Merge pull request #705 from esethna/patch-1Corey Hulen2015-09-171-1/+1
|\ \ \ | |_|/ |/| | Grammar change to New Channel ui text
| * | Grammar change to New Channel ui textesethna2015-09-171-1/+1
| | |
* | | Merge pull request #701 from mattermost/PLT-40Joram Wilander2015-09-171-2/+26
|\ \ \ | |/ / |/| | PLT-40 adding experimental support for emojis
| * | Fixing css=Corey Hulen2015-09-161-2/+2
| | |
| * | PLT-40 adding experimental support for emojis=Corey Hulen2015-09-161-2/+26
| |/
* | Merge pull request #702 from mattermost/oauth-switch-fixJoram Wilander2015-09-171-1/+1
|\ \ | | | | | | Properly check if OAuth providing is enabled on the client.