Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | 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. | |||||
| | * | | Update incoming webhooks to hide DMs and accept direct JSON payloads. | JoramWilander | 2015-09-29 | 1 | -7/+9 | |
| | | | | ||||||
| * | | | Merge pull request #843 from rgarmsen2295/plt-138 | Corey Hulen | 2015-09-29 | 4 | -13/+12 | |
| |\ \ \ | | | | | | | | | | | PLT-138 Better parsing of the site's title when viewing a channel | |||||
| | * | | | Removed unused title update code | Reed Garmsen | 2015-09-29 | 3 | -8/+2 | |
| | | | | | ||||||
| | * | | | Better parsing of the website's title when viewing a channel | Reed Garmsen | 2015-09-28 | 1 | -5/+10 | |
| | | |/ | | |/| | ||||||
| * | | | plt-479 - Fixing command lists and also making them theme compatible | Asaad Mahmood | 2015-09-29 | 1 | -2/+2 | |
| | | | | ||||||
* | | | | Updating stuff with states in slack import | Asaad Mahmood | 2015-09-29 | 1 | -27/+48 | |
| | | | | ||||||
* | | | | Updating class with setState | Asaad Mahmood | 2015-09-29 | 1 | -8/+16 | |
| | | | | ||||||
* | | | | plt-383 - Slack upload improvement | Asaad Mahmood | 2015-09-29 | 1 | -1/+3 | |
|/ / / | ||||||
* | | | Merge pull request #845 from trashcan/fix-autocomplete-suggestion | Joram Wilander | 2015-09-29 | 1 | -3/+3 | |
|\ \ \ | | | | | | | | | Add pull-left and pull-right to autocomplete command suggestions. | |||||
| * | | | Add pull-left and pull-right to autocomplete command suggestions. | Pat Lathem | 2015-09-28 | 1 | -3/+3 | |
| |/ / | ||||||
* | | | Merge pull request #846 from mattermost/Fixing-Quotes | Christopher Speller | 2015-09-29 | 1 | -1/+1 | |
|\ \ \ | | | | | | | | | Fixing quotes | |||||
| * | | | Fixing quotes | it33 | 2015-09-28 | 1 | -1/+1 | |
| | |/ | |/| | ||||||
* | | | Merge pull request #833 from mattermost/plt-417 | Christopher Speller | 2015-09-29 | 2 | -9/+30 | |
|\ \ \ | | | | | | | | | PLT-417 Fix scrolling related to RHS. | |||||
| * | | | Fix scrolling related to RHS. | JoramWilander | 2015-09-29 | 2 | -9/+30 | |
| | |/ | |/| | ||||||
* | | | Merge pull request #830 from mattermost/youtube-scroll-fix | Christopher Speller | 2015-09-29 | 1 | -1/+121 | |
|\ \ \ | |_|/ |/| | | Fix youtube minor scrolling bug. | |||||
| * | | Fix youtube minor scrolling bug. | JoramWilander | 2015-09-28 | 1 | -1/+121 | |
| |/ | ||||||
* / | Inactive members are no longer counted or shown as members of a channel | Reed Garmsen | 2015-09-28 | 2 | -10/+18 | |
|/ | ||||||
* | PLT-441 - Minor Ui touches to the admin console | Asaad Mahmood | 2015-09-28 | 1 | -0/+10 | |
| | ||||||
* | Fixing revoke session | =Corey Hulen | 2015-09-26 | 1 | -3/+4 | |
| | ||||||
* | Fixing broken page | =Corey Hulen | 2015-09-26 | 1 | -0/+1 | |
| | ||||||
* | Merge pull request #819 from mattermost/it33-patch-1 | Corey Hulen | 2015-09-26 | 9 | -41/+40 | |
|\ | | | | | Adjustments to help text of System Console | |||||
| * | Update log_settings.jsx | it33 | 2015-09-25 | 1 | -3/+3 | |
| | | ||||||
| * | Update gitlab_settings.jsx | it33 | 2015-09-25 | 1 | -8/+8 | |
| | | ||||||
| * | Update privacy_settings.jsx | it33 | 2015-09-25 | 1 | -2/+2 | |
| | | ||||||
| * | Update rate_settings.jsx | it33 | 2015-09-25 | 1 | -5/+5 | |
| | | ||||||
| * | Update rate_settings.jsx | it33 | 2015-09-25 | 1 | -3/+3 | |
| | | ||||||
| * | Update log_settings.jsx | it33 | 2015-09-25 | 1 | -7/+7 | |
| | | ||||||
| * | Update image_settings.jsx | it33 | 2015-09-25 | 1 | -1/+1 | |
| | | ||||||
| * | Update email_settings.jsx | it33 | 2015-09-25 | 1 | -10/+9 | |
| | | ||||||
| * | Update sql_settings.jsx | it33 | 2015-09-25 | 1 | -1/+1 | |
| | | ||||||
| * | Update team_settings.jsx | it33 | 2015-09-25 | 1 | -3/+3 | |
| | | ||||||
| * | Update service_settings.jsx | it33 | 2015-09-25 | 1 | -2/+2 | |
| | |