Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| | | |||||
* | | 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 |
| |/ | |||||
* | | fix click through on the image viewer modal to work with new team domain changes | JoramWilander | 2015-07-21 | 1 | -1/+1 |
| | | |||||
* | | Fixing image previews | Christopher Speller | 2015-07-21 | 1 | -0/+5 |
| | | |||||
* | | Fixing issues with files trasitioning to relative paths | Christopher Speller | 2015-07-21 | 1 | -0/+4 |
| | | |||||
* | | Fixing file uploads and previews for new /team/ URL structure | Christopher Speller | 2015-07-21 | 3 | -2/+8 |
| | | |||||
* | | Old files are saved with full paths, this changes so that new files are not ↵ | Christopher Speller | 2015-07-21 | 1 | -0/+12 |
| | | | | | | | | saved with absolute paths and detects old files saved and fixes them. | ||||
* | | Merge pull request #200 from mattermost/mm-1356 | Corey Hulen | 2015-07-21 | 38 | -609/+338 |
|\ \ | |/ |/| | MM-1356 Changing team URLs from team.domain.com to domain.com/team | ||||
| * | Changing the way we mattermost handles URLs. team.domain.com becomes ↵ | Christopher Speller | 2015-07-20 | 38 | -609/+338 |
| | | | | | | | | | | | | | | domain.com/team. Renaming team.Name to team.DisplayName and team.Domain to team.Name. So: team.Name -> url safe name. team.DisplayName -> nice name for users | ||||
* | | quick fix to get manage team modal working again | JoramWilander | 2015-07-21 | 1 | -0/+1 |
| | | |||||
* | | mm-1631 - Fixing image previewer bug | Asaad Mahmood | 2015-07-21 | 3 | -4/+13 |
| | | |||||
* | | Merge pull request #211 from rgarmsen2295/mm-1186 | Christopher Speller | 2015-07-20 | 3 | -2/+13 |
|\ \ | | | | | | | MM-1186 Adds channel name to RHS comment threads | ||||
| * | | Added channel name to RHS comment threads; minor css changes to compensate ↵ | Reed Garmsen | 2015-07-19 | 3 | -2/+13 |
| | | | | | | | | | | | | for addition | ||||
* | | | Merge pull request #207 from hmhealey/mm825 | Joram Wilander | 2015-07-20 | 1 | -1/+2 |
|\ \ \ | | | | | | | | | MM-825 Fixed the labels on the mention list for users without their first/last name configured | ||||
| * | | | Fixed the labels on the mention list for users without their first/last name ↵ | hmhealey | 2015-07-18 | 1 | -1/+2 |
| |/ / | | | | | | | | | | configured | ||||
* | | | Merge pull request #204 from nickago/MM-1519 | Joram Wilander | 2015-07-20 | 1 | -1/+2 |
|\ \ \ | | | | | | | | | MM-1519 Even on error, submission stops, updated to relect that | ||||
| * | | | Even on error, submission stop, updated to relect that | nickago | 2015-07-17 | 1 | -1/+2 |
| | | | | |||||
* | | | | fixes mm-831 post timestamps now update | JoramWilander | 2015-07-20 | 3 | -10/+25 |
| |_|/ |/| | | |||||
* | | | Merge pull request #208 from nickago/MM-1079 | Joram Wilander | 2015-07-20 | 1 | -3/+1 |
|\ \ \ | |_|/ |/| | | MM-1079 Removed remenant of non-hover system | ||||
| * | | Removed remenant of non-hover system | nickago | 2015-07-18 | 1 | -3/+1 |
| | | | |||||
* | | | Fixes javascript console errors | =Corey Hulen | 2015-07-17 | 2 | -4/+5 |
| | | | |||||
* | | | Merge pull request #192 from nickago/MM-1079 | Corey Hulen | 2015-07-17 | 3 | -6/+8 |
|\| | | | | | | | | MM-1079 Changed hover effect for menu | ||||
| * | | Changed javascript to CSS method | nickago | 2015-07-17 | 3 | -6/+8 |
| |/ | |||||
* | | Use a user's full name as their display name if a nickname hasn't been specified | hmhealey | 2015-07-17 | 1 | -1/+19 |
| | | |||||
* | | Unify all locations where we determine a user's display named based off of ↵ | hmhealey | 2015-07-17 | 3 | -5/+11 |
| | | | | | | | | their nickname/username into a helper function | ||||
* | | Allow Users to be notified using @all, @channel, and their first name when ↵ | hmhealey | 2015-07-17 | 1 | -9/+7 |
| | | | | | | | | other notifications are disabled | ||||
* | | Use User.FirstName for notifications instead of trying to determine it from ↵ | hmhealey | 2015-07-17 | 3 | -32/+11 |
| | | | | | | | | User.Nickname | ||||
* | | Use User.FirstName instead of trying to infer a user's first name from their ↵ | hmhealey | 2015-07-17 | 1 | -1/+1 |
| | | | | | | | | nickname in multiple places. | ||||
* | | Fix migration code so that LastName is populated correctly for users who ↵ | hmhealey | 2015-07-17 | 1 | -13/+18 |
| | | | | | | | | only have one word in their FullName | ||||
* | | Add interface to edit a user's nickname directly | hmhealey | 2015-07-17 | 1 | -1/+54 |
| | | |||||
* | | Renamed all clientside references from full_name to nickname | hmhealey | 2015-07-17 | 8 | -21/+21 |
| | |