summaryrefslogtreecommitdiffstats
path: root/web/react
Commit message (Collapse)AuthorAgeFilesLines
* 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-0211-150/+226
|\ | | | | | | | | Conflicts: web/react/components/user_settings/user_settings_appearance.jsx
| * Merge pull request #912 from hmhealey/plt174Christopher Speller2015-10-021-2/+4
| |\ | | | | | | PLT-174 Added emailto: to the beginning of email links
| | * Added emailto: to the beginning of email linkshmhealey2015-10-021-2/+4
| | |
| * | 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-026-139/+192
| |\ \ | | |/ | |/| PLT-194 Changes to ChannelMember notification settings
| | * Moved ChannelMember.NotifyLevel into ChannelMember.NotifyPropshmhealey2015-10-013-27/+7
| | |
| | * Replaced ChannelMember.MarkUnreadLevel with ChannelMember.NotifyPropshmhealey2015-10-014-15/+12
| | |
| | * Changed notification preference submission to only be updated when options ↵hmhealey2015-09-301-0/+10
| | | | | | | | | | | | have actually changed
| | * Added channel id to updateLastViewed api calls to prevent multiple updates ↵hmhealey2015-09-301-7/+9
| | | | | | | | | | | | to different channels from clashing
| | * 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-302-93/+136
| | | | | | | | | | | | unread in the sidebar
| | * Added 'default' option to channel notification settings that just uses the ↵hmhealey2015-09-303-31/+52
| | | | | | | | | | | | user's notification level
| * | 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 #866 from mattermost/PLT-345Christopher Speller2015-10-011-0/+14
| |\ \ \ | | | | | | | | | | PLT-345 adding client side logging
| | * | | PLT-345 adding client side logging=Corey Hulen2015-09-291-0/+14
| | | | |
* | | | | pot-375 - Making modals compatible with themesAsaad Mahmood2015-10-014-24/+30
|/ / / /
* | | | 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>
* | | | Adding a quick fix for search bar bg related to themesAsaad Mahmood2015-09-301-1/+1
| | | |
* | | | 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-3014-100/+119
|\ \ \ \ | | |_|/ | |/| |
| * | | Fix RHS scrolling center pane.JoramWilander2015-09-301-2/+2
| |/ /
| * | Merge pull request #862 from mattermost/PLT-435Joram Wilander2015-09-293-1/+24
| |\ \ | | | | | | | | PLT-435 adding system console link to RHS
| | * | PLT-435 adding system console link to RHS=Corey Hulen2015-09-293-1/+24
| | | |
| * | | 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-292-24/+23
| |\ \
| | * | Removing command stylesAsaad Mahmood2015-09-291-5/+4
| | | |
| | * | Removing mentions changes since they're for a masterAsaad Mahmood2015-09-291-3/+0
| | | |
| | * | Updating placeholder text in responsiveAsaad Mahmood2015-09-291-10/+12
| | | |
| | * | Merge pull request #841 from hmhealey/plt456bCorey Hulen2015-09-281-0/+1
| | |\ \ | | | | | | | | | | PLT-456 Changed mobile search bar to use the colour of the sidebar header
| | | * | Changed mobile search bar to use the colour of the sidebar headerhmhealey2015-09-281-0/+1
| | | | |
| | * | | 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-292-7/+10
| |\ \ \ | | |/ / | |/| | 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-292-7/+10
| | | |
| * | | Merge pull request #843 from rgarmsen2295/plt-138Corey Hulen2015-09-295-24/+13
| |\ \ \ | | | | | | | | | | PLT-138 Better parsing of the site's title when viewing a channel
| | * | | Removed unused title update codeReed Garmsen2015-09-294-19/+3
| | | | |
| | * | | Better parsing of the website's title when viewing a channelReed Garmsen2015-09-281-5/+10
| | | |/ | | |/|
| * | | plt-479 - Fixing command lists and also making them theme compatibleAsaad Mahmood2015-09-292-6/+10
| | | |
* | | | Updating stuff with states in slack importAsaad Mahmood2015-09-291-27/+48
| | | |
generated by cgit v1.2.3-1-g7c22 (git 2.25.1) at 2024-10-30 03:05:57 +0000