summaryrefslogtreecommitdiffstats
path: root/web
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | PLT-93 cleaing up client side configs=Corey Hulen2015-09-1555-285/+272
| * | removing loggly=Corey Hulen2015-09-153-18/+0
* | | Merge pull request #691 from asaadmahmoodspin/ui-changesCorey Hulen2015-09-169-7/+33
|\ \ \
| * | | UI Updates for multiple ticketsAsaad Mahmood2015-09-169-7/+33
| | |/ | |/|
* / | PLT-149 Removed the file list from (message deleted) placeholder postshmhealey2015-09-161-0/+1
|/ /
* | Removing js map from react bootstrap to make safari happy.Christopher Speller2015-09-162-4/+4
* | Merge pull request #686 from hmhealey/plt172Joram Wilander2015-09-164-13/+58
|\ \ | |/ |/|
| * PLT-172 Added a modified version of perfect-scrollbar-0.6.5 which correctly s...hmhealey2015-09-152-6/+9
| * PLT-172 Updated perfect-scrollbar to 0.6.5hmhealey2015-09-154-12/+54
* | Merge pull request #681 from mattermost/PLT-12-logChristopher Speller2015-09-159-8/+215
|\ \
| * | Moving style into css=Corey Hulen2015-09-152-11/+11
| * | Fixing eslint issues=Corey Hulen2015-09-141-9/+0
| * | Merge branch 'master' into PLT-12-log=Corey Hulen2015-09-1438-657/+18411
| |\ \
| * | | PLT-12 adding log viewer=Corey Hulen2015-09-108-8/+224
* | | | Merge pull request #684 from mattermost/fix-text-overflowCorey Hulen2015-09-151-1/+1
|\ \ \ \
| * | | | Fixing long channel name overflow by changing text to EditChristopher Speller2015-09-151-1/+1