Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | Merge pull request #2602 from ZBoxApp/autolinker | Harrison Healey | 2016-04-01 | 1 | -33/+6 | |
|\ \ | |/ |/| | Replace Autolinker in extractLinks with a pattern | |||||
| * | Rename extractLinks to extractFirstLink | Elias Nahum | 2016-04-01 | 1 | -9/+7 | |
| | | ||||||
| * | Replace Autolinker in extractLinks with a pattern | Elias Nahum | 2016-03-31 | 1 | -31/+6 | |
| | | ||||||
* | | Merge pull request #2609 from mattermost/plt-2311 | Christopher Speller | 2016-04-01 | 1 | -0/+2 | |
|\ \ | | | | | | | PLT-2311 Update tutorial channel names to reflect actual display names | |||||
| * | | Update tutorial channel names to reflect actual display names | JoramWilander | 2016-04-01 | 1 | -0/+2 | |
| | | | ||||||
* | | | Revert "PLT-2027- Improvements to about dialog" | Christopher Speller | 2016-04-01 | 2 | -2/+0 | |
| | | | ||||||
* | | | PLT-2027- Improvements to about dialog | Asaad Mahmood | 2016-04-01 | 2 | -0/+2 | |
| |/ |/| | ||||||
* | | Update webhook posts to never show in collapsed view | JoramWilander | 2016-03-31 | 1 | -1/+3 | |
|/ | ||||||
* | Fixing session and logout errors | Christopher Speller | 2016-03-30 | 1 | -6/+2 | |
| | ||||||
* | Merge pull request #2582 from hmhealey/emoji | Christopher Speller | 2016-03-30 | 2 | -2/+60 | |
|\ | | | | | Added a few missing emojis | |||||
| * | Added South Africa emoji | Harrison Healey | 2016-03-30 | 1 | -0/+10 | |
| | | ||||||
| * | Added slight smiling, slighting frowning, upside-down smiling, Canada, and ↵ | Harrison Healey | 2016-03-30 | 2 | -2/+50 | |
| | | | | | | | | Pakistan emojis | |||||
* | | Add MFA functionality | JoramWilander | 2016-03-30 | 2 | -5/+36 | |
|/ | ||||||
* | Merge pull request #2575 from hmhealey/plt2480 | Joram Wilander | 2016-03-30 | 1 | -3/+6 | |
|\ | | | | | PLT-2478/PLT-2480 Fixing direct channels in sidebar | |||||
| * | 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 | 1 | -0/+4 | |
|\ \ | | | | | | | PLT-2453 Resetting theme upon logout. | |||||
| * | | Resetting theme upon logout. Displaying loading page when logging in so user ↵ | Christopher Speller | 2016-03-30 | 1 | -0/+4 | |
| | | | | | | | | | | | | does not see their theme switch. | |||||
* | | | Merge pull request #2561 from hmhealey/plt1736 | Christopher Speller | 2016-03-30 | 2 | -0/+145 | |
|\ \ \ | |_|/ |/| | | PLT-1736 Initial Backstage Work | |||||
| * | | Added english localization for Backstage and additional cleanup | Harrison Healey | 2016-03-29 | 1 | -10/+0 | |
| | | | ||||||
| * | | Added ability to regenerate outgoing webhook tokens on InstalledIntegrations ↵ | Harrison Healey | 2016-03-29 | 2 | -0/+16 | |
| | | | | | | | | | | | | page | |||||
| * | | Added delete buttons to InstalledIntegrations | Harrison Healey | 2016-03-29 | 2 | -0/+33 | |
| | | | ||||||
| * | | Added ChannelSelect component | Harrison Healey | 2016-03-29 | 1 | -0/+2 | |
| | | | ||||||
| * | | Added basic screen to add incoming webhooks | Harrison Healey | 2016-03-29 | 1 | -0/+46 | |
| | | | ||||||
| * | | Added initial backstage components and InstalledIntegrations page | Harrison Healey | 2016-03-29 | 3 | -0/+58 | |
| | | | ||||||
* | | | Fixing react warnings on permalink return | Christopher Speller | 2016-03-29 | 1 | -0/+4 | |
| |/ |/| | ||||||
* | | Merge pull request #2564 from hmhealey/actions | Christopher Speller | 2016-03-29 | 1 | -0/+1 | |
|\ \ | |/ |/| | Added RECEIVED_ANALYTICS action | |||||
| * | Added RECEIVED_ANALYTICS action | Harrison Healey | 2016-03-29 | 1 | -0/+1 | |
| | | ||||||
* | | Merge pull request #2556 from asaadmahmoodspin/ui-improvements | Harrison Healey | 2016-03-29 | 1 | -2/+2 | |
|\ \ | | | | | | | Multiple UI improvements | |||||
| * | | Additional UI improvements | Asaad Mahmood | 2016-03-29 | 1 | -2/+2 | |
| |/ | ||||||
* / | Refactoring center panel away. Moving tutorial to a route. Fixing a | Christopher Speller | 2016-03-29 | 1 | -20/+2 | |
|/ | | | | bunch of bugs. | |||||
* | Merge pull request #2529 from mattermost/plt-2383 | Harrison Healey | 2016-03-24 | 1 | -2/+3 | |
|\ | | | | | PLT-2383 Fixed system console login page flash. | |||||
| * | Moving all links and redirects to react-router | Christopher Speller | 2016-03-24 | 1 | -2/+3 | |
| | | ||||||
* | | Merge pull request #2523 from hmhealey/plt2351 | Joram Wilander | 2016-03-24 | 3 | -105/+8357 | |
|\ \ | |/ |/| | PLT-2351 Switch to Apple emoji set | |||||
| * | Fixed ESLint errors | Harrison Healey | 2016-03-24 | 1 | -19/+20 | |
| | | ||||||
| * | Change emoticon rendering code to use image files with unicode names | Harrison Healey | 2016-03-23 | 2 | -104/+8354 | |
| | | ||||||
| * | Fixed unicode emoji not having a consistent size | Harrison Healey | 2016-03-23 | 1 | -1/+2 | |
| | | ||||||
* | | Merge pull request #2465 from mattermost/plt-2260 | Christopher Speller | 2016-03-23 | 2 | -8/+43 | |
|\ \ | | | | | | | PLT-2260 Add the ability to switch from email to ldap and back | |||||
| * | | Add the ability to switch from email to ldap and back | JoramWilander | 2016-03-23 | 2 | -8/+43 | |
| |/ | ||||||
* | | Merge pull request #2509 from asaadmahmoodspin/ui-improvements | Joram Wilander | 2016-03-23 | 1 | -1/+1 | |
|\ \ | |/ |/| | Multiple UI improvements | |||||
| * | Multiple UI improvements | Asaad Mahmood | 2016-03-23 | 1 | -1/+1 | |
| | | ||||||
* | | 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 | 1 | -3/+14 | |
|\ \ \ | |/ / |/| | | Changed PreferenceStore to store data in memory | |||||
| * | | Changed PreferenceStore to store data in memory | Harrison Healey | 2016-03-23 | 1 | -3/+14 | |
| |/ | ||||||
* / | Fixing websocket connection issue. Refactoring websockets into an action ↵ | Christopher Speller | 2016-03-23 | 1 | -0/+2 | |
|/ | | | | creator. | |||||
* | Merge release branch commits | Christopher Speller | 2016-03-21 | 1 | -15/+15 | |
| | ||||||
* | Revert "PLT-2183 Slash command auto-complete" | Christopher Speller | 2016-03-18 | 3 | -10/+5 | |
| | ||||||
* | PLT-2392: Fix for Notification sound broken | Elias Nahum | 2016-03-18 | 1 | -1/+2 | |
| | ||||||
* | Fixing merge | =Corey Hulen | 2016-03-17 | 7 | -112/+280 | |
|\ | ||||||
| * | Fixing style issue caused by build changes | Christopher Speller | 2016-03-17 | 1 | -3/+0 | |
| | |