Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Removed all calls to textToJsx and replaced them with calls to TextFormatting | hmhealey | 2015-09-14 | 7 | -28/+39 |
| | |||||
* | Cleaned up TextFormatting and added a default click handler for hashtags and ↵ | hmhealey | 2015-09-14 | 1 | -47/+74 |
| | | | | @mentions | ||||
* | 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 #648 from mattermost/PLT-12 | Christopher Speller | 2015-09-14 | 13 | -34/+1134 |
|\ | | | | | PLT-12: Work in progress for Admin Console UI | ||||
| * | Merge branch 'master' into PLT-12 | =Corey Hulen | 2015-09-11 | 6 | -20/+28 |
| |\ | |||||
| * | | Cleaning up html | =Corey Hulen | 2015-09-10 | 6 | -44/+53 |
| | | | |||||
| * | | merging | =Corey Hulen | 2015-09-10 | 28 | -184/+626 |
| |\ \ | |||||
| * | | | PLT-12 UI framework for admin console | =Corey Hulen | 2015-09-10 | 8 | -353/+901 |
| | | | | |||||
| * | | | Adding unit tests for cmd line | =Corey Hulen | 2015-09-04 | 1 | -1/+1 |
| | | | | |||||
| * | | | Merge branch 'master' into PLT-12 | =Corey Hulen | 2015-09-03 | 45 | -257/+434 |
| |\ \ \ | |||||
| * | | | | Adding initial admin console html pages | =Corey Hulen | 2015-09-03 | 3 | -0/+545 |
| | | | | | |||||
| * | | | | Adding initial admin console html pages | =Corey Hulen | 2015-09-03 | 7 | -41/+33 |
| | | | | | |||||
* | | | | | PLT-217 - Improving horizontal scrollbar in LHS menu | Asaad Mahmood | 2015-09-14 | 2 | -1/+6 |
| | | | | | |||||
* | | | | | Merge pull request #654 from hmhealey/plt198 | Corey Hulen | 2015-09-11 | 1 | -2/+7 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | PLT-198 Fix unit tests on Go 1.5.1 | ||||
| * | | | | PLT-198 Added a small delay to one of the web tests to allow the server to ↵ | hmhealey | 2015-09-11 | 1 | -2/+7 |
| | | | | | | | | | | | | | | | | | | | | get fully set up | ||||
* | | | | | 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 |
|/ / / / | |||||
* | | / | Updating UI for modals and notification bar | Asaad Mahmood | 2015-09-11 | 3 | -2/+4 |
| |_|/ |/| | | |||||
* | | | Removing border from first tr tds in more modal | Asaad Mahmood | 2015-09-10 | 1 | -0/+5 |
| | | | |||||
* | | | PM-183 and PM-162 - Updating UI for more modal and unread notification bar | Asaad Mahmood | 2015-09-10 | 2 | -7/+8 |
| | | | |||||
* | | | Merge release branch 'release-0.7.0' | Christopher Speller | 2015-09-10 | 1 | -0/+1 |
|\ \ \ | |||||
| * | | | Set EmailVerified to true for users signing up with SSO. | JoramWilander | 2015-09-10 | 1 | -0/+1 |
| | | | | |||||
* | | | | Fixing attachment button in RHS | Asaad Mahmood | 2015-09-10 | 1 | -7/+12 |
| | | | | |||||
* | | | | 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 |
| | | | | | |||||
* | | | | | Merge pull request #633 from asaadmahmoodspin/ui-changes | Joram Wilander | 2015-09-10 | 3 | -3/+11 |
|\ \ \ \ \ | | | | | | | | | | | | | PLT-188 - Moving attachment button to the left on mobile UI | ||||
| * | | | | | PLT-188 - Moving attachment button to the left and fixing buttons in modal ↵ | Asaad Mahmood | 2015-09-09 | 3 | -3/+11 |
| |/ / / / | | | | | | | | | | | | | | | | header | ||||
* | | | | | Adding minor hover changes for settings | Asaad Mahmood | 2015-09-09 | 2 | -1/+14 |
| | | | | | |||||
* | | | | | MM-1825 - Improving UI for settings | Asaad Mahmood | 2015-09-09 | 4 | -24/+28 |
| | | | | | |||||
* | | | | | Merge branch 'master' of https://github.com/mattermost/platform into mm-1866 | Asaad Mahmood | 2015-09-09 | 8 | -25/+42 |
|\| | | | | |||||
| * | | | | 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 | 7 | -22/+35 |
| |\ \ \ \ | | | | | | | | | | | | | 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 | 2 | -2/+2 |
| | | | | | | |||||
| | * | | | | 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 | 7 | -18/+29 |
| | | | | | | | |||||
* | | | | | | | MM-1866 - Adding download icon and adding download link for both file title ↵ | Asaad Mahmood | 2015-09-09 | 2 | -4/+24 |
|/ / / / / / | | | | | | | | | | | | | | | | | | | and download icon | ||||
* | | | | | | Merge pull request #628 from mattermost/mm-2127 | Christopher Speller | 2015-09-09 | 3 | -20/+60 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | 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 | 3 | -20/+60 |
| |/ / / / / | |||||
* | | | | | | Merge pull request #623 from mattermost/plt-35 | Christopher Speller | 2015-09-09 | 8 | -106/+250 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | 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 | 8 | -106/+250 |
| |/ / / / | | | | | | | | | | | | | | | | 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. |