summaryrefslogtreecommitdiffstats
path: root/web
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | * | | | added .off() for dropdown hide event on LHS headerJoramWilander2015-07-301-0/+2
| | | | | |
| | * | | | makes the LHS dropdown close when clicking on the LHS headerJoramWilander2015-07-301-3/+14
| | | | | |
* | | | | | Improving smoothness of RHS searchAsaad Mahmood2015-07-302-6/+13
|/ / / / /
* | | | | Merge pull request #284 from nickago/MM-1768Joram Wilander2015-07-301-15/+15
|\ \ \ \ \ | | | | | | | | | | | | MM-1768 Updated Upload to Select in profile uploader and did cosmetic refactoring
| * | | | | Changed Update to Select, removed illegal spaces, and changed double quotes ↵nickago2015-07-291-15/+15
| | |_|_|/ | |/| | | | | | | | | | | | | to single
* | | | | Merge pull request #282 from nickago/MM-1642Christopher Speller2015-07-301-7/+12
|\ \ \ \ \ | | | | | | | | | | | | MM-1642 Updated the password error message to not contain extraneous information
| * | | | | Stripped obfuscating information from password change error and synchronized ↵nickago2015-07-291-7/+12
| |/ / / / | | | | | | | | | | | | | | | error slots so that only one will show at once.
* | | | | Merge pull request #281 from nickago/MM-1600Christopher Speller2015-07-301-1/+5
|\ \ \ \ \ | |_|/ / / |/| | | | MM-1600 Improve quality of error returned upon a duplicate username request
| * | | | Added error safety and a unique message for duplicate emailsnickago2015-07-291-1/+5
| | | | |
| * | | | Added a unique error message for bad username and simplified error outputed ↵nickago2015-07-291-1/+1
| |/ / / | | | | | | | | | | | | to user
* | | | Merge pull request #289 from mattermost/it33-patch-4Corey Hulen2015-07-301-1/+1
|\ \ \ \ | | | | | | | | | | MM-1816 Make Off-Topic description more clear
| * | | | MM-1816 Make Off-Topic description more clearit332015-07-291-1/+1
| | |_|/ | |/| |
* | | | Merge pull request #288 from mattermost/it33-patch-3Corey Hulen2015-07-301-1/+1
|\ \ \ \ | | | | | | | | | | Corrected "lower case" to "lowercase"
| * | | | Corrected "lower case" to "lowercase"it332015-07-291-1/+1
| |/ / /
* | | | Merge pull request #287 from mattermost/it33-patch-2Corey Hulen2015-07-301-1/+1
|\ \ \ \ | | | | | | | | | | Correcting proper use of "set up" vs. "setup"
| * | | | Correcting proper use of "set up" vs. "setup"it332015-07-291-1/+1
| |/ / /
* | | | Merge pull request #280 from mattermost/mm-1746Corey Hulen2015-07-301-1/+1
|\ \ \ \ | |/ / / |/| | | MM-1746 channel handle now populates properly on opening of channel rename modal
| * | | channel handle now populates properly on opening of channel rename modalJoramWilander2015-07-291-1/+1
| | | |
* | | | Merge pull request #279 from asaadmahmoodspin/masterJoram Wilander2015-07-294-14/+15
|\ \ \ \ | |_|_|/ |/| | | Fixing LHS Header css
| * | | Minor Ui updates regarding the search and the center channel header on mobile.Asaad Mahmood2015-07-293-12/+12
| | | |
| * | | Updating color of hover on LHS HeaderAsaad Mahmood2015-07-291-1/+1
| | | |
| * | | Fixing LHS Header cssAsaad Mahmood2015-07-291-1/+2
| | | |