summaryrefslogtreecommitdiffstats
path: root/model
Commit message (Collapse)AuthorAgeFilesLines
* Merge release branch 'release-1.2'Christopher Speller2015-11-161-0/+1
|\
| * Updating version to 1.2.1Christopher Speller2015-11-161-0/+1
| |
* | Added ChannelExtra.MemberCount field to reflect the actual member count when ↵hmhealey2015-11-121-2/+3
| | | | | | | | we truncate the list of members to 20
* | Merge pull request #1396 from 42wim/useractivityJoram Wilander2015-11-111-1/+0
|\ \ | | | | | | Do not clear LastActivityAt for GetProfiles
| * | Do not clear LastActivityAt for GetProfilesWim2015-11-111-1/+0
| | |
* | | Fix: Unable to change passwordFlorian Orben2015-11-111-1/+1
|/ /
* / Omit unneeded fields from user object in getProfiles service and remove ↵JoramWilander2015-11-092-22/+33
|/ | | | ImgCount field from Post model
* Updating version to v1.2.0Christopher Speller2015-11-091-0/+1
|
* Add tutorial pref for new users by defaultJoramWilander2015-11-061-0/+1
|
* Merge pull request #1334 from mattermost/plt-121Joram Wilander2015-11-063-6/+170
|\ | | | | PLT-121 Fixing searching for quotations
| * Fixing searching for quotationsChristopher Speller2015-11-063-6/+170
| |
* | Merge pull request #1332 from mattermost/plt-560Christopher Speller2015-11-061-0/+7
|\ \ | | | | | | PLT-560 Prevent SSO users from changing their email
| * | Prevent SSO users from changing their emailJoramWilander2015-11-061-0/+7
| |/
* / PLT-857: Support for Incoming Webhooks - Try #2Florian Orben2015-11-053-26/+51
|/
* Fixed string length checks for fields that can contain unicode charactershmhealey2015-11-056-12/+18
|
* Merge pull request #1289 from mattermost/plt-516-2Joram Wilander2015-11-041-2/+2
|\ | | | | PLT-516 Part 1 of performance fixes for large teams
| * Revert model/version.goJoramWilander2015-11-031-4/+4
| |
| * Updated getStatuses unit testgsJoramWilander2015-11-032-6/+6
| |
* | Merge pull request #1285 from mattermost/plt-824Joram Wilander2015-11-041-0/+18
|\ \ | |/ |/| PLT-824 Adding ability to fetch posts around a specifc post
| * Adding ability to fetch posts around a specifc postChristopher Speller2015-11-031-0/+18
| |
* | Merge pull request #1249 from mattermost/plt-823Harrison Healey2015-11-021-1/+0
|\ \ | | | | | | PLT-823 Refactor of center channel
| * | Refactoring center channelChristopher Speller2015-11-021-1/+0
| |/
* / Validate callback urls on the server and add help text to outgoing webhooksJoramWilander2015-11-023-0/+24
|/
* Merge pull request #1211 from mattermost/PLT-340Joram Wilander2015-10-303-13/+26
|\ | | | | PLT-340 allow team directory and open invites
| * PLT-340=Corey Hulen2015-10-273-7/+13
| |
| * Merge branch 'master' into PLT-340=Corey Hulen2015-10-278-44/+223
| |\
| * | Adding new fields to team model=Corey Hulen2015-10-261-10/+17
| | |
* | | 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