summaryrefslogtreecommitdiffstats
path: root/model
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #944 from mattermost/PLT-518Christopher Speller2015-10-082-3/+58
|\ | | | | PLT-518 check for security bulletins
| * PLT-518 check for security bulletins=Corey Hulen2015-10-052-3/+58
| |
* | Fix user_added websocket event and update websocket channel access cache on ↵JoramWilander2015-10-071-2/+2
|/ | | | add/remove member.
* Merge pull request #914 from mattermost/plt-297Joram Wilander2015-10-051-0/+2
|\ | | | | PLT-297 Add ability to override username and icon for posts from incoming webhooks.
| * Add config options for overriding username and icon, and add BOT indicator ↵JoramWilander2015-10-051-0/+2
| | | | | | | | next to webhook posts.
* | Merge pull request #915 from mattermost/plt-300Christopher Speller2015-10-051-0/+1
|\ \ | | | | | | PLT-300 Update allow/deny oauth page UI, and add ouath as reserved word.
| * | Update allow/deny oauth page UI, and add ouath as reserved word.JoramWilander2015-10-021-0/+1
| | |
* | | Merge pull request #903 from mattermost/PLT-44Christopher Speller2015-10-051-0/+1
|\ \ \ | | | | | | | | PLT-44 allow team switching without the need to login
| * | | PLT-44 allow team switching without the need to login=Corey Hulen2015-10-011-0/+1
| | |/ | |/|
* | | Fixing break=Corey Hulen2015-10-021-1/+1
| | |
* | | Adding offical build function=Corey Hulen2015-10-021-0/+4
| | |
* | | Merge branch 'master' into PLT-462=Corey Hulen2015-10-025-23/+75
|\ \ \ | | |/ | |/|
| * | Merge pull request #906 from teviot/teviot-patch-2Christopher Speller2015-10-022-1/+17
| |\ \ | | | | | | | | Pass-through post creation time when importing posts
| | * | Pass-through post creation time when importing postsTeviot Systems2015-10-022-1/+17
| | |/
| * | Merge pull request #881 from hmhealey/plt194Joram Wilander2015-10-023-22/+58
| |\ \ | | |/ | |/| PLT-194 Changes to ChannelMember notification settings
| | * Moved ChannelMember.NotifyLevel into ChannelMember.NotifyPropshmhealey2015-10-013-16/+6
| | |
| | * Replaced ChannelMember.MarkUnreadLevel with ChannelMember.NotifyPropshmhealey2015-10-013-16/+28
| | |
| | * Removed deprecated constants related to quiet modehmhealey2015-09-301-3/+1
| | |
| | * Added additional test cases and fixed existing ones for ↵hmhealey2015-09-302-0/+20
| | | | | | | | | | | | ChannelMember.MarkUnreadLevel
| | * Removed UI for quiet mode and added UI to set when a channel will be marked ↵hmhealey2015-09-301-14/+25
| | | | | | | | | | | | unread in the sidebar
| | * Added 'default' option to channel notification settings that just uses the ↵hmhealey2015-09-301-2/+7
| | | | | | | | | | | | user's notification level
* | | PLT-462 Adding diagnostic info=Corey Hulen2015-10-011-0/+1
|/ /
* | Merge release branch 'release-1.0.0'Christopher Speller2015-09-301-0/+4
|\ \ | |/ |/|
| * Fixing some locations to use the IsTeamAdmin function which properly checks ↵Christopher Speller2015-09-301-0/+4
| | | | | | | | for system admin permissions.
* | PLT-404 adding basic error checking to config file.=Corey Hulen2015-09-291-0/+92
| |
* | Merge release branch 'release-1.0.0'Christopher Speller2015-09-292-2/+2
|\|
| * Fixing version unit testChristopher Speller2015-09-281-1/+1
| |
| * Updating dockerfiles and version.goChristopher Speller2015-09-281-1/+1
| |
* | rebaseJack2015-09-284-21/+31
|\|
| * Fixing merge=Corey Hulen2015-09-241-1/+0
| |\
| | * Removing default theme no longer in use=Corey Hulen2015-09-241-1/+0
| | |
| * | Removing old valet crud=Corey Hulen2015-09-242-19/+0
| |/
| * Fixing merge=Corey Hulen2015-09-232-2/+7
| |\
| * | PLT-349 adding team mgt to admin console=Corey Hulen2015-09-232-1/+31
| | |
* | | use github.com/disintegration/imagingJack2015-09-231-6/+6
| |/ |/|
* | Changing image settings to file settings=Corey Hulen2015-09-231-2/+2
| |
* | Merge branch 'master' into PLT-11-email=Corey Hulen2015-09-231-0/+5
|\ \ | |/ |/|
| * Implement UI theme colors.JoramWilander2015-09-231-0/+5
| |
* | Fixing merge conflict=Corey Hulen2015-09-221-1/+1
| |
* | Fixing merge conflict=Corey Hulen2015-09-225-1/+229
|\|
| * Implement incoming webhooks.JoramWilander2015-09-215-1/+229
| |
* | Adding service settings to admin console=Corey Hulen2015-09-222-15/+12
| |
* | Adding team settings to admin console=Corey Hulen2015-09-222-6/+4
| |
* | Adding SQL settings to admin console=Corey Hulen2015-09-221-2/+2
| |
* | Fixing unit tests=Corey Hulen2015-09-211-2/+12
| |
* | Adding rate limiter settings to the admin console=Corey Hulen2015-09-211-13/+9
| |
* | Adding privacy to admin console=Corey Hulen2015-09-211-2/+0
| |
* | Adding image properties=Corey Hulen2015-09-211-17/+22
| |
* | Adding email to admin console=Corey Hulen2015-09-212-9/+21
|/
* Merge pull request #709 from mattermost/PLT-11Harrison Healey2015-09-182-0/+169
|\ | | | | PLT-11 adding config for logs to UI