Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | Merge pull request #959 from mattermost/build-fix | Corey Hulen | 2015-10-07 | 1 | -11/+10 | |
|\ | | | | | Moving external libraries to the install step and into a seperate bundle. | |||||
| * | Moving external libraries to the install step and into a seperate bundle | Christopher Speller | 2015-10-07 | 1 | -11/+10 | |
| | | ||||||
* | | Merge pull request #938 from mattermost/plt-111 | Corey Hulen | 2015-10-06 | 1 | -10/+15 | |
|\ \ | | | | | | | PLT-111 Combining email verification confirmation screen with login screen. | |||||
| * | | Combining email verification confirmation screen with login screen. | Christopher Speller | 2015-10-06 | 1 | -10/+15 | |
| |/ | ||||||
* / | Admin console UI Improvements | Asaad Mahmood | 2015-10-06 | 1 | -4/+4 | |
|/ | ||||||
* | Update allow/deny oauth page UI, and add ouath as reserved word. | JoramWilander | 2015-10-02 | 1 | -20/+20 | |
| | ||||||
* | PLT-345 adding client side logging | =Corey Hulen | 2015-09-29 | 1 | -0/+19 | |
| | ||||||
* | fixing segment bug | =Corey Hulen | 2015-09-23 | 1 | -1/+1 | |
| | ||||||
* | fixing segment bug | =Corey Hulen | 2015-09-23 | 1 | -1/+0 | |
| | ||||||
* | Merge branch 'master' into PLT-11-email | =Corey Hulen | 2015-09-23 | 2 | -5/+3 | |
|\ | ||||||
| * | Merge pull request #759 from mattermost/plt-242-3 | Harrison Healey | 2015-09-23 | 2 | -0/+3 | |
| |\ | | | | | | | PLT-242 Implement custom UI theme colors. | |||||
| | * | Implement UI theme colors. | JoramWilander | 2015-09-23 | 2 | -0/+3 | |
| | | | ||||||
| * | | Restored changes which remove emojify and switch to our own version | hmhealey | 2015-09-22 | 1 | -5/+0 | |
| |/ | ||||||
| * | Revert "PLT-289 Properly removed lingering references to emojify" | Christopher Speller | 2015-09-22 | 1 | -0/+5 | |
| | | ||||||
| * | Properly removed lingering references to emojify | hmhealey | 2015-09-22 | 1 | -5/+0 | |
| | | ||||||
* | | Adding service settings to admin console | =Corey Hulen | 2015-09-22 | 1 | -23/+0 | |
|/ | ||||||
* | Fixing css | =Corey Hulen | 2015-09-16 | 1 | -1/+0 | |
| | ||||||
* | PLT-40 adding experimental support for emojis | =Corey Hulen | 2015-09-16 | 1 | -0/+5 | |
| | ||||||
* | Implement OAuth2 service provider functionality. | JoramWilander | 2015-09-16 | 2 | -0/+27 | |
| | ||||||
* | Merge branch 'master' into PLT-93 | =Corey Hulen | 2015-09-16 | 1 | -1/+1 | |
|\ | ||||||
| * | Merge pull request #686 from hmhealey/plt172 | Joram Wilander | 2015-09-16 | 1 | -1/+1 | |
| |\ | | | | | | | PLT-172 Fixes TypeErrors and random jumping that occurs when clicking the scroll bar in the sidebar | |||||
| | * | PLT-172 Updated perfect-scrollbar to 0.6.5 | hmhealey | 2015-09-15 | 1 | -1/+1 | |
| | | | ||||||
* | | | PLT-93 cleaing up client side configs | =Corey Hulen | 2015-09-15 | 11 | -33/+25 | |
| | | | ||||||
* | | | removing loggly | =Corey Hulen | 2015-09-15 | 1 | -11/+0 | |
|/ / | ||||||
* | | Merge pull request #678 from mattermost/mm-1589 | Corey Hulen | 2015-09-14 | 1 | -3/+4 | |
|\ \ | |/ |/| | PLT-171 MM-1589 New add channel modal using react-bootstrap. | |||||
| * | New add channel modal using react-bootstrap. | Christopher Speller | 2015-09-14 | 1 | -3/+4 | |
| | | ||||||
* | | Merge branch 'master' into PLT-12 | =Corey Hulen | 2015-09-11 | 1 | -0/+1 | |
|\| | ||||||
| * | Updating UI for modals and notification bar | Asaad Mahmood | 2015-09-11 | 1 | -0/+1 | |
| | | ||||||
* | | Cleaning up html | =Corey Hulen | 2015-09-10 | 1 | -38/+6 | |
| | | ||||||
* | | PLT-12 UI framework for admin console | =Corey Hulen | 2015-09-10 | 1 | -344/+38 | |
| | | ||||||
* | | Adding initial admin console html pages | =Corey Hulen | 2015-09-03 | 1 | -0/+362 | |
|/ | ||||||
* | Moving config.js to /web/react/utils/ Including in every file needed | Christopher Speller | 2015-09-02 | 1 | -11/+10 | |
| | ||||||
* | Merge pull request #494 from rgarmsen2295/mm-1628 | Christopher Speller | 2015-08-31 | 1 | -1/+1 | |
|\ | | | | | MM-1628 The navbar is no longer completely obscured by the status bar in full screen safari on iOS | |||||
| * | When viewing the site on iOS from the home screen, the top of the screen is ↵ | Reed Garmsen | 2015-08-27 | 1 | -1/+1 | |
| | | | | | | | | no longer obscured by the phone's status bar | |||||
* | | Merge pull request #512 from mattermost/mm-1870 | Corey Hulen | 2015-08-28 | 1 | -1/+1 | |
|\ \ | | | | | | | MM-1870 Creating local version of fonts retrieved from Google with compatibility with all browsers. | |||||
| * | | Creating local version of fonts retrieved from Google with compatibility | Christopher Speller | 2015-08-28 | 1 | -1/+1 | |
| | | | | | | | | | | | | with all browsers. | |||||
* | | | Merge pull request #496 from mattermost/mm-2015 | Christopher Speller | 2015-08-28 | 2 | -27/+1 | |
|\ \ \ | |/ / |/| | | MM-2015 Added the ability to create a team with SSO services and added the ability to turn off email sign up. | |||||
| * | | Added the ability to create a team with SSO services and added the ability ↵ | JoramWilander | 2015-08-28 | 2 | -27/+1 | |
| | | | | | | | | | | | | to turn off email sign up. | |||||
* | | | Revert "MM-1870 Creating local version of fonts retrieved from Google" | Corey Hulen | 2015-08-27 | 1 | -1/+1 | |
|/ / | ||||||
* / | Creating local version of fonts retrieved from Google | Christopher Speller | 2015-08-27 | 1 | -1/+1 | |
|/ | ||||||
* | Fixes mm-1991 Allow ability to white label | =Corey Hulen | 2015-08-24 | 1 | -1/+1 | |
| | ||||||
* | Added help text to profile picture screen | nickago | 2015-08-21 | 1 | -0/+2 | |
| | ||||||
* | Cosmetic refactoring for ESLint | Christopher Speller | 2015-08-19 | 1 | -4/+4 | |
| | ||||||
* | Changed location of file upload overlay | Reed Garmsen | 2015-08-13 | 1 | -0/+1 | |
| | ||||||
* | Switched to using the jquery-dragster library to implement more consistent ↵ | Reed Garmsen | 2015-08-12 | 1 | -0/+2 | |
| | | | | drag and drop support, rather than using the inconsistent html5 implementation | |||||
* | Merge pull request #329 from asaadmahmoodspin/ui-changes | Christopher Speller | 2015-08-06 | 1 | -1/+3 | |
|\ | | | | | UI Improvements | |||||
| * | UI Improvements | Asaad Mahmood | 2015-08-04 | 1 | -1/+3 | |
| | | ||||||
* | | Fixed typo on landing page for sign-up | Reed Garmsen | 2015-08-03 | 1 | -1/+1 | |
|/ | ||||||
* | Fixing links for signup from team invite link. Enter now advances ↵ | Christopher Speller | 2015-07-30 | 1 | -1/+1 | |
| | | | | signup_user_complete screen. Signin now link now redirects properly. | |||||
* | updates to sign-up flow, remove company name and marketing checkbox | JoramWilander | 2015-07-28 | 1 | -1/+1 | |
| |