Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #2500 from ZBoxApp/es-locs | Corey Hulen | 2016-03-21 | 2 | -2/+4 |
|\ | | | | | Add admin support es locs | ||||
| * | Add admin support es locs | Elias Nahum | 2016-03-21 | 2 | -2/+4 |
| | | |||||
* | | Merge pull request #2497 from mattermost/plt-2378 | Corey Hulen | 2016-03-21 | 2 | -4/+24 |
|\ \ | |/ |/| | PLT-2378 Fixing intl on Safari | ||||
| * | Fixing intl on Safari | Christopher Speller | 2016-03-21 | 2 | -4/+24 |
|/ | |||||
* | Merge pull request #2491 from rodrigocorsi2/compliance_pt_loc | Joram Wilander | 2016-03-21 | 2 | -26/+132 |
|\ | | | | | Translation compliance and others in pt | ||||
| * | Translation compliance and others pt | Rodrigo Corsi | 2016-03-21 | 2 | -26/+132 |
| | | |||||
* | | Merge pull request #2492 from mattermost/fix-webhooks | Joram Wilander | 2016-03-21 | 1 | -1/+112 |
|\ \ | | | | | | | Fixing incoming webhooks | ||||
| * | | Fixing incoming webhooks | Christopher Speller | 2016-03-21 | 1 | -1/+112 |
| |/ | |||||
* | | Merge pull request #2493 from mattermost/plt-1840 | Joram Wilander | 2016-03-21 | 5 | -257/+150 |
|\ \ | | | | | | | PLT-1840 Better build system. | ||||
| * | | Removing Travis | Christopher Speller | 2016-03-21 | 1 | -56/+0 |
| | | | |||||
| * | | Redo of makefile. Build files no longer need to be modified for enterprise ↵ | Christopher Speller | 2016-03-21 | 4 | -201/+150 |
| | | | | | | | | | | | | builds. | ||||
* | | | Merge release branch commits | Christopher Speller | 2016-03-21 | 6 | -75/+49 |
| |/ |/| | |||||
* | | Merge pull request #2475 from mattermost/plt-1606 | Christopher Speller | 2016-03-21 | 3 | -7/+15 |
|\ \ | | | | | | | PLT-1606/PLT-714 Change searches to AND terms instead of OR | ||||
| * | | Removed search test case where MySQL and PostgreSQL didn't agree | JoramWilander | 2016-03-18 | 1 | -4/+0 |
| | | | |||||
| * | | Update search unit tests | JoramWilander | 2016-03-18 | 1 | -2/+7 |
| | | | |||||
| * | | Change searches to AND terms instead of OR | JoramWilander | 2016-03-18 | 1 | -1/+8 |
| | | | |||||
* | | | Merge pull request #2481 from khoa-le/PLT-2018 | Christopher Speller | 2016-03-21 | 1 | -1/+5 |
|\ \ \ | | | | | | | | | PLT-2018 After clicking "Use a different address" hitting enter should submit … | ||||
| * | | | After clicking "Use a different address" hitting enter should submit the ↵ | Khoa, Le Ngoc | 2016-03-19 | 1 | -1/+5 |
| | | | | | | | | | | | | | | | | "Use this instead" button | ||||
* | | | | Merge pull request #2482 from khoa-le/PLT-2017 | Christopher Speller | 2016-03-21 | 2 | -1/+18 |
|\ \ \ \ | |/ / / |/| | | | PLT-2017 System Console > Legal and Support Settings: If a link does not inclu… | ||||
| * | | | System Console > Legal and Support Settings: If a link does not include http ↵ | Khoa, Le Ngoc | 2016-03-19 | 2 | -1/+18 |
|/ / / | | | | | | | | | | or https, it does not open properly | ||||
* | | | Merge pull request #2473 from ZBoxApp/compliance-es | Corey Hulen | 2016-03-18 | 4 | -93/+186 |
|\ \ \ | | | | | | | | | Add spanish translations for compliance | ||||
| * | | | Add spanish translations for compliance | Elias Nahum | 2016-03-18 | 4 | -95/+186 |
| | | | | |||||
* | | | | Merge pull request #2476 from ↵ | Christopher Speller | 2016-03-18 | 14 | -332/+150 |
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | mattermost/revert-2169-external-slashcommands-management Revert "PLT-2183 Slash command auto-complete" | ||||
| * | | | Revert "PLT-2183 Slash command auto-complete" | Christopher Speller | 2016-03-18 | 14 | -332/+150 |
|/ / / | |||||
* | | | 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 |
| |/ | |||||
* | | 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 |
| | | | | | |