summaryrefslogtreecommitdiffstats
path: root/web
Commit message (Expand)AuthorAgeFilesLines
* 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 #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
| |/
* / 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 cr...hmhealey2015-09-193-3/+16
* | Merge pull request #731 from asaadmahmoodspin/new-channelChristopher Speller2015-09-212-6/+10
|\ \
| * | Updating new channel UIAsaad Mahmood2015-09-212-6/+10
| |/
* | 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
* | 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
| |\
| | * 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-17888-36/+116
| | |\
| | * | 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-1717-293/+208
* | | | PLT-11 Adding ability to save config file=Corey Hulen2015-09-178-131/+489
|/ / /
* | | Merge pull request #705 from esethna/patch-1Corey Hulen2015-09-171-1/+1
|\ \ \ | |_|/ |/| |
| * | Grammar change to New Channel ui textesethna2015-09-171-1/+1
* | | Merge pull request #701 from mattermost/PLT-40Joram Wilander2015-09-17885-2/+42
|\ \ \ | |/ / |/| |
| * | Fixing css=Corey Hulen2015-09-164-9/+7
| * | PLT-40 adding experimental support for emojis=Corey Hulen2015-09-16886-2/+44
| |/
* | Merge pull request #702 from mattermost/oauth-switch-fixJoram Wilander2015-09-171-1/+1
|\ \
| * | Properly check if OAuth providing is enabled on the client.JoramWilander2015-09-171-1/+1
| |/
* | Cleaned up logic for the unread indicatorsChristopher Speller2015-09-163-108/+100
* | Moved unread channel indicators into their own React component and filehmhealey2015-09-162-70/+112
* | Properly hide unread channel indicators when there are no unread channelshmhealey2015-09-161-5/+11
|/
* Merge pull request #693 from mattermost/mm-1419Christopher Speller2015-09-1614-13/+864
|\
| * Implement OAuth2 service provider functionality.JoramWilander2015-09-1614-13/+864
* | Merge pull request #695 from hmhealey/startswithCorey Hulen2015-09-161-2/+2
|\ \ | |/ |/|
| * Replaced instances of startsWith with lastIndexOf in TextFormattinghmhealey2015-09-161-2/+2
* | Merge pull request #687 from mattermost/PLT-93Christopher Speller2015-09-1659-582/+270
|\ \
| * | Merge branch 'master' into PLT-93=Corey Hulen2015-09-166-17/+62
| |\|
| * | Fixing eslint problems=Corey Hulen2015-09-153-7/+0
| * | Finished removing some of the last bits of client side config=Corey Hulen2015-09-154-41/+1
| * | Removing old config stuff=Corey Hulen2015-09-158-238/+4