Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | Merge pull request #2519 from mattermost/search-store-fix | Christopher Speller | 2016-03-23 | 1 | -31/+9 | |
|\ \ | | | | | | | Moving search store to memory | |||||
| * | | Moving search store to memory | Christopher Speller | 2016-03-23 | 1 | -31/+9 | |
| |/ | ||||||
* | | Merge pull request #2520 from hmhealey/prefs | Christopher Speller | 2016-03-23 | 2 | -7/+11 | |
|\ \ | | | | | | | Fixed tutorial step preferences to be saved as strings | |||||
| * | | Fixed tutorial step preferences to be saved as strings | Harrison Healey | 2016-03-23 | 2 | -7/+11 | |
| |/ | ||||||
* | | Merge pull request #2465 from mattermost/plt-2260 | Christopher Speller | 2016-03-23 | 20 | -225/+927 | |
|\ \ | | | | | | | PLT-2260 Add the ability to switch from email to ldap and back | |||||
| * | | Fix imports and change ldap function name | JoramWilander | 2016-03-23 | 7 | -11/+11 | |
| | | | ||||||
| * | | Add the ability to switch from email to ldap and back | JoramWilander | 2016-03-23 | 20 | -230/+932 | |
| |/ | ||||||
* | | Merge pull request #2494 from hmhealey/plt2190 | Christopher Speller | 2016-03-23 | 6 | -66/+53 | |
|\ \ | | | | | | | PLT-2190 Switched Textbox to use a TextareaAutosize and removed custom resizing code | |||||
| * | | Switched Textbox to use a TextareaAutosize and removed custom resizing code | Harrison Healey | 2016-03-21 | 6 | -66/+53 | |
| | | | ||||||
* | | | Merge pull request #2517 from mattermost/plt-2379 | Joram Wilander | 2016-03-23 | 4 | -66/+48 | |
|\ \ \ | | | | | | | | | PLT-2379, PLT-2432 Fixing browser store issue. | |||||
| * | | | Fixing browser store issue. | Christopher Speller | 2016-03-23 | 4 | -66/+48 | |
| | |/ | |/| | ||||||
* | | | Merge pull request #2509 from asaadmahmoodspin/ui-improvements | Joram Wilander | 2016-03-23 | 19 | -52/+66 | |
|\ \ \ | |/ / |/| | | Multiple UI improvements | |||||
| * | | Multiple UI improvements | Asaad Mahmood | 2016-03-23 | 19 | -52/+66 | |
| | | | ||||||
* | | | Merge pull request #2516 from hmhealey/disableautolinker | Joram Wilander | 2016-03-23 | 1 | -2/+8 | |
|\ \ \ | | | | | | | | | Disabled autolinker | |||||
| * | | | Disabled autolinker | Harrison Healey | 2016-03-23 | 1 | -2/+8 | |
| | | | | ||||||
* | | | | Merge pull request #2515 from hmhealey/prefs | Joram Wilander | 2016-03-23 | 8 | -150/+118 | |
|\ \ \ \ | |/ / / |/| | | | Changed PreferenceStore to store data in memory | |||||
| * | | | Changed PreferenceStore to store data in memory | Harrison Healey | 2016-03-23 | 8 | -150/+118 | |
| | | | | ||||||
* | | | | Merge pull request #2512 from mattermost/plt-2473 | Corey Hulen | 2016-03-23 | 11 | -430/+495 | |
|\ \ \ \ | | | | | | | | | | | PLT-2473, PLT-2310 Fixing websocket issues. | |||||
| * | | | | Fixing websocket connection issue. Refactoring websockets into an action ↵ | Christopher Speller | 2016-03-23 | 11 | -430/+495 | |
| |/ / / | | | | | | | | | | | | | creator. | |||||
* | | | | Merge pull request #2508 from mattermost/mf-fixes | Corey Hulen | 2016-03-23 | 2 | -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 Speller | 2016-03-22 | 2 | -2/+3 | |
| |/ / | ||||||
* | | | Merge pull request #2507 from stupied4ever/patch-1 | Christopher Speller | 2016-03-23 | 1 | -1/+1 | |
|\ \ \ | |/ / |/| | | Fix typo | |||||
| * | | Fix typo | Rafael da Silva Almeida | 2016-03-22 | 1 | -1/+1 | |
| | | | | | | | | | The word maximum was with a typo (maxmium). | |||||
* | | | Merge pull request #2498 from hmhealey/plt2285 | Corey Hulen | 2016-03-22 | 8 | -54/+171 | |
|\ \ \ | |/ / |/| | | PLT-2285 Adding spinner after clicking invite channel member button | |||||
| * | | Added SpinnerButton component to handle buttons that are also spinners | Harrison Healey | 2016-03-22 | 4 | -31/+65 | |
| | | | ||||||
| * | | Adding loading indicator after clicking invite channel member button | Harrison Healey | 2016-03-22 | 5 | -40/+123 | |
|/ / | ||||||
* | | Merge pull request #2496 from mattermost/fix-postgres-bug | Christopher Speller | 2016-03-22 | 1 | -5/+0 | |
|\ \ | | | | | | | Removing old schema upgrades affecting postgres | |||||
| * | | Removing old schema upgrades affecting postgres | =Corey Hulen | 2016-03-21 | 1 | -5/+0 | |
| | | | ||||||
* | | | Merge pull request #2495 from hmhealey/plt2317a | Joram Wilander | 2016-03-22 | 4 | -53/+68 | |
|\ \ \ | | | | | | | | | PLT-2317 Changed RhsRootPost and RhsComment to receive current user through props | |||||
| * | | | Changed RhsComment to receive the current user through props | Harrison Healey | 2016-03-21 | 2 | -6/+7 | |
| | | | | ||||||
| * | | | Passed currentUser into RhsRootPost | Harrison Healey | 2016-03-21 | 3 | -47/+61 | |
| | |/ | |/| | ||||||
* | | | Merge pull request #2499 from hmhealey/plt2284 | Joram Wilander | 2016-03-22 | 1 | -0/+11 | |
|\ \ \ | | | | | | | | | PLT-2284 Re-added ChannelMembersModal on mobile | |||||
| * | | | Re-added ChannelMembersModal on mobile | Harrison Healey | 2016-03-21 | 1 | -0/+11 | |
| | |/ | |/| | ||||||
* | | | 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 … |