summaryrefslogtreecommitdiffstats
path: root/model
Commit message (Expand)AuthorAgeFilesLines
* merging files=Corey Hulen2016-03-162-1/+6
|\
| * Merge pull request #2451 from mattermost/PLT-2344Joram Wilander2016-03-161-0/+5
| |\
| | * PLT-2344 support 3 versions back=Corey Hulen2016-03-161-0/+5
| * | Converting to Webpack. Stage 1.Christopher Speller2016-03-161-1/+1
| |/
* | PLT-2115 Adding compliance=Corey Hulen2016-03-156-18/+245
* | Merge branch 'master' into PLT-2115=Corey Hulen2016-03-144-38/+39
|\|
| * Merge branch 'release-2.1'Christopher Speller2016-03-141-0/+1
| |\
| | * Bumping version to: 2.1.0-rc1Mattermost Build2016-03-091-0/+1
| * | Convering client to react-router.Christopher Speller2016-03-143-38/+38
| |/
* | PLT-2115 adding compliance interfaces=Corey Hulen2016-03-111-4/+5
* | PLT-2115 adding compliance feature to enterprise=Corey Hulen2016-03-102-0/+119
|/
* Stopped removing *s from the end of search phrasesHarrison Healey2016-03-043-2/+7
* Add default value to AllowCorsFrom settingElias Nahum2016-03-011-1/+6
* Allow CORSElias Nahum2016-03-011-0/+1
* Make sure the GitLab user has the required fieldsJoramWilander2016-02-121-2/+25
* Fixing version unit testChristopher Speller2016-02-091-10/+5
* Updating version.go for 2.0Christopher Speller2016-02-091-0/+1
* Make insecure TLS connections configurableJoramWilander2016-02-051-21/+27
* Merge pull request #2073 from mattermost/ee-updatesCorey Hulen2016-02-042-0/+27
|\
| * Move license storage to databaseJoramWilander2016-02-042-0/+27
* | Merge pull request #2064 from hmhealey/plt882Christopher Speller2016-02-042-0/+3
|\ \ | |/ |/|
| * Changed how posts are marked ephemeralhmhealey2016-02-041-7/+7
| * Added ephemeral messages sent when a user mentions someone not in the channelhmhealey2016-02-042-5/+8
* | PLT-1429 Fixing code review comments=Corey Hulen2016-02-041-1/+0
* | Fixing based on feedback=Corey Hulen2016-02-031-1/+1
* | Merge branch 'master' into PLT-1429=Corey Hulen2016-02-032-0/+34
|\|
| * Merge pull request #2049 from mattermost/plt-1856Christopher Speller2016-02-031-0/+9
| |\
| | * Add basic server audit tab to system console for EEJoramWilander2016-02-021-0/+9
| * | Added ability to sign in via username; separated email sign in and sign up co...Reed Garmsen2016-02-022-0/+25
| |/
* | Fixing version=Corey Hulen2016-02-021-1/+1
* | Adding loc to new command backend=Corey Hulen2016-02-011-10/+10
* | Fixing merge=Corey Hulen2016-02-017-68/+155
|\|
| * PLT-1765 allowing support of 2 previous versions=Corey Hulen2016-01-282-28/+84
| * Fixing build=Corey Hulen2016-01-271-1/+1
| * PLT-7 Removing AppError ctor=Corey Hulen2016-01-271-10/+0
| * Merge pull request #1993 from mattermost/PLT-1586Christopher Speller2016-01-271-0/+11
| |\
| | * Fixing version=Corey Hulen2016-01-261-1/+1
| | * PLT-1586 adding attach device id method=Corey Hulen2016-01-262-1/+12
| * | Updated serverside hashtag regex to ignore more punctuation around wordshmhealey2016-01-264-25/+54
| |/
* | merging=Corey Hulen2016-01-2516-138/+163
|\|
| * Fixed serverside errors occurring when getting files with no extensionhmhealey2016-01-252-5/+24
| * PLT-7: Refactoring models to use translations (chunk 6)Elias Nahum2016-01-2515-127/+129
| * Merge pull request #1956 from mattermost/plt-1779Corey Hulen2016-01-222-2/+10
| |\
| | * Added unit test and fixed errorsJoramWilander2016-01-221-1/+10
| | * Add create_at back to profile fields to fix analyticsJoramWilander2016-01-221-1/+0
* | | merging=Corey Hulen2016-01-223-9/+54
|\| |
| * | Merge pull request #1924 from loafoe/masterChristopher Speller2016-01-211-0/+10
| |\ \ | | |/ | |/|
| | * Optionally specify ws:// and wss:// port in configAndy Lo-A-Foe2016-01-191-0/+10
| * | tweaking=Corey Hulen2016-01-201-6/+5
| * | tweak=Corey Hulen2016-01-201-1/+1