Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | Fix typo preventing saving of MFA setting in system console | JoramWilander | 2016-04-01 | 1 | -1/+1 | |
| | | | | ||||||
* | | | | Merge pull request #2609 from mattermost/plt-2311 | Christopher Speller | 2016-04-01 | 12 | -29/+74 | |
|\ \ \ \ | | | | | | | | | | | PLT-2311 Update tutorial channel names to reflect actual display names | |||||
| * | | | | Remove old translations | JoramWilander | 2016-04-01 | 3 | -12/+0 | |
| | | | | | ||||||
| * | | | | Update tutorial channel names to reflect actual display names | JoramWilander | 2016-04-01 | 9 | -17/+74 | |
| | | | | | ||||||
* | | | | | Merge pull request #2616 from mattermost/revert-2608-ui-improvements | Christopher Speller | 2016-04-01 | 10 | -196/+56 | |
|\ \ \ \ \ | | | | | | | | | | | | | Revert "PLT-2027- Improvements to about dialog" | |||||
| * | | | | | Revert "PLT-2027- Improvements to about dialog" | Christopher Speller | 2016-04-01 | 10 | -196/+56 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #2608 from asaadmahmoodspin/ui-improvements | Joram Wilander | 2016-04-01 | 10 | -56/+196 | |
|\ \ \ \ \ | | | | | | | | | | | | | PLT-2027- Improvements to about dialog | |||||
| * | | | | | PLT-2027- Improvements to about dialog | Asaad Mahmood | 2016-04-01 | 10 | -56/+196 | |
| | |/ / / | |/| | | | ||||||
* | | | | | Merge pull request #2600 from mattermost/new-messages-fix | Harrison Healey | 2016-04-01 | 1 | -2/+2 | |
|\ \ \ \ \ | | | | | | | | | | | | | PLT-2473 Fixing new messages jump | |||||
| * | | | | | Fixing new messages jump | Christopher Speller | 2016-03-31 | 1 | -2/+2 | |
| | |_|/ / | |/| | | | ||||||
* | | | | | Merge pull request #2601 from mattermost/permalink-view-fix | Harrison Healey | 2016-04-01 | 1 | -2/+2 | |
|\ \ \ \ \ | |_|/ / / |/| | | | | PLT-2382 Fixing reply from permalinks | |||||
| * | | | | Fixing reply from permalinks | Christopher Speller | 2016-03-31 | 1 | -2/+2 | |
| |/ / / | ||||||
* | | | | Merge pull request #2599 from ZBoxApp/locs | Joram Wilander | 2016-04-01 | 9 | -89/+249 | |
|\ \ \ \ | | | | | | | | | | | Add missing en locs and translations to es | |||||
| * | | | | Add missing en locs and translations to es | Elias Nahum | 2016-03-31 | 9 | -89/+249 | |
| |/ / / | ||||||
* | | | | Merge pull request #2603 from rodrigocorsi2/pt-translations | Joram Wilander | 2016-04-01 | 2 | -2/+130 | |
|\ \ \ \ | |/ / / |/| | | | MFA translations | |||||
| * | | | MFA translations | Rodrigo Corsi | 2016-03-31 | 2 | -2/+130 | |
|/ / / | ||||||
* | | | Merge pull request #2594 from mattermost/plt-2476 | Harrison Healey | 2016-03-31 | 5 | -54/+38 | |
|\ \ \ | | | | | | | | | PLT-2476 Fixing username display in center channel | |||||
| * | | | Fixing username display in center channel | Christopher Speller | 2016-03-31 | 5 | -54/+38 | |
| | | | | ||||||
* | | | | Merge pull request #2595 from hmhealey/plt2480 | Joram Wilander | 2016-03-31 | 4 | -8/+6 | |
|\ \ \ \ | | | | | | | | | | | PLT-2480 Fixed errors when joining a channel that doesn't exist yet | |||||
| * | | | | Changed ChannelHeader to pass channel to PopoverListMembers directly | Harrison Healey | 2016-03-31 | 2 | -11/+4 | |
| | | | | | ||||||
| * | | | | Fixed errors when joining a channel that doesn't exist yet | Harrison Healey | 2016-03-31 | 2 | -2/+6 | |
| | | | | | ||||||
| * | | | | Fixed PostsView not unregistering it's PreferenceStore listener when unmounting | Harrison Healey | 2016-03-31 | 1 | -0/+1 | |
| |/ / / | ||||||
* | | | | Merge pull request #2598 from mattermost/plt-2474 | Harrison Healey | 2016-03-31 | 1 | -5/+7 | |
|\ \ \ \ | | | | | | | | | | | PLT-2474 Fixing typing message on channel switch. | |||||
| * | | | | Fixing typing message on channel switch | Christopher Speller | 2016-03-31 | 1 | -5/+7 | |
| | |/ / | |/| | | ||||||
* | | | | Merge pull request #2597 from mattermost/plt-2011 | Harrison Healey | 2016-03-31 | 1 | -2/+1 | |
|\ \ \ \ | | | | | | | | | | | PLT-2011 Fixing sidebar jump warning | |||||
| * | | | | Fixing sidebar jump warning | Christopher Speller | 2016-03-31 | 1 | -2/+1 | |
| |/ / / | ||||||
* | | | | Merge pull request #2592 from ZBoxApp/editorconfig | Joram Wilander | 2016-03-31 | 1 | -1/+7 | |
|\ \ \ \ | | | | | | | | | | | Update .editorconfig | |||||
| * | | | | Update .editorconfig | Elias Nahum | 2016-03-31 | 1 | -1/+7 | |
| |/ / / | ||||||
* | | | | Merge pull request #2590 from mattermost/plt-2287 | Harrison Healey | 2016-03-31 | 2 | -0/+9 | |
|\ \ \ \ | | | | | | | | | | | PLT-2287 Disable previously created public links with the config setting | |||||
| * | | | | Disable previously created public links with the config setting | JoramWilander | 2016-03-31 | 2 | -0/+9 | |
| | |/ / | |/| | | ||||||
* | | | | Merge pull request #2589 from mattermost/plt-1812 | Harrison Healey | 2016-03-31 | 5 | -19/+12 | |
|\ \ \ \ | | | | | | | | | | | PLT-1812 Update webhook posts to never show in collapsed view | |||||
| * | | | | Update webhook posts to never show in collapsed view | JoramWilander | 2016-03-31 | 5 | -19/+12 | |
| | | | | | ||||||
* | | | | | Merge pull request #2588 from hmhealey/plt2490 | Christopher Speller | 2016-03-31 | 2 | -2/+8 | |
|\ \ \ \ \ | |_|_|/ / |/| | | | | PLT-2491/PLT-2492 Fixed saving changes in ServiceSettings when MFA isn't available | |||||
| * | | | | Fixed saving changes in ServiceSettings when MFA isn't available | Harrison Healey | 2016-03-31 | 1 | -1/+4 | |
| | | | | | ||||||
| * | | | | Fixed prop type warning in system console | Harrison Healey | 2016-03-31 | 1 | -1/+4 | |
| | |/ / | |/| | | ||||||
* | | | | Merge pull request #2587 from asaadmahmoodspin/ui-improvements | Joram Wilander | 2016-03-31 | 4 | -33/+34 | |
|\ \ \ \ | |/ / / |/| | | | Improvements to preview textarea and about modal | |||||
| * | | | Improvements to preview textarea and about modal | Asaad Mahmood | 2016-03-31 | 4 | -33/+34 | |
| | | | | ||||||
* | | | | Fix login | Christopher Speller | 2016-03-31 | 2 | -1/+8 | |
| |/ / |/| | | ||||||
* | | | Merge pull request #2585 from mattermost/fix-ldap-email | Joram Wilander | 2016-03-31 | 1 | -1/+1 | |
|\ \ \ | |/ / |/| | | Fix for ldap ability to change email | |||||
| * | | Fix for ldap ability to change email | Christopher Speller | 2016-03-30 | 1 | -1/+1 | |
| | | | ||||||
* | | | Merge pull request #2578 from mattermost/plt-2463 | Christopher Speller | 2016-03-30 | 4 | -9/+9 | |
|\ \ \ | | | | | | | | | PLT-2463, PLT-2465 Fixing session and logout errors | |||||
| * | | | Fixing session and logout errors | Christopher Speller | 2016-03-30 | 4 | -9/+9 | |
|/ / / | ||||||
* | | | Merge pull request #2582 from hmhealey/emoji | Christopher Speller | 2016-03-30 | 8 | -2/+60 | |
|\ \ \ | |/ / |/| | | Added a few missing emojis | |||||
| * | | Added South Africa emoji | Harrison Healey | 2016-03-30 | 2 | -0/+10 | |
| | | | ||||||
| * | | Added slight smiling, slighting frowning, upside-down smiling, Canada, and ↵ | Harrison Healey | 2016-03-30 | 7 | -2/+50 | |
| | | | | | | | | | | | | Pakistan emojis | |||||
* | | | Merge pull request #2518 from mattermost/plt-2187 | Christopher Speller | 2016-03-30 | 49 | -355/+5839 | |
|\ \ \ | |/ / |/| | | PLT-2187 Add MFA functionality | |||||
| * | | Add MFA functionality | JoramWilander | 2016-03-30 | 49 | -355/+5839 | |
| | | | ||||||
* | | | Merge pull request #2580 from hmhealey/plt2482 | Corey Hulen | 2016-03-30 | 1 | -0/+1 | |
|\ \ \ | |/ / |/| | | PLT-2482 Fixed function binding in FileStore | |||||
| * | | Fixed function binding in FileStore | Harrison Healey | 2016-03-30 | 1 | -0/+1 | |
| | | | ||||||
* | | | Merge pull request #2577 from mattermost/plt-2349 | Christopher Speller | 2016-03-30 | 6 | -282/+407 | |
|\ \ \ | | | | | | | | | PLT-2349 Update email/password settings text depending on sign-in method |