Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| | |||||
* | Signup Ui changes | Asaad Mahmood | 2015-07-28 | 2 | -3/+3 |
| | |||||
* | Merge pull request #253 from nickago/MM-1654 | Christopher Speller | 2015-07-28 | 1 | -0/+7 |
|\ | | | | | MM-1654 Anti-clickjacking measures | ||||
| * | Removed ability to place MM in an iframe | nickago | 2015-07-24 | 1 | -0/+7 |
| | | |||||
* | | When user is removed, a modal appears, which on closing redirects the | nickago | 2015-07-27 | 1 | -0/+1 |
|/ | | | | user to town square. | ||||
* | Merge pull request #237 from mattermost/mm-1570 | Corey Hulen | 2015-07-23 | 3 | -2/+28 |
|\ | | | | | fixes mm-1570 adds support for using mattermost as an OAuth client | ||||
| * | only show gitlab signup/login links if gitlab oauth is turned on | JoramWilander | 2015-07-22 | 2 | -2/+2 |
| | | |||||
| * | merged with new team domain changes and added signup/login links for gitlab | JoramWilander | 2015-07-22 | 1 | -1/+1 |
| | | |||||
| * | inital implementation of using GitLab OAuth2 provider for signup/login | JoramWilander | 2015-07-22 | 1 | -0/+26 |
| | | |||||
* | | Adding back Access History and Active Devices | Reed Garmsen | 2015-07-22 | 1 | -0/+2 |
|/ | |||||
* | Merge pull request #222 from rgarmsen2295/mm-1574 | Joram Wilander | 2015-07-22 | 1 | -1/+1 |
|\ | | | | | MM-1574 Fixed typo in the 'Sign up Complete' page: you email -> your email | ||||
| * | Fixed typo in the 'Sign up Complete' page: you email -> your email | Reed Garmsen | 2015-07-21 | 1 | -1/+1 |
| | | |||||
* | | Changing the way we mattermost handles URLs. team.domain.com becomes ↵ | Christopher Speller | 2015-07-20 | 8 | -10/+8 |
|/ | | | | | | | domain.com/team. Renaming team.Name to team.DisplayName and team.Domain to team.Name. So: team.Name -> url safe name. team.DisplayName -> nice name for users | ||||
* | Fixes javascript console errors | =Corey Hulen | 2015-07-17 | 1 | -2/+3 |
| | |||||
* | Renamed all clientside references from full_name to nickname | hmhealey | 2015-07-17 | 1 | -1/+1 |
| | |||||
* | remove admin's ability to manage members of default channel (fixes #172) | ralder | 2015-07-16 | 1 | -1/+2 |
| | |||||
* | remove newline | Fabian Frei | 2015-07-09 | 1 | -1/+1 |
| | |||||
* | added link to manifest.json and ios metatags | Fabian Frei | 2015-07-09 | 1 | -0/+13 |
| | |||||
* | Use correctly minified and unminified js libraries for JQuery, Bootstrap, ↵ | hmhealey | 2015-07-08 | 1 | -3/+3 |
| | | | | and Perfect Scrollbar |