summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #881 from hmhealey/plt194Joram Wilander2015-10-0216-253/+443
|\
| * Moved ChannelMember.NotifyLevel into ChannelMember.NotifyPropshmhealey2015-10-0113-233/+31
| * Replaced ChannelMember.MarkUnreadLevel with ChannelMember.NotifyPropshmhealey2015-10-0113-117/+225
| * Changed notification preference submission to only be updated when options ha...hmhealey2015-09-301-0/+10
| * Removed deprecated constants related to quiet modehmhealey2015-09-301-3/+1
| * Added channel id to updateLastViewed api calls to prevent multiple updates to...hmhealey2015-09-301-7/+9
| * Implemented ChannelMember.MarkUnreadLevel so that it actually functionshmhealey2015-09-302-2/+2
| * Added additional test cases and fixed existing ones for ChannelMember.MarkUnr...hmhealey2015-09-305-0/+119
| * Removed UI for quiet mode and added UI to set when a channel will be marked u...hmhealey2015-09-306-115/+244
| * Added 'default' option to channel notification settings that just uses the us...hmhealey2015-09-305-39/+65
* | Update slack-import.mdit332015-10-021-1/+4
* | 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 texthmhealey2015-10-011-1/+1
* | | Merge pull request #898 from tmuwandi/patch-1it332015-10-011-2/+2
|\ \ \
| * | | Update prod-ubuntu.mdtmuwandi2015-10-011-2/+2
| |/ /
* | | Merge pull request #894 from thomas9987/patch-1it332015-10-011-2/+1
|\ \ \
| * | | Fixed formattingthomas99872015-10-011-2/+1
* | | | Merge pull request #897 from chuck5/patch-1it332015-10-011-1/+1
|\ \ \ \ | |_|/ / |/| | |
| * | | 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 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=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=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
| |\ \ \ \
| | * | | | Fixing some locations to use the IsTeamAdmin function which properly checks f...Christopher Speller2015-09-307-11/+15
| | * | | | 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
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | 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=Corey Hulen2015-09-303-12/+12
| |/ / / /
| * | | | Merge pull request #877 from mattermost/lfbrock-patch-2Christopher Speller2015-09-301-0/+123
| |\ \ \ \
| | * | | | Updated to include goexif, react-bootstrap, graphics-go, and bootstrap colorp...lfbrock2015-09-301-0/+123
| |/ / / /
| * | | | Merge pull request #874 from mattermost/it33-patch-1it332015-09-301-0/+14
| |\ \ \ \
| | * | | | Create MIT-COMPILED-LICENSE.mdit332015-09-301-0/+14
| |/ / / /
* | | | | Merge pull request #867 from chengweiv5/team-nameChristopher Speller2015-09-302-6/+8
|\ \ \ \ \
| * | | | | Check team name in correct sequence to avoid null pointerChengwei Yang2015-09-301-3/+5
| * | | | | Change minimal length of team name to 3 characterChengwei Yang2015-09-302-4/+4
| | |/ / / | |/| | |
* | | | | Merge pull request #876 from hmhealey/echotestfixChristopher Speller2015-09-301-0/+3
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | 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
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | 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