Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #485 from nickago/MM-1899 | Christopher Speller | 2015-08-31 | 1 | -0/+5 |
|\ | | | | | MM-1899 Enabled and added help text for settings items | ||||
| * | Enabled and added help text for settings items | Asaad Mahmood | 2015-08-27 | 1 | -0/+5 |
| | | |||||
* | | Added the ability to create a team with SSO services and added the ability ↵ | JoramWilander | 2015-08-28 | 2 | -13/+37 |
|/ | | | | to turn off email sign up. | ||||
* | Refactored post handling/updating on both the client and server. | JoramWilander | 2015-08-27 | 1 | -0/+3 |
| | |||||
* | Added white background to non-image files (was previously transparent | Reed Garmsen | 2015-08-25 | 1 | -0/+4 |
| | |||||
* | MM-1989 - Hiding Cancel text in LHS that messes up the RHS | Asaad Mahmood | 2015-08-21 | 1 | -0/+3 |
| | |||||
* | Merge pull request #427 from asaadmahmoodspin/mm-1696 | Harrison Healey | 2015-08-21 | 1 | -0/+10 |
|\ | | | | | MM-1696 - Improvements for Slack Import | ||||
| * | Merge branch 'master' of https://github.com/mattermost/platform into mm-1696 | Asaad Mahmood | 2015-08-21 | 1 | -3/+11 |
| |\ | | | | | | | | | | | | | | | | Conflicts: web/react/components/setting_upload.jsx web/react/components/team_import_tab.jsx | ||||
| * | | MM-1696 - Improvements for Slack Import | Asaad Mahmood | 2015-08-21 | 1 | -0/+10 |
| | | | |||||
* | | | Merge pull request #420 from asaadmahmoodspin/ui-changes | Joram Wilander | 2015-08-21 | 4 | -7/+24 |
|\ \ \ | |_|/ |/| | | Multiple UI Improvements | ||||
| * | | Solving conflicts and also fixing css for MM-1752 | Asaad Mahmood | 2015-08-21 | 2 | -1/+4 |
| | | | |||||
| * | | Multiple UI Improvements | Asaad Mahmood | 2015-08-21 | 3 | -7/+21 |
| |/ | |||||
* / | Fixed issue with channel name in url and added loading icon to replace ↵ | Reed Garmsen | 2015-08-20 | 1 | -3/+11 |
|/ | | | | 'Join' button for slow connections | ||||
* | Revert "Multiple UI Improvements" | Joram Wilander | 2015-08-20 | 3 | -21/+7 |
| | |||||
* | Multiple UI Improvements | Asaad Mahmood | 2015-08-20 | 3 | -7/+21 |
| | |||||
* | Added feature to the 'More...' PM channel list and fixed small cosmetic issues | Reed Garmsen | 2015-08-18 | 1 | -0/+1 |
| | |||||
* | Private message channels no longer refresh on creation/first use | Reed Garmsen | 2015-08-18 | 1 | -0/+5 |
| | |||||
* | MM-319 - Minor ui changes | Asaad Mahmood | 2015-08-18 | 1 | -18/+15 |
| | |||||
* | adds predictive posting on the client | JoramWilander | 2015-08-18 | 1 | -0/+18 |
| | |||||
* | Merge pull request #391 from asaadmahmoodspin/master | Christopher Speller | 2015-08-18 | 6 | -12/+22 |
|\ | | | | | Multiple UI changes | ||||
| * | Multiple UI changes | Asaad Mahmood | 2015-08-18 | 6 | -12/+22 |
| | | |||||
* | | Merge pull request #381 from mattermost/mm-1705 | Christopher Speller | 2015-08-18 | 1 | -0/+17 |
|\ \ | | | | | | | MM-1705 add google as an oauth single-sign-on service | ||||
| * | | incorporate asaad's UI updates for google sign-up | JoramWilander | 2015-08-14 | 1 | -0/+17 |
| | | | |||||
* | | | Merge pull request #378 from rgarmsen2295/mm-316c | Christopher Speller | 2015-08-18 | 5 | -7/+42 |
|\ \ \ | |_|/ |/| | | MM-316 Allows users to drag and drop files from their computer to the center pane or RHS to upload them | ||||
| * | | Small changes to css to clean up code | Reed Garmsen | 2015-08-14 | 2 | -7/+1 |
| | | | |||||
| * | | Updating UI to cover RHS and the centre channel separately | Asaad Mahmood | 2015-08-13 | 2 | -3/+4 |
| | | | |||||
| * | | UI Upgrades to file overlay for uploads | Asaad Mahmood | 2015-08-13 | 3 | -43/+36 |
| | | | |||||
| * | | Implements better markup for css changes to be made, including an overlay of ↵ | Reed Garmsen | 2015-08-12 | 3 | -7/+46 |
| | | | | | | | | | | | | the dropzones and help pic/text | ||||
| * | | Added check to make sure files are not strings | Reed Garmsen | 2015-08-12 | 2 | -9/+0 |
| | | | |||||
| * | | Changed structure to keep code contained to file_upload.jsx | Reed Garmsen | 2015-08-12 | 2 | -6/+12 |
| | | | |||||
| * | | Working on adding overlays for file drag and drop | Reed Garmsen | 2015-08-12 | 2 | -0/+11 |
| | | | |||||
| * | | Users can now drop files into the center pane or the rhs respectively to ↵ | Reed Garmsen | 2015-08-12 | 1 | -7/+7 |
| | | | | | | | | | | | | upload images and other files | ||||
* | | | Merge pull request #369 from nickago/MM-1703 | Joram Wilander | 2015-08-17 | 2 | -9/+0 |
|\ \ \ | | | | | | | | | MM 1703 Closing access history or activity log returns user to security menu | ||||
| * | | | Changed user_settings1 to user_settings and removed vestigial css | nickago | 2015-08-14 | 2 | -9/+0 |
| |/ / | |||||
* | | | Merge pull request #379 from asaadmahmoodspin/mm-1854 | Joram Wilander | 2015-08-17 | 1 | -5/+4 |
|\ \ \ | | | | | | | | | mm-1858 - Truncating and adding tooltips to file names | ||||
| * | | | mm-1858 - Truncating and adding tooltips to file names in thumbnail details | Asaad Mahmood | 2015-08-14 | 1 | -5/+4 |
| | |/ | |/| | |||||
* / | | Revert "MM-375 Adds text formatting features using a modified version of the ↵ | Christopher Speller | 2015-08-14 | 2 | -21/+0 |
|/ / | | | | | | | marked js library" | ||||
* / | Implemented basic text formatting package using a modfied version of the ↵ | Reed Garmsen | 2015-08-12 | 2 | -0/+21 |
|/ | | | | marked js library. Supports *bold*, _italics_, and `code` | ||||
* | Added indicators for when a channel with unread posts is offscreen | hmhealey | 2015-08-06 | 1 | -0/+22 |
| | |||||
* | Merge pull request #329 from asaadmahmoodspin/ui-changes | Christopher Speller | 2015-08-06 | 7 | -32/+80 |
|\ | | | | | UI Improvements | ||||
| * | Adding tooltip to email in user popover | Asaad Mahmood | 2015-08-05 | 1 | -0/+6 |
| | | |||||
| * | Merge branch 'master' of https://github.com/mattermost/platform | Asaad Mahmood | 2015-08-05 | 2 | -0/+7 |
| |\ | | | | | | | | | | | | | Conflicts: web/react/components/mention_list.jsx | ||||
| * | | UI Improvements | Asaad Mahmood | 2015-08-04 | 7 | -32/+74 |
| | | | |||||
* | | | Merge pull request #342 from mattermost/release-0.6.0 | Christopher Speller | 2015-08-05 | 2 | -2/+27 |
|\ \ \ | |_|/ |/| | | Release 0.6.0 | ||||
| * | | Updating css for url input add-on and removing display flex | Asaad Mahmood | 2015-08-05 | 2 | -3/+6 |
| | | | |||||
| * | | Fixing tooltip word-wrap | Asaad Mahmood | 2015-08-05 | 1 | -0/+3 |
| | | | |||||
| * | | mm-1874 - Improving team url screen and fixing file attachments in IE 10 | Asaad Mahmood | 2015-08-04 | 2 | -0/+19 |
| |/ | |||||
* | | Fixed help text rendering on mobile | Reed Garmsen | 2015-08-04 | 1 | -3/+3 |
| | | |||||
* | | Added help text informing the user that the team invite link has been copied ↵ | Reed Garmsen | 2015-08-03 | 2 | -0/+7 |
|/ | | | | when they press the 'Copy Link' button | ||||
* | Merge pull request #302 from hmhealey/mm1788 | Corey Hulen | 2015-08-02 | 1 | -6/+0 |
|\ | | | | | MM-1788 Removed ^replying in preparation for 0.6.0 |