summaryrefslogtreecommitdiffstats
path: root/web/react/components
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge pull request #922 from mattermost/plt-360Harrison Healey2015-10-0527-289/+326
|\ \ | |/ |/| PLT-360 Upgrade and changes to ESLint
| * Disabling complexity warning. Allowing non-nested ternary. Upgrading ESList. ↵Christopher Speller2015-10-0527-289/+326
| | | | | | | | Adding new ESLint rules. Fixing new ESLint errors.
* | Merge pull request #923 from mattermost/fix-load-scrollCorey Hulen2015-10-051-1/+1
|\ \ | | | | | | Fix missed binding for youtube data callback.
| * | Fix missed binding for youtube data callback.JoramWilander2015-10-051-1/+1
| | |
* | | Merge pull request #914 from mattermost/plt-297Joram Wilander2015-10-055-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.JoramWilander2015-10-051-1/+1
| | |
| * | Add config options for overriding username and icon, and add BOT indicator ↵JoramWilander2015-10-054-14/+91
| | | | | | | | | | | | next to webhook posts.
| * | Add ability to override username and icon for posts from incoming webhooks.JoramWilander2015-10-024-8/+43
| | |
* | | Merge pull request #903 from mattermost/PLT-44Christopher Speller2015-10-053-6/+13
|\ \ \ | | | | | | | | PLT-44 allow team switching without the need to login
| * | | Fixing issues=Corey Hulen2015-10-021-1/+1
| | | |
| * | | PLT-44 allow team switching without the need to login=Corey Hulen2015-10-013-5/+12
| |/ /
* | | Merge pull request #887 from asaadmahmoodspin/plt-375Joram Wilander2015-10-051-1/+1
|\ \ \ | | | | | | | | plt-375 - Making modals compatible with themes
| * | | Updating jpg to png for theme namesAsaad Mahmood2015-10-051-1/+1
| | | |
| * | | Merge branch 'master' of https://github.com/mattermost/platform into plt-375Asaad Mahmood2015-10-028-138/+196
| |\ \ \ | | | |/ | | |/| | | | | | | | | Conflicts: web/react/components/user_settings/user_settings_appearance.jsx
| * | | pot-375 - Making modals compatible with themesAsaad Mahmood2015-10-012-9/+10
| | | |
* | | | Merge branch 'master' into PLT-462=Corey Hulen2015-10-027-131/+184
|\ \ \ \ | | |/ / | |/| |
| * | | Merge pull request #909 from mattermost/plt-446Harrison Healey2015-10-021-0/+2
| |\ \ \ | | | | | | | | | | PLT-446 Added help text to incoming webhooks.
| | * | | Added help text for incoming webhooks.JoramWilander2015-10-021-0/+2
| | | |/ | | |/|
| * | | Change text to avoid confusion with Slack Importit332015-10-021-1/+1
| | | |
| * | | Removed $ from time tooltiphmhealey2015-10-021-1/+1
| | | |
| * | | Merge pull request #881 from hmhealey/plt194Joram Wilander2015-10-024-129/+180
| |\ \ \ | | |/ / | |/| | PLT-194 Changes to ChannelMember notification settings
| | * | Moved ChannelMember.NotifyLevel into ChannelMember.NotifyPropshmhealey2015-10-012-11/+7
| | | |
| | * | Replaced ChannelMember.MarkUnreadLevel with ChannelMember.NotifyPropshmhealey2015-10-013-12/+8
| | | |
| | * | Changed notification preference submission to only be updated when options ↵hmhealey2015-09-301-0/+10
| | | | | | | | | | | | | | | | have actually changed
| | * | Implemented ChannelMember.MarkUnreadLevel so that it actually functionshmhealey2015-09-302-2/+2
| | | |
| | * | Removed UI for quiet mode and added UI to set when a channel will be marked ↵hmhealey2015-09-301-93/+121
| | | | | | | | | | | | | | | | unread in the sidebar
| | * | Added 'default' option to channel notification settings that just uses the ↵hmhealey2015-09-303-31/+52
| | | | | | | | | | | | | | | | user's notification level
* | | | PLT-462 Adding diagnostic info=Corey Hulen2015-10-011-0/+34
|/ / /
* | | Merge pull request #859 from mattermost/PLT-409Christopher Speller2015-10-011-0/+6
|\ \ \ | |_|/ |/| | PLT-409 add warning to at rest salt gen
| * | PLT-409 add warning to at rest salt gen=Corey Hulen2015-09-291-0/+6
| | |
* | | Merge pull request #867 from chengweiv5/team-nameChristopher Speller2015-09-302-6/+8
|\ \ \ | | | | | | | | Team name
| * | | Check team name in correct sequence to avoid null pointerChengwei Yang2015-09-301-3/+5
| | | | | | | | | | | | | | | | Signed-off-by: Chengwei Yang <yangchengwei@qiyi.com>
| * | | Change minimal length of team name to 3 characterChengwei Yang2015-09-302-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 statesAsaad Mahmood2015-09-301-59/+33
| | | |
* | | | Merge branch 'master' of https://github.com/mattermost/platform into plt-383Asaad Mahmood2015-09-3012-80/+97
|\ \ \ \ | | |_|/ | |/| |
| * | | Fix RHS scrolling center pane.JoramWilander2015-09-301-2/+2
| |/ /
| * | Merge pull request #862 from mattermost/PLT-435Joram Wilander2015-09-292-1/+16
| |\ \ | | | | | | | | PLT-435 adding system console link to RHS
| | * | PLT-435 adding system console link to RHS=Corey Hulen2015-09-292-1/+16
| | | |
| * | | Update email notification help textesethna2015-09-291-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 Speller2015-09-291-19/+19
| |\ \
| | * | Fixing gitlab settings in admin console=Corey Hulen2015-09-281-20/+20
| | | |
| * | | Merge pull request #857 from mattermost/PLT-429Harrison Healey2015-09-291-33/+34
| |\ \ \ | | | | | | | | | | PLT-429, PLT-483, PLT-472 fixes to Gitlab settings page
| | * | | PLT-472 switching field ordering.=Corey Hulen2015-09-291-13/+14
| | | | |
| | * | | PLT-429 removing scope field.=Corey Hulen2015-09-291-23/+23
| | | | |
| | * | | PLT-483 adding better help text=Corey Hulen2015-09-291-3/+3
| | | | |
| * | | | PLT-425 changing wording=Corey Hulen2015-09-291-2/+2
| | |_|/ | |/| |
| * | | Merge pull request #848 from mattermost/plt-488Corey Hulen2015-09-291-7/+9
| |\ \ \ | | |/ / | |/| | PLT-488 Update incoming webhooks to hide DMs and accept direct JSON payloads.
| | * | Update incoming webhooks to hide DMs and accept direct JSON payloads.JoramWilander2015-09-291-7/+9
| | | |
| * | | Merge pull request #843 from rgarmsen2295/plt-138Corey Hulen2015-09-294-13/+12
| |\ \ \ | | | | | | | | | | PLT-138 Better parsing of the site's title when viewing a channel
| | * | | Removed unused title update codeReed Garmsen2015-09-293-8/+2
| | | | |
generated by cgit v1.2.3-1-g7c22 (git 2.25.1) at 2024-10-31 01:27:58 +0000