summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Add config options for overriding username and icon, and add BOT indicator ↵JoramWilander2015-10-0511-17/+119
| | | | next to webhook posts.
* Add ability to override username and icon for posts from incoming webhooks.JoramWilander2015-10-025-8/+54
|
* Added link to Slack Importit332015-10-021-0/+1
|
* Create slack-import.mdit332015-10-021-0/+15
|
* Merge pull request #901 from hmhealey/paosswordJoram Wilander2015-10-021-1/+1
|\ | | | | Fixed typo in mattermost.go help text
| * Fixed typo in mattermost.go help texthmhealey2015-10-011-1/+1
| |
* | Merge pull request #898 from tmuwandi/patch-1it332015-10-011-2/+2
|\ \ | | | | | | Fixed incorrect punctuation
| * | Update prod-ubuntu.mdtmuwandi2015-10-011-2/+2
| |/
* | Merge pull request #894 from thomas9987/patch-1it332015-10-011-2/+1
|\ \ | | | | | | Fixed formatting
| * | Fixed formattingthomas99872015-10-011-2/+1
| | | | | | | | | Removed empty bullet point
* | | Merge pull request #897 from chuck5/patch-1it332015-10-011-1/+1
|\ \ \ | |_|/ |/| | Changed comma to period to correct grammar error.
| * | Changed comma to period to correct grammar error.chuck52015-10-011-1/+1
| |/
* | Merge pull request #895 from drbaker/patch-1it332015-10-011-4/+4
|\ \ | |/ |/| Grammar fix: "setup" -> "set up" in header lines
| * Grammar fix: "setup" -> "set up" in header linesdrbaker2015-10-011-4/+4
|/
* Adding link to prod installit332015-10-011-0/+1
|
* 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-013-1/+56
|\ \ | | | | | | PLT-345 adding client side logging
| * | PLT-345 adding client side logging=Corey Hulen2015-09-293-1/+56
| | |
* | | Update CHANGELOG.mdit332015-09-301-6/+11
| | |
* | | Merge release branch 'release-1.0.0'Christopher Speller2015-09-3014-40/+178
|\ \ \
| * | | Updating dockerfile for release v1.0.0-rc2Christopher Speller2015-09-301-1/+1
| | | |
| * | | Merge pull request #884 from mattermost/permissions-fixChristopher Speller2015-09-307-25/+26
| |\ \ \ | | | | | | | | | | Permissions fixes. Fixes PLT-487
| | * | | Fixing some locations to use the IsTeamAdmin function which properly checks ↵Christopher Speller2015-09-307-11/+15
| | | | | | | | | | | | | | | | | | | | for system admin permissions.
| | * | | Fixing permissions for system admin. Fixes slack import for system admins.Christopher Speller2015-09-301-14/+11
| | | | |
| * | | | Merge pull request #883 from mattermost/plt-496Joram Wilander2015-09-301-2/+2
| |\ \ \ \ | | |/ / / | |/| | | PLT-496 Adding MIT compiled licence to build
| | * | | Adding MIT compiled licence to buildChristopher Speller2015-09-301-2/+2
| |/ / /
| * | | Merge pull request #882 from mattermost/PLT-499Harrison Healey2015-09-303-12/+12
| |\ \ \ | | | | | | | | | | PLT-499 fixing broken salts
| | * | | PLT-499 fixing broken salts=Corey Hulen2015-09-303-12/+12
| |/ / /
| * | | Merge pull request #877 from mattermost/lfbrock-patch-2Christopher Speller2015-09-301-0/+123
| |\ \ \ | | | | | | | | | | Update NOTICE.txt to include goexif, react-bootstrap, graphics-go, bootstrap colorpicker
| | * | | Updated to include goexif, react-bootstrap, graphics-go, and bootstrap ↵lfbrock2015-09-301-0/+123
| |/ / / | | | | | | | | | | | | colorpicker
| * | | Merge pull request #874 from mattermost/it33-patch-1it332015-09-301-0/+14
| |\ \ \ | | | | | | | | | | Create MIT-COMPILED-LICENSE.md
| | * | | Create MIT-COMPILED-LICENSE.mdit332015-09-301-0/+14
| |/ / /
* | | | 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>
* | | | Merge pull request #876 from hmhealey/echotestfixChristopher Speller2015-09-301-0/+3
|\ \ \ \ | | | | | | | | | | Added slight delay to TestEchoCommand to account for race condition
| * | | | Added slight delay to TestEchoCommand to account for race conditionhmhealey2015-09-301-0/+3
| | | | |
* | | | | Merge pull request #852 from asaadmahmoodspin/plt-383Joram Wilander2015-09-302-21/+26
|\ \ \ \ \ | |/ / / / |/| | | | plt-383 - Slack upload UI improvements
| * | | | 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-3051-534/+589
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | Merge pull request #875 from mattermost/rhs-scroll-fixJoram Wilander2015-09-301-2/+2
|\ \ \ \ \ | | | | | | | | | | | | Fix RHS scrolling center pane.
| * | | | | Fix RHS scrolling center pane.JoramWilander2015-09-301-2/+2
| | |/ / / | |/| | |
* | | | | Merge pull request #863 from mattermost/PLT-475Christopher Speller2015-09-301-1/+1
|\ \ \ \ \ | |/ / / / |/| | | | PLT-475 making sure session is properly removed
| * | | | PLT-475 making sure session is properly removed=Corey Hulen2015-09-291-1/+1
| | | | |
* | | | | Merge pull request #865 from mattermost/PLT-404Harrison Healey2015-09-298-32/+114
|\ \ \ \ \ | | | | | | | | | | | | PLT-404 adding basic error checking to config file.
| * | | | | PLT-404 adding basic error checking to config file.=Corey Hulen2015-09-298-32/+114
| |/ / / /
* | | | | 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
| |/ / / /