summaryrefslogtreecommitdiffstats
path: root/model
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #1199 from hmhealey/plt600Corey Hulen2015-10-283-5/+39
|\ | | | | PLT-600 Renamed channel description to channel header and added channel purpose field
| * Added Channel.Purpose on the serverhmhealey2015-10-273-0/+34
| |
| * Renamed Channel.Description to Channel.Header on the serverhmhealey2015-10-272-5/+5
| |
* | Merge branch 'master' into PLT-25=Corey Hulen2015-10-266-45/+124
|\|
| * Merge pull request #1194 from mattermost/webhook-requestCorey Hulen2015-10-261-0/+18
| |\ | | | | | | Parse incoming webhook requests into model instead of string map
| | * Remove unused iconemoji fieldJoramWilander2015-10-261-1/+0
| | |
| | * Parse incoming webhook requsets into model instead of string mapJoramWilander2015-10-261-0/+19
| | |
| * | Merge pull request #1164 from hmhealey/plt778Corey Hulen2015-10-264-44/+104
| |\ \ | | |/ | |/| PLT-778 Changed post searching to allow searching by multiple users/channels
| | * Moved logic for searching for posts by multiple users/channels into the sql ↵hmhealey2015-10-261-39/+28
| | | | | | | | | | | | query
| | * Changed post searching to allow searching by multiple users/channelshmhealey2015-10-234-42/+113
| | |
| * | Mattermost can not send message start with slashFlorian Orben2015-10-251-1/+2
| | | | | | | | | | | | resolves #827
* | | Merge branch 'master' into PLT-25=Corey Hulen2015-10-232-14/+15
|\| |
| * | Fixing merge conflict=Corey Hulen2015-10-223-10/+16
| |\|
| * | Merge branch 'master' into PLT-44=Corey Hulen2015-10-205-11/+211
| |\ \
| * | | Multi-session login=Corey Hulen2015-10-201-12/+13
| | | |
| * | | Adding multi-session cookie=Corey Hulen2015-10-202-14/+14
| | | |
* | | | Adding analytics tab=Corey Hulen2015-10-223-0/+101
| |_|/ |/| |
* | | 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 '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
| | |
* | | 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
|