summaryrefslogtreecommitdiffstats
path: root/webapp
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #2442 from mattermost/PLT-2115Corey Hulen2016-03-1712-26/+847
|\
| * Fixing localization stuff=Corey Hulen2016-03-171-3/+0
| * Fixing localization stuff=Corey Hulen2016-03-171-20/+8
| * Fixing merge=Corey Hulen2016-03-1773-1548/+2159
| |\
| * | Fixing webpack=Corey Hulen2016-03-162-0/+3
| * | Fixing merge=Corey Hulen2016-03-162-0/+660
| * | merging files=Corey Hulen2016-03-1610-26/+199
* | | Merge pull request #2418 from ZBoxApp/PLT-2053Christopher Speller2016-03-173-3/+53
|\ \ \
| * | | Fix ESLint for code_preview.jsxElias Nahum2016-03-172-4/+1
| * | | Option to enable full snippets in push notificationsElias Nahum2016-03-173-3/+53
* | | | 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-173-12/+43
|\ \ \ \ | |_|/ / |/| | |
| * | | Webpack optimizations and fixesChristopher Speller2016-03-173-12/+43
* | | | Merge pull request #2169 from kernicPanel/external-slashcommands-managementChristopher Speller2016-03-179-128/+214
|\ \ \ \ | |/ / / |/| | |
| * | | 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
| * | | 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-176-10/+54
* | | | Changed mention parser to ignore empty string mentionsHarrison Healey2016-03-171-0/+5
| |/ / |/| |
* | | Merge pull request #2448 from asaadmahmoodspin/ui-improvementsChristopher Speller2016-03-1755-1294/+1463
|\ \ \ | |_|/ |/| |
| * | 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-1754-1293/+1463
| |/
* | Merge pull request #2436 from rodrigocorsi2/pt_translationsCorey Hulen2016-03-161-3/+13
|\ \
| * | added missing translations in ptRodrigo Corsi2016-03-161-3/+13
| |/
* | 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
| |/
* / Add missing spanish locale stringsElias Nahum2016-03-162-3/+6
|/
* Converting to Webpack. Stage 1.Christopher Speller2016-03-163258-0/+334019