summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #329 from asaadmahmoodspin/ui-changesChristopher Speller2015-08-0612-37/+102
|\ | | | | UI Improvements
| * Adding tooltip to email in user popoverAsaad Mahmood2015-08-052-0/+7
| |
| * Fixing style guide stuff in post_listAsaad Mahmood2015-08-051-5/+3
| |
| * Removing console.logAsaad Mahmood2015-08-051-1/+0
| |
| * Fixing mentions scroll again due to merge conflictAsaad Mahmood2015-08-051-0/+7
| |
| * Merge branch 'master' of https://github.com/mattermost/platformAsaad Mahmood2015-08-0512-295/+359
| |\ | | | | | | | | | | | | Conflicts: web/react/components/mention_list.jsx
| * | Updating channel header tooltip placementAsaad Mahmood2015-08-041-1/+1
| | |
| * | Merge branch 'master' of https://github.com/mattermost/platformAsaad Mahmood2015-08-042-190/+223
| |\ \ | | | | | | | | | | | | | | | | Conflicts: web/react/components/channel_header.jsx
| * | | Fixing scrolling of mention box in RHSAsaad Mahmood2015-08-041-1/+3
| | | |
| * | | Adding bootstrap tooltip for channel membersAsaad Mahmood2015-08-041-1/+1
| | | |
| * | | UI ImprovementsAsaad Mahmood2015-08-0412-41/+99
| | | |
* | | | Merge pull request #324 from rgarmsen2295/mm-1617Christopher Speller2015-08-062-56/+81
|\ \ \ \ | | | | | | | | | | MM-1617 Now shows a loading gif while a profile pic is being uploaded
| * | | | Minor cosmetic refactoring to the General Tab of user settingsReed Garmsen2015-08-042-57/+77
| | | | |
| * | | | Added spinner animation to replace save button when uploading a new profile ↵Reed Garmsen2015-08-042-4/+9
| | |/ / | |/| | | | | | | | | | picture
* | | | Merge pull request #342 from mattermost/release-0.6.0Christopher Speller2015-08-058-58/+109
|\ \ \ \ | | | | | | | | | | Release 0.6.0
| * \ \ \ Merge pull request #331 from mattermost/060-readme-updatesChristopher Speller2015-08-051-48/+52
| |\ \ \ \ | | | | | | | | | | | | Updates to the README for release.
| | * | | | Correcting minor typos, formatting, wordingit332015-08-041-31/+30
| | | | | |
| | * | | | Fixing typeoChristopher Speller2015-08-041-1/+1
| | | | | |
| | * | | | Updates to the README for release.it332015-08-041-23/+28
| | | | | |
| * | | | | Merge pull request #328 from asaadmahmoodspin/mm-1874Christopher Speller2015-08-053-4/+31
| |\ \ \ \ \ | | | | | | | | | | | | | | mm-1874 - Improving team url screen and fixing file attachments in IE 10
| | * | | | | Updating css for url input add-on and removing display flexAsaad Mahmood2015-08-052-3/+6
| | | | | | |
| | * | | | | Fixing tooltip word-wrapAsaad Mahmood2015-08-051-0/+3
| | | | | | |
| | * | | | | mm-1874 - Improving team url screen and fixing file attachments in IE 10Asaad Mahmood2015-08-043-2/+23
| | |/ / / /
| * | | | | Merge pull request #337 from mattermost/docker-config-updatesChristopher Speller2015-08-052-5/+13
| |\ \ \ \ \ | | | | | | | | | | | | | | Updating docker configuration files for release
| | * | | | | Updating docker configuration files for releaseChristopher Speller2015-08-052-5/+13
| |/ / / / /
| * | | | | Merge pull request #320 from rgarmsen2295/mm-1873Christopher Speller2015-08-041-1/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | Fixed typo on landing page for sign-up
| | * | | | | Fixed typo on landing page for sign-upReed Garmsen2015-08-031-1/+1
| | |/ / / /
| * | | | | Merge pull request #319 from mattermost/fix-distChristopher Speller2015-08-041-0/+12
| |\ \ \ \ \ | | |/ / / / | |/| | | | Adding docs to build
| | * | | | Adding docs to build=Corey Hulen2015-08-031-0/+12
| |/ / / /
* | | | | Merge pull request #338 from nickago/MM-1671Christopher Speller2015-08-051-1/+1
|\ \ \ \ \ | |_|_|_|/ |/| | | | MM-1671 Fixed typo causing new channels not to spawn
| * | | | Fixed non-cosmetic refactoring typonickago2015-08-051-1/+1
|/ / / /
* | | | Merge pull request #326 from nickago/MM-1754Christopher Speller2015-08-046-6/+6
|\ \ \ \ | | | | | | | | | | MM-1754 Modals now close upon pressing ESC
| * | | | Added closing on ESC key pressnickago2015-08-046-6/+6
| | |_|/ | |/| |
* | | | Merge pull request #321 from rgarmsen2295/mm-1611Christopher Speller2015-08-041-84/+96
|\ \ \ \ | | | | | | | | | | MM-1611 Removes ability to cycle through the mention list by jumping top to bottom or vice versa
| * | | | Cosmetic changes to better follow style guideReed Garmsen2015-08-031-75/+95
| | | | |
| * | | | Removes ability for the mention list to cycle from top to bottom and vice-versaReed Garmsen2015-08-031-13/+5
| | |/ / | |/| |
* | | | Merge pull request #310 from nickago/MM-1671Christopher Speller2015-08-041-62/+70
|\ \ \ \ | | | | | | | | | | MM-1671 Added support for enter key triggering submission and changed Close to Cancel
| * | | | Cosmetic Refactoringnickago2015-08-041-59/+67
| | | | |
| * | | | Changed 'Close' to 'Cancel'nickago2015-08-041-2/+2
| | | | |
| * | | | Placed button inside of form to allow for submission on strike of enter keynickago2015-08-041-8/+8
| | |/ / | |/| |
* | | | Merge pull request #325 from rgarmsen2295/mm-1618Christopher Speller2015-08-043-19/+37
|\ \ \ \ | | | | | | | | | | MM-1618 Adds help text to the Get Link modal that informs user when link has been copied to clipboard
| * | | | Fixed help text rendering on mobileReed Garmsen2015-08-042-9/+10
| | | | |
| * | | | Added help text informing the user that the team invite link has been copied ↵Reed Garmsen2015-08-033-18/+35
| | |/ / | |/| | | | | | | | | | when they press the 'Copy Link' button
* | | | Merge pull request #323 from rgarmsen2295/mm-1554Christopher Speller2015-08-041-119/+151
|\ \ \ \ | |_|_|/ |/| | | MM-1554 Removes the delete icon for the first entry in the 'Invite New Members' form
| * | | Cosmetic refactoring to better fit style guideReed Garmsen2015-08-041-121/+151
| | | |
| * | | The first field of the 'Invite New Member' field can no longer be cleared or ↵Reed Garmsen2015-08-031-0/+2
| |/ / | | | | | | | | | deleted
* | | Merge pull request #318 from rgarmsen2295/mm-1592Christopher Speller2015-08-041-81/+99
|\ \ \ | | | | | | | | MM-1592 Searching for recent mentions no longer includes all or channel if the all/channel options were toggled on
| * | | Cosmetic refactoring to be inline with the style guideReed Garmsen2015-08-021-84/+95
| | | |
| * | | Searching for recent mentions no longer includes all or channel if those ↵Reed Garmsen2015-08-021-1/+8
| | | | | | | | | | | | | | | | options were toggled in the users mention settings
* | | | Merge pull request #322 from nickago/MM-1679Christopher Speller2015-08-041-109/+124
|\ \ \ \ | |_|_|/ |/| | | MM-1679 PM channels in sidebar now display username instead of nickname, plus semi-cosmetic refactoring