Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 #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 | ||||
| | * | | Added 'default' option to channel notification settings that just uses the ↵ | hmhealey | 2015-09-30 | 3 | -31/+52 |
| | | | | | | | | | | | | | | | | user's notification level | ||||
* | | | | PLT-462 Adding diagnostic info | =Corey Hulen | 2015-10-01 | 1 | -0/+34 |
|/ / / | |||||
* | | | Merge pull request #859 from mattermost/PLT-409 | Christopher Speller | 2015-10-01 | 1 | -0/+6 |
|\ \ \ | | | | | | | | | PLT-409 add warning to at rest salt gen | ||||
| * | | | PLT-409 add warning to at rest salt gen | =Corey Hulen | 2015-09-29 | 1 | -0/+6 |
| | | | | |||||
* | | | | Merge pull request #866 from mattermost/PLT-345 | Christopher Speller | 2015-10-01 | 2 | -0/+33 |
|\ \ \ \ | |_|_|/ |/| | | | PLT-345 adding client side logging | ||||
| * | | | PLT-345 adding client side logging | =Corey Hulen | 2015-09-29 | 2 | -0/+33 |
| | | | | |||||
* | | | | Merge pull request #867 from chengweiv5/team-name | Christopher Speller | 2015-09-30 | 2 | -6/+8 |
|\ \ \ \ | | | | | | | | | | | Team name | ||||
| * | | | | Check team name in correct sequence to avoid null pointer | Chengwei Yang | 2015-09-30 | 1 | -3/+5 |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Chengwei Yang <yangchengwei@qiyi.com> | ||||
| * | | | | Change minimal length of team name to 3 character | Chengwei Yang | 2015-09-30 | 2 | -4/+4 |
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | team named in 3 character in non-English language is very common, e.g. in Chinese. Signed-off-by: Chengwei Yang <yangchengwei@qiyi.com> | ||||
* | | | | Adding a quick fix for search bar bg related to themes | Asaad Mahmood | 2015-09-30 | 1 | -1/+1 |
| | | | | |||||
* | | | | Updating slack import UI with states | Asaad Mahmood | 2015-09-30 | 1 | -59/+33 |
| | | | | |||||
* | | | | Merge branch 'master' of https://github.com/mattermost/platform into plt-383 | Asaad Mahmood | 2015-09-30 | 18 | -114/+140 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | Fix RHS scrolling center pane. | JoramWilander | 2015-09-30 | 1 | -2/+2 |
| |/ / | |||||
| * | | Merge pull request #862 from mattermost/PLT-435 | Joram Wilander | 2015-09-29 | 3 | -1/+24 |
| |\ \ | | | | | | | | | PLT-435 adding system console link to RHS | ||||
| | * | | PLT-435 adding system console link to RHS | =Corey Hulen | 2015-09-29 | 3 | -1/+24 |
| | | | | |||||
| * | | | Update email notification help text | esethna | 2015-09-29 | 1 | -1/+1 |
| |/ / | | | | | | | | | | Current: Email notifications are sent for mentions and direct messages after you have been away from Mattermost for 5 minutes. New: Email notifications are sent for mentions and direct messages after you’ve been offline for more than 60 seconds or away from Mattermost for more than 5 minutes. | ||||
| * | | Merge release branch 'release-1.0.0' | Christopher Speller | 2015-09-29 | 4 | -33/+25 |
| |\ \ | |||||
| | * | | Removing command styles | Asaad Mahmood | 2015-09-29 | 1 | -5/+4 |
| | | | | |||||
| | * | | Removing mentions changes since they're for a master | Asaad Mahmood | 2015-09-29 | 1 | -3/+0 |
| | | | |