Browse Source

Turn on track changes for everyone and take out of beta

James Allen 9 years ago
parent
commit
eb30c46458

+ 1 - 6
services/web/app/coffee/Features/Project/ProjectEditorHandler.coffee

@@ -22,11 +22,6 @@ module.exports = ProjectEditorHandler =
 		if !result.invites?
 			result.invites = []
 			
-		trackChangesVisible = false
-		for member in members
-			if member.privilegeLevel == "owner" and (member.user?.featureSwitches?.track_changes or member.user?.betaProgram)
-				trackChangesVisible = true
-
 		{owner, ownerFeatures, members} = @buildOwnerAndMembersViews(members)
 		result.owner = owner
 		result.members = members
@@ -40,7 +35,7 @@ module.exports = ProjectEditorHandler =
 			templates: false
 			references: false
 			trackChanges: false
-			trackChangesVisible: ProjectEditorHandler.trackChangesAvailable and trackChangesVisible
+			trackChangesVisible: ProjectEditorHandler.trackChangesAvailable
 		})
 
 		return result

+ 0 - 3
services/web/app/coffee/models/User.coffee

@@ -39,9 +39,6 @@ UserSchema = new Schema
 							references:    { type:Boolean, default: Settings.defaultFeatures.references }
 							trackChanges:  { type:Boolean, default: Settings.defaultFeatures.trackChanges }
 						}
-	featureSwitches	  : {
-		track_changes: { type: Boolean }
-	}
 	referal_id : {type:String, default:() -> uuid.v4().split("-")[0]}
 	refered_users: [ type:ObjectId, ref:'User' ]
 	refered_user_count: { type:Number, default: 0 }

+ 1 - 3
services/web/app/views/beta_program/opt_in.pug

@@ -18,9 +18,7 @@ block content
 											| #{translate("beta_program_badge_description")}
 											span.beta-feature-badge
 										p.text-centered
-											strong We're currently testing track changes and commenting:
-										p.text-centered
-											img(src="/img/teasers/track-changes/track-changes-beta.png", style="max-width: 100%; border-bottom: 1px solid #ddd")
+											strong We're not currently testing anything in beta, but keep checking back!
 								.row.text-centered
 									.col-md-12
 										if user.betaProgram

+ 0 - 1
services/web/app/views/project/editor/header.pug

@@ -94,7 +94,6 @@ header.toolbar.toolbar-header.toolbar-with-labels(
 			i.review-icon
 			p.toolbar-label
 				| #{translate("review")}
-				span(style="vertical-align: 20%; margin-left: 4px; padding: 2px 4px;").beta-feature-badge
 		a.btn.btn-full-height(
 			href,
 			ng-if="permissions.admin",