summaryrefslogtreecommitdiffstats
path: root/model
Commit message (Collapse)AuthorAgeFilesLines
* Small refactor of websocket code on client and serverJoramWilander2015-10-161-8/+8
|
* Merge pull request #1079 from hmhealey/initprefsChristopher Speller2015-10-161-0/+9
|\ | | | | Added an initial call to get all user preferences on page load
| * Added an initial call to get all user preferences on page loadhmhealey2015-10-151-0/+9
| |
* | Merge pull request #1049 from apaatsio/full-teams-dataJoram Wilander2015-10-162-1/+7
|\ \ | |/ |/| Use display name instead of name in team switcher menu
| * Sanitize team dataAntti Ahti2015-10-141-0/+6
| | | | | | | | We don't want to expose sensitive data that might pose a security risk.
| * Use team display name in team switcher menuAntti Ahti2015-10-141-1/+1
| | | | | | | | | | - /teams/find_teams returns team objects instead of just team names - use display_name in UI instead of name in the team switch menu
* | Marking when user ran the unit tests=Corey Hulen2015-10-151-0/+6
|/
* Made further changes based on feedbackhmhealey2015-10-132-21/+5
|
* Removed Preference.AltIdhmhealey2015-10-134-29/+31
|
* Made structural changes to server-side Preference code based on feedbackhmhealey2015-10-133-25/+36
|
* Renamed show_hide preference to showhmhealey2015-10-132-3/+3
|
* Added api to get and set preferenceshmhealey2015-10-132-0/+38
|
* Added Preferences table to store user preferenceshmhealey2015-10-131-2/+4
|
* Added model class for user preferences objecthmhealey2015-10-132-0/+136
|
* PLT-586 fixing issues with security alert=Corey Hulen2015-10-091-3/+10
|
* Adding release 1.1.0 versionChristopher Speller2015-10-081-0/+1
|
* Changing SpinPunch to Mattermost in copyrightChristopher Speller2015-10-0849-49/+49
|
* 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
| |\