Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | 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 | 3 | -9/+14 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Profile pic changes in LHS Header | |||||
| * | | | | | | Improving formatting for Channel Intro | Asaad Mahmood | 2015-07-22 | 1 | -9/+9 | |
| | | | | | | | ||||||
| * | | | | | | 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 | 1 | -0/+4 | |
| |/ / / / / | | | | | | | | | | | | | | | | | | | 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 | 4 | -162/+228 | |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | Adding back Access History and Active Devices | |||||
| * | | | | | Adding back Access History and Active Devices | Reed Garmsen | 2015-07-22 | 4 | -162/+228 | |
| | | | | | | ||||||
* | | | | | | 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 | |
| | |_|_|/ | |/| | | | ||||||
* / | | | | fixed download link in image viewer | JoramWilander | 2015-07-21 | 1 | -3/+10 | |
|/ / / / | ||||||
* | | / | 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 | 15 | -458/+177 | |
|\ \ \ | |/ / |/| | | 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 | 15 | -458/+177 | |
| | | | | | | | | | | | | | | | | | | | | | 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 | 2 | -4/+7 | |
| | | ||||||
* | | Merge pull request #211 from rgarmsen2295/mm-1186 | Christopher Speller | 2015-07-20 | 2 | -1/+7 | |
|\ \ | | | | | | | 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 | 2 | -1/+7 | |
| | | | | | | | | | | | | 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 | 1 | -2/+2 | |
| | | | ||||||
* | | | Merge pull request #192 from nickago/MM-1079 | Corey Hulen | 2015-07-17 | 2 | -6/+2 | |
|\| | | | | | | | | MM-1079 Changed hover effect for menu | |||||
| * | | Changed javascript to CSS method | nickago | 2015-07-17 | 2 | -6/+2 | |
| |/ | ||||||
* | | Unify all locations where we determine a user's display named based off of ↵ | hmhealey | 2015-07-17 | 2 | -4/+4 | |
| | | | | | | | | their nickname/username into a helper function | |||||
* | | Use User.FirstName for notifications instead of trying to determine it from ↵ | hmhealey | 2015-07-17 | 2 | -27/+10 | |
| | | | | | | | | User.Nickname | |||||
* | | 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 | 6 | -18/+18 | |
| | | ||||||
* | | Merge pull request #199 from asaadmahmoodspin/master | Joram Wilander | 2015-07-17 | 1 | -1/+1 | |
|\ \ | | | | | | | Improving search header for mobile layouts and other UI changes | |||||
| * | | Improving search header for mobile layouts and other UI changes | Asaad Mahmood | 2015-07-17 | 1 | -1/+1 | |
| | | | ||||||
* | | | Merge pull request #184 from nickago/MM-1278 | Joram Wilander | 2015-07-17 | 1 | -1/+2 | |
|\ \ \ | |_|/ |/| | | MM-1278 Team admin can now delete any post | |||||
| * | | Team admin can now delete any post | nickago | 2015-07-14 | 1 | -1/+2 | |
| | | | ||||||
* | | | Merge pull request #193 from ralder/fix-manage-members-town-square | Joram Wilander | 2015-07-17 | 4 | -127/+116 | |
|\ \ \ | | | | | | | | | [webui] remove admin's ability to manage members of default channel fixes (#172) | |||||
| * | | | remove admin's ability to manage members of default channel (fixes #172) | ralder | 2015-07-16 | 4 | -127/+116 | |
| | | | | ||||||
* | | | | Merge pull request #196 from nickago/MM-1058 | Christopher Speller | 2015-07-17 | 1 | -2/+7 | |
|\ \ \ \ | |_|_|/ |/| | | | MM-1058 Added last updated for pictures | |||||
| * | | | Added last updated for pictures | nickago | 2015-07-16 | 1 | -2/+7 | |
| |/ / | ||||||
* | | | MM-1401 - Removing most inline styles and other UI changes | Asaad Mahmood | 2015-07-17 | 10 | -21/+20 | |
| | | | ||||||
* | | | Minor code change for clarity | Reed Garmsen | 2015-07-16 | 1 | -1/+1 | |
| | | | ||||||
* | | | Code simplification and rebasing | Reed Garmsen | 2015-07-16 | 2 | -32/+6 | |
| | | | ||||||
* | | | Added missing semi-colons | Reed Garmsen | 2015-07-16 | 2 | -2/+2 | |
| | | |