Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Blank Content-Type for file GETs. | JoramWilander | 2015-09-14 | 1 | -4/+3 |
| | |||||
* | 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. | ||||
| | * | | 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 | 3 | -0/+105 |
| |\ \ | | | | | | | | | MM-1409 Adding ability to export data from mattermost | ||||
| | * | | Adding ability to export data from mattermost | Christopher Speller | 2015-09-04 | 3 | -0/+105 |
| | | | | |||||
| * | | | 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 |
| | |/ | |/| | |||||
| * | | Make onHeightChange not required. | JoramWilander | 2015-09-04 | 1 | -3/+3 |
| |/ | |||||
* / | PLT-12 UI framework for admin console | =Corey Hulen | 2015-09-10 | 5 | -0/+839 |
|/ | |||||
* | Merge pull request #591 from mattermost/mm-1909 | Corey Hulen | 2015-09-03 | 33 | -192/+314 |
|\ | | | | | MM-1909 Upgrading ESLint, turning on new rules, enabling some warnings, optimizations | ||||
| * | Upgrading ESLint and adding some more rules. Refactoring to meet these new rules | Christopher Speller | 2015-09-03 | 33 | -192/+314 |
| | | |||||
* | | Merge pull request #590 from nickago/MM-1932 | Corey Hulen | 2015-09-03 | 4 | -11/+37 |
|\ \ | | | | | | | MM-1932 Added emoji wrapper with cross platform available gliffs | ||||
| * | | Added emoji wrapper with cross platform available gliffs | nickago | 2015-09-03 | 4 | -11/+37 |
| |/ | |||||
* | | Merge pull request #585 from mattermost/plt-37 | Christopher Speller | 2015-09-03 | 2 | -8/+9 |
|\ \ | | | | | | | PLT-37 Fix poor typing performance on iOS devices. | ||||
| * | | Fix poor typing performance on iOS devices. | JoramWilander | 2015-09-03 | 2 | -8/+9 |
| | | | |||||
* | | | Merge pull request #587 from nickago/MM-1899 | Christopher Speller | 2015-09-03 | 3 | -14/+10 |
|\ \ \ | |_|/ |/| | | MM-1899 Added help text to channel notifications | ||||
| * | | Added help text to channel notifications | nickago | 2015-09-03 | 3 | -14/+10 |
| |/ | |||||
* / | Fixed file uploads to still upload other files when one is too large | hmhealey | 2015-09-03 | 1 | -57/+31 |
|/ | |||||
* | Merge pull request #570 from rgarmsen2295/fix-initial-state-calls | Corey Hulen | 2015-09-02 | 5 | -22/+30 |
|\ | | | | | Refactor remaining uses of getInitialState and componentWillMount | ||||
| * | Moved componentWillMount logic into the constructor of the react components ↵ | Reed Garmsen | 2015-09-02 | 2 | -9/+7 |
| | | | | | | | | it was used in | ||||
| * | Replaced remaining calls of getInitialState | Reed Garmsen | 2015-09-02 | 3 | -13/+23 |
| | | |||||
* | | Merge pull request #561 from mishimi/patch-2 | Corey Hulen | 2015-09-02 | 1 | -1/+1 |
|\ \ | |/ |/| | MM-2102 Clarifying error message on reserved URL words | ||||
| * | MM-2102 Clarifying error message on reserved URL words | mishimi | 2015-09-02 | 1 | -1/+1 |
| | | |||||
* | | Fixed some react warnings involving missing keys in render arrays | Reed Garmsen | 2015-09-02 | 7 | -9/+34 |
| | | |||||
* | | Fixed issue of missing empty, placeholder profile image for comments | Reed Garmsen | 2015-09-02 | 1 | -1/+1 |
| | | |||||
* | | Fixing style | =Corey Hulen | 2015-09-02 | 1 | -39/+21 |
| | | |||||
* | | Merge pull request #565 from mattermost/mm-2081 | Corey Hulen | 2015-09-02 | 27 | -1/+31 |
|\ \ | | | | | | | MM-2081 Moving config.js to /web/react/utils/ Including in every file needed |