Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Change searches to AND terms instead of OR | JoramWilander | 2016-03-18 | 1 | -1/+8 |
| | |||||
* | Merge pull request #2471 from ZBoxApp/PLT-2368 | Harrison Healey | 2016-03-18 | 1 | -14/+16 |
|\ | | | | | PLT-2368: Fix for Date of last profile picture update is showing [obj… | ||||
| * | 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 | 4 | -28/+66 |
|\ | | | | | 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 | 4 | -28/+66 |
| | | | | | | | | Updated to latest master webpack to fix bug in watch mode | ||||
* | | Merge pull request #2442 from mattermost/PLT-2115 | Corey Hulen | 2016-03-17 | 37 | -84/+1935 |
|\ \ | |/ |/| | 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 | 90 | -1590/+2706 |
| |\ | |||||
| * | | Fixing webpack | =Corey Hulen | 2016-03-16 | 2 | -0/+3 |
| | | | |||||
| * | | skipping version.go file | =Corey Hulen | 2016-03-16 | 1 | -0/+1 |
| | | | |||||
| * | | Fixing merge | =Corey Hulen | 2016-03-16 | 2 | -2/+7 |
| | | | |||||
| * | | merging files | =Corey Hulen | 2016-03-16 | 5211 | -1667653/+72877 |
| |\ \ | |||||
| * | | | Fixing unit tests | =Corey Hulen | 2016-03-15 | 2 | -6/+6 |
| | | | | |||||
| * | | | Fixing config file | =Corey Hulen | 2016-03-15 | 1 | -1/+1 |
| | | | | |||||
| * | | | PLT-2115 Adding compliance | =Corey Hulen | 2016-03-15 | 36 | -211/+1791 |
| | | | | |||||
| * | | | Merge branch 'master' into PLT-2115 | =Corey Hulen | 2016-03-14 | 203 | -5201/+3967 |
| |\ \ \ | |||||
| * | | | | PLT-2115 adding compliance | =Corey Hulen | 2016-03-14 | 3 | -10/+14 |
| | | | | | |||||
| * | | | | Updating interface | =Corey Hulen | 2016-03-11 | 2 | -2/+2 |
| | | | | | |||||
| * | | | | PLT-2115 adding compliance interfaces | =Corey Hulen | 2016-03-11 | 4 | -4/+46 |
| | | | | | |||||
| * | | | | PLT-2115 adding compliance feature to enterprise | =Corey Hulen | 2016-03-10 | 6 | -0/+256 |
| | | | | | |||||
* | | | | | Merge pull request #2456 from chengweiv5/fix-build | Corey Hulen | 2016-03-17 | 1 | -1/+3 |
|\ \ \ \ \ | | | | | | | | | | | | | Makefile: fix for non-enterprise build | ||||
| * | | | | | Makefile: fix for non-enterprise build | Chengwei Yang | 2016-03-17 | 1 | -1/+3 |
| | |_|/ / | |/| | | | | | | | | | | | | | Signed-off-by: Chengwei Yang <yangchengwei@qiyi.com> | ||||
* | | | | | Merge pull request #2418 from ZBoxApp/PLT-2053 | Christopher Speller | 2016-03-17 | 13 | -7/+210 |
|\ \ \ \ \ | | | | | | | | | | | | | 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 | 13 | -7/+210 |
| | | | | | | |||||
* | | | | | | 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 | 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 |
| | |_|/ / / | |/| | | | |