summaryrefslogtreecommitdiffstats
path: root/model
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #2073 from mattermost/ee-updatesCorey Hulen2016-02-042-0/+27
|\ | | | | Some general updates to EE
| * Move license storage to databaseJoramWilander2016-02-042-0/+27
| |
* | Merge pull request #2064 from hmhealey/plt882Christopher Speller2016-02-042-0/+3
|\ \ | |/ |/| PLT-882 Ephemeral Messages and Out-Of-Channel mentions
| * 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
| |\ | | | | | | 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
* | 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
| |\ | | | | | | 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
| |/
* | 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
| | | | | | | | - 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
| | |
* | | merging=Corey Hulen2016-01-223-9/+54
|\| |
| * | 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
| |/
* | Merge branch 'master' into PLT-1429=Corey Hulen2016-01-145-5/+125
|\|
| * 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
| | |
* | | adding different commands=Corey Hulen2016-01-091-0/+1
| | |
* | | Adding web service methods=Corey Hulen2016-01-083-2/+42
| | |
* | | 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
| |