summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Created component CodePreviewRodrigo Corsi2016-03-179-111/+434
* 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
| |/
* | 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
|\ \ \ | |/ / |/| |
| * | Updating pages to routesAsaad Mahmood2016-03-1512-1/+1
| * | Updating character in post.scssAsaad Mahmood2016-03-151-1/+1
| * | Reverting changes for core filesAsaad Mahmood2016-03-142-30/+5
| * | PLT-963 - Improving scss structureAsaad Mahmood2016-03-14113-5018/+5493
|/ /
* | Merge branch 'release-2.1'Christopher Speller2016-03-1420-55/+122
|\ \
| * \ Merge pull request #2412 from asaadmahmoodspin/ui-improvementsChristopher Speller2016-03-125-4/+38
| |\ \
| | * | Adding or separator between ldap, username, email, githubAsaad Mahmood2016-03-115-4/+38
| * | | Merge pull request #2416 from rodrigocorsi2/pt_translationsChristopher Speller2016-03-112-18/+36
| |\ \ \ | | |/ / | |/| |
| | * | standardized terminology for sign in and sign upRodrigo Corsi2016-03-102-15/+15
| | * | added missing translationsRodrigo Corsi2016-03-102-3/+21
| * | | Merge pull request #2417 from hmhealey/plt2264Christopher Speller2016-03-111-6/+14
| |\ \ \
| | * | | Disabled embed toggle when it's disabled in user settingsHarrison Healey2016-03-101-6/+14
| * | | | Merge pull request #2414 from mattermost/bluebar-fixChristopher Speller2016-03-112-8/+8
| |\ \ \ \
| | * | | | Fixing blue bar on iOS=Corey Hulen2016-03-102-8/+8
| * | | | | Merge pull request #2413 from asaadmahmoodspin/themeFixChristopher Speller2016-03-113-17/+18
| |\ \ \ \ \ | | |/ / / / | |/| | | |