Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Cleaned up logic for the unread indicators | Christopher Speller | 2015-09-16 | 3 | -108/+100 |
| | |||||
* | Moved unread channel indicators into their own React component and file | hmhealey | 2015-09-16 | 2 | -70/+112 |
| | |||||
* | Properly hide unread channel indicators when there are no unread channels | hmhealey | 2015-09-16 | 1 | -5/+11 |
| | |||||
* | Implement OAuth2 service provider functionality. | JoramWilander | 2015-09-16 | 6 | -5/+432 |
| | |||||
* | Merge pull request #687 from mattermost/PLT-93 | Christopher Speller | 2015-09-16 | 29 | -315/+99 |
|\ | | | | | PLT-93 Cleaning up client side configs | ||||
| * | Fixing eslint problems | =Corey Hulen | 2015-09-15 | 1 | -1/+0 |
| | | |||||
| * | Removing old config stuff | =Corey Hulen | 2015-09-15 | 6 | -154/+4 |
| | | |||||
| * | PLT-93 cleaing up client side configs | =Corey Hulen | 2015-09-15 | 28 | -166/+101 |
| | | |||||
* | | UI Updates for multiple tickets | Asaad Mahmood | 2015-09-16 | 6 | -5/+14 |
|/ | |||||
* | Merge pull request #681 from mattermost/PLT-12-log | Christopher Speller | 2015-09-15 | 3 | -1/+100 |
|\ | | | | | PLT-12 Adding server logs viewer to admin console | ||||
| * | Moving style into css | =Corey Hulen | 2015-09-15 | 1 | -11/+1 |
| | | |||||
| * | Merge branch 'master' into PLT-12-log | =Corey Hulen | 2015-09-14 | 13 | -232/+633 |
| |\ | |||||
| * | | PLT-12 adding log viewer | =Corey Hulen | 2015-09-10 | 3 | -1/+110 |
| | | | |||||
* | | | Fixing long channel name overflow by changing text to Edit | Christopher Speller | 2015-09-15 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #676 from hmhealey/mm1900b | Joram Wilander | 2015-09-15 | 7 | -21/+40 |
|\ \ \ | |_|/ |/| | | MM-1900 Removed textToJsx | ||||
| * | | Removed all calls to textToJsx and replaced them with calls to TextFormatting | hmhealey | 2015-09-14 | 7 | -28/+39 |
| | | | |||||
| * | | Changed one instance of textToJsx to use new text formatting for testing ↵ | hmhealey | 2015-09-14 | 1 | -1/+9 |
| | | | | | | | | | | | | purposes | ||||
* | | | Merge pull request #678 from mattermost/mm-1589 | Corey Hulen | 2015-09-14 | 6 | -220/+598 |
|\ \ \ | | | | | | | | | PLT-171 MM-1589 New add channel modal using react-bootstrap. | ||||
| * | | | New add channel modal using react-bootstrap. | Christopher Speller | 2015-09-14 | 6 | -220/+598 |
| | | | | |||||
* | | | | 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 | 3 | -3/+3 |
|\ \ \ \ \ | | | | | | | | | | | | | 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 |
| | | | | | | |||||
| * | | | | | 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 | 2 | -4/+10 |
|\| | | |/ |/| | |||||
| * | Fix load more posts bug. | JoramWilander | 2015-09-11 | 2 | -4/+10 |
| | | |||||
* | | Cleaning up html | =Corey Hulen | 2015-09-10 | 4 | -6/+41 |
| | | |||||
* | | merging | =Corey Hulen | 2015-09-10 | 16 | -156/+451 |
|\| | |||||
| * | 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 | 6 | -1/+147 |
| | | |\ | |||||
| | | * | | 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 | 4 | -104/+227 |
| |\ \ \ | | |_|/ | |/| | | 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 | 4 | -104/+227 |
| | |/ | | | | | | | | | | 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. |