summaryrefslogtreecommitdiffstats
path: root/model
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | 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
| |\
| | * 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
| |\
| | * 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
|\ \ | |/ |/|
| * 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
|\
| * 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=Corey Hulen2015-12-231-1/+1
| |/
* | Merge pull request #1763 from benburkert/non-s3-regionChristopher Speller2016-01-041-15/+29
|\ \
| * | support unofficial S3 regionsBen Burkert2015-12-211-15/+29
| |/
* | 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
|\
| * 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
|\ \
| * | 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
|\ \ | |/ |/|
| * Added legal and support settings to sys console and implemented support for o...Reed Garmsen2015-12-101-0/+39
* | Merge pull request #1652 from hmhealey/plt1319Corey Hulen2015-12-111-8/+9
|\ \
| * | Added preference_changed web socket eventhmhealey2015-12-071-8/+9
generated by cgit v1.2.3-1-g7c22 (git 2.25.1) at 2024-06-28 21:00:24 +0000