summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | Merge pull request #1926 from mattermost/PLT-7-contextCorey Hulen2016-01-1911-10/+193
|\ \ \ \ \ \
| * | | | | | 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=Corey Hulen2016-01-1941-0/+12241
|/ / / / / /
* | | | | | Merge pull request #1915 from pawelad/patch-1Corey Hulen2016-01-191-2/+4
|\ \ \ \ \ \
| * | | | | | Update Amazon-Elastic-Beanstalk.mdPaweł Adamczak2016-01-181-2/+4
* | | | | | | Merge pull request #1920 from pawelad/masterCorey Hulen2016-01-191-0/+0
|\ \ \ \ \ \ \
| * | | | | | | #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.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
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | 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 switchingJoramWilander2016-01-141-3/+3
| |/ / / / /
* | | | | | Merge pull request #1888 from mattermost/fix-droidCorey Hulen2016-01-141-3/+10
|\ \ \ \ \ \
| * \ \ \ \ \ 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
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | 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
|\ \ \ \ \
| * | | | | 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 iconsAsaad Mahmood2016-01-115-6/+20
* | | | | | | Merge pull request #1850 from mattermost/preview-modeCorey Hulen2016-01-132-2/+4
|\ \ \ \ \ \ \
| * | | | | | | Update email_settings.jsxit332016-01-091-1/+1
| * | | | | | | Update Configuration-Settings.mdit332016-01-091-1/+3
| * | | | | | | Documenting how Preview Mode turns offit332016-01-091-1/+1
* | | | | | | | Merge pull request #1878 from mattermost/release-1.4Corey Hulen2016-01-123-2/+2
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | / | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Fixing config file=Corey Hulen2016-01-121-2/+19
| * | | | | | Fixing docker files for 1.4 RC2=Corey Hulen2016-01-124-21/+4
* | | | | | | Merge pull request #1876 from mattermost/release-1.4Corey Hulen2016-01-126-5/+10
|\| | | | | | | |_|_|_|_|/ |/| | | | |
| * | | | | Update docker to 1.4 RC2=Corey Hulen2016-01-123-2/+2
| * | | | | Merge pull request #1872 from mattermost/plt-1667Corey Hulen2016-01-122-2/+4
| |\ \ \ \ \
| | * | | | | Add removal commentsJoramWilander2016-01-121-2/+2
| | * | | | | Support old oauth routesJoramWilander2016-01-122-2/+4
| * | | | | | Merge pull request #1862 from mattermost/lfbrock-patch-1Corey Hulen2016-01-121-0/+3
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Update CHANGELOG.mdlfbrock2016-01-111-0/+1
| | * | | | | Update CHANGELOG.mdlfbrock2016-01-111-1/+1
| | * | | | | Update CHANGELOG.mdlfbrock2016-01-111-1/+0
| | * | | | | Update CHANGELOG.mdlfbrock2016-01-111-0/+3
| * | | | | | Merge pull request #1866 from mattermost/fix-docker-14Corey Hulen2016-01-111-2/+2
| |\ \ \ \ \ \