Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| | | |||||
* | | Merge pull request #209 from mattermost/mm-831 | Joram Wilander | 2015-07-20 | 3 | -10/+25 |
|\ \ | | | | | | | fixes mm-831 post timestamps now update | ||||
| * | | 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 #185 from mattermost/mm-1348 | Corey Hulen | 2015-07-17 | 14 | -216/+35 |
|\ \ \ | | | | | | | | | fixes mm-1348 removing dependency on redis | ||||
| * | | | fixes mm-1348 removing dependency on redis | =Corey Hulen | 2015-07-14 | 14 | -216/+35 |
| | | | | |||||
* | | | | 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 |
| | |/ | |/| | |||||
* | | | Merge pull request #177 from hmhealey/mm825 | Corey Hulen | 2015-07-17 | 31 | -230/+395 |
|\ \ \ | | | | | | | | | MM-825 Replace FullName field with separate FirstName and LastName fields and repurpose the existing FullName as Nickname | ||||
| * | | | Use a user's full name as their display name if a nickname hasn't been specified | hmhealey | 2015-07-17 | 3 | -2/+64 |
| | | | | |||||
| * | | | Unify all locations where we determine a user's display named based off of ↵ | hmhealey | 2015-07-17 | 6 | -11/+33 |
| | | | | | | | | | | | | | | | | their nickname/username into a helper function | ||||
| * | | | Add tests to check if a User's first/last name are valid | hmhealey | 2015-07-17 | 1 | -0/+17 |
| | | | | |||||
| * | | | Allow Users to be notified using @all, @channel, and their first name when ↵ | hmhealey | 2015-07-17 | 2 | -13/+11 |
| | | | | | | | | | | | | | | | | 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 | 3 | -10/+5 |
| | | | | | | | | | | | | | | | | nickname in multiple places. | ||||
| * | | | Sanitize FirstName and LastName fields of an object instead of the nickname ↵ | hmhealey | 2015-07-17 | 2 | -4/+2 |
| | | | | | | | | | | | | | | | | when ShowFullName is set to false | ||||
| * | | | Fix migration code so that LastName is populated correctly for users who ↵ | hmhealey | 2015-07-17 | 2 | -17/+26 |
| | | | | | | | | | | | | | | | | only have one word in their FullName | ||||
| * | | | Add interface to edit a user's nickname directly | hmhealey | 2015-07-17 | 1 | -1/+54 |
| | | | | |||||
| * | | | Added FirstName and LastName fields to User object and attempt to populate ↵ | hmhealey | 2015-07-17 | 2 | -2/+24 |
| | | | | | | | | | | | | | | | | them from the FullName/Nickname field | ||||
| * | | | Renamed all clientside references from full_name to nickname | hmhealey | 2015-07-17 | 8 | -21/+21 |
| | | | | |||||
| * | | | Renamed FullName column in database to Nickname. Renamed all serverside ↵ | hmhealey | 2015-07-17 | 22 | -155/+165 |
| | | | | | | | | | | | | | | | | references from FullName to Nickname. | ||||
* | | | | Merge pull request #202 from mattermost/readme-update-mm-1356 | it33 | 2015-07-17 | 1 | -18/+2 |
|\ \ \ \ | |/ / / |/| | | | Modifications to readme for mm-1356 | ||||
| * | | | Fixing grammar | Christopher Speller | 2015-07-17 | 1 | -1/+1 |
| | | | | |||||
| * | | | Modifications to readme for mm-1356 | Christopher Speller | 2015-07-17 | 1 | -18/+2 |
| | | | | |||||
* | | | | Merge pull request #203 from nickago/MM-1601 | Christopher Speller | 2015-07-17 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | MM-1601 Fixed typo in reset password field | ||||
| * | | | | Fixed typo | nickago | 2015-07-17 | 1 | -1/+1 |
| | |/ / | |/| | | |||||
* | | | | Merge pull request #199 from asaadmahmoodspin/master | Joram Wilander | 2015-07-17 | 5 | -13/+20 |
|\ \ \ \ | | | | | | | | | | | 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 | 5 | -13/+20 |
| | | | | | |||||
* | | | | | Merge pull request #184 from nickago/MM-1278 | Joram Wilander | 2015-07-17 | 4 | -7/+31 |
|\ \ \ \ \ | |_|/ / / |/| | | | | MM-1278 Team admin can now delete any post | ||||
| * | | | | removed testing material | nickago | 2015-07-16 | 1 | -1/+0 |
| | | | | | |||||
| * | | | | removed testing material | nickago | 2015-07-16 | 1 | -4/+0 |
| | | | | | |||||
| * | | | | Check your credentials from session | nickago | 2015-07-16 | 2 | -1/+6 |
| | | | | | |||||
| * | | | | reworked logic to stem from post | nickago | 2015-07-16 | 2 | -6/+6 |
| | | | | | |||||
| * | | | | Moved admin checking into seperate function | nickago | 2015-07-16 | 2 | -13/+17 |
| | | | | | |||||
| * | | | | Team admin can now delete any post | nickago | 2015-07-14 | 3 | -9/+29 |
| | | | | | |||||
* | | | | | Merge pull request #193 from ralder/fix-manage-members-town-square | Joram Wilander | 2015-07-17 | 8 | -162/+140 |
|\ \ \ \ \ | | | | | | | | | | | | | [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 | 8 | -162/+140 |
| | | | | | | |||||
* | | | | | | Merge pull request #198 from nickago/MM-1518 | Joram Wilander | 2015-07-17 | 1 | -1/+7 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | MM-1518 Fixed config on our link parser | ||||
| * | | | | | | fixed formatting | nickago | 2015-07-16 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | readded space | nickago | 2015-07-16 | 1 | -0/+1 |
| | | | | | | | |||||
| * | | | | | | Fixed config on our link parser | nickago | 2015-07-16 | 1 | -2/+7 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #196 from nickago/MM-1058 | Christopher Speller | 2015-07-17 | 5 | -6/+16 |
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | MM-1058 Added last updated for pictures | ||||
| * | | | | | | Added table updater | nickago | 2015-07-16 | 1 | -0/+1 |
| | | | | | | | |||||
| * | | | | | | Added last updated for pictures | nickago | 2015-07-16 | 5 | -6/+15 |
| |/ / / / / | |||||
* | | | | | | Merge pull request #183 from nickago/MM-1073 | Joram Wilander | 2015-07-16 | 2 | -8/+19 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | MM-1073 Enable youtube metadata with a google developer key | ||||
| * | | | | | | Changed scope of 'metatdata' | nickago | 2015-07-15 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | Need you GDev key for youtube stuff | nickago | 2015-07-14 | 2 | -8/+19 |
| | |_|/ / / | |/| | | | |