Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 | ||||
| * | | Update email/password settings text depending on sign-in method | JoramWilander | 2016-03-30 | 6 | -282/+407 |
| | | | |||||
* | | | Merge pull request #2576 from hmhealey/plt2450 | Christopher Speller | 2016-03-30 | 4 | -28/+4 |
|\ \ \ | | | | | | | | | PLT-2450 Updated out of channel notification message | ||||
| * | | | Updated out of channel notification message | Harrison Healey | 2016-03-30 | 4 | -28/+4 |
| |/ / | |||||
* | | | Merge pull request #2579 from asaadmahmoodspin/ui-improvements | Harrison Healey | 2016-03-30 | 3 | -13/+6 |
|\ \ \ | |_|/ |/| | | Multiple UI Improvements | ||||
| * | | Multiple UI Improvements | Asaad Mahmood | 2016-03-30 | 3 | -13/+6 |
| |/ | |||||
* | | Merge pull request #2575 from hmhealey/plt2480 | Joram Wilander | 2016-03-30 | 2 | -6/+11 |
|\ \ | | | | | | | PLT-2478/PLT-2480 Fixing direct channels in sidebar | ||||
| * | | Fixed leaving a direct channel so that it doesn't open the channel you just left | Harrison Healey | 2016-03-30 | 1 | -3/+5 |
| | | | |||||
| * | | Fixed adding direct channels to the sidebar | Harrison Healey | 2016-03-30 | 1 | -3/+6 |
| | | | |||||
* | | | Merge pull request #2573 from mattermost/plt-2453 | Joram Wilander | 2016-03-30 | 2 | -0/+20 |
|\ \ \ | |_|/ |/| | | PLT-2453 Resetting theme upon logout. | ||||
| * | | Resetting theme upon logout. Displaying loading page when logging in so user ↵ | Christopher Speller | 2016-03-30 | 2 | -0/+20 |
| | | | | | | | | | | | | does not see their theme switch. | ||||
* | | | Merge pull request #2574 from asaadmahmoodspin/ui-improvements | Harrison Healey | 2016-03-30 | 2 | -18/+44 |
|\ \ \ | | | | | | | | | PLT-2296 - Adding back button to main create team page | ||||
| * | | | Fixing link | Asaad Mahmood | 2016-03-30 | 1 | -1/+1 |
| | | | | |||||
| * | | | Fixing eslint error | Asaad Mahmood | 2016-03-30 | 1 | -1/+0 |
| | | | | |||||
| * | | | Adding back button to main create team page | Asaad Mahmood | 2016-03-30 | 2 | -18/+45 |
| |/ / | |||||
* | | | Merge pull request #2561 from hmhealey/plt1736 | Christopher Speller | 2016-03-30 | 33 | -836/+2026 |
|\ \ \ | | | | | | | | | PLT-1736 Initial Backstage Work | ||||
| * | | | Removed changes introduced by a merge that somehow didn't break anything | Harrison Healey | 2016-03-30 | 1 | -1/+0 |
| | | | | |||||
| * | | | Moved backstage integrations pages to /settings/integrations | Harrison Healey | 2016-03-29 | 7 | -137/+10 |
| | | | | |||||
| * | | | Updated AddIntegrations help text | Harrison Healey | 2016-03-29 | 2 | -4/+4 |
| | | | | |||||
| * | | | Removed expand widget from the backstage sidebar and changed how the ↵ | Harrison Healey | 2016-03-29 | 1 | -44/+2 |
| | | | | | | | | | | | | | | | | sections highlight | ||||
| * | | | Fixed hardcoded team name in InstalledIntegrations | Harrison Healey | 2016-03-29 | 1 | -5/+20 |
| | | | | |||||
| * | | | Added english localization for Backstage and additional cleanup | Harrison Healey | 2016-03-29 | 11 | -138/+67 |
| | | | | |||||
| * | | | Removed incoming and outgoing webhooks from user settings | Harrison Healey | 2016-03-29 | 3 | -709/+1 |
| | | | |