summaryrefslogtreecommitdiffstats
path: root/web
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | Added the ability for the sidebar to determine whether or not there's any ↵hmhealey2015-08-061-2/+40
| | | | | | | | | | | | | | | | unread channels offscreen
| * | | Refactored sidebar in preparation for adding unread indicatorshmhealey2015-08-061-78/+67
| |/ /
* | | Merge pull request #350 from nickago/MM-1684Christopher Speller2015-08-116-238/+234
|\ \ \ | |_|/ |/| | MM-1684 Refactored code to remove errors on startup
| * | Removed unnecessary keysnickago2015-08-101-7/+7
| | |
| * | Removed vestigial arguements from refactored codenickago2015-08-071-2/+2
| | |
| * | Cosmetic refactors, including variable name changes and splitting if statementsnickago2015-08-062-39/+53
| | |
| * | fixed the spacing on UserStorenickago2015-08-061-220/+220
| | |
| * | Added keys to array-based elements and made getMe asynchronousnickago2015-08-066-34/+16
| |/
* | Merge pull request #348 from nickago/MM-1550Christopher Speller2015-08-103-299/+233
|\ \ | | | | | | Mm 1550 Mentions are no longer removed from auto complete once used
| * | further cosmetic refactoringnickago2015-08-101-67/+65
| | |
| * | Removed vetigial argument and properly aligned post_storenickago2015-08-101-176/+176
| | |
| * | Added cosmetic refactoringnickago2015-08-051-46/+49
| | |
| * | Removed all functionality required for removing used mentions from auto-completenickago2015-08-053-76/+9
| | |
* | | Merge pull request #356 from nickago/MM-1646Christopher Speller2015-08-101-1/+1
|\ \ \ | | | | | | | | MM-1646 Fixed typo in channel/group naming
| * | | Fixed typo in channel/group namingnickago2015-08-071-1/+1
| | |/ | |/|
* | | Merge pull request #351 from rgarmsen2295/mm-1759Christopher Speller2015-08-102-32/+45
|\ \ \ | | | | | | | | MM-1759 Fixes issue with team sign up link displaying incorrectly in ie10
| * | | Cosmetic refactoringReed Garmsen2015-08-061-31/+43
| | | |
| * | | Correct sign up link now displays on ie10 in the 'Team Invite Link' modal; ↵Reed Garmsen2015-08-062-2/+3
| |/ / | | | | | | | | | replaces location.origin with utils function
* | | Merge pull request #341 from rgarmsen2295/mm-1643Harrison Healey2015-08-071-61/+72
|\ \ \ | |/ / |/| | MM-1643 Errors displayed on the "change password" screen are now cleared when the user hits cancel
| * | Cosmetic refactoring of the Security Setting subsectionReed Garmsen2015-08-051-61/+72
| | |
| * | Fixed issue with password field not being cleared after canceling out of ↵Reed Garmsen2015-08-041-1/+1
| | | | | | | | | | | | changing your password
* | | Merge pull request #346 from hmhealey/mm1613Christopher Speller2015-08-062-75/+128
|\ \ \ | | | | | | | | MM-1613 Add option to hide Terms of Service disclaimer during signup
| * | | Added ShowTermsDuringSignup config option on the client which toggles the ↵hmhealey2015-08-052-1/+9
| | | | | | | | | | | | | | | | Terms of Service disclaimer on signup
| * | | Reformat signup_user_complete to match style guidehmhealey2015-08-051-76/+121
| | | |
* | | | Merge pull request #344 from nickago/MM-1646Christopher Speller2015-08-062-5/+15
|\ \ \ \ | | | | | | | | | | MM-1646 Changes the word channel to group for priavte groups
| * | | | Changes the word channel to group for priavte groupsnickago2015-08-052-5/+15
| | |_|/ | |/| |
* | | | Merge pull request #340 from nickago/MM-1769Christopher Speller2015-08-061-1/+1
|\ \ \ \ | | | | | | | | | | MM-1769 Changed max number of displayed direct message channels to 20
| * | | | Changed max number of displayed direct message channels to 20nickago2015-08-051-1/+1
| | |_|/ | |/| |
* | | | Merge pull request #332 from nickago/MM-1720Christopher Speller2015-08-061-55/+62
|\ \ \ \ | | | | | | | | | | MM-1720 Switch teams menu no longer display the team you are currently on
| * | | | Added cosmetic refactoringnickago2015-08-041-45/+49
| | | | |
| * | | | Added listening to the Team Store and removed current team name from team ↵nickago2015-08-041-11/+14
| | | | | | | | | | | | | | | | | | | | swap menu
* | | | | Merge pull request #330 from hmhealey/mm1579Christopher Speller2015-08-061-2/+1
|\ \ \ \ \ | | | | | | | | | | | | MM-1579 Added a date separator before the first post displayed in a channel
| * | | | | Added a date separator before the first post displayed in a channelhmhealey2015-08-041-2/+1
| |/ / / /
* | | | | Merge pull request #329 from asaadmahmoodspin/ui-changesChristopher Speller2015-08-0612-37/+102
|\ \ \ \ \ | | | | | | | | | | | | UI Improvements
| * | | | | Adding tooltip to email in user popoverAsaad Mahmood2015-08-052-0/+7
| | | | | |
| * | | | | Fixing style guide stuff in post_listAsaad Mahmood2015-08-051-5/+3
| | | | | |
| * | | | | Removing console.logAsaad Mahmood2015-08-051-1/+0
| | | | | |
| * | | | | Fixing mentions scroll again due to merge conflictAsaad Mahmood2015-08-051-0/+7
| | | | | |
| * | | | | Merge branch 'master' of https://github.com/mattermost/platformAsaad Mahmood2015-08-0512-295/+359
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | Conflicts: web/react/components/mention_list.jsx
| * | | | | Updating channel header tooltip placementAsaad Mahmood2015-08-041-1/+1
| | | | | |
| * | | | | Merge branch 'master' of https://github.com/mattermost/platformAsaad Mahmood2015-08-042-190/+223
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: web/react/components/channel_header.jsx
| * | | | | | Fixing scrolling of mention box in RHSAsaad Mahmood2015-08-041-1/+3
| | | | | | |
| * | | | | | Adding bootstrap tooltip for channel membersAsaad Mahmood2015-08-041-1/+1
| | | | | | |
| * | | | | | UI ImprovementsAsaad Mahmood2015-08-0412-41/+99
| | |_|/ / / | |/| | | |
* | | | | | Merge pull request #324 from rgarmsen2295/mm-1617Christopher Speller2015-08-062-56/+81
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | MM-1617 Now shows a loading gif while a profile pic is being uploaded
| * | | | | Minor cosmetic refactoring to the General Tab of user settingsReed Garmsen2015-08-042-57/+77
| | | | | |
| * | | | | Added spinner animation to replace save button when uploading a new profile ↵Reed Garmsen2015-08-042-4/+9
| | |/ / / | |/| | | | | | | | | | | | | picture
* | | | | Merge pull request #342 from mattermost/release-0.6.0Christopher Speller2015-08-054-5/+32
|\ \ \ \ \ | |_|_|_|/ |/| | | | Release 0.6.0
| * | | | Merge pull request #328 from asaadmahmoodspin/mm-1874Christopher Speller2015-08-053-4/+31
| |\ \ \ \ | | | | | | | | | | | | mm-1874 - Improving team url screen and fixing file attachments in IE 10
| | * | | | Updating css for url input add-on and removing display flexAsaad Mahmood2015-08-052-3/+6
| | | | | |