Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #2380 from rodrigocorsi2/code_preview | Christopher Speller | 2016-03-17 | 9 | -111/+434 |
|\ | | | | | Created component CodePreview | ||||
| * | Created component CodePreview | Rodrigo Corsi | 2016-03-17 | 9 | -111/+434 |
| | | |||||
* | | Merge pull request #2461 from hmhealey/teamdefault | Christopher Speller | 2016-03-17 | 3 | -4/+4 |
|\ \ | | | | | | | Changed 'show username' display text to be more accurate | ||||
| * | | Changed 'show username' display text to be more accurate | Harrison Healey | 2016-03-17 | 3 | -4/+4 |
| | | | |||||
* | | | Merge pull request #2462 from mattermost/plt-2340 | Christopher Speller | 2016-03-17 | 11 | -27/+285 |
|\ \ \ | | | | | | | | | PLT-2340 Webpack optimizations and fixes | ||||
| * | | | Webpack optimizations and fixes | Christopher Speller | 2016-03-17 | 11 | -27/+285 |
| | | | | |||||
* | | | | Merge pull request #2463 from mattermost/fix-merge | Harrison Healey | 2016-03-17 | 1 | -0/+0 |
|\ \ \ \ | | | | | | | | | | | Fix bad scss merge | ||||
| * | | | | Fix bad scss merge | Christopher Speller | 2016-03-17 | 1 | -0/+0 |
| |/ / / | |||||
* | | | | Merge pull request #2441 from FeliciousX/patch-1 | Corey Hulen | 2016-03-17 | 1 | -1/+1 |
|\ \ \ \ | |_|_|/ |/| | | | Path in docker differs for CD | ||||
| * | | | Path in docker differs for CD | Churchill Lee | 2016-03-16 | 1 | -1/+1 |
| | | | | | | | | | | | | Running docker will fail because it can't CD into the mattermost directory | ||||
* | | | | Merge pull request #2169 from kernicPanel/external-slashcommands-management | Christopher Speller | 2016-03-17 | 14 | -150/+332 |
|\ \ \ \ | |_|/ / |/| | | | PLT-2183 Slash command auto-complete | ||||
| * | | | toggle incompatible settings views | Nicolas Clerc | 2016-03-17 | 1 | -119/+135 |
| | | | | |||||
| * | | | wording + localization | Nicolas Clerc | 2016-03-17 | 2 | -2/+3 |
| | | | | |||||
| * | | | use pre-released features | Nicolas Clerc | 2016-03-17 | 4 | -29/+56 |
| | | | | |||||
| * | | | fix TestListCommands | Nicolas Clerc | 2016-03-17 | 2 | -3/+9 |
| | | | | |||||
| * | | | eslint error: validate suggestion_box channelId prop | Nicolas Clerc | 2016-03-17 | 1 | -0/+1 |
| | | | | |||||
| * | | | fix eslint errors | Nicolas Clerc | 2016-03-17 | 1 | -4/+1 |
| | | | | |||||
| * | | | add external slashcommands management | Nicolas Clerc | 2016-03-17 | 9 | -29/+163 |
| | | | | |||||
* | | | | Merge pull request #2424 from hmhealey/escape | Harrison Healey | 2016-03-17 | 1 | -0/+5 |
|\ \ \ \ | |_|_|/ |/| | | | Changed mention parser to ignore empty string mentions | ||||
| * | | | Changed mention parser to ignore empty string mentions | Harrison Healey | 2016-03-17 | 1 | -0/+5 |
|/ / / | |||||
* | | | Merge pull request #2459 from ZBoxApp/server-es-locs | Christopher Speller | 2016-03-17 | 2 | -4/+8 |
|\ \ \ | | | | | | | | | Added Missing es server locs and sort by id | ||||
| * | | | Added Missing es server locs and sort by id | Elias Nahum | 2016-03-17 | 2 | -4/+8 |
| | | | | |||||
* | | | | Merge pull request #2448 from asaadmahmoodspin/ui-improvements | Christopher Speller | 2016-03-17 | 57 | -1294/+1641 |
|\ \ \ \ | |/ / / |/| | | | Updating sass lint stuff with other scss improvements | ||||
| * | | | Removing package.json | Asaad Mahmood | 2016-03-17 | 1 | -56/+0 |
| | | | | |||||
| * | | | Reordering styles.scss file | Asaad Mahmood | 2016-03-17 | 1 | -1/+1 |
| | | | | |||||
| * | | | Updating sidebar | Asaad Mahmood | 2016-03-17 | 1 | -1/+0 |
| | | | | |||||
| * | | | Updating asss lint stuff with other scss improvements | Asaad Mahmood | 2016-03-17 | 57 | -1293/+1697 |
| |/ / | |||||
* | | | Merge pull request #2436 from rodrigocorsi2/pt_translations | Corey Hulen | 2016-03-16 | 2 | -23/+21 |
|\ \ \ | | | | | | | | | added missing translations in pt | ||||
| * | | | added missing translations in pt | Rodrigo Corsi | 2016-03-16 | 2 | -23/+21 |
| |/ / | |||||
* | | | Merge pull request #2427 from ZBoxApp/PLT-2342 | Corey Hulen | 2016-03-16 | 1 | -18/+24 |
|\ \ \ | | | | | | | | | PLT-2342: Incorrect formatting of last password update string in all … | ||||
| * | | | PLT-2342: Incorrect formatting of last password update string in all languages | Elias Nahum | 2016-03-16 | 1 | -18/+24 |
| |/ / | |||||
* | | | Merge pull request #2426 from ZBoxApp/es-locs | Corey Hulen | 2016-03-16 | 4 | -7/+18 |
|\ \ \ | |/ / |/| | | Add missing spanish locale strings | ||||
| * | | Add missing spanish locale strings | Elias Nahum | 2016-03-16 | 4 | -7/+18 |
|/ / | |||||
* | | Merge pull request #2451 from mattermost/PLT-2344 | Joram Wilander | 2016-03-16 | 2 | -15/+22 |
|\ \ | | | | | | | PLT-2344 support 3 versions back | ||||
| * | | PLT-2344 support 3 versions back | =Corey Hulen | 2016-03-16 | 2 | -15/+22 |
| |/ | |||||
* | | Merge pull request #2419 from mattermost/plt-2044 | Christopher Speller | 2016-03-16 | 5 | -10/+25 |
|\ \ | | | | | | | PLT-2044 Auto-create account if team allows sign-up from login page and oauth … | ||||
| * | | Auto-create account if team allows sign-up from login page and oauth account ↵ | JoramWilander | 2016-03-11 | 5 | -10/+25 |
| | | | | | | | | | | | | doesn't exist | ||||
* | | | Merge pull request #2430 from mattermost/changelog-to-docs | Christopher Speller | 2016-03-16 | 1 | -1299/+1 |
|\ \ \ | | | | | | | | | Moving CHANGELOG to docs | ||||
| * | | | Moving CHANGELOG to docs | it33 | 2016-03-14 | 1 | -1299/+1 |
| | | | | |||||
* | | | | Merge pull request #2453 from mattermost/plt-2340 | Christopher Speller | 2016-03-16 | 5165 | -1655065/+61125 |
|\ \ \ \ | |_|_|/ |/| | | | PLT-2340 Converting to Webpack. Stage 1. | ||||
| * | | | Converting to Webpack. Stage 1. | Christopher Speller | 2016-03-16 | 5165 | -1655065/+61125 |
|/ / / | |||||
* | | | Merge pull request #2431 from mattermost/fix-seg | Christopher Speller | 2016-03-15 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Fixing segment tracking | ||||
| * | | | Fixing segment tracking | =Corey Hulen | 2016-03-14 | 1 | -1/+1 |
| |/ / | |||||
* | | | Merge pull request #2429 from asaadmahmoodspin/ui-improvements | Christopher Speller | 2016-03-15 | 111 | -5013/+5463 |
|\ \ \ | |/ / |/| | | PLT-963 - Improving scss structure | ||||
| * | | Updating pages to routes | Asaad Mahmood | 2016-03-15 | 12 | -1/+1 |
| | | | |||||
| * | | Updating character in post.scss | Asaad Mahmood | 2016-03-15 | 1 | -1/+1 |
| | | | |||||
| * | | Reverting changes for core files | Asaad Mahmood | 2016-03-14 | 2 | -30/+5 |
| | | | |||||
| * | | PLT-963 - Improving scss structure | Asaad Mahmood | 2016-03-14 | 113 | -5018/+5493 |
|/ / | |||||
* | | Merge branch 'release-2.1' | Christopher Speller | 2016-03-14 | 20 | -55/+122 |
|\ \ | |||||
| * \ | Merge pull request #2412 from asaadmahmoodspin/ui-improvements | Christopher Speller | 2016-03-12 | 5 | -4/+38 |
| |\ \ | | | | | | | | | Adding separators between ldap, username, email, github |