Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #2472 from ZBoxApp/PLT-2392 | Christopher Speller | 2016-03-18 | 2 | -2/+3 |
|\ | | | | | PLT-2392: Fix for Notification sound broken | ||||
| * | PLT-2392: Fix for Notification sound broken | Elias Nahum | 2016-03-18 | 2 | -2/+3 |
| | | |||||
* | | PLT-2368: Fix for Date of last profile picture update is showing ↵ | Elias Nahum | 2016-03-18 | 1 | -14/+16 |
|/ | | | | [object][object] | ||||
* | Merge pull request #2470 from mattermost/plt-2380 | Joram Wilander | 2016-03-18 | 3 | -25/+60 |
|\ | | | | | PLT-2380 Improvements to webpack build system + watch mode | ||||
| * | Creating sepearate dev and prod webpack builds. Enabled webpack watch mode. ↵ | Christopher Speller | 2016-03-18 | 3 | -25/+60 |
| | | | | | | | | Updated to latest master webpack to fix bug in watch mode | ||||
* | | Merge pull request #2442 from mattermost/PLT-2115 | Corey Hulen | 2016-03-17 | 12 | -26/+847 |
|\ \ | |/ |/| | PLT-2115 adding compliance feature | ||||
| * | Fixing localization stuff | =Corey Hulen | 2016-03-17 | 1 | -3/+0 |
| | | |||||
| * | Fixing localization stuff | =Corey Hulen | 2016-03-17 | 1 | -20/+8 |
| | | |||||
| * | Fixing merge | =Corey Hulen | 2016-03-17 | 73 | -1548/+2159 |
| |\ | |||||
| * | | Fixing webpack | =Corey Hulen | 2016-03-16 | 2 | -0/+3 |
| | | | |||||
| * | | Fixing merge | =Corey Hulen | 2016-03-16 | 2 | -0/+660 |
| | | | |||||
| * | | merging files | =Corey Hulen | 2016-03-16 | 10 | -26/+199 |
| | | | |||||
* | | | Merge pull request #2418 from ZBoxApp/PLT-2053 | Christopher Speller | 2016-03-17 | 3 | -3/+53 |
|\ \ \ | | | | | | | | | PLT-2053: Option to enable full snippets in push notifications | ||||
| * | | | Fix ESLint for code_preview.jsx | Elias Nahum | 2016-03-17 | 2 | -4/+1 |
| | | | | |||||
| * | | | Option to enable full snippets in push notifications | Elias Nahum | 2016-03-17 | 3 | -3/+53 |
| | | | | |||||
* | | | | Fxing make clean | Christopher Speller | 2016-03-17 | 1 | -1/+1 |
| |_|/ |/| | | |||||
* | | | Fixing style issue caused by build changes | Christopher Speller | 2016-03-17 | 2 | -4/+1 |
|/ / | |||||
* | | 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 | 3 | -12/+43 |
|\ \ \ \ | |_|/ / |/| | | | PLT-2340 Webpack optimizations and fixes | ||||
| * | | | Webpack optimizations and fixes | Christopher Speller | 2016-03-17 | 3 | -12/+43 |
| | | | | |||||
* | | | | Merge pull request #2169 from kernicPanel/external-slashcommands-management | Christopher Speller | 2016-03-17 | 9 | -128/+214 |
|\ \ \ \ | |/ / / |/| | | | 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 |
| | | | | |||||
| * | | | 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 | 6 | -10/+54 |
| | | | | |||||
* | | | | Changed mention parser to ignore empty string mentions | Harrison Healey | 2016-03-17 | 1 | -0/+5 |
| |/ / |/| | | |||||
* | | | Merge pull request #2448 from asaadmahmoodspin/ui-improvements | Christopher Speller | 2016-03-17 | 55 | -1294/+1463 |
|\ \ \ | |_|/ |/| | | Updating sass lint stuff with other scss improvements | ||||
| * | | 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 | 54 | -1293/+1463 |
| |/ | |||||
* | | Merge pull request #2436 from rodrigocorsi2/pt_translations | Corey Hulen | 2016-03-16 | 1 | -3/+13 |
|\ \ | | | | | | | added missing translations in pt | ||||
| * | | added missing translations in pt | Rodrigo Corsi | 2016-03-16 | 1 | -3/+13 |
| |/ | |||||
* | | 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 |
| |/ | |||||
* / | Add missing spanish locale strings | Elias Nahum | 2016-03-16 | 2 | -3/+6 |
|/ | |||||
* | Converting to Webpack. Stage 1. | Christopher Speller | 2016-03-16 | 3258 | -0/+334019 |