summaryrefslogtreecommitdiffstats
path: root/web/react
Commit message (Expand)AuthorAgeFilesLines
* 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
* 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 purp...hmhealey2015-09-141-1/+9
* Added handling for @mentions to the new text formattinghmhealey2015-09-141-9/+54
* Added skeleton for new text formatting code which will replace textToJsxhmhealey2015-09-141-0/+36
* Merge branch 'master' into PLT-12=Corey Hulen2015-09-113-18/+24
|\
| * Merge pull request #657 from mattermost/fix-npm-packageCorey Hulen2015-09-111-14/+14
| |\
| | * Change versioning to exact versions in package.jsonChristopher Speller2015-09-111-14/+14
| * | Fix load more posts bug.JoramWilander2015-09-112-4/+10
| |/
* | Cleaning up html=Corey Hulen2015-09-105-6/+47
* | merging=Corey Hulen2015-09-1021-159/+482
|\|
| * Merge pull request #635 from hmhealey/plt159Christopher Speller2015-09-101-3/+5
| |\
| | * PLT-159 Changed unread posts indicator to not be shown for the current channelhmhealey2015-09-091-3/+5
| * | Adding minor hover changes for settingsAsaad Mahmood2015-09-091-1/+2
| * | MM-1825 - Improving UI for settingsAsaad Mahmood2015-09-093-23/+24
| * | Merge branch 'master' of https://github.com/mattermost/platform into mm-1866Asaad Mahmood2015-09-093-15/+17
| |\|
| | * Fix race condition where switching between two channels that both had new mes...JoramWilander2015-09-091-3/+7
| | * Merge pull request #625 from asaadmahmoodspin/ui-changesChristopher Speller2015-09-092-12/+10
| | |\
| | | * Adding symbol instead of × for close iconAsaad Mahmood2015-09-091-1/+1
| | | * Removing jsx container from × in team_import_tab.jsxAsaad Mahmood2015-09-091-1/+1
| | | * Merge branch 'master' of https://github.com/mattermost/platform into ui-changesAsaad Mahmood2015-09-097-1/+160
| | | |\
| | | * | Improving formatting in team_import_tab.jsxAsaad Mahmood2015-09-081-5/+7
| | | * | UI changes for various ticketsAsaad Mahmood2015-09-082-8/+4
| * | | | MM-1866 - Adding download icon and adding download link for both file title a...Asaad Mahmood2015-09-091-2/+14
| |/ / /
| * | | Merge pull request #628 from mattermost/mm-2127Christopher Speller2015-09-091-19/+27
| |\ \ \
| | * | | Added send icon button to create post control for mobile view.JoramWilander2015-09-081-19/+27
| | |/ /
| * | | Merge pull request #623 from mattermost/plt-35Christopher Speller2015-09-097-106/+244
| |\ \ \ | | |_|/ | |/| |
| | * | Add post list container to hold mounted post lists for faster rendering/chann...JoramWilander2015-09-087-106/+244
| | |/
| * | Merge pull request #626 from mattermost/mm-2125Christopher Speller2015-09-081-0/+5
| |\ \
| | * | Resize create post control when file previews are added.JoramWilander2015-09-081-0/+5
| | |/
| * | Merge pull request #602 from mattermost/mm-1409Joram Wilander2015-09-084-0/+118
| |\ \
| | * | Adding ability to export data from mattermostChristopher Speller2015-09-044-0/+118
| * | | Merge pull request #593 from nickago/MM-1892Corey Hulen2015-09-082-1/+37
| |\ \ \ | | |_|/ | |/| |
| | * | Added refactoring to pass style checknickago2015-09-041-5/+6
| | * | Added help text to username, nickname, and fullnamenickago2015-09-042-1/+36
| * | | Fixed @mentions containing uppercase charactershmhealey2015-09-041-1/+1
| |/ /
| * / Make onHeightChange not required.JoramWilander2015-09-041-3/+3
| |/
* | PLT-12 UI framework for admin console=Corey Hulen2015-09-106-0/+850
* | Adding unit tests for cmd line=Corey Hulen2015-09-041-1/+1
* | Merge branch 'master' into PLT-12=Corey Hulen2015-09-0345-257/+434
|\|
| * Merge pull request #591 from mattermost/mm-1909Corey Hulen2015-09-0340-223/+375
| |\
| | * Turning off eslint perfer-templates that was mistakinly turned onChristopher Speller2015-09-031-1/+1
| | * Turning on optimizations in uglifyjsChristopher Speller2015-09-031-1/+1
| | * Upgrading some warnings to errors so Travis won't accept them. Enabling some ...Christopher Speller2015-09-031-22/+22
| | * Upgrading ESLint and adding some more rules. Refactoring to meet these new rulesChristopher Speller2015-09-0340-207/+359
| * | Merge pull request #590 from nickago/MM-1932Corey Hulen2015-09-036-12/+40
| |\ \