summaryrefslogtreecommitdiffstats
path: root/model
Commit message (Collapse)AuthorAgeFilesLines
...
* | | partial fix for UI=Corey Hulen2016-01-085-22/+111
| | |
* | | PLT-1429 adding sql storage for slash commands=Corey Hulen2016-01-062-29/+182
|/ /
* | Merge pull request #1813 from mattermost/PLT-1558Harrison Healey2016-01-062-14/+31
|\ \ | |/ |/| PLT-1558 adding session length to config file
| * Adding UI for session length settings=Corey Hulen2016-01-051-8/+1
| |
| * PLT-1558 adding session length to config file=Corey Hulen2016-01-052-14/+38
| |
* | PLT-1485 Adding last view channel sticky=Corey Hulen2016-01-051-0/+3
|/
* Merge pull request #1745 from mattermost/plt-1118Christopher Speller2016-01-042-0/+25
|\ | | | | PLT-1118 Add ability to switch between SSO and email account
| * Add ability to switch between SSO and email accountJoramWilander2015-12-172-0/+25
| |
* | Merge pull request #1770 from mattermost/GIT-1766Christopher Speller2016-01-041-1/+1
|\ \ | | | | | | GIT-1766 fixing typo
| * | GIT-1766 fixing typo=Corey Hulen2015-12-231-1/+1
| |/
* | Merge pull request #1763 from benburkert/non-s3-regionChristopher Speller2016-01-041-15/+29
|\ \ | | | | | | support unofficial S3 regions
| * | support unofficial S3 regionsBen Burkert2015-12-211-15/+29
| |/ | | | | | | Adds support for S3 clones like Ceph.
* | Fixed TestGetFile unit testhmhealey2015-12-182-1/+13
| |
* | Added additional information to getFileInfo api callhmhealey2015-12-182-0/+136
|/
* Some refactoringChristopher Speller2015-12-163-7/+71
|
* Merge pull request #1710 from mattermost/plt-1498Christopher Speller2015-12-162-3/+27
|\ | | | | PLT-1498 Add hashtag testing and allow special german characters
| * Add hashtag testing and allow special german charactersJoramWilander2015-12-112-3/+27
| |
* | Adding error bar message when console error detected=Corey Hulen2015-12-141-0/+6
| |
* | 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
|