summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Fixing merge=Corey Hulen2016-03-1790-1590/+2706
|\
| * 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
| | |/ / /
| * | | | Merge pull request #2441 from FeliciousX/patch-1Corey Hulen2016-03-171-1/+1
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Path in docker differs for CDChurchill Lee2016-03-161-1/+1
| * | | | Merge pull request #2169 from kernicPanel/external-slashcommands-managementChristopher Speller2016-03-1714-150/+332
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | toggle incompatible settings viewsNicolas Clerc2016-03-171-119/+135
| | * | | wording + localizationNicolas Clerc2016-03-172-2/+3
| | * | | use pre-released featuresNicolas Clerc2016-03-174-29/+56
| | * | | fix TestListCommandsNicolas Clerc2016-03-172-3/+9
| | * | | eslint error: validate suggestion_box channelId propNicolas Clerc2016-03-171-0/+1
| | * | | fix eslint errorsNicolas Clerc2016-03-171-4/+1
| | * | | add external slashcommands managementNicolas Clerc2016-03-179-29/+163
| * | | | Merge pull request #2424 from hmhealey/escapeHarrison Healey2016-03-171-0/+5
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Changed mention parser to ignore empty string mentionsHarrison Healey2016-03-171-0/+5
| |/ / /
| * | | Merge pull request #2459 from ZBoxApp/server-es-locsChristopher Speller2016-03-172-4/+8
| |\ \ \
| | * | | Added Missing es server locs and sort by idElias Nahum2016-03-172-4/+8
| * | | | Merge pull request #2448 from asaadmahmoodspin/ui-improvementsChristopher Speller2016-03-1757-1294/+1641
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Removing package.jsonAsaad Mahmood2016-03-171-56/+0
| | * | | Reordering styles.scss fileAsaad Mahmood2016-03-171-1/+1
| | * | | Updating sidebarAsaad Mahmood2016-03-171-1/+0
| | * | | Updating asss lint stuff with other scss improvementsAsaad Mahmood2016-03-1757-1293/+1697
| | |/ /
* | | | 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
|\| | |
| * | | Merge pull request #2436 from rodrigocorsi2/pt_translationsCorey Hulen2016-03-162-23/+21
| |\ \ \
| | * | | added missing translations in ptRodrigo Corsi2016-03-162-23/+21
| | |/ /
| * | | Merge pull request #2427 from ZBoxApp/PLT-2342Corey Hulen2016-03-161-18/+24
| |\ \ \
| | * | | PLT-2342: Incorrect formatting of last password update string in all languagesElias Nahum2016-03-161-18/+24
| | |/ /
| * | | Merge pull request #2426 from ZBoxApp/es-locsCorey Hulen2016-03-164-7/+18
| |\ \ \ | | |/ / | |/| |
| | * | Add missing spanish locale stringsElias Nahum2016-03-164-7/+18
| |/ /
| * | Merge pull request #2451 from mattermost/PLT-2344Joram Wilander2016-03-162-15/+22
| |\ \
| | * | PLT-2344 support 3 versions back=Corey Hulen2016-03-162-15/+22
| | |/
| * | Merge pull request #2419 from mattermost/plt-2044Christopher Speller2016-03-165-10/+25
| |\ \
| | * | Auto-create account if team allows sign-up from login page and oauth account ...JoramWilander2016-03-115-10/+25
| * | | Merge pull request #2430 from mattermost/changelog-to-docsChristopher Speller2016-03-161-1299/+1
| |\ \ \
| | * | | Moving CHANGELOG to docsit332016-03-141-1299/+1
| * | | | Merge pull request #2453 from mattermost/plt-2340Christopher Speller2016-03-165165-1655065/+61125
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Converting to Webpack. Stage 1.Christopher Speller2016-03-165165-1655065/+61125
| |/ / /
| * | | Merge pull request #2431 from mattermost/fix-segChristopher Speller2016-03-151-1/+1
| |\ \ \
| | * | | Fixing segment tracking=Corey Hulen2016-03-141-1/+1
| | |/ /
| * | | Merge pull request #2429 from asaadmahmoodspin/ui-improvementsChristopher Speller2016-03-15111-5013/+5463
| |\ \ \ | | |/ / | |/| |