summaryrefslogtreecommitdiffstats
path: root/model
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #1720 from rgarmsen2295/plt-860Harrison Healey2015-12-143-6/+6
|\ | | | | PLT 860 & 1116 - Changes test emails to include a '+' and fixes email verification issue with emails that included a '+'
| * Fixing issues caused by changing test emailsReed Garmsen2015-12-132-2/+2
| |
| * Updated emails in unit tests to include '+'Reed Garmsen2015-12-132-5/+5
| |
* | Merge pull request #1588 from rgarmsen2295/plt-881Joram Wilander2015-12-121-0/+39
|\ \ | |/ |/| PLT-881 Adds Legal and Support Settings to the System Console
| * Added legal and support settings to sys console and implemented support for ↵Reed Garmsen2015-12-101-0/+39
| | | | | | | | options in app
* | Merge pull request #1652 from hmhealey/plt1319Corey Hulen2015-12-111-8/+9
|\ \ | | | | | | PLT-1319 Fixed direct channels not being visible when no actual channel exists
| * | Added preference_changed web socket eventhmhealey2015-12-071-8/+9
| | |
* | | Fixed issue with Team Settings modal saving items instead of cancelling; ↵Reed Garmsen2015-12-105-5/+5
| | | | | | | | | | | | changed remaining copyrights
* | | Merge pull request #1688 from mattermost/fix-saltsChristopher Speller2015-12-103-0/+38
|\ \ \ | | | | | | | | Generate salts when empty
| * | | Fixing unit test=Corey Hulen2015-12-091-3/+0
| | | |
| * | | Generate salts when empty=Corey Hulen2015-12-093-0/+41
| | | |
* | | | Updating version to 1.3.0Christopher Speller2015-12-091-0/+1
|/ / /
* | | Fixing defaults=Corey Hulen2015-12-081-2/+2
| | |
* | | PLT-1302 fixing hiding email adddress=Corey Hulen2015-12-071-0/+8
|/ /
* | PLT-1380: Post system message when user updates channel headerFlorian Orben2015-12-041-1/+2
| |
* | PLT-1326: Enable channel posts of type join or leave not trigger unread ↵Florian Orben2015-12-042-3/+23
| | | | | | | | notifications
* | Add limit to Props size in Post tableJoramWilander2015-12-031-0/+4
| |
* | Merge pull request #1556 from npcode/sso-github-entJoram Wilander2015-12-021-1/+6
|\ \ | |/ |/| Make the Gitlab SSO Support compatible with Github Enterprise
| * Make the Gitlab SSO Support compatible with Github EnterpriseYi EungJun2015-12-021-1/+6
| | | | | | | | | | | | | | See doc/integrations/Single-Sign-On/Github.md for the usage. Note: I thought it should work also with Github.com but it failed with "Bad token type" error.
* | PLT-902 switching to push proxy server=Corey Hulen2015-11-303-5/+77
|/
* add unit testsFlorian Orben2015-11-271-0/+1
|
* upgrading libs=Corey Hulen2015-11-232-2/+2
|
* PLT-1087: return NewAppError instead of nilWim2015-11-191-1/+1
|
* 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
| | |