summaryrefslogtreecommitdiffstats
path: root/model
Commit message (Collapse)AuthorAgeFilesLines
* Fixing merge conflict=Corey Hulen2015-10-223-10/+16
|\
| * Fixing unit tests=Corey Hulen2015-10-201-4/+4
| |
| * Fixing unit test=Corey Hulen2015-10-201-4/+4
| |
| * PLT-350 allow ability to disable restricted team names=Corey Hulen2015-10-202-2/+8
| |
* | Merge branch 'master' into PLT-44=Corey Hulen2015-10-205-11/+211
|\|
| * Merge branch 'release-1.1.0'Christopher Speller2015-10-201-8/+8
| |\
| | * Allowing salts longer than 32 chars=Corey Hulen2015-10-191-8/+8
| | |
| * | Merge pull request #1116 from sharms/masterJoram Wilander2015-10-201-1/+1
| |\ \ | | | | | | | | Fixed missing colon
| | * | Fixed missing colonSteven Harms2015-10-191-1/+1
| | | |
| * | | Merge pull request #1113 from hmhealey/plt716Joram Wilander2015-10-203-2/+202
| |\ \ \ | | |/ / | |/| | PLT-716/717 Added from:, in:, and channel: search filters
| | * | Added from:, in:, and channel: search modifiershmhealey2015-10-193-2/+202
| | | |
* | | | Multi-session login=Corey Hulen2015-10-201-12/+13
| | | |
* | | | Adding multi-session cookie=Corey Hulen2015-10-202-14/+14
|/ / /
* | | Merge pull request #1108 from mattermost/plt-235Harrison Healey2015-10-196-0/+269
|\ \ \ | | | | | | | | PLT-235 Implement outgoing webhooks.
| * | | Refactor to hit database less often.JoramWilander2015-10-191-0/+14
| | | |
| * | | Remove temporary test code.JoramWilander2015-10-191-4/+0
| | | |
| * | | Add api unit tests for outgoing webhooks.JoramWilander2015-10-191-0/+36
| | | |
| * | | Add model test for outgoing webhooks.JoramWilander2015-10-192-0/+97
| | | |
| * | | Implement outgoing webhooks.JoramWilander2015-10-194-0/+126
| | | |
* | | | Merge pull request #1072 from mattermost/plt-554Corey Hulen2015-10-191-8/+8
|\ \ \ \ | |/ / / |/| | | PLT-554 Small refactor of websocket code on client and server
| * | | Small refactor of websocket code on client and serverJoramWilander2015-10-161-8/+8
| |/ /
* | | Merge pull request #1085 from mattermost/plt-633Harrison Healey2015-10-161-0/+5
|\ \ \ | |/ / |/| | PLT-633 Add default username and icon to incoming webhooks.
| * | Add default username and icon to incoming webhooks.JoramWilander2015-10-161-0/+5
| | |
* | | 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
| | |
generated by cgit v1.2.3-1-g7c22 (git 2.25.1) at 2024-10-30 09:21:37 +0000