summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #1867 from apskim/patch-1Joram Wilander2016-01-211-0/+22
|\ | | | | Parse Slack links in the attachment pretext and fields (Fix #1868)
| * Parse Slack links in the attachment fieldsAlex Polozov2016-01-111-0/+16
| |
| * Parse Slack links in the attachment pretextAlex Polozov2016-01-111-0/+6
| |
* | Merge pull request #1934 from mattermost/PLT-7-server-dbCorey Hulen2016-01-206-13/+47
|\ \ | | | | | | PLT-7-server-db
| * | tweaking=Corey Hulen2016-01-201-6/+5
| | |
| * | tweak=Corey Hulen2016-01-201-1/+1
| | |
| * | PLT-7-server-db=Corey Hulen2016-01-207-13/+48
|/ /
* | Merge pull request #1932 from mattermost/revert-1930-PLT-7-server-dbCorey Hulen2016-01-2056-1297/+1255
|\ \ | | | | | | Revert " PLT-7 adding loc for db calls"
| * | Revert " PLT-7 adding loc for db calls"Corey Hulen2016-01-2056-1297/+1255
|/ /
* | Merge pull request #1930 from mattermost/PLT-7-server-dbCorey Hulen2016-01-2056-1255/+1297
|\ \ | | | | | | PLT-7 adding loc for db calls
| * | PLT-7 adding loc db calls for users table=Corey Hulen2016-01-2033-320/+323
| | |
| * | PLT-7 adding loc db calls for posts table=Corey Hulen2016-01-2010-181/+182
| | |
| * | PLT-7 adding loc db calls for session table=Corey Hulen2016-01-2011-72/+75
| | |
| * | PLT-7 adding loc db calls for oauth table=Corey Hulen2016-01-2019-292/+303
| | |
| * | PLT-7 adding loc db calls for oauth table=Corey Hulen2016-01-207-67/+71
| | |
| * | PLT-7 adding loc db calls for webhooks table=Corey Hulen2016-01-208-86/+88
| | |
| * | PLT-7 adding loc db calls for team table=Corey Hulen2016-01-2012-109/+113
| | |
| * | PLT-7 adding loc db calls for system table=Corey Hulen2016-01-205-20/+22
| | |
| * | PLT-7 adding loc for db calls audits and prefs=Corey Hulen2016-01-2015-108/+120
|/ /
* | Merge pull request #1926 from mattermost/PLT-7-contextCorey Hulen2016-01-1911-10/+193
|\ \ | | | | | | PLT-7 Adding translation function to context
| * | Fxing version=Corey Hulen2016-01-191-1/+1
| | |
| * | PLT-7 Adding translation function to context=Corey Hulen2016-01-1912-11/+194
|/ /
* | Merge pull request #1921 from mattermost/PLT-7-server-libsCorey Hulen2016-01-1941-0/+12241
|\ \ | | | | | | PLT-7 adding server side libraries
| * | PLT-7 adding server side libraries=Corey Hulen2016-01-1941-0/+12241
|/ /
* | Merge pull request #1915 from pawelad/patch-1Corey Hulen2016-01-191-2/+4
|\ \ | | | | | | Update Amazon-Elastic-Beanstalk.md
| * | Update Amazon-Elastic-Beanstalk.mdPaweł Adamczak2016-01-181-2/+4
| | | | | | | | | Updated 'Dockerrun.aws.zip' link to newer, existing version
* | | Merge pull request #1920 from pawelad/masterCorey Hulen2016-01-191-0/+0
|\ \ \ | | | | | | | | #1916 - Fixed Dockerrun.aws.zip 1.4
| * | | #1916 - Fixed Dockerrun.aws.zip 1.4Paweł Adamczak2016-01-191-0/+0
| |/ /
* | | Merge pull request #1907 from cifvts/patch-4Corey Hulen2016-01-191-1/+1
|\ \ \ | |/ / |/| | Bump download link to version to 1.4.0
| * | Bump download link to version to 1.4.0Andrea Agosti2016-01-181-1/+1
|/ /
* | Remove extra config infoJoramWilander2016-01-141-24/+1
| |
* | Merge pull request #1894 from mattermost/release-1.4Corey Hulen2016-01-142-4/+4
|\ \ | | | | | | Release 1.4
| * | Fixing dockerfile for release=Corey Hulen2016-01-141-1/+1
| | |
| * | Merge pull request #1892 from mattermost/sso-email-fixCorey Hulen2016-01-141-3/+3
| |\ \ | | | | | | | | Encode url query properly for SSO switching
| | * | Encode url query properly for SSO switchingJoramWilander2016-01-141-3/+3
| |/ /
* | | Merge pull request #1888 from mattermost/fix-droidCorey Hulen2016-01-141-3/+10
|\ \ \ | | | | | | | | Fixing android push
| * \ \ Merge branch 'master' into fix-droid=Corey Hulen2016-01-142-2/+2
| |\ \ \ | |/ / / |/| | |
* | | | Fix old l4g referencesJoramWilander2016-01-142-2/+2
| | | |
| * | | Fixing android push=Corey Hulen2016-01-141-3/+10
|/ / /
* | | Minor fixJoramWilander2016-01-141-5/+0
| | |
* | | Merge pull request #1887 from mattermost/editionsJoram Wilander2016-01-1424-43/+900
|\ \ \ | | | | | | | | Editions
| * | | Final updatesJoramWilander2016-01-147-27/+86
| | | |
| * | | Fix error messageJoramWilander2016-01-141-5/+10
| | | |
| * | | Minor update to about modalJoramWilander2016-01-141-4/+1
| | | |
| * | | Remove bin from gitignoreJoramWilander2016-01-142-2/+0
| | | |
| * | | Add some unit testsJoramWilander2016-01-144-10/+105
| | | |
| * | | Added license validation and settingsJoramWilander2016-01-1420-33/+736
|/ / /
* | | Merge pull request #1855 from rgarmsen2295/plt-1006Corey Hulen2016-01-134-7/+45
|\ \ \ | | | | | | | | PLT-1006 Changed team statistics page to show usernames with email shown in a tooltip
| * | | Changed statistics to show usernames with an email tooltipReed Garmsen2016-01-114-7/+45
| | | |
* | | | Merge pull request #1853 from asaadmahmoodspin/ui-improvementsCorey Hulen2016-01-135-6/+20
|\ \ \ \ | | | | | | | | | | Adding away icon and changing online and offline icons