Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | Merge pull request #350 from nickago/MM-1684 | Christopher Speller | 2015-08-11 | 6 | -238/+234 | |
|\ \ \ | |_|/ |/| | | MM-1684 Refactored code to remove errors on startup | |||||
| * | | Removed unnecessary keys | nickago | 2015-08-10 | 1 | -7/+7 | |
| | | | ||||||
| * | | Removed vestigial arguements from refactored code | nickago | 2015-08-07 | 1 | -2/+2 | |
| | | | ||||||
| * | | Cosmetic refactors, including variable name changes and splitting if statements | nickago | 2015-08-06 | 2 | -39/+53 | |
| | | | ||||||
| * | | fixed the spacing on UserStore | nickago | 2015-08-06 | 1 | -220/+220 | |
| | | | ||||||
| * | | Added keys to array-based elements and made getMe asynchronous | nickago | 2015-08-06 | 6 | -34/+16 | |
| |/ | ||||||
* | | Merge pull request #348 from nickago/MM-1550 | Christopher Speller | 2015-08-10 | 3 | -299/+233 | |
|\ \ | | | | | | | Mm 1550 Mentions are no longer removed from auto complete once used | |||||
| * | | further cosmetic refactoring | nickago | 2015-08-10 | 1 | -67/+65 | |
| | | | ||||||
| * | | Removed vetigial argument and properly aligned post_store | nickago | 2015-08-10 | 1 | -176/+176 | |
| | | | ||||||
| * | | Added cosmetic refactoring | nickago | 2015-08-05 | 1 | -46/+49 | |
| | | | ||||||
| * | | Removed all functionality required for removing used mentions from auto-complete | nickago | 2015-08-05 | 3 | -76/+9 | |
| | | | ||||||
* | | | Merge pull request #356 from nickago/MM-1646 | Christopher Speller | 2015-08-10 | 1 | -1/+1 | |
|\ \ \ | | | | | | | | | MM-1646 Fixed typo in channel/group naming | |||||
| * | | | Fixed typo in channel/group naming | nickago | 2015-08-07 | 1 | -1/+1 | |
| | |/ | |/| | ||||||
* | | | Merge pull request #351 from rgarmsen2295/mm-1759 | Christopher Speller | 2015-08-10 | 2 | -32/+45 | |
|\ \ \ | | | | | | | | | MM-1759 Fixes issue with team sign up link displaying incorrectly in ie10 | |||||
| * | | | Cosmetic refactoring | Reed Garmsen | 2015-08-06 | 1 | -31/+43 | |
| | | | | ||||||
| * | | | Correct sign up link now displays on ie10 in the 'Team Invite Link' modal; ↵ | Reed Garmsen | 2015-08-06 | 2 | -2/+3 | |
| |/ / | | | | | | | | | | replaces location.origin with utils function | |||||
* | | | Merge pull request #341 from rgarmsen2295/mm-1643 | Harrison Healey | 2015-08-07 | 1 | -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 subsection | Reed Garmsen | 2015-08-05 | 1 | -61/+72 | |
| | | | ||||||
| * | | Fixed issue with password field not being cleared after canceling out of ↵ | Reed Garmsen | 2015-08-04 | 1 | -1/+1 | |
| | | | | | | | | | | | | changing your password | |||||
* | | | Merge pull request #346 from hmhealey/mm1613 | Christopher Speller | 2015-08-06 | 1 | -75/+125 | |
|\ \ \ | | | | | | | | | MM-1613 Add option to hide Terms of Service disclaimer during signup | |||||
| * | | | Added ShowTermsDuringSignup config option on the client which toggles the ↵ | hmhealey | 2015-08-05 | 1 | -1/+6 | |
| | | | | | | | | | | | | | | | | Terms of Service disclaimer on signup | |||||
| * | | | Reformat signup_user_complete to match style guide | hmhealey | 2015-08-05 | 1 | -76/+121 | |
| | | | | ||||||
* | | | | Merge pull request #344 from nickago/MM-1646 | Christopher Speller | 2015-08-06 | 2 | -5/+15 | |
|\ \ \ \ | | | | | | | | | | | MM-1646 Changes the word channel to group for priavte groups | |||||
| * | | | | Changes the word channel to group for priavte groups | nickago | 2015-08-05 | 2 | -5/+15 | |
| | |_|/ | |/| | | ||||||
* | | | | Merge pull request #340 from nickago/MM-1769 | Christopher Speller | 2015-08-06 | 1 | -1/+1 | |
|\ \ \ \ | | | | | | | | | | | MM-1769 Changed max number of displayed direct message channels to 20 | |||||
| * | | | | Changed max number of displayed direct message channels to 20 | nickago | 2015-08-05 | 1 | -1/+1 | |
| | |_|/ | |/| | | ||||||
* | | | | Merge pull request #332 from nickago/MM-1720 | Christopher Speller | 2015-08-06 | 1 | -55/+62 | |
|\ \ \ \ | | | | | | | | | | | MM-1720 Switch teams menu no longer display the team you are currently on | |||||
| * | | | | Added cosmetic refactoring | nickago | 2015-08-04 | 1 | -45/+49 | |
| | | | | | ||||||
| * | | | | Added listening to the Team Store and removed current team name from team ↵ | nickago | 2015-08-04 | 1 | -11/+14 | |
| | | | | | | | | | | | | | | | | | | | | swap menu | |||||
* | | | | | Merge pull request #330 from hmhealey/mm1579 | Christopher Speller | 2015-08-06 | 1 | -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 channel | hmhealey | 2015-08-04 | 1 | -2/+1 | |
| |/ / / / | ||||||
* | | | | | Merge pull request #329 from asaadmahmoodspin/ui-changes | Christopher Speller | 2015-08-06 | 4 | -4/+19 | |
|\ \ \ \ \ | | | | | | | | | | | | | UI Improvements | |||||
| * | | | | | Adding tooltip to email in user popover | Asaad Mahmood | 2015-08-05 | 1 | -0/+1 | |
| | | | | | | ||||||
| * | | | | | Fixing style guide stuff in post_list | Asaad Mahmood | 2015-08-05 | 1 | -5/+3 | |
| | | | | | | ||||||
| * | | | | | Removing console.log | Asaad Mahmood | 2015-08-05 | 1 | -1/+0 | |
| | | | | | | ||||||
| * | | | | | Fixing mentions scroll again due to merge conflict | Asaad Mahmood | 2015-08-05 | 1 | -0/+7 | |
| | | | | | | ||||||
| * | | | | | Merge branch 'master' of https://github.com/mattermost/platform | Asaad Mahmood | 2015-08-05 | 10 | -295/+352 | |
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | | Conflicts: web/react/components/mention_list.jsx | |||||
| * | | | | | Updating channel header tooltip placement | Asaad Mahmood | 2015-08-04 | 1 | -1/+1 | |
| | | | | | | ||||||
| * | | | | | Merge branch 'master' of https://github.com/mattermost/platform | Asaad Mahmood | 2015-08-04 | 2 | -190/+223 | |
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: web/react/components/channel_header.jsx | |||||
| * | | | | | | Fixing scrolling of mention box in RHS | Asaad Mahmood | 2015-08-04 | 1 | -1/+3 | |
| | | | | | | | ||||||
| * | | | | | | Adding bootstrap tooltip for channel members | Asaad Mahmood | 2015-08-04 | 1 | -1/+1 | |
| | | | | | | | ||||||
| * | | | | | | UI Improvements | Asaad Mahmood | 2015-08-04 | 4 | -8/+22 | |
| | |_|/ / / | |/| | | | | ||||||
* | | | | | | Merge pull request #324 from rgarmsen2295/mm-1617 | Christopher Speller | 2015-08-06 | 2 | -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 settings | Reed Garmsen | 2015-08-04 | 2 | -57/+77 | |
| | | | | | | ||||||
| * | | | | | Added spinner animation to replace save button when uploading a new profile ↵ | Reed Garmsen | 2015-08-04 | 2 | -4/+9 | |
| | |/ / / | |/| | | | | | | | | | | | | | picture | |||||
* | | | | | Merge pull request #342 from mattermost/release-0.6.0 | Christopher Speller | 2015-08-05 | 1 | -2/+4 | |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | Release 0.6.0 | |||||
| * | | | | mm-1874 - Improving team url screen and fixing file attachments in IE 10 | Asaad Mahmood | 2015-08-04 | 1 | -2/+4 | |
| | | | | | ||||||
* | | | | | Fixed non-cosmetic refactoring typo | nickago | 2015-08-05 | 1 | -1/+1 | |
| |_|_|/ |/| | | | ||||||
* | | | | Merge pull request #326 from nickago/MM-1754 | Christopher Speller | 2015-08-04 | 6 | -6/+6 | |
|\ \ \ \ | | | | | | | | | | | MM-1754 Modals now close upon pressing ESC | |||||
| * | | | | Added closing on ESC key press | nickago | 2015-08-04 | 6 | -6/+6 | |
| | |_|/ | |/| | |