summaryrefslogtreecommitdiffstats
path: root/web
Commit message (Collapse)AuthorAgeFilesLines
* 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 text
| * Grammar change to New Channel ui textesethna2015-09-171-1/+1
| |
* | Merge pull request #701 from mattermost/PLT-40Joram Wilander2015-09-17885-2/+42
|\ \ | |/ |/| PLT-40 adding experimental support for emojis
| * 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.
| * | 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.
| * 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 TextFormatting
| * 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
|\ \ | | | | | | PLT-93 Cleaning up client side configs
| * | 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 tickets
| * | | 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
| | | | | | | | | | Adding babel runtime to build process because Safari hasen't gotten with the program yet.
* | Merge pull request #686 from hmhealey/plt172Joram Wilander2015-09-164-13/+58
|\ \ | |/ |/| PLT-172 Fixes TypeErrors and random jumping that occurs when clicking the scroll bar in the sidebar
| * PLT-172 Added a modified version of perfect-scrollbar-0.6.5 which correctly ↵hmhealey2015-09-152-6/+9
| | | | | | | | stops clicks through the scrollbar
| * 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
|\ \ | | | | | | PLT-12 Adding server logs viewer to admin console
| * | 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 Edit
| * | | | Fixing long channel name overflow by changing text to EditChristopher Speller2015-09-151-1/+1
| | | | |
* | | | | Merge pull request #682 from mattermost/nc-patchJoram Wilander2015-09-151-1/+1
|\ \ \ \ \ | |/ / / / |/| | | | Fixing cutoff team name in new channel modal.
| * | | | Fixing cutoff team name in new channel modalChristopher Speller2015-09-151-1/+1
| | |/ / | |/| |
* | | | Merge pull request #676 from hmhealey/mm1900bJoram Wilander2015-09-159-220/+308
|\ \ \ \ | |/ / / |/| | | MM-1900 Removed textToJsx
| * | | Renamed text formatting tokens so that there should be significantly less ↵hmhealey2015-09-141-11/+11
| | | | | | | | | | | | | | | | chance of having conflicting tokens
| * | | Removed textToJsx!hmhealey2015-09-141-199/+0
| | | |
| * | | Removed all calls to textToJsx and replaced them with calls to TextFormattinghmhealey2015-09-147-28/+39
| | | |
| * | | Cleaned up TextFormatting and added a default click handler for hashtags and ↵hmhealey2015-09-141-47/+74
| | | | | | | | | | | | | | | | @mentions
| * | | Added highlighting of search terms to the new text formattinghmhealey2015-09-141-6/+41
| | | |
| * | | Added autolinking of hashtags to the new text formattinghmhealey2015-09-141-6/+48
| | | |
| * | | Added autolinking of urls to the new text formattinghmhealey2015-09-141-4/+35
| | | |
| * | | Added highlighting when the current user is mentioned to the new text formattinghmhealey2015-09-141-17/+69
| | | |
| * | | Changed one instance of textToJsx to use new text formatting for testing ↵hmhealey2015-09-141-1/+9
| | | | | | | | | | | | | | | | purposes