Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | Added highlighting of search terms to the new text formatting | hmhealey | 2015-09-14 | 1 | -6/+41 | |
| | | | ||||||
| * | | Added autolinking of hashtags to the new text formatting | hmhealey | 2015-09-14 | 1 | -6/+48 | |
| | | | ||||||
| * | | Added autolinking of urls to the new text formatting | hmhealey | 2015-09-14 | 1 | -4/+35 | |
| | | | ||||||
| * | | Added highlighting when the current user is mentioned to the new text formatting | hmhealey | 2015-09-14 | 1 | -17/+69 | |
| | | | ||||||
| * | | Changed one instance of textToJsx to use new text formatting for testing ↵ | hmhealey | 2015-09-14 | 1 | -1/+9 | |
| | | | | | | | | | | | | purposes | |||||
| * | | Added handling for @mentions to the new text formatting | hmhealey | 2015-09-14 | 1 | -9/+54 | |
| | | | ||||||
| * | | Added skeleton for new text formatting code which will replace textToJsx | hmhealey | 2015-09-14 | 1 | -0/+36 | |
| | | | ||||||
* | | | Merge pull request #678 from mattermost/mm-1589 | Corey Hulen | 2015-09-14 | 10 | -228/+611 | |
|\ \ \ | | | | | | | | | PLT-171 MM-1589 New add channel modal using react-bootstrap. | |||||
| * | | | New add channel modal using react-bootstrap. | Christopher Speller | 2015-09-14 | 10 | -228/+611 | |
| | | | | ||||||
* | | | | Merge pull request #679 from mattermost/fix-file-content-type | Harrison Healey | 2015-09-14 | 1 | -4/+3 | |
|\ \ \ \ | | | | | | | | | | | Blank Content-Type for file GETs. | |||||
| * | | | | Blank Content-Type for file GETs. | JoramWilander | 2015-09-14 | 1 | -4/+3 | |
| | | | | | ||||||
* | | | | | Merge pull request #674 from Trozz/PLT-41 | Joram Wilander | 2015-09-14 | 4 | -7/+5 | |
|\ \ \ \ \ | | | | | | | | | | | | | PLT-41 Automatically convert uppercase letters to lowercase in username input box. | |||||
| * | | | | | update remaining web files tolowercase | Michael Leer | 2015-09-14 | 2 | -2/+2 | |
| | | | | | | ||||||
| * | | | | | replace lowerName with name | Michael Leer | 2015-09-14 | 1 | -3/+1 | |
| | | | | | | ||||||
| * | | | | | PLT-41 | Michael Leer | 2015-09-14 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed lowercase from the error wording. Removed additional toLowerCase within validator. | |||||
| * | | | | | PLT-41 | Michael Leer | 2015-09-14 | 1 | -1/+1 | |
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | Automatically convert uppercase letters to lowercase in username input box. Validator not changed. | |||||
* | | | | | Merge pull request #677 from mattermost/plt-50 | Joram Wilander | 2015-09-14 | 1 | -1/+1 | |
|\ \ \ \ \ | |_|/ / / |/| | | | | PLT-50 Allowing channel names with underscores. Allow import of more slack channel names. | |||||
| * | | | | Allowing underscores in channel names. Added conversion of some slack ↵ | Christopher Speller | 2015-09-14 | 1 | -1/+1 | |
| | |/ / | |/| | | | | | | | | | | channel names into valid mattermost names. | |||||
* | | | | Merge pull request #668 from nickago/MM-1958 | Corey Hulen | 2015-09-14 | 1 | -0/+18 | |
|\ \ \ \ | |_|/ / |/| | | | MM-1958 please read comment, base video player | |||||
| * | | | WIP Added base video player | nickago | 2015-09-12 | 1 | -0/+18 | |
| |/ / | ||||||
* | / | Merge branch 'master' into PLT-12 | =Corey Hulen | 2015-09-11 | 3 | -18/+24 | |
|\| | | |/ |/| | ||||||
| * | Merge pull request #657 from mattermost/fix-npm-package | Corey Hulen | 2015-09-11 | 1 | -14/+14 | |
| |\ | | | | | | | Change versioning to exact versions in package.json | |||||
| | * | Change versioning to exact versions in package.json | Christopher Speller | 2015-09-11 | 1 | -14/+14 | |
| | | | ||||||
| * | | Fix load more posts bug. | JoramWilander | 2015-09-11 | 2 | -4/+10 | |
| |/ | ||||||
* | | Cleaning up html | =Corey Hulen | 2015-09-10 | 5 | -6/+47 | |
| | | ||||||
* | | merging | =Corey Hulen | 2015-09-10 | 21 | -159/+482 | |
|\| | ||||||
| * | Merge pull request #635 from hmhealey/plt159 | Christopher Speller | 2015-09-10 | 1 | -3/+5 | |
| |\ | | | | | | | PLT-159/MM-2074 Changed unread posts indicator to not be shown for the current channel | |||||
| | * | PLT-159 Changed unread posts indicator to not be shown for the current channel | hmhealey | 2015-09-09 | 1 | -3/+5 | |
| | | | ||||||
| * | | Adding minor hover changes for settings | Asaad Mahmood | 2015-09-09 | 1 | -1/+2 | |
| | | | ||||||
| * | | MM-1825 - Improving UI for settings | Asaad Mahmood | 2015-09-09 | 3 | -23/+24 | |
| | | | ||||||
| * | | Merge branch 'master' of https://github.com/mattermost/platform into mm-1866 | Asaad Mahmood | 2015-09-09 | 3 | -15/+17 | |
| |\| | ||||||
| | * | Fix race condition where switching between two channels that both had new ↵ | JoramWilander | 2015-09-09 | 1 | -3/+7 | |
| | | | | | | | | | | | | messages sometimes caused improper scrolling. | |||||
| | * | Merge pull request #625 from asaadmahmoodspin/ui-changes | Christopher Speller | 2015-09-09 | 2 | -12/+10 | |
| | |\ | | | | | | | | | UI changes for various tickets | |||||
| | | * | Adding symbol instead of × for close icon | Asaad Mahmood | 2015-09-09 | 1 | -1/+1 | |
| | | | | ||||||
| | | * | Removing jsx container from × in team_import_tab.jsx | Asaad Mahmood | 2015-09-09 | 1 | -1/+1 | |
| | | | | ||||||
| | | * | Merge branch 'master' of https://github.com/mattermost/platform into ui-changes | Asaad Mahmood | 2015-09-09 | 7 | -1/+160 | |
| | | |\ | ||||||
| | | * | | Improving formatting in team_import_tab.jsx | Asaad Mahmood | 2015-09-08 | 1 | -5/+7 | |
| | | | | | ||||||
| | | * | | UI changes for various tickets | Asaad Mahmood | 2015-09-08 | 2 | -8/+4 | |
| | | | | | ||||||
| * | | | | MM-1866 - Adding download icon and adding download link for both file title ↵ | Asaad Mahmood | 2015-09-09 | 1 | -2/+14 | |
| |/ / / | | | | | | | | | | | | | and download icon | |||||
| * | | | Merge pull request #628 from mattermost/mm-2127 | Christopher Speller | 2015-09-09 | 1 | -19/+27 | |
| |\ \ \ | | | | | | | | | | | MM-2127 Added send icon button to create post control for mobile view. | |||||
| | * | | | Added send icon button to create post control for mobile view. | JoramWilander | 2015-09-08 | 1 | -19/+27 | |
| | |/ / | ||||||
| * | | | Merge pull request #623 from mattermost/plt-35 | Christopher Speller | 2015-09-09 | 7 | -106/+244 | |
| |\ \ \ | | |_|/ | |/| | | PLT-35 Add post list container to hold mounted post lists for faster rendering/channel switching. | |||||
| | * | | Add post list container to hold mounted post lists for faster ↵ | JoramWilander | 2015-09-08 | 7 | -106/+244 | |
| | |/ | | | | | | | | | | rendering/channel switching. | |||||
| * | | Merge pull request #626 from mattermost/mm-2125 | Christopher Speller | 2015-09-08 | 1 | -0/+5 | |
| |\ \ | | | | | | | | | MM-2125 Resize create post control when file previews are added. | |||||
| | * | | Resize create post control when file previews are added. | JoramWilander | 2015-09-08 | 1 | -0/+5 | |
| | |/ | ||||||
| * | | Merge pull request #602 from mattermost/mm-1409 | Joram Wilander | 2015-09-08 | 4 | -0/+118 | |
| |\ \ | | | | | | | | | MM-1409 Adding ability to export data from mattermost | |||||
| | * | | Adding ability to export data from mattermost | Christopher Speller | 2015-09-04 | 4 | -0/+118 | |
| | | | | ||||||
| * | | | Merge pull request #593 from nickago/MM-1892 | Corey Hulen | 2015-09-08 | 2 | -1/+37 | |
| |\ \ \ | | |_|/ | |/| | | MM-1892 Added help text to username, nickname, and fullname | |||||
| | * | | Added refactoring to pass style check | nickago | 2015-09-04 | 1 | -5/+6 | |
| | | | | ||||||
| | * | | Added help text to username, nickname, and fullname | nickago | 2015-09-04 | 2 | -1/+36 | |
| | | | |