Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Don't auto-add http:// to mailto: and ftp: markdown links | Florian Orben | 2015-10-14 | 2 | -2/+2 |
| | |||||
* | Multiple UI Improvements | Asaad Mahmood | 2015-10-14 | 1 | -0/+6 |
| | |||||
* | Merge pull request #968 from hmhealey/plt322 | Harrison Healey | 2015-10-13 | 3 | -1/+85 |
|\ | | | | | PLT-322 Updated Direct Messages menu | ||||
| * | Removed Preference.AltId | hmhealey | 2015-10-13 | 3 | -20/+18 |
| | | |||||
| * | Fixed edge cases with leaving a direct channel while viewing that channel | hmhealey | 2015-10-13 | 1 | -0/+1 |
| | | |||||
| * | Renamed show_hide preference to show | hmhealey | 2015-10-13 | 2 | -3/+7 |
| | | |||||
| * | Changed direct messages channels so users can show/hide them | hmhealey | 2015-10-13 | 2 | -0/+37 |
| | | |||||
| * | Changed direct channels in the sidebar to be displayed based on user preferences | hmhealey | 2015-10-13 | 3 | -0/+44 |
| | | |||||
* | | Revert "Modified markdown lexer to not break up words written in snake_case" | hmhealey | 2015-10-13 | 2 | -39/+8 |
| | | | | | | | | This reverts commit 787d2ef7bca7f411b18d1d13561d61d7e95c81a7. | ||||
* | | Merge pull request #1026 from asaadmahmoodspin/master | Joram Wilander | 2015-10-13 | 1 | -0/+1 |
|\ \ | |/ |/| | Fixing code block markdown | ||||
| * | Fixing code block markdown | Asaad Mahmood | 2015-10-13 | 1 | -0/+1 |
| | | |||||
* | | Merge pull request #987 from hmhealey/plt521 | Joram Wilander | 2015-10-13 | 2 | -8/+39 |
|\ \ | |/ |/| | PLT-521 Modified markdown lexer to not break up words written in snake_case | ||||
| * | Modified markdown lexer to not break up words written in snake_case | hmhealey | 2015-10-09 | 2 | -8/+39 |
| | | |||||
* | | Multiple UI Improvements | Asaad Mahmood | 2015-10-12 | 2 | -3/+6 |
|/ | |||||
* | Fixed html used for autolinking | hmhealey | 2015-10-08 | 1 | -1/+1 |
| | |||||
* | Merge pull request #982 from hmhealey/plt547 | Harrison Healey | 2015-10-08 | 1 | -24/+24 |
|\ | | | | | PLT-547 Changed emoticons so that they must be surrounded by whitespace | ||||
| * | Fixed parsing of :'( emoticon | hmhealey | 2015-10-08 | 1 | -1/+1 |
| | | |||||
| * | Changed emoticons so that they much be surrounded by whitespace | hmhealey | 2015-10-08 | 1 | -24/+24 |
| | | |||||
| * | Switched :p emoticon | hmhealey | 2015-10-08 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #981 from mattermost/plt-517 | Christopher Speller | 2015-10-08 | 6 | -6/+6 |
|\ \ | | | | | | | PLT-517 Changing SpinPunch to Mattermost in copyright | ||||
| * | | Changing SpinPunch to Mattermost in copyright | Christopher Speller | 2015-10-08 | 6 | -6/+6 |
| |/ | |||||
* | | Fixing issue with lastIndexOf | =Corey Hulen | 2015-10-08 | 2 | -2/+2 |
| | | |||||
* | | Adding removing blank target for browser links | =Corey Hulen | 2015-10-08 | 2 | -2/+7 |
| | | |||||
* | | PLT-567 auto join open channels | =Corey Hulen | 2015-10-07 | 1 | -1/+9 |
|/ | |||||
* | Merge pull request #951 from mattermost/PLT-500 | Corey Hulen | 2015-10-07 | 1 | -1/+11 |
|\ | | | | | PLT-500 fixing connection msg issues | ||||
| * | PLT-500 fixing connection msg issues | =Corey Hulen | 2015-10-06 | 1 | -1/+11 |
| | | |||||
* | | Merge pull request #953 from asaadmahmoodspin/plt-522 | Christopher Speller | 2015-10-07 | 2 | -4/+16 |
|\ \ | | | | | | | PLT-522 - Adding option for mentionHighlightLink for themes | ||||
| * | | PLT-522 - Adding option for mentionHighlightLink for themes | Asaad Mahmood | 2015-10-07 | 2 | -4/+16 |
| |/ | |||||
* | | Removing sidebar text hover color | Asaad Mahmood | 2015-10-06 | 2 | -14/+1 |
| | | |||||
* | | Changing link colour opacity LHS | Asaad Mahmood | 2015-10-06 | 1 | -3/+3 |
| | | |||||
* | | Updating link color opacity in LHS | Asaad Mahmood | 2015-10-06 | 2 | -11/+11 |
| | | |||||
* | | PLT-451 - Adding visual effect for logout active sessions button | Asaad Mahmood | 2015-10-06 | 1 | -1/+1 |
|/ | |||||
* | PLT-432 - Status icon for active LHS item the same as text color | Asaad Mahmood | 2015-10-06 | 1 | -0/+1 |
| | |||||
* | Updating form-control focus | Asaad Mahmood | 2015-10-06 | 1 | -2/+3 |
| | |||||
* | Adding mention highlight setting and improving search highlight too | Asaad Mahmood | 2015-10-06 | 2 | -6/+17 |
| | |||||
* | Multiple UI Improvements | Asaad Mahmood | 2015-10-06 | 2 | -6/+7 |
| | |||||
* | Merge pull request #925 from asaadmahmoodspin/ui-improvements | Harrison Healey | 2015-10-05 | 1 | -2/+2 |
|\ | | | | | Multiple UI Improvements | ||||
| * | Multiple UI Improvements | Asaad Mahmood | 2015-10-05 | 1 | -2/+2 |
| | | |||||
* | | Disabling complexity warning. Allowing non-nested ternary. Upgrading ESList. ↵ | Christopher Speller | 2015-10-05 | 2 | -5/+5 |
|/ | | | | Adding new ESLint rules. Fixing new ESLint errors. | ||||
* | Updating theme colours for popovers, drop downs etc | Asaad Mahmood | 2015-10-05 | 1 | -14/+18 |
| | |||||
* | Updating search colours | Asaad Mahmood | 2015-10-05 | 1 | -1/+2 |
| | |||||
* | Merge branch 'master' of https://github.com/mattermost/platform into plt-375 | Asaad Mahmood | 2015-10-02 | 3 | -12/+30 |
|\ | | | | | | | | | Conflicts: web/react/components/user_settings/user_settings_appearance.jsx | ||||
| * | Added emailto: to the beginning of email links | hmhealey | 2015-10-02 | 1 | -2/+4 |
| | | |||||
| * | Merge pull request #881 from hmhealey/plt194 | Joram Wilander | 2015-10-02 | 2 | -10/+12 |
| |\ | | | | | | | PLT-194 Changes to ChannelMember notification settings | ||||
| | * | Moved ChannelMember.NotifyLevel into ChannelMember.NotifyProps | hmhealey | 2015-10-01 | 1 | -16/+0 |
| | | | |||||
| | * | Replaced ChannelMember.MarkUnreadLevel with ChannelMember.NotifyProps | hmhealey | 2015-10-01 | 1 | -3/+4 |
| | | | |||||
| | * | Added channel id to updateLastViewed api calls to prevent multiple updates ↵ | hmhealey | 2015-09-30 | 1 | -7/+9 |
| | | | | | | | | | | | | to different channels from clashing | ||||
| | * | Removed UI for quiet mode and added UI to set when a channel will be marked ↵ | hmhealey | 2015-09-30 | 1 | -0/+15 |
| | | | | | | | | | | | | unread in the sidebar | ||||
| * | | Merge pull request #866 from mattermost/PLT-345 | Christopher Speller | 2015-10-01 | 1 | -0/+14 |
| |\ \ | | | | | | | | | PLT-345 adding client side logging | ||||
| | * | | PLT-345 adding client side logging | =Corey Hulen | 2015-09-29 | 1 | -0/+14 |
| | |/ |