summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #208 from nickago/MM-1079Joram Wilander2015-07-201-3/+1
|\ | | | | MM-1079 Removed remenant of non-hover system
| * Removed remenant of non-hover systemnickago2015-07-181-3/+1
| |
* | Fixes javascript console errors=Corey Hulen2015-07-172-4/+5
| |
* | Merge pull request #185 from mattermost/mm-1348Corey Hulen2015-07-1714-216/+35
|\ \ | | | | | | fixes mm-1348 removing dependency on redis
| * | fixes mm-1348 removing dependency on redis=Corey Hulen2015-07-1414-216/+35
| | |
* | | Merge pull request #192 from nickago/MM-1079Corey Hulen2015-07-173-6/+8
|\ \ \ | | |/ | |/| MM-1079 Changed hover effect for menu
| * | Changed javascript to CSS methodnickago2015-07-173-6/+8
| | |
* | | Merge pull request #177 from hmhealey/mm825Corey Hulen2015-07-1731-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 specifiedhmhealey2015-07-173-2/+64
| | | |
| * | | Unify all locations where we determine a user's display named based off of ↵hmhealey2015-07-176-11/+33
| | | | | | | | | | | | | | | | their nickname/username into a helper function
| * | | Add tests to check if a User's first/last name are validhmhealey2015-07-171-0/+17
| | | |
| * | | Allow Users to be notified using @all, @channel, and their first name when ↵hmhealey2015-07-172-13/+11
| | | | | | | | | | | | | | | | other notifications are disabled
| * | | Use User.FirstName for notifications instead of trying to determine it from ↵hmhealey2015-07-173-32/+11
| | | | | | | | | | | | | | | | User.Nickname
| * | | Use User.FirstName instead of trying to infer a user's first name from their ↵hmhealey2015-07-173-10/+5
| | | | | | | | | | | | | | | | nickname in multiple places.
| * | | Sanitize FirstName and LastName fields of an object instead of the nickname ↵hmhealey2015-07-172-4/+2
| | | | | | | | | | | | | | | | when ShowFullName is set to false
| * | | Fix migration code so that LastName is populated correctly for users who ↵hmhealey2015-07-172-17/+26
| | | | | | | | | | | | | | | | only have one word in their FullName
| * | | Add interface to edit a user's nickname directlyhmhealey2015-07-171-1/+54
| | | |
| * | | Added FirstName and LastName fields to User object and attempt to populate ↵hmhealey2015-07-172-2/+24
| | | | | | | | | | | | | | | | them from the FullName/Nickname field
| * | | Renamed all clientside references from full_name to nicknamehmhealey2015-07-178-21/+21
| | | |
| * | | Renamed FullName column in database to Nickname. Renamed all serverside ↵hmhealey2015-07-1722-155/+165
| | | | | | | | | | | | | | | | references from FullName to Nickname.
* | | | Merge pull request #202 from mattermost/readme-update-mm-1356it332015-07-171-18/+2
|\ \ \ \ | |/ / / |/| | | Modifications to readme for mm-1356
| * | | Fixing grammarChristopher Speller2015-07-171-1/+1
| | | |
| * | | Modifications to readme for mm-1356Christopher Speller2015-07-171-18/+2
| | | |
* | | | Merge pull request #203 from nickago/MM-1601Christopher Speller2015-07-171-1/+1
|\ \ \ \ | | | | | | | | | | MM-1601 Fixed typo in reset password field
| * | | | Fixed typonickago2015-07-171-1/+1
| | |/ / | |/| |
* | | | Merge pull request #199 from asaadmahmoodspin/masterJoram Wilander2015-07-175-13/+20
|\ \ \ \ | | | | | | | | | | Improving search header for mobile layouts and other UI changes
| * | | | Improving search header for mobile layouts and other UI changesAsaad Mahmood2015-07-175-13/+20
| | | | |
* | | | | Merge pull request #184 from nickago/MM-1278Joram Wilander2015-07-174-7/+31
|\ \ \ \ \ | |_|/ / / |/| | | | MM-1278 Team admin can now delete any post
| * | | | removed testing materialnickago2015-07-161-1/+0
| | | | |
| * | | | removed testing materialnickago2015-07-161-4/+0
| | | | |
| * | | | Check your credentials from sessionnickago2015-07-162-1/+6
| | | | |
| * | | | reworked logic to stem from postnickago2015-07-162-6/+6
| | | | |
| * | | | Moved admin checking into seperate functionnickago2015-07-162-13/+17
| | | | |
| * | | | Team admin can now delete any postnickago2015-07-143-9/+29
| | | | |
* | | | | Merge pull request #193 from ralder/fix-manage-members-town-squareJoram Wilander2015-07-178-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)ralder2015-07-168-162/+140
| | | | | |
* | | | | | Merge pull request #198 from nickago/MM-1518Joram Wilander2015-07-171-1/+7
|\ \ \ \ \ \ | | | | | | | | | | | | | | MM-1518 Fixed config on our link parser
| * | | | | | fixed formattingnickago2015-07-161-1/+1
| | | | | | |
| * | | | | | readded spacenickago2015-07-161-0/+1
| | | | | | |
| * | | | | | Fixed config on our link parsernickago2015-07-161-2/+7
| | | | | | |
* | | | | | | Merge pull request #196 from nickago/MM-1058Christopher Speller2015-07-175-6/+16
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | MM-1058 Added last updated for pictures
| * | | | | | Added table updaternickago2015-07-161-0/+1
| | | | | | |
| * | | | | | Added last updated for picturesnickago2015-07-165-6/+15
| |/ / / / /
* | | | | | Merge pull request #183 from nickago/MM-1073Joram Wilander2015-07-162-8/+19
|\ \ \ \ \ \ | | | | | | | | | | | | | | MM-1073 Enable youtube metadata with a google developer key
| * | | | | | Changed scope of 'metatdata'nickago2015-07-151-1/+1
| | | | | | |
| * | | | | | Need you GDev key for youtube stuffnickago2015-07-142-8/+19
| | |_|/ / / | |/| | | |
* | | | | | Merge pull request #197 from asaadmahmoodspin/masterJoram Wilander2015-07-1621-31/+76
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | MM-1401 - Removing most inline styles and other UI changes
| * | | | | MM-1401 - Removing most inline styles and other UI changesAsaad Mahmood2015-07-1721-31/+76
|/ / / / /
* | | | | Merge pull request #186 from rgarmsen2295/mm-644Joram Wilander2015-07-163-10/+104
|\ \ \ \ \ | |_|/ / / |/| | | | MM-644 Adds the ability to use the arrow keys to scroll the @ mention list and use tab to complete
| * | | | Minor code change for clarityReed Garmsen2015-07-161-1/+1
| | | | |