Hi <%= first_name %>,
-I'm sorry to see you cancelled your ShareLaTeX premium account. Would you mind giving me some advice on what the site is lacking at the moment via this survey?
+I'm sorry to see you cancelled your ShareLaTeX premium account. Would you mind giving me some advice on what the site is lacking at the moment via this survey?
Thank you in advance.
diff --git a/services/web/app/coffee/infrastructure/ExpressLocals.coffee b/services/web/app/coffee/infrastructure/ExpressLocals.coffee index 7e2945ead9..7b79904436 100644 --- a/services/web/app/coffee/infrastructure/ExpressLocals.coffee +++ b/services/web/app/coffee/infrastructure/ExpressLocals.coffee @@ -122,7 +122,9 @@ module.exports = (app, webRouter, apiRouter)-> res.locals.translate = (key, vars = {}) -> vars.appName = Settings.appName req.i18n.translate(key, vars) - res.locals.currentUrl = req.originalUrl + # Don't include the query string parameters, otherwise Google + # treats ?nocdn=true as the canonical version + res.locals.currentUrl = Url.parse(req.originalUrl).pathname next() webRouter.use (req, res, next)-> diff --git a/services/web/app/views/layout.jade b/services/web/app/views/layout.jade index 88fe4187fe..30b6b2294b 100644 --- a/services/web/app/views/layout.jade +++ b/services/web/app/views/layout.jade @@ -57,7 +57,7 @@ html(itemscope, itemtype='http://schema.org/Product') var noCdnKey = "nocdn=true" var cdnBlocked = typeof jQuery === 'undefined' var noCdnAlreadyInUrl = window.location.href.indexOf(noCdnKey) != -1 //prevent loops - if (cdnBlocked && !noCdnAlreadyInUrl) { + if (cdnBlocked && !noCdnAlreadyInUrl && navigator.userAgent.indexOf("Googlebot") == -1) { window.location.search += '&'+noCdnKey; } script(src=buildJsPath("libs/angular-1.3.15.min.js", {fingerprint:false})) diff --git a/services/web/app/views/project/editor/left-menu.jade b/services/web/app/views/project/editor/left-menu.jade index 05fa19542f..695e24d05a 100644 --- a/services/web/app/views/project/editor/left-menu.jade +++ b/services/web/app/views/project/editor/left-menu.jade @@ -197,6 +197,10 @@ script(type='text/ng-template', id='wordCountModalTemplate') ) div(ng-if="!status.loading") .container-fluid + .row(ng-show='data.messages.length > 0') + .col-xs-12 + .alert.alert-danger + p(style="white-space: pre-wrap") {{data.messages}} .row .col-xs-4 .pull-right #{translate("total_words")} : diff --git a/services/web/app/views/project/list/project-list.jade b/services/web/app/views/project/list/project-list.jade index 649c860b26..01007213d0 100644 --- a/services/web/app/views/project/list/project-list.jade +++ b/services/web/app/views/project/list/project-list.jade @@ -8,7 +8,7 @@ input.form-control.col-md-7.col-xs-12( placeholder="#{translate('search_projects')}…", autofocus='autofocus', - ng-model="searchText", + ng-model="searchText.value", focus-on='search:clear', ng-keyup="searchProjects()" ) @@ -16,7 +16,7 @@ i.fa.fa-times.form-control-feedback( ng-click="clearSearchText()", style="cursor: pointer;", - ng-show="searchText.length > 0" + ng-show="searchText.value.length > 0" ) //- i.fa.fa-remove diff --git a/services/web/app/views/project/list/side-bar.jade b/services/web/app/views/project/list/side-bar.jade index 96365c813e..3738e9a4ae 100644 --- a/services/web/app/views/project/list/side-bar.jade +++ b/services/web/app/views/project/list/side-bar.jade @@ -155,6 +155,6 @@ | #{translate("or_unlock_features_bonus")} a(href="/user/bonus") #{translate("sharing_sl")} . script. - window.userHasNoSubscription = #{settings.enableSubscriptions && !hasSubscription} + window.userHasNoSubscription = #{!!(settings.enableSubscriptions && !hasSubscription)} diff --git a/services/web/config/settings.defaults.coffee b/services/web/config/settings.defaults.coffee index 10fef74a11..ea5b6ef8a1 100644 --- a/services/web/config/settings.defaults.coffee +++ b/services/web/config/settings.defaults.coffee @@ -155,7 +155,7 @@ module.exports = settings = collaborators: -1 dropbox: true versioning: true - compileTimeout: 60 + compileTimeout: 180 compileGroup: "standard" references: true templates: true diff --git a/services/web/public/coffee/ide/pdf/controllers/PdfController.coffee b/services/web/public/coffee/ide/pdf/controllers/PdfController.coffee index c79d654dbc..790f2384a1 100644 --- a/services/web/public/coffee/ide/pdf/controllers/PdfController.coffee +++ b/services/web/public/coffee/ide/pdf/controllers/PdfController.coffee @@ -74,7 +74,8 @@ define [ $scope.pdf.renderingError = true # abort compile if syntax checks fail - $scope.stop_on_validation_error = localStorage("stop_on_validation_error:#{$scope.project_id}") or ide.$scope?.user?.betaProgram + $scope.stop_on_validation_error = localStorage("stop_on_validation_error:#{$scope.project_id}") + $scope.stop_on_validation_error ?= true # turn on for all users by default $scope.$watch "stop_on_validation_error", (new_value, old_value) -> if new_value? and old_value != new_value localStorage("stop_on_validation_error:#{$scope.project_id}", new_value) diff --git a/services/web/public/coffee/ide/share/controllers/ShareProjectModalController.coffee b/services/web/public/coffee/ide/share/controllers/ShareProjectModalController.coffee index 409608825e..48c6440718 100644 --- a/services/web/public/coffee/ide/share/controllers/ShareProjectModalController.coffee +++ b/services/web/public/coffee/ide/share/controllers/ShareProjectModalController.coffee @@ -19,7 +19,7 @@ define [ , 200 INFINITE_COLLABORATORS = -1 - $scope.$watch "project.members.length", (noOfMembers) -> + $scope.$watch "(project.members.length + project.invites.length)", (noOfMembers) -> allowedNoOfMembers = $scope.project.features.collaborators $scope.canAddCollaborators = noOfMembers < allowedNoOfMembers or allowedNoOfMembers == INFINITE_COLLABORATORS diff --git a/services/web/public/coffee/main/project-list/project-list.coffee b/services/web/public/coffee/main/project-list/project-list.coffee index 313b52ba1f..39ce68043f 100644 --- a/services/web/public/coffee/main/project-list/project-list.coffee +++ b/services/web/public/coffee/main/project-list/project-list.coffee @@ -11,6 +11,8 @@ define [ $scope.filter = "all" $scope.predicate = "lastUpdated" $scope.reverse = true + $scope.searchText = + value : "" if $scope.projects.length == 0 $timeout () -> @@ -69,7 +71,7 @@ define [ $scope.updateVisibleProjects() $scope.clearSearchText = () -> - $scope.searchText = "" + $scope.searchText.value = "" $scope.filter = "all" $scope.$emit "search:clear" $scope.updateVisibleProjects() @@ -96,8 +98,8 @@ define [ for project in $scope.projects visible = true # Only show if it matches any search text - if $scope.searchText? and $scope.searchText != "" - if !project.name.toLowerCase().match($scope.searchText.toLowerCase()) + if $scope.searchText.value? and $scope.searchText.value != "" + if !project.name.toLowerCase().match($scope.searchText.value.toLowerCase()) visible = false # Only show if it matches the selected tag if $scope.filter == "tag" and selectedTag? and project.id not in selectedTag.project_ids