summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | Merge pull request #2512 from mattermost/plt-2473Corey Hulen2016-03-2311-430/+495
|\ \ \ \ | | | | | | | | | | PLT-2473, PLT-2310 Fixing websocket issues.
| * | | | Fixing websocket connection issue. Refactoring websockets into an action ↵Christopher Speller2016-03-2311-430/+495
| |/ / / | | | | | | | | | | | | creator.
* | | | Merge pull request #2508 from mattermost/mf-fixesCorey Hulen2016-03-232-2/+3
|\ \ \ \ | |_|/ / |/| | | Removing static test. Adding start-docker as a dep for run-server.
| * | | Removing static test. Adding start-docker as a dep for run-server.Christopher Speller2016-03-222-2/+3
| |/ /
* | | Merge pull request #2507 from stupied4ever/patch-1Christopher Speller2016-03-231-1/+1
|\ \ \ | |/ / |/| | Fix typo
| * | Fix typoRafael da Silva Almeida2016-03-221-1/+1
| | | | | | | | | The word maximum was with a typo (maxmium).
* | | Merge pull request #2498 from hmhealey/plt2285Corey Hulen2016-03-228-54/+171
|\ \ \ | |/ / |/| | PLT-2285 Adding spinner after clicking invite channel member button
| * | Added SpinnerButton component to handle buttons that are also spinnersHarrison Healey2016-03-224-31/+65
| | |
| * | Adding loading indicator after clicking invite channel member buttonHarrison Healey2016-03-225-40/+123
|/ /
* | Merge pull request #2496 from mattermost/fix-postgres-bugChristopher Speller2016-03-221-5/+0
|\ \ | | | | | | Removing old schema upgrades affecting postgres
| * | Removing old schema upgrades affecting postgres=Corey Hulen2016-03-211-5/+0
| | |
* | | Merge pull request #2495 from hmhealey/plt2317aJoram Wilander2016-03-224-53/+68
|\ \ \ | | | | | | | | PLT-2317 Changed RhsRootPost and RhsComment to receive current user through props
| * | | Changed RhsComment to receive the current user through propsHarrison Healey2016-03-212-6/+7
| | | |
| * | | Passed currentUser into RhsRootPostHarrison Healey2016-03-213-47/+61
| | |/ | |/|
* | | Merge pull request #2499 from hmhealey/plt2284Joram Wilander2016-03-221-0/+11
|\ \ \ | | | | | | | | PLT-2284 Re-added ChannelMembersModal on mobile
| * | | Re-added ChannelMembersModal on mobileHarrison Healey2016-03-211-0/+11
| | |/ | |/|
* | | Merge pull request #2500 from ZBoxApp/es-locsCorey Hulen2016-03-212-2/+4
|\ \ \ | | | | | | | | Add admin support es locs
| * | | Add admin support es locsElias Nahum2016-03-212-2/+4
| |/ /
* | | Merge pull request #2497 from mattermost/plt-2378Corey Hulen2016-03-212-4/+24
|\ \ \ | |/ / |/| | PLT-2378 Fixing intl on Safari
| * | Fixing intl on SafariChristopher Speller2016-03-212-4/+24
|/ /
* | Merge pull request #2491 from rodrigocorsi2/compliance_pt_locJoram Wilander2016-03-212-26/+132
|\ \ | | | | | | Translation compliance and others in pt
| * | Translation compliance and others ptRodrigo Corsi2016-03-212-26/+132
| |/
* | Merge pull request #2492 from mattermost/fix-webhooksJoram Wilander2016-03-211-1/+112
|\ \ | | | | | | Fixing incoming webhooks
| * | Fixing incoming webhooksChristopher Speller2016-03-211-1/+112
| |/
* | 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
| |\