Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | 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 | 2 | -4/+3 | |
|\ \ | | | | | | | Multiple UI Improvements | |||||
| * | | Multiple UI Improvements | Asaad Mahmood | 2015-10-05 | 2 | -4/+3 | |
| |/ | ||||||
* | | Merge pull request #922 from mattermost/plt-360 | Harrison Healey | 2015-10-05 | 27 | -289/+326 | |
|\ \ | |/ |/| | PLT-360 Upgrade and changes to ESLint | |||||
| * | Disabling complexity warning. Allowing non-nested ternary. Upgrading ESList. ↵ | Christopher Speller | 2015-10-05 | 27 | -289/+326 | |
| | | | | | | | | 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 | 5 | -9/+121 | |
|\ \ \ | |_|/ |/| | | 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 | 4 | -14/+91 | |
| | | | | | | | | | | | | next to webhook posts. | |||||
| * | | Add ability to override username and icon for posts from incoming webhooks. | JoramWilander | 2015-10-02 | 4 | -8/+43 | |
| | | | ||||||
* | | | Merge pull request #903 from mattermost/PLT-44 | Christopher Speller | 2015-10-05 | 3 | -6/+13 | |
|\ \ \ | | | | | | | | | PLT-44 allow team switching without the need to login | |||||
| * | | | Fixing issues | =Corey Hulen | 2015-10-02 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | PLT-44 allow team switching without the need to login | =Corey Hulen | 2015-10-01 | 3 | -5/+12 | |
| |/ / | ||||||
* | | | Merge pull request #887 from asaadmahmoodspin/plt-375 | Joram Wilander | 2015-10-05 | 1 | -1/+1 | |
|\ \ \ | | | | | | | | | plt-375 - Making modals compatible with themes | |||||
| * | | | Updating jpg to png for theme names | Asaad Mahmood | 2015-10-05 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | Merge branch 'master' of https://github.com/mattermost/platform into plt-375 | Asaad Mahmood | 2015-10-02 | 8 | -138/+196 | |
| |\ \ \ | | | |/ | | |/| | | | | | | | | | Conflicts: web/react/components/user_settings/user_settings_appearance.jsx | |||||
| * | | | pot-375 - Making modals compatible with themes | Asaad Mahmood | 2015-10-01 | 2 | -9/+10 | |
| | | | | ||||||
* | | | | Merge branch 'master' into PLT-462 | =Corey Hulen | 2015-10-02 | 7 | -131/+184 | |
|\ \ \ \ | | |/ / | |/| | | ||||||
| * | | | 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 | 4 | -129/+180 | |
| |\ \ \ | | |/ / | |/| | | PLT-194 Changes to ChannelMember notification settings | |||||
| | * | | Moved ChannelMember.NotifyLevel into ChannelMember.NotifyProps | hmhealey | 2015-10-01 | 2 | -11/+7 | |
| | | | | ||||||
| | * | | Replaced ChannelMember.MarkUnreadLevel with ChannelMember.NotifyProps | hmhealey | 2015-10-01 | 3 | -12/+8 | |
| | | | | ||||||
| | * | | Changed notification preference submission to only be updated when options ↵ | hmhealey | 2015-09-30 | 1 | -0/+10 | |
| | | | | | | | | | | | | | | | | have actually changed | |||||
| | * | | 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 | 1 | -93/+121 | |
| | | | | | | | | | | | | | | | | 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 #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> | |||||
* | | | | 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 | 12 | -80/+97 | |
|\ \ \ \ | | |_|/ | |/| | | ||||||
| * | | | 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 | 2 | -1/+16 | |
| |\ \ | | | | | | | | | PLT-435 adding system console link to RHS | |||||
| | * | | PLT-435 adding system console link to RHS | =Corey Hulen | 2015-09-29 | 2 | -1/+16 | |
| | | | | ||||||
| * | | | 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 | 1 | -19/+19 | |
| |\ \ | ||||||
| | * | | Fixing gitlab settings in admin console | =Corey Hulen | 2015-09-28 | 1 | -20/+20 | |
| | | | | ||||||
| * | | | Merge pull request #857 from mattermost/PLT-429 | Harrison Healey | 2015-09-29 | 1 | -33/+34 | |
| |\ \ \ | | | | | | | | | | | PLT-429, PLT-483, PLT-472 fixes to Gitlab settings page | |||||
| | * | | | PLT-472 switching field ordering. | =Corey Hulen | 2015-09-29 | 1 | -13/+14 | |
| | | | | | ||||||
| | * | | | PLT-429 removing scope field. | =Corey Hulen | 2015-09-29 | 1 | -23/+23 | |
| | | | | | ||||||
| | * | | | PLT-483 adding better help text | =Corey Hulen | 2015-09-29 | 1 | -3/+3 | |
| | | | | | ||||||
| * | | | | PLT-425 changing wording | =Corey Hulen | 2015-09-29 | 1 | -2/+2 | |
| | |_|/ | |/| | | ||||||
| * | | | Merge pull request #848 from mattermost/plt-488 | Corey Hulen | 2015-09-29 | 1 | -7/+9 | |
| |\ \ \ | | |/ / | |/| | | PLT-488 Update incoming webhooks to hide DMs and accept direct JSON payloads. |