Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | Merge pull request #229 from rgarmsen2295/mm-1626 | Corey Hulen | 2015-07-22 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | MM-1626 Changes the subject line for emails sent regarding notifications | |||||
| * | | | | | | | | Changed the subject line for emails sent regarding mentions and other team ↵ | Reed Garmsen | 2015-07-21 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | notifications. This is meant to prevent notification emails from different teams from combining into a single email thread | |||||
* | | | | | | | | | Merge pull request #219 from nickago/scrollBug | Corey Hulen | 2015-07-22 | 1 | -0/+2 | |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Fixes RHS scrolling into whitespace on new comment open | |||||
| * | | | | | | | | | Upon changing to a new comment thread, fixes the the bug of the RHS ↵ | nickago | 2015-07-21 | 1 | -0/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | scrolling to whitespace below the pane | |||||
* | | | | | | | | | | Merge pull request #201 from hmhealey/mm1539 | Corey Hulen | 2015-07-22 | 6 | -5/+130 | |
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | MM-1539 Added the ability to reply to earlier message threads by starting a post with ^ | |||||
| * | | | | | | | | | | Prevent users from sending empty ^ reply messages | hmhealey | 2015-07-21 | 1 | -5/+5 | |
| | | | | | | | | | | | ||||||
| * | | | | | | | | | | Added handling for when the user is ^ responding to a post that gets deleted | hmhealey | 2015-07-21 | 1 | -1/+7 | |
| | | | | | | | | | | | ||||||
| * | | | | | | | | | | Track caretCount as part of createPost's state so that we don't ↵ | hmhealey | 2015-07-21 | 1 | -22/+22 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | unnecessarily search for a thread to reply to when the user is typing | |||||
| * | | | | | | | | | | Changed the placeholder highlight for active thread to be more subtle | hmhealey | 2015-07-21 | 1 | -2/+4 | |
| | | | | | | | | | | | ||||||
| * | | | | | | | | | | Trim the carets from the beginning of reply messages when they're posted | hmhealey | 2015-07-21 | 1 | -0/+5 | |
| | | | | | | | | | | | ||||||
| * | | | | | | | | | | Change the create_post component to track the active thread using the event ↵ | hmhealey | 2015-07-21 | 1 | -14/+24 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dispatcher so that it stays in sync with the post_list | |||||
| * | | | | | | | | | | Added function to reply to earlier messages by prefixing a message with carets | hmhealey | 2015-07-21 | 4 | -4/+89 | |
| | | | | | | | | | | | ||||||
| * | | | | | | | | | | Added events for when the active thread (ie the message thread that a user ↵ | hmhealey | 2015-07-21 | 2 | -0/+17 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | is responding to) changes | |||||
* | | | | | | | | | | | Merge pull request #236 from mattermost/it33-patch-1 | Corey Hulen | 2015-07-22 | 1 | -3/+8 | |
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Update to latest community URLs | |||||
| * | | | | | | | | | | | Update to latest community URLs | it33 | 2015-07-22 | 1 | -3/+8 | |
| | |_|_|_|_|/ / / / / | |/| | | | | | | | | | ||||||
* | | | | | | | | | | | Merge pull request #235 from rgarmsen2295/mm-1596 | Corey Hulen | 2015-07-22 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | MM-1596 While in mobile mode notifications are no longer counted for channels set to 'quiet mode' that are not direct mentions | |||||
| * | | | | | | | | | | | While in mobile mode notifications are no longer counted for channels set to ↵ | Reed Garmsen | 2015-07-22 | 1 | -1/+1 | |
| |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'quiet mode' that are not direct mentions. | |||||
* | | | | | | | | | | | Merge pull request #234 from asaadmahmoodspin/master | Corey Hulen | 2015-07-22 | 5 | -12/+29 | |
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Profile pic changes in LHS Header | |||||
| * | | | | | | | | | | | Improving formatting for Channel Intro | Asaad Mahmood | 2015-07-22 | 3 | -11/+23 | |
| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | Adjusting scroll in RHS to not show whitespace | Asaad Mahmood | 2015-07-22 | 1 | -0/+1 | |
| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | Profile pic changes in LHS Header | Asaad Mahmood | 2015-07-22 | 2 | -1/+5 | |
| |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removing profile pic in the LHS Header if the user hasn't uploaded a custom profile pic. | |||||
* | | | | | | | | | | | Merge pull request #233 from asaadmahmoodspin/mm-1616 | Corey Hulen | 2015-07-22 | 10 | -168/+350 | |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | Adding back Access History and Active Devices | |||||
| * | | | | | | | | | | Adding back Access History and Active Devices | Reed Garmsen | 2015-07-22 | 10 | -168/+350 | |
| | | | | | | | | | | | ||||||
* | | | | | | | | | | | Merge pull request #232 from mattermost/post-list-null | Joram Wilander | 2015-07-22 | 1 | -0/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | Small fix for a null TypeError in post_list updating code | |||||
| * | | | | | | | | | | Small patch for a null TypeError in post_list updating code | Christopher Speller | 2015-07-22 | 1 | -0/+1 | |
|/ / / / / / / / / / | ||||||
* | | | | | | | | | | Merge pull request #231 from mattermost/file-fixes | Christopher Speller | 2015-07-22 | 2 | -27/+27 | |
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | More patches for files | |||||
| * | | | | | | | | | | fix the ability to remove file previews once uploaded | JoramWilander | 2015-07-22 | 1 | -2/+3 | |
| | | | | | | | | | | | ||||||
| * | | | | | | | | | | fixed thumbnails and files in RHS | JoramWilander | 2015-07-22 | 1 | -25/+24 | |
| | |_|_|_|_|/ / / / | |/| | | | | | | | | ||||||
* | | | | | | | | | | Merge pull request #230 from mattermost/download-link-fix | Christopher Speller | 2015-07-22 | 1 | -3/+10 | |
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | fixed download link in image viewer | |||||
| * | | | | | | | | | | fixed download link in image viewer | JoramWilander | 2015-07-21 | 1 | -3/+10 | |
| | |_|_|/ / / / / / | |/| | | | | | | | | ||||||
* | | | | | | | | | | Merge pull request #224 from hmhealey/mm1625 | Christopher Speller | 2015-07-22 | 2 | -4/+11 | |
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | | | MM-1625 Correct the appearance of the post menu on both desktop and mobile | |||||
| * | | | | | | | | | Changed post menu label to be ... and to make it visible at all times on ↵ | hmhealey | 2015-07-21 | 1 | -0/+10 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | small screens (ie mobile devices) | |||||
| * | | | | | | | | | Changed post menu label to just be [...] regardless of whether or not the ↵ | hmhealey | 2015-07-21 | 1 | -4/+1 | |
| | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | user is hovering over it | |||||
* | | | | | | | | | Merge pull request #222 from rgarmsen2295/mm-1574 | Joram Wilander | 2015-07-22 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | MM-1574 Fixed typo in the 'Sign up Complete' page: you email -> your email | |||||
| * | | | | | | | | Fixed typo in the 'Sign up Complete' page: you email -> your email | Reed Garmsen | 2015-07-21 | 1 | -1/+1 | |
| |/ / / / / / / | ||||||
* | | | | | | | | Merge pull request #205 from mattermost/mm-1351 | Corey Hulen | 2015-07-21 | 16 | -206/+383 | |
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | | fixes mm-1351 adds local server storage | |||||
| * | | | | | | | removed unnecessary debug statements | JoramWilander | 2015-07-21 | 2 | -4/+0 | |
| | | | | | | | | ||||||
| * | | | | | | | fix click through on the image viewer modal to work with new team domain changes | JoramWilander | 2015-07-21 | 1 | -1/+1 | |
| | | | | | | | | ||||||
| * | | | | | | | fixed unit tests to work with team domain changes and update partial url ↵ | JoramWilander | 2015-07-21 | 6 | -19/+55 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | regex for files | |||||
| * | | | | | | | added sanitization to filenames to remove the possibility of relative paths | JoramWilander | 2015-07-21 | 2 | -4/+12 | |
| | | | | | | | | ||||||
| * | | | | | | | updated create profile image unit test to clean up images properly | JoramWilander | 2015-07-21 | 1 | -0/+18 | |
| | | | | | | | | ||||||
| * | | | | | | | remove data dirs in make clean and updated gitignore with api/data | JoramWilander | 2015-07-21 | 2 | -0/+3 | |
| | | | | | | | | ||||||
| * | | | | | | | change docker default storage directory to /mattermost/data | JoramWilander | 2015-07-21 | 1 | -1/+1 | |
| | | | | | | | | ||||||
| * | | | | | | | added relative data directory as default for storage and added it to gitignore | JoramWilander | 2015-07-21 | 2 | -2/+5 | |
| | | | | | | | | ||||||
| * | | | | | | | add proper url encoding for filenames | JoramWilander | 2015-07-21 | 2 | -1/+23 | |
| | | | | | | | | ||||||
| * | | | | | | | create default storage directory in Dockerfile, turn on server storage by ↵ | JoramWilander | 2015-07-21 | 2 | -6/+9 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | default for docker config | |||||
| * | | | | | | | turned off local server storage by default | JoramWilander | 2015-07-21 | 2 | -4/+4 | |
| | | | | | | | | ||||||
| * | | | | | | | update file unit tests | JoramWilander | 2015-07-21 | 3 | -67/+143 | |
| | | | | | | | | ||||||
| * | | | | | | | initial implementation of local server storage for files | JoramWilander | 2015-07-21 | 5 | -115/+127 | |
|/ / / / / / / | ||||||
* | | | | | | | Merge pull request #227 from mattermost/files-patch | Christopher Speller | 2015-07-21 | 1 | -0/+5 | |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Fixing image previews. |