summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge release branch commitsChristopher Speller2016-03-216-75/+49
* Merge pull request #2475 from mattermost/plt-1606Christopher Speller2016-03-213-7/+15
|\
| * Removed search test case where MySQL and PostgreSQL didn't agreeJoramWilander2016-03-181-4/+0
| * Update search unit testsJoramWilander2016-03-181-2/+7
| * Change searches to AND terms instead of ORJoramWilander2016-03-181-1/+8
* | Merge pull request #2481 from khoa-le/PLT-2018Christopher Speller2016-03-211-1/+5
|\ \
| * | After clicking "Use a different address" hitting enter should submit the "Use...Khoa, Le Ngoc2016-03-191-1/+5
* | | Merge pull request #2482 from khoa-le/PLT-2017Christopher Speller2016-03-212-1/+18
|\ \ \ | |/ / |/| |
| * | System Console > Legal and Support Settings: If a link does not include http ...Khoa, Le Ngoc2016-03-192-1/+18
|/ /
* | Merge pull request #2473 from ZBoxApp/compliance-esCorey Hulen2016-03-184-93/+186
|\ \
| * | Add spanish translations for complianceElias Nahum2016-03-184-95/+186
* | | Merge pull request #2476 from mattermost/revert-2169-external-slashcommands-m...Christopher Speller2016-03-1814-332/+150
|\ \ \
| * | | Revert "PLT-2183 Slash command auto-complete"Christopher Speller2016-03-1814-332/+150
|/ / /
* | | Merge pull request #2472 from ZBoxApp/PLT-2392Christopher Speller2016-03-182-2/+3
|\ \ \ | |_|/ |/| |
| * | PLT-2392: Fix for Notification sound brokenElias Nahum2016-03-182-2/+3
| |/
* | Merge pull request #2471 from ZBoxApp/PLT-2368Harrison Healey2016-03-181-14/+16
|\ \ | |/ |/|
| * PLT-2368: Fix for Date of last profile picture update is showing [object][obj...Elias Nahum2016-03-181-14/+16
|/
* Merge pull request #2470 from mattermost/plt-2380Joram Wilander2016-03-184-28/+66
|\
| * Creating sepearate dev and prod webpack builds. Enabled webpack watch mode. U...Christopher Speller2016-03-184-28/+66
* | Merge pull request #2442 from mattermost/PLT-2115Corey Hulen2016-03-1737-84/+1935
|\ \ | |/ |/|
| * Fixing localization stuff=Corey Hulen2016-03-171-3/+0
| * Fixing localization stuff=Corey Hulen2016-03-171-20/+8
| * Fixing merge=Corey Hulen2016-03-1790-1590/+2706
| |\
| * | Fixing webpack=Corey Hulen2016-03-162-0/+3
| * | skipping version.go file=Corey Hulen2016-03-161-0/+1
| * | Fixing merge=Corey Hulen2016-03-162-2/+7
| * | merging files=Corey Hulen2016-03-165211-1667653/+72877
| |\ \
| * | | Fixing unit tests=Corey Hulen2016-03-152-6/+6
| * | | Fixing config file=Corey Hulen2016-03-151-1/+1
| * | | PLT-2115 Adding compliance=Corey Hulen2016-03-1536-211/+1791
| * | | Merge branch 'master' into PLT-2115=Corey Hulen2016-03-14203-5201/+3967
| |\ \ \
| * | | | PLT-2115 adding compliance=Corey Hulen2016-03-143-10/+14
| * | | | Updating interface=Corey Hulen2016-03-112-2/+2
| * | | | PLT-2115 adding compliance interfaces=Corey Hulen2016-03-114-4/+46
| * | | | PLT-2115 adding compliance feature to enterprise=Corey Hulen2016-03-106-0/+256
* | | | | Merge pull request #2456 from chengweiv5/fix-buildCorey Hulen2016-03-171-1/+3
|\ \ \ \ \
| * | | | | Makefile: fix for non-enterprise buildChengwei Yang2016-03-171-1/+3
| | |_|/ / | |/| | |
* | | | | Merge pull request #2418 from ZBoxApp/PLT-2053Christopher Speller2016-03-1713-7/+210
|\ \ \ \ \
| * | | | | Fix ESLint for code_preview.jsxElias Nahum2016-03-172-4/+1
| * | | | | Option to enable full snippets in push notificationsElias Nahum2016-03-1713-7/+210
* | | | | | Fxing make cleanChristopher Speller2016-03-171-1/+1
| |_|_|_|/ |/| | | |
* | | | | Fixing style issue caused by build changesChristopher Speller2016-03-172-4/+1
|/ / / /
* | | | Merge pull request #2380 from rodrigocorsi2/code_previewChristopher Speller2016-03-179-111/+434
|\ \ \ \
| * | | | Created component CodePreviewRodrigo Corsi2016-03-179-111/+434
* | | | | Merge pull request #2461 from hmhealey/teamdefaultChristopher Speller2016-03-173-4/+4
|\ \ \ \ \
| * | | | | Changed 'show username' display text to be more accurateHarrison Healey2016-03-173-4/+4
* | | | | | Merge pull request #2462 from mattermost/plt-2340Christopher Speller2016-03-1711-27/+285
|\ \ \ \ \ \
| * | | | | | Webpack optimizations and fixesChristopher Speller2016-03-1711-27/+285
* | | | | | | Merge pull request #2463 from mattermost/fix-mergeHarrison Healey2016-03-171-0/+0
|\ \ \ \ \ \ \
| * | | | | | | Fix bad scss mergeChristopher Speller2016-03-171-0/+0
| |/ / / / / /