summaryrefslogtreecommitdiffstats
path: root/model
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #2049 from mattermost/plt-1856Christopher Speller2016-02-031-0/+9
|\ | | | | PLT-1856 Add basic server audit tab to system console for EE
| * 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 ↵Reed Garmsen2016-02-022-0/+25
|/ | | | config settings
* 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
|\ | | | | PLT-1586 adding LDAP/OAuth to iOS
| * 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
|/
* 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
| | | | - Add spanish translations
* Merge pull request #1956 from mattermost/plt-1779Corey Hulen2016-01-222-2/+10
|\ | | | | PLT-1779 Add system-wide statistics page
| * Added unit test and fixed errorsJoramWilander2016-01-221-1/+10
| |
| * Add create_at back to profile fields to fix analyticsJoramWilander2016-01-221-1/+0
| |
* | Merge pull request #1924 from loafoe/masterChristopher Speller2016-01-211-0/+10
|\ \ | |/ |/| [#1923] Make Websocket ports configurable
| * 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
| |
* | PLT-7-server-db=Corey Hulen2016-01-202-8/+33
| |
* | Fxing version=Corey Hulen2016-01-191-1/+1
| |
* | PLT-7 Adding translation function to context=Corey Hulen2016-01-192-2/+11
|/
* Final updatesJoramWilander2016-01-141-3/+20
|
* Add some unit testsJoramWilander2016-01-142-1/+35
|
* Added license validation and settingsJoramWilander2016-01-141-0/+68
|
* Merge pull request #1852 from mattermost/PLT-1608Joram Wilander2016-01-121-1/+1
|\ | | | | PLT-1608 Upgrading logging package
| * Upgrade logging package=Corey Hulen2016-01-111-1/+1
| |
* | Release 1.4 rc1=Corey Hulen2016-01-111-0/+1
|/
* Merge pull request #1824 from hmhealey/plt1525Joram Wilander2016-01-112-4/+4
|\ | | | | PLT-1525 Fixed ChannelInviteModal displaying some users that are already in the channel
| * Added the ability to get more channel members from getChannelExtraInfohmhealey2016-01-062-4/+4
| |
* | 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