summaryrefslogtreecommitdiffstats
path: root/web/templates
Commit message (Collapse)AuthorAgeFilesLines
* Fixing css=Corey Hulen2015-09-161-1/+0
|
* PLT-40 adding experimental support for emojis=Corey Hulen2015-09-161-0/+5
|
* Implement OAuth2 service provider functionality.JoramWilander2015-09-162-0/+27
|
* Merge branch 'master' into PLT-93=Corey Hulen2015-09-161-1/+1
|\
| * Merge pull request #686 from hmhealey/plt172Joram Wilander2015-09-161-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.5hmhealey2015-09-151-1/+1
| | |
* | | PLT-93 cleaing up client side configs=Corey Hulen2015-09-1511-33/+25
| | |
* | | removing loggly=Corey Hulen2015-09-151-11/+0
|/ /
* | Merge pull request #678 from mattermost/mm-1589Corey Hulen2015-09-141-3/+4
|\ \ | |/ |/| PLT-171 MM-1589 New add channel modal using react-bootstrap.
| * New add channel modal using react-bootstrap.Christopher Speller2015-09-141-3/+4
| |
* | Merge branch 'master' into PLT-12=Corey Hulen2015-09-111-0/+1
|\|
| * Updating UI for modals and notification barAsaad Mahmood2015-09-111-0/+1
| |
* | Cleaning up html=Corey Hulen2015-09-101-38/+6
| |
* | PLT-12 UI framework for admin console=Corey Hulen2015-09-101-344/+38
| |
* | Adding initial admin console html pages=Corey Hulen2015-09-031-0/+362
|/
* Moving config.js to /web/react/utils/ Including in every file neededChristopher Speller2015-09-021-11/+10
|
* Merge pull request #494 from rgarmsen2295/mm-1628Christopher Speller2015-08-311-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 Garmsen2015-08-271-1/+1
| | | | | | | | no longer obscured by the phone's status bar
* | Merge pull request #512 from mattermost/mm-1870Corey Hulen2015-08-281-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 compatibilityChristopher Speller2015-08-281-1/+1
| | | | | | | | | | | | with all browsers.
* | | Merge pull request #496 from mattermost/mm-2015Christopher Speller2015-08-282-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 ↵JoramWilander2015-08-282-27/+1
| | | | | | | | | | | | to turn off email sign up.
* | | Revert "MM-1870 Creating local version of fonts retrieved from Google"Corey Hulen2015-08-271-1/+1
|/ /
* / Creating local version of fonts retrieved from GoogleChristopher Speller2015-08-271-1/+1
|/
* Fixes mm-1991 Allow ability to white label=Corey Hulen2015-08-241-1/+1
|
* Added help text to profile picture screennickago2015-08-211-0/+2
|
* Cosmetic refactoring for ESLintChristopher Speller2015-08-191-4/+4
|
* Changed location of file upload overlayReed Garmsen2015-08-131-0/+1
|
* Switched to using the jquery-dragster library to implement more consistent ↵Reed Garmsen2015-08-121-0/+2
| | | | drag and drop support, rather than using the inconsistent html5 implementation
* Merge pull request #329 from asaadmahmoodspin/ui-changesChristopher Speller2015-08-061-1/+3
|\ | | | | UI Improvements
| * UI ImprovementsAsaad Mahmood2015-08-041-1/+3
| |
* | Fixed typo on landing page for sign-upReed Garmsen2015-08-031-1/+1
|/
* Fixing links for signup from team invite link. Enter now advances ↵Christopher Speller2015-07-301-1/+1
| | | | signup_user_complete screen. Signin now link now redirects properly.
* updates to sign-up flow, remove company name and marketing checkboxJoramWilander2015-07-281-1/+1
|
* Signup Ui changesAsaad Mahmood2015-07-282-3/+3
|
* Merge pull request #253 from nickago/MM-1654Christopher Speller2015-07-281-0/+7
|\ | | | | MM-1654 Anti-clickjacking measures
| * Removed ability to place MM in an iframenickago2015-07-241-0/+7
| |
* | When user is removed, a modal appears, which on closing redirects thenickago2015-07-271-0/+1
|/ | | | user to town square.
* Merge pull request #237 from mattermost/mm-1570Corey Hulen2015-07-233-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 onJoramWilander2015-07-222-2/+2
| |
| * merged with new team domain changes and added signup/login links for gitlabJoramWilander2015-07-221-1/+1
| |
| * inital implementation of using GitLab OAuth2 provider for signup/loginJoramWilander2015-07-221-0/+26
| |
* | Adding back Access History and Active DevicesReed Garmsen2015-07-221-0/+2
|/
* Merge pull request #222 from rgarmsen2295/mm-1574Joram Wilander2015-07-221-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 emailReed Garmsen2015-07-211-1/+1
| |
* | Changing the way we mattermost handles URLs. team.domain.com becomes ↵Christopher Speller2015-07-208-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 Hulen2015-07-171-2/+3
|
* Renamed all clientside references from full_name to nicknamehmhealey2015-07-171-1/+1
|
* remove admin's ability to manage members of default channel (fixes #172)ralder2015-07-161-1/+2
|
* remove newlineFabian Frei2015-07-091-1/+1
|