Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #935 from mattermost/remove-zeroclipboard | Christopher Speller | 2015-10-06 | 1 | -1/+0 |
|\ | | | | | Remove npm reference to unused zeroclipboard. | ||||
| * | Remove npm reference to unused zeroclipboard. | JoramWilander | 2015-10-06 | 1 | -1/+0 |
| | | |||||
* | | Merge pull request #934 from asaadmahmoodspin/ui-improvements | Christopher Speller | 2015-10-06 | 8 | -21/+51 |
|\ \ | | | | | | | Multiple UI Improvements | ||||
| * | | Updating form-control focus | Asaad Mahmood | 2015-10-06 | 2 | -2/+6 |
| | | | |||||
| * | | Merge branch 'master' of https://github.com/mattermost/platform into ↵ | Asaad Mahmood | 2015-10-06 | 2 | -3/+3 |
| |\ \ | | | | | | | | | | | | | ui-improvements | ||||
| * | | | Adding mention highlight setting and improving search highlight too | Asaad Mahmood | 2015-10-06 | 4 | -9/+32 |
| | | | | |||||
| * | | | Multiple UI Improvements | Asaad Mahmood | 2015-10-06 | 5 | -12/+15 |
| | |/ | |/| | |||||
* | | | Merge pull request #936 from mattermost/signup-fix | Joram Wilander | 2015-10-06 | 1 | -13/+14 |
|\ \ \ | |_|/ |/| | | Fixing broken signup page | ||||
| * | | Fixing broken signup page | Christopher Speller | 2015-10-06 | 1 | -13/+14 |
| |/ | |||||
* / | Fixed Get Public Link button | hmhealey | 2015-10-05 | 2 | -3/+3 |
|/ | |||||
* | Merge pull request #925 from asaadmahmoodspin/ui-improvements | Harrison Healey | 2015-10-05 | 8 | -24/+20 |
|\ | | | | | Multiple UI Improvements | ||||
| * | Multiple UI Improvements | Asaad Mahmood | 2015-10-05 | 8 | -24/+20 |
| | | |||||
* | | Merge pull request #922 from mattermost/plt-360 | Harrison Healey | 2015-10-05 | 33 | -308/+350 |
|\ \ | |/ |/| | PLT-360 Upgrade and changes to ESLint | ||||
| * | Disabling complexity warning. Allowing non-nested ternary. Upgrading ESList. ↵ | Christopher Speller | 2015-10-05 | 33 | -308/+350 |
| | | | | | | | | Adding new ESLint rules. Fixing new ESLint errors. | ||||
* | | Merge pull request #923 from mattermost/fix-load-scroll | Corey Hulen | 2015-10-05 | 1 | -1/+1 |
|\ \ | | | | | | | Fix missed binding for youtube data callback. | ||||
| * | | Fix missed binding for youtube data callback. | JoramWilander | 2015-10-05 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #914 from mattermost/plt-297 | Joram Wilander | 2015-10-05 | 7 | -9/+147 |
|\ \ \ | |_|/ |/| | | PLT-297 Add ability to override username and icon for posts from incoming webhooks. | ||||
| * | | Update help text to mention the BOT tag for webhook posts. | JoramWilander | 2015-10-05 | 1 | -1/+1 |
| | | | |||||
| * | | Add config options for overriding username and icon, and add BOT indicator ↵ | JoramWilander | 2015-10-05 | 6 | -16/+108 |
| | | | | | | | | | | | | next to webhook posts. | ||||
| * | | Add ability to override username and icon for posts from incoming webhooks. | JoramWilander | 2015-10-02 | 5 | -8/+54 |
| | | | |||||
* | | | Merge pull request #915 from mattermost/plt-300 | Christopher Speller | 2015-10-05 | 4 | -28/+62 |
|\ \ \ | | | | | | | | | PLT-300 Update allow/deny oauth page UI, and add ouath as reserved word. | ||||
| * | | | Update allow/deny oauth page UI, and add ouath as reserved word. | JoramWilander | 2015-10-02 | 4 | -28/+62 |
| | |/ | |/| | |||||
* | | | Merge pull request #903 from mattermost/PLT-44 | Christopher Speller | 2015-10-05 | 5 | -17/+69 |
|\ \ \ | | | | | | | | | PLT-44 allow team switching without the need to login | ||||
| * | | | Fixing redirect issue | =Corey Hulen | 2015-10-02 | 1 | -1/+1 |
| | | | | |||||
| * | | | Fixing issues | =Corey Hulen | 2015-10-02 | 1 | -1/+1 |
| | | | | |||||
| * | | | Fixing issues | =Corey Hulen | 2015-10-02 | 1 | -2/+2 |
| | | | | |||||
| * | | | Fixing issue with being logged into other team | =Corey Hulen | 2015-10-01 | 1 | -9/+17 |
| | | | | |||||
| * | | | PLT-44 allow team switching without the need to login | =Corey Hulen | 2015-10-01 | 5 | -7/+51 |
| | |/ | |/| | |||||
* | | | Merge pull request #887 from asaadmahmoodspin/plt-375 | Joram Wilander | 2015-10-05 | 17 | -89/+69 |
|\ \ \ | | | | | | | | | plt-375 - Making modals compatible with themes | ||||
| * | | | Increasing spacing for bottom unread notification | Asaad Mahmood | 2015-10-05 | 1 | -1/+1 |
| | | | | |||||
| * | | | Updating theme colours for popovers, drop downs etc | Asaad Mahmood | 2015-10-05 | 6 | -52/+33 |
| | | | | |||||
| * | | | Updating search colours | Asaad Mahmood | 2015-10-05 | 1 | -1/+2 |
| | | | | |||||
| * | | | Updating jpg to png for theme names | Asaad Mahmood | 2015-10-05 | 1 | -1/+1 |
| | | | | |||||
| * | | | Changing jpeg images back to png | Asaad Mahmood | 2015-10-02 | 8 | -0/+0 |
| | | | | |||||
| * | | | Merge branch 'master' of https://github.com/mattermost/platform into plt-375 | Asaad Mahmood | 2015-10-02 | 12 | -150/+245 |
| |\ \ \ | | | |/ | | |/| | | | | | | | | | Conflicts: web/react/components/user_settings/user_settings_appearance.jsx | ||||
| * | | | pot-375 - Making modals compatible with themes | Asaad Mahmood | 2015-10-01 | 18 | -52/+51 |
| | | | | |||||
* | | | | Merge branch 'master' into PLT-462 | =Corey Hulen | 2015-10-02 | 10 | -143/+200 |
|\ \ \ \ | | |/ / | |/| | | |||||
| * | | | Merge pull request #912 from hmhealey/plt174 | Christopher Speller | 2015-10-02 | 1 | -2/+4 |
| |\ \ \ | | | | | | | | | | | PLT-174 Added emailto: to the beginning of email links | ||||
| | * | | | Added emailto: to the beginning of email links | hmhealey | 2015-10-02 | 1 | -2/+4 |
| | | | | | |||||
| * | | | | Merge pull request #909 from mattermost/plt-446 | Harrison Healey | 2015-10-02 | 1 | -0/+2 |
| |\ \ \ \ | | | | | | | | | | | | | PLT-446 Added help text to incoming webhooks. | ||||
| | * | | | | Added help text for incoming webhooks. | JoramWilander | 2015-10-02 | 1 | -0/+2 |
| | | |_|/ | | |/| | | |||||
| * | | | | Change text to avoid confusion with Slack Import | it33 | 2015-10-02 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Removed $ from time tooltip | hmhealey | 2015-10-02 | 1 | -1/+1 |
| | |/ / | |/| | | |||||
| * | | | Merge pull request #881 from hmhealey/plt194 | Joram Wilander | 2015-10-02 | 6 | -139/+192 |
| |\ \ \ | | |/ / | |/| | | PLT-194 Changes to ChannelMember notification settings | ||||
| | * | | Moved ChannelMember.NotifyLevel into ChannelMember.NotifyProps | hmhealey | 2015-10-01 | 3 | -27/+7 |
| | | | | |||||
| | * | | Replaced ChannelMember.MarkUnreadLevel with ChannelMember.NotifyProps | hmhealey | 2015-10-01 | 4 | -15/+12 |
| | | | | |||||
| | * | | Changed notification preference submission to only be updated when options ↵ | hmhealey | 2015-09-30 | 1 | -0/+10 |
| | | | | | | | | | | | | | | | | have actually changed | ||||
| | * | | Added channel id to updateLastViewed api calls to prevent multiple updates ↵ | hmhealey | 2015-09-30 | 1 | -7/+9 |
| | | | | | | | | | | | | | | | | to different channels from clashing | ||||
| | * | | Implemented ChannelMember.MarkUnreadLevel so that it actually functions | hmhealey | 2015-09-30 | 2 | -2/+2 |
| | | | | |||||
| | * | | Removed UI for quiet mode and added UI to set when a channel will be marked ↵ | hmhealey | 2015-09-30 | 2 | -93/+136 |
| | | | | | | | | | | | | | | | | unread in the sidebar |