summaryrefslogtreecommitdiffstats
path: root/web
Commit message (Collapse)AuthorAgeFilesLines
* 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 #312 from mattermost/mm-1784Corey Hulen2015-08-021-1/+2
|\ | | | | MM-1784 switching to a new PM channel now works in the more modal
| * switching to a new PM channel now works in the more modalJoramWilander2015-07-311-1/+2
| |
* | Merge pull request #302 from hmhealey/mm1788Corey Hulen2015-08-026-125/+5
|\ \ | | | | | | MM-1788 Removed ^replying in preparation for 0.6.0
| * | Removed ^replying in preparation for 0.6.0hmhealey2015-07-306-125/+5
| | |
* | | Merge pull request #301 from lfbrock/patch-1Corey Hulen2015-08-021-1/+1
|\ \ \ | | | | | | | | MM-1841 Corrected help text
| * | | MM-1841 Corrected help textlfbrock2015-07-301-1/+1
| |/ /
* | | Merge pull request #276 from mattermost/mm-1688Corey Hulen2015-08-024-5/+13
|\ \ \ | | | | | | | | MM-1688 reset number of posts to fetch on channel switch and fresh page load
| * | | removed ternary operator to make if statement clearerJoramWilander2015-07-301-1/+4
| | | |
| * | | reset number of posts to fetch on channel switch and fresh page loadJoramWilander2015-07-294-5/+10
| | | |
* | | | Merge pull request #274 from mattermost/mm-1497Corey Hulen2015-08-023-1/+19
|\ \ \ \ | |_|_|/ |/| | | MM-1497 image thumbnails now scale appropriately so there is no whitespace
| * | | center small thumbnails and top left larger thumbnailsJoramWilander2015-07-311-0/+11
| | | |
| * | | removed uneccessary utils loadThumbnails functionJoramWilander2015-07-311-44/+0
| | | |
| * | | image thumbnails now scale appropriately so there is no whitespace, also ↵JoramWilander2015-07-313-1/+52
| | | | | | | | | | | | | | | | generalized some thumbnail loading code
* | | | Merge pull request #299 from nickago/MM-1734Christopher Speller2015-07-311-24/+22
|\ \ \ \ | | | | | | | | | | MM-1734 Changed language in error message and did cosmetic refactoring
| * | | | Updated actual text of error messagenickago2015-07-311-1/+1
| | | | |
| * | | | Changed language in error message to reflect better English and did cosmetic ↵nickago2015-07-301-24/+22
| | | | | | | | | | | | | | | | | | | | refactoring
* | | | | Merge pull request #306 from nickago/MM-1660Christopher Speller2015-07-311-91/+112
|\ \ \ \ \ | | | | | | | | | | | | MM-1660 Added singlequotes around 'Edit' and did cosmetic refactoring
| * | | | | Added singlequotes around 'Edit' and did cosmetic refactoringnickago2015-07-311-91/+112
| | |_|_|/ | |/| | |
* | | | | Revert "MM-1706 Changed mention highlighting code to split words on all ↵Joram Wilander2015-07-311-7/+7
| |_|/ / |/| | | | | | | | | | | non-word characters"
* | | | Merge pull request #271 from hmhealey/mm1656Joram Wilander2015-07-3117-333/+468
|\ \ \ \ | | | | | | | | | | MM-1656 Updated file UI
| * | | | Cleaned up ViewImageModal and FileAttachment and added some extra commentshmhealey2015-07-293-11/+27
| | | | |
| * | | | Changed flexbox styles to be compatible with all browsershmhealey2015-07-291-2/+4
| | | | |
| * | | | Updated ViewImage modal dialog to include details about non-image fileshmhealey2015-07-294-57/+119
| | | | |
| * | | | Added check to make sure that FileAttachment is mounted before ↵hmhealey2015-07-291-2/+11
| | | | | | | | | | | | | | | | | | | | asynchronously setting state to avoid warning messages.
| * | | | Fixed FileAttachment component to not spam the server with requests when ↵hmhealey2015-07-291-3/+8
| | | | | | | | | | | | | | | | | | | | displaying a zero byte file
| * | | | Added utility function to get a file attachment's urlhmhealey2015-07-292-9/+14
| | | | |
| * | | | Changed the thumbnail for non-image file attachments to open the ↵hmhealey2015-07-291-12/+6
| | | | | | | | | | | | | | | | | | | | ViewImageModal on click like it does for image attachments
| * | | | Added preview images for non-image fileshmhealey2015-07-292-18/+42
| | | | |
| * | | | UI update for filesAsaad Mahmood2015-07-2911-10/+6
| | | | |
| * | | | Removed unused imgCount property from ViewImageModalhmhealey2015-07-292-21/+12
| | | | |
| * | | | Fixed race condition which could occur while requesting the file size for ↵hmhealey2015-07-292-11/+29
| | | | | | | | | | | | | | | | | | | | the file attachment previews
| * | | | Removed unused custom-file CSS class that was being applied to non-image ↵hmhealey2015-07-292-9/+1
| | | | | | | | | | | | | | | | | | | | file attachment previews
| * | | | Fix ViewImageModals created by RHS posts so that their ids are distinct from ↵hmhealey2015-07-294-16/+15
| | | | | | | | | | | | | | | | | | | | those in the main window
| * | | | Center image icons in attachment previews instead of stretching themhmhealey2015-07-291-20/+17
| | | | |
| * | | | Cleaned up references to the current post in post_right.jsxhmhealey2015-07-291-30/+33
| | | | |
| * | | | Reconcile the code to display attachment previews into a FileAttachmentList ↵hmhealey2015-07-294-234/+176
| | | | | | | | | | | | | | | | | | | | class to clean up duplicated code.
| * | | | Add an info box next to image thumbnails which provides the name, type, and ↵hmhealey2015-07-293-18/+98
| | |_|/ | |/| | | | | | | | | | size of a file.
* | | | Merge pull request #304 from hmhealey/mm1706Joram Wilander2015-07-311-7/+7
|\ \ \ \ | | | | | | | | | | MM-1706 Changed mention highlighting code to split words on all non-word characters
| * | | | Changed mention highlighting code to split words on all non-word charactershmhealey2015-07-301-7/+7
| | |/ / | |/| |
* | | | Merge pull request #293 from rgarmsen2295/mm-1725Christopher Speller2015-07-311-24/+28
|\ \ \ \ | | | | | | | | | | MM-1725 Added text to inform the user a session id is not available for a login attempt
| * | | | Added text to inform the user a session id is not available for a login ↵Reed Garmsen2015-07-301-24/+28
| | | | | | | | | | | | | | | | | | | | attempt (no session created yet)
* | | | | Merge pull request #283 from mattermost/mm-1787Christopher Speller2015-07-315-21/+22
|\ \ \ \ \ | | | | | | | | | | | | MM-1787 Fixing links for signup from team invite link.
| * | | | | Removing nickname parameter from FireAndForgetVerifyEmailChristopher Speller2015-07-301-1/+1
| | | | | |
| * | | | | Fixing links for signup from team invite link. Enter now advances ↵Christopher Speller2015-07-305-21/+22
| | | | | | | | | | | | | | | | | | | | | | | | signup_user_complete screen. Signin now link now redirects properly.
* | | | | | MM-1473 - Updating text for close buttonsAsaad Mahmood2015-07-315-5/+5
| | | | | |
* | | | | | Merge branch 'master' of https://github.com/mattermost/platformAsaad Mahmood2015-07-311-3/+16
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Merge pull request #292 from mattermost/mm-1782Joram Wilander2015-07-301-3/+16
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | | MM-1782 makes the LHS dropdown close when clicking on the LHS header