agw/overleaf-cep
1
0
Fork 0
mirror of https://github.com/yu-i-i/overleaf-cep.git synced 2026-11-15 14:43:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:sharelatex/web-sharelatex

Browse Source
This commit is contained in:
Henry Oswald
2014-02-27 17:35:48 +00:00
parent 303a0e985b cfe13af6ff
commit aa0d26d5ab
14 changed files with 63 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
services/web/app/coffee/controllers/UserController.coffee
+4
View File
@@ -170,6 +170,7 @@ module.exports =
metrics.inc "user.password-change"
oldPass = req.body.currentPassword
AuthenticationManager.authenticate _id: req.session.user._id, oldPass, (err, user)->
return callback(err) if err?
if(user)
logger.log user: req.session.user, "changing password"
newPassword1 = req.body.newPassword1
@@ -198,17 +199,20 @@ module.exports =
redirectUserToDropboxAuth: (req, res)->
user_id = req.session.user._id
dropboxHandler.getDropboxRegisterUrl user_id, (err, url)->
return callback(err) if err?
logger.log url:url, "redirecting user for dropbox auth"
res.redirect url
completeDropboxRegistration: (req, res)->
user_id = req.session.user._id
dropboxHandler.completeRegistration user_id, (err, success)->
return callback(err) if err?
res.redirect('/user/settings#dropboxSettings')
unlinkDropbox: (req, res)->
user_id = req.session.user._id
dropboxHandler.unlinkAccount user_id, (err, success)->
return callback(err) if err?
res.redirect('/user/settings#dropboxSettings')
deleteUser: (req, res)->
services/web/app/coffee/models/User.coffee
+3 -3
View File
@@ -26,9 +26,9 @@ UserSchema = new Schema
pdfViewer : {type : String, default: "pdfjs"}
}
features : {
collaborators: {type:Number, default:1}
versioning: {type:Boolean, default:false}
dropbox: {type:Boolean, default:false}
collaborators: { type:Number, default: Settings.defaultFeatures.collaborators }
versioning: { type:Boolean, default: Settings.defaultFeatures.versioning }
dropbox: { type:Boolean, default: Settings.defaultFeatures.dropbox }
}
featureSwitches : {
dropbox: {type:Boolean, default:true},
services/web/app/views/general/small-footer.jade
+4
View File
@@ -1,4 +1,8 @@
.row-fluid
.span12
div.alert.alert-success.open-source
| ShareLaTeX is open source.
a(href="https://github.com/sharelatex/sharelatex") Fork us on GitHub.
.span12
.small-footer
ul
services/web/app/views/referal/bonus.jade
+1 -1
View File
@@ -34,7 +34,7 @@ block content
.row
.span4.offset4.bonus-banner
.title
a(href='mailto:?subject=Online LaTeX editor you may like, &body=Hey, I have been using the online LaTeX editor ShareLaTeX recently and thought you might like to check it out. #{encodeURIComponent(buildReferalUrl("e"))}', title='Share by Email').email Email us to your friends
a(href='mailto:?subject=Online LaTeX editor you may like &body=Hey, I have been using the online LaTeX editor ShareLaTeX recently and thought you might like to check it out. #{encodeURIComponent(buildReferalUrl("e"))}', title='Share by Email').email Email us to your friends
.row
.span4.offset4.bonus-banner
services/web/app/views/subscriptions/plans.jade
+4 -4
View File
@@ -150,8 +150,8 @@ block content
mixin plan(plans.groupAnnualPlans[2], "", false)
.tab-pane.student-pricing
include ../general/small-footer
link(rel='stylesheet', href='/brand/plans.css?fingerprint='+fingerprint('/brand/mainStyle.css'))
include ../general/small-footer
link(rel='stylesheet', href='/brand/plans.css?fingerprint='+fingerprint('/brand/mainStyle.css'))
script
mixpanel.track("Page Viewed", { name: "plans" })
script
mixpanel.track("Page Viewed", { name: "plans" })
services/web/app/views/user/settings.jade
+2
View File
@@ -152,6 +152,8 @@ block content
p Every few months we send a news letter out summarizing the new features available, if you would prefer to not receive this email then you are free to unsubscribe below at any time
a#unsubscribeFromNewsletter.btn.btn-danger(data-csrf=csrfToken) Unsubscribe
include ../general/small-footer
#changePasswordModal(style='display: none')
.modal
form#changePasswordForm(method="post", action="/user/password/update")