summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | Merge pull request #904 from teviot/teviot-patch-1Corey Hulen2015-10-021-5/+5
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | Increase test timeouts to accommodate slow dev environments
| * | | | | | | Increase test timeouts to accommodate slow dev environmentsTeviot Systems2015-10-021-5/+5
| |/ / / / / /
* | | | | | | 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
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge pull request #913 from mattermost/it33-patch-3Harrison Healey2015-10-021-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Change text to avoid confusion with Slack Import
| * | | | | | | | Change text to avoid confusion with Slack Importit332015-10-021-1/+1
|/ / / / / / / /
* | | | | | | | Merge pull request #911 from hmhealey/plt437Christopher Speller2015-10-021-1/+1
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | PLT-437 Removed $ from time tooltip
| * | | | | | | Removed $ from time tooltiphmhealey2015-10-021-1/+1
|/ / / / / / /
* | | | | | | Merge pull request #906 from teviot/teviot-patch-2Christopher Speller2015-10-023-1/+19
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Pass-through post creation time when importing posts
| * | | | | | | Pass-through post creation time when importing postsTeviot Systems2015-10-023-1/+19
| | |/ / / / / | |/| | | | |
* | | | | | | Merge pull request #881 from hmhealey/plt194Joram Wilander2015-10-0216-253/+443
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | PLT-194 Changes to ChannelMember notification settings
| * | | | | | | 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 ↵hmhealey2015-09-301-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | have actually changed
| * | | | | | | Removed deprecated constants related to quiet modehmhealey2015-09-301-3/+1
| | | | | | | |
| * | | | | | | 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
| | | | | | | |
| * | | | | | | Added additional test cases and fixed existing ones for ↵hmhealey2015-09-305-0/+119
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ChannelMember.MarkUnreadLevel
| * | | | | | | Removed UI for quiet mode and added UI to set when a channel will be marked ↵hmhealey2015-09-306-115/+244
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | unread in the sidebar
| * | | | | | | Added 'default' option to channel notification settings that just uses the ↵hmhealey2015-09-305-39/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | user's notification level
* | | | | | | | 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 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
| |/ / / /