summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #2493 from mattermost/plt-1840Joram Wilander2016-03-215-257/+150
|\ | | | | PLT-1840 Better build system.
| * Removing TravisChristopher Speller2016-03-211-56/+0
| |
| * Redo of makefile. Build files no longer need to be modified for enterprise ↵Christopher Speller2016-03-214-201/+150
| | | | | | | | builds.
* | Merge release branch commitsChristopher Speller2016-03-216-75/+49
| |
* | Merge pull request #2475 from mattermost/plt-1606Christopher Speller2016-03-213-7/+15
|\ \ | | | | | | PLT-1606/PLT-714 Change searches to AND terms instead of OR
| * | Removed search test case where MySQL and PostgreSQL didn't agreeJoramWilander2016-03-181-4/+0
| | |
| * | Update search unit testsJoramWilander2016-03-181-2/+7
| | |
| * | Change searches to AND terms instead of ORJoramWilander2016-03-181-1/+8
| | |
* | | Merge pull request #2481 from khoa-le/PLT-2018Christopher Speller2016-03-211-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 Ngoc2016-03-191-1/+5
| | | | | | | | | | | | | | | | "Use this instead" button
* | | | Merge pull request #2482 from khoa-le/PLT-2017Christopher Speller2016-03-212-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 Ngoc2016-03-192-1/+18
|/ / / | | | | | | | | | or https, it does not open properly
* | | Merge pull request #2473 from ZBoxApp/compliance-esCorey Hulen2016-03-184-93/+186
|\ \ \ | | | | | | | | Add spanish translations for compliance
| * | | Add spanish translations for complianceElias Nahum2016-03-184-95/+186
| | | |
* | | | Merge pull request #2476 from ↵Christopher Speller2016-03-1814-332/+150
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | mattermost/revert-2169-external-slashcommands-management Revert "PLT-2183 Slash command auto-complete"
| * | | Revert "PLT-2183 Slash command auto-complete"Christopher Speller2016-03-1814-332/+150
|/ / /
* | | Merge pull request #2472 from ZBoxApp/PLT-2392Christopher Speller2016-03-182-2/+3
|\ \ \ | |_|/ |/| | PLT-2392: Fix for Notification sound broken
| * | PLT-2392: Fix for Notification sound brokenElias Nahum2016-03-182-2/+3
| |/
* | Merge pull request #2471 from ZBoxApp/PLT-2368Harrison Healey2016-03-181-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 Nahum2016-03-181-14/+16
|/ | | | [object][object]
* Merge pull request #2470 from mattermost/plt-2380Joram Wilander2016-03-184-28/+66
|\ | | | | PLT-2380 Improvements to webpack build system + watch mode
| * Creating sepearate dev and prod webpack builds. Enabled webpack watch mode. ↵Christopher Speller2016-03-184-28/+66
| | | | | | | | Updated to latest master webpack to fix bug in watch mode
* | Merge pull request #2442 from mattermost/PLT-2115Corey Hulen2016-03-1737-84/+1935
|\ \ | |/ |/| PLT-2115 adding compliance feature
| * Fixing localization stuff=Corey Hulen2016-03-171-3/+0
| |
| * Fixing localization stuff=Corey Hulen2016-03-171-20/+8
| |
| * Fixing merge=Corey Hulen2016-03-1790-1590/+2706
| |\
| * | Fixing webpack=Corey Hulen2016-03-162-0/+3
| | |
| * | skipping version.go file=Corey Hulen2016-03-161-0/+1
| | |
| * | Fixing merge=Corey Hulen2016-03-162-2/+7
| | |
| * | merging files=Corey Hulen2016-03-165211-1667653/+72877
| |\ \
| * | | Fixing unit tests=Corey Hulen2016-03-152-6/+6
| | | |
| * | | Fixing config file=Corey Hulen2016-03-151-1/+1
| | | |
| * | | PLT-2115 Adding compliance=Corey Hulen2016-03-1536-211/+1791
| | | |
| * | | Merge branch 'master' into PLT-2115=Corey Hulen2016-03-14203-5201/+3967
| |\ \ \
| * | | | PLT-2115 adding compliance=Corey Hulen2016-03-143-10/+14
| | | | |
| * | | | Updating interface=Corey Hulen2016-03-112-2/+2
| | | | |
| * | | | PLT-2115 adding compliance interfaces=Corey Hulen2016-03-114-4/+46
| | | | |
| * | | | PLT-2115 adding compliance feature to enterprise=Corey Hulen2016-03-106-0/+256
| | | | |
* | | | | Merge pull request #2456 from chengweiv5/fix-buildCorey Hulen2016-03-171-1/+3
|\ \ \ \ \ | | | | | | | | | | | | Makefile: fix for non-enterprise build
| * | | | | Makefile: fix for non-enterprise buildChengwei Yang2016-03-171-1/+3
| | |_|/ / | |/| | | | | | | | | | | | | Signed-off-by: Chengwei Yang <yangchengwei@qiyi.com>
* | | | | Merge pull request #2418 from ZBoxApp/PLT-2053Christopher Speller2016-03-1713-7/+210
|\ \ \ \ \ | | | | | | | | | | | | PLT-2053: Option to enable full snippets in push notifications
| * | | | | Fix ESLint for code_preview.jsxElias Nahum2016-03-172-4/+1
| | | | | |
| * | | | | Option to enable full snippets in push notificationsElias Nahum2016-03-1713-7/+210
| | | | | |
* | | | | | Fxing make cleanChristopher Speller2016-03-171-1/+1
| |_|_|_|/ |/| | | |
* | | | | Fixing style issue caused by build changesChristopher Speller2016-03-172-4/+1
|/ / / /
* | | | Merge pull request #2380 from rodrigocorsi2/code_previewChristopher Speller2016-03-179-111/+434
|\ \ \ \ | | | | | | | | | | Created component CodePreview
| * | | | Created component CodePreviewRodrigo Corsi2016-03-179-111/+434
| | | | |
* | | | | Merge pull request #2461 from hmhealey/teamdefaultChristopher Speller2016-03-173-4/+4
|\ \ \ \ \ | | | | | | | | | | | | Changed 'show username' display text to be more accurate
| * | | | | Changed 'show username' display text to be more accurateHarrison Healey2016-03-173-4/+4
| | | | | |
* | | | | | Merge pull request #2462 from mattermost/plt-2340Christopher Speller2016-03-1711-27/+285
|\ \ \ \ \ \ | | | | | | | | | | | | | | PLT-2340 Webpack optimizations and fixes
generated by cgit v1.2.3-1-g7c22 (git 2.25.1) at 2024-07-28 22:43:48 +0000