Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | merging | =Corey Hulen | 2016-01-25 | 10 | -236/+533 |
|\ | |||||
| * | Merge pull request #1977 from hmhealey/plt1685 | Corey Hulen | 2016-01-25 | 1 | -3/+8 |
| |\ | | | | | | | PLT-1685 Fixed handling of files with no extension | ||||
| | * | Fixed info displayed for files with 0 size or with no extension | hmhealey | 2016-01-25 | 1 | -3/+8 |
| | | | |||||
| * | | Merge pull request #1972 from mattermost/PLT-1576 | Christopher Speller | 2016-01-25 | 1 | -1/+5 |
| |\ \ | | | | | | | | | PLT-1576 display iOS device in session history | ||||
| | * | | PLT-1576 display iOS device in session history | =Corey Hulen | 2016-01-24 | 1 | -1/+5 |
| | | | | |||||
| * | | | Merge pull request #1936 from rgarmsen2295/plt-1654 | Christopher Speller | 2016-01-25 | 1 | -2/+10 |
| |\ \ \ | | |_|/ | |/| | | PLT-1654 Fixed issue with enter key not working in delete post modal | ||||
| | * | | Fixed issue with enter key not working in delete post modal | Reed Garmsen | 2016-01-21 | 1 | -2/+10 |
| | | | | |||||
| * | | | Merge pull request #1963 from hmhealey/plt1670 | Joram Wilander | 2016-01-25 | 1 | -0/+6 |
| |\ \ \ | | | | | | | | | | | PLT-1670 Added a limit to the number of suggestions when autocompleting at mentions | ||||
| | * | | | Added a limit to the number of suggestions when autocompleting at mentions | hmhealey | 2016-01-23 | 1 | -0/+6 |
| | | |/ | | |/| | |||||
| * | | | Merge pull request #1961 from rgarmsen2295/plt-1689 | Joram Wilander | 2016-01-25 | 1 | -1/+7 |
| |\ \ \ | | |/ / | |/| | | PLT-1689 Fixed duplicate email team sign-up error | ||||
| | * | | Fixed duplicate email team signup error | Reed Garmsen | 2016-01-22 | 1 | -1/+7 |
| | | | | |||||
| * | | | Merge pull request #1956 from mattermost/plt-1779 | Corey Hulen | 2016-01-22 | 5 | -229/+497 |
| |\ \ \ | | | | | | | | | | | PLT-1779 Add system-wide statistics page | ||||
| | * | | | Change default system console page to statistics | JoramWilander | 2016-01-22 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | Added unit test and fixed errors | JoramWilander | 2016-01-22 | 2 | -3/+3 |
| | | | | | |||||
| | * | | | Add create_at back to profile fields to fix analytics | JoramWilander | 2016-01-22 | 2 | -1/+5 |
| | | | | | |||||
| | * | | | Add system analytics page | JoramWilander | 2016-01-21 | 4 | -79/+264 |
| | | | | | |||||
| | * | | | Generalize analytics server functions and begin componentizing client ↵ | JoramWilander | 2016-01-21 | 2 | -227/+306 |
| | | | | | | | | | | | | | | | | | | | | analytics controls | ||||
* | | | | | merging | =Corey Hulen | 2016-01-22 | 21 | -98/+278 |
|\| | | | | |||||
| * | | | | Updating favicon stuff | Asaad Mahmood | 2016-01-22 | 1 | -2/+2 |
| | |/ / | |/| | | |||||
| * | | | Merge pull request #1955 from mattermost/PLT-7-client-user-loc | Corey Hulen | 2016-01-22 | 2 | -0/+147 |
| |\ \ \ | | | | | | | | | | | Plt 7 client user loc | ||||
| | * | | | PLT-7 adding loc feature to preview | =Corey Hulen | 2016-01-22 | 1 | -1/+0 |
| | | | | | |||||
| | * | | | PLT-7 adding loc feature to preview | =Corey Hulen | 2016-01-22 | 1 | -37/+39 |
| | | | | | |||||
| | * | | | PLT-7 adding lang selector | =Corey Hulen | 2016-01-22 | 3 | -0/+146 |
| | | | | | |||||
| * | | | | Merge pull request #1929 from esethna/patch-54 | Joram Wilander | 2016-01-22 | 1 | -1/+1 |
| |\ \ \ \ | | |/ / / | |/| | | | Update team_general_tab.jsx | ||||
| | * | | | Update team_general_tab.jsx | Eric Sethna | 2016-01-21 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | Correct capitalization based on UX discussion | ||||
| | * | | | Update team_general_tab.jsx | Eric Sethna | 2016-01-20 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | Add more direct instructions on enabling the team directory in the system console. From community issue: https://github.com/mattermost/platform/issues/1835 | ||||
| * | | | | PLT-7 fixing unit test for chunk 2 server | =Corey Hulen | 2016-01-22 | 2 | -2/+2 |
| | | | | | |||||
| * | | | | Merge pull request #1948 from hmhealey/plt1652 | Christopher Speller | 2016-01-22 | 1 | -1/+2 |
| |\ \ \ \ | | | | | | | | | | | | | PLT-1652 Added download param to getFile api call | ||||
| | * | | | | Added download param to getFile api call | hmhealey | 2016-01-21 | 1 | -1/+2 |
| | | |_|/ | | |/| | | |||||
| * / | | | PLT-7 client side infra | =Corey Hulen | 2016-01-21 | 1 | -2/+15 |
| |/ / / | |||||
| * | | | Merge pull request #1937 from hmhealey/plt1695 | Corey Hulen | 2016-01-21 | 1 | -1/+5 |
| |\ \ \ | | | | | | | | | | | PLT-1695 Completely disabled broken pasting of images on IE11 | ||||
| | * | | | Completely disabled broken pasting of images on IE11 | hmhealey | 2016-01-20 | 1 | -1/+5 |
| | |/ / | |||||
| * | | | Merge pull request #1935 from hmhealey/plt1664 | Corey Hulen | 2016-01-21 | 1 | -1/+1 |
| |\ \ \ | | | | | | | | | | | PLT-1664 Fix unread channel indicators so that they work on IE11 | ||||
| | * | | | Changed UnreadChannelIndicator display style so that it uses a value that ↵ | hmhealey | 2016-01-20 | 1 | -1/+1 |
| | |/ / | | | | | | | | | | | | | IE11 supports | ||||
| * | | | Merge pull request #1933 from hmhealey/plt1661 | Corey Hulen | 2016-01-21 | 2 | -41/+31 |
| |\ \ \ | | | | | | | | | | | PLT-1661/PLT-1745 Scrolling fixes | ||||
| | * | | | Added a small margin where the PostsView will be considered to be at the ↵ | hmhealey | 2016-01-20 | 1 | -1/+4 |
| | | | | | | | | | | | | | | | | | | | | bottom even if it's not exactly at the bottom | ||||
| | * | | | Removed some vestigial code from the post textbox | hmhealey | 2016-01-20 | 1 | -19/+0 |
| | | | | | |||||
| | * | | | Changed the post textbox resizing code to be more reliable and not rely on ↵ | hmhealey | 2016-01-20 | 1 | -23/+29 |
| | |/ / | | | | | | | | | | | | | magic numbers | ||||
| * | | | Merge pull request #1927 from rgarmsen2295/plt-1668 | Christopher Speller | 2016-01-21 | 7 | -41/+50 |
| |\ \ \ | | |_|/ | |/| | | PLT-1668 Removes duplicate short username error message | ||||
| | * | | Removed extraneous error when providing a short username | Reed Garmsen | 2016-01-20 | 7 | -41/+50 |
| | |/ | |||||
| * | | Merge pull request #1922 from cloudron-io/check_auth_service | Harrison Healey | 2016-01-21 | 1 | -2/+2 |
| |\ \ | | | | | | | | | Check auth_service when constructing messages | ||||
| | * | | Check auth_service for constructing message | girish@cloudron.io | 2016-01-19 | 1 | -1/+1 |
| | | | | |||||
| | * | | Check auth_service to describe user login message | girish@cloudron.io | 2016-01-19 | 1 | -1/+1 |
| | | | | |||||
| * | | | Merge pull request #1882 from trashcan/PLT-1232-more-channel-info | Harrison Healey | 2016-01-21 | 1 | -2/+10 |
| |\ \ \ | | | | | | | | | | | PLT-1232: More channel info | ||||
| | * | | | Show correct channel URL in channel info modal | Pat Lathem | 2016-01-13 | 1 | -1/+4 |
| | | | | | |||||
| | * | | | Rename 'Channel Handle' to Channel URL' | Pat Lathem | 2016-01-13 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | Add channel purpose | Pat Lathem | 2016-01-13 | 1 | -0/+5 |
| | | | | | |||||
| * | | | | Merge pull request #1886 from rgarmsen2295/plt-549c | Joram Wilander | 2016-01-21 | 1 | -2/+10 |
| |\ \ \ \ | | |_|_|/ | |/| | | | PLT-549 Fixed react warning issue with setState in RHS | ||||
| | * | | | Fixed react warning issue with setState in RHS | Reed Garmsen | 2016-01-13 | 1 | -2/+10 |
| | | | | | |||||
* | | | | | merging | =Corey Hulen | 2016-01-15 | 1 | -3/+3 |
|\| | | | |