Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | Removing redis from makefile | Christopher Speller | 2015-08-06 | 1 | -20/+0 | |
| |/ / / | ||||||
* | | | | Merge pull request #347 from mattermost/it33-patch-1 | Harrison Healey | 2015-08-07 | 1 | -5/+4 | |
|\ \ \ \ | | | | | | | | | | | MM-1898 Updates to Mac OSX instructions | |||||
| * | | | | Removing note on creating new .bash_profile | it33 | 2015-08-06 | 1 | -2/+1 | |
| | | | | | ||||||
| * | | | | MM-1898 Updates to Mac OSX instructions | it33 | 2015-08-05 | 1 | -5/+5 | |
| | | | | | ||||||
* | | | | | 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 | 2 | -75/+128 | |
|\ \ \ \ \ | | | | | | | | | | | | | 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 | 2 | -1/+9 | |
| | | | | | | | | | | | | | | | | | | | | | | | | 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 #335 from mattermost/it33-patch-4 | Christopher Speller | 2015-08-06 | 1 | -2/+2 | |
|\ \ \ \ \ | | | | | | | | | | | | | Typo and case correction | |||||
| * | | | | | Typo and case correction | it33 | 2015-08-04 | 1 | -2/+2 | |
| |/ / / / | | | | | | | | | | | Propose for 0.7.0 | |||||
* | | | | | Merge pull request #333 from nickago/MM-1181 | Christopher Speller | 2015-08-06 | 1 | -0/+8 | |
|\ \ \ \ \ | | | | | | | | | | | | | MM-1181 Drawing all images onto a white background, thus removing transparency | |||||
| * | | | | | Drawing all images onto a white background, thus removing transparency | nickago | 2015-08-04 | 1 | -0/+8 | |
| | | | | | | ||||||
* | | | | | | 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 | 12 | -37/+102 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | UI Improvements | |||||
| * | | | | | | Adding tooltip to email in user popover | Asaad Mahmood | 2015-08-05 | 2 | -0/+7 | |
| | | | | | | | ||||||
| * | | | | | | 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 | 12 | -295/+359 | |
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | | 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 | 12 | -41/+99 | |
| | |_|/ / / / | |/| | | | | | ||||||
* | | | | | | | 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 | 8 | -58/+109 | |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | / | | |_|_|/ | |/| | | | Release 0.6.0 | |||||
| * | | | | Merge pull request #331 from mattermost/060-readme-updates | Christopher Speller | 2015-08-05 | 1 | -48/+52 | |
| |\ \ \ \ | | | | | | | | | | | | | Updates to the README for release. | |||||
| | * | | | | Correcting minor typos, formatting, wording | it33 | 2015-08-04 | 1 | -31/+30 | |
| | | | | | | ||||||
| | * | | | | Fixing typeo | Christopher Speller | 2015-08-04 | 1 | -1/+1 | |
| | | | | | | ||||||
| | * | | | | Updates to the README for release. | it33 | 2015-08-04 | 1 | -23/+28 | |
| | | | | | | ||||||
| * | | | | | Merge pull request #328 from asaadmahmoodspin/mm-1874 | Christopher Speller | 2015-08-05 | 3 | -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 flex | Asaad Mahmood | 2015-08-05 | 2 | -3/+6 | |
| | | | | | | | ||||||
| | * | | | | | Fixing tooltip word-wrap | Asaad Mahmood | 2015-08-05 | 1 | -0/+3 | |
| | | | | | | | ||||||
| | * | | | | | mm-1874 - Improving team url screen and fixing file attachments in IE 10 | Asaad Mahmood | 2015-08-04 | 3 | -2/+23 | |
| | |/ / / / | ||||||
| * | | | | | Merge pull request #337 from mattermost/docker-config-updates | Christopher Speller | 2015-08-05 | 2 | -5/+13 | |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Updating docker configuration files for release | |||||
| | * | | | | | Updating docker configuration files for release | Christopher Speller | 2015-08-05 | 2 | -5/+13 | |
| |/ / / / / | ||||||
| * | | | | | Merge pull request #320 from rgarmsen2295/mm-1873 | Christopher Speller | 2015-08-04 | 1 | -1/+1 | |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Fixed typo on landing page for sign-up | |||||
| | * | | | | | Fixed typo on landing page for sign-up | Reed Garmsen | 2015-08-03 | 1 | -1/+1 | |
| | |/ / / / |