From 1a1320b561a8a13f33ea10d3864aac745b8c08e4 Mon Sep 17 00:00:00 2001
From: Paulo Reis <paulojreis@gmail.com>
Date: Thu, 26 Jan 2017 11:59:55 +0000
Subject: [PATCH 1/7] Avoid shrinking the expandable text area.

---
 .../public/coffee/directives/expandableTextArea.coffee | 10 +++++-----
 .../public/stylesheets/app/editor/review-panel.less    |  1 +
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/services/web/public/coffee/directives/expandableTextArea.coffee b/services/web/public/coffee/directives/expandableTextArea.coffee
index 8f646c10a7..58f8ce13ae 100644
--- a/services/web/public/coffee/directives/expandableTextArea.coffee
+++ b/services/web/public/coffee/directives/expandableTextArea.coffee
@@ -5,12 +5,12 @@ define [
 		restrict: "A"
 		link: (scope, el) ->
 			resetHeight = () ->
-				el.css("height", "auto")
-				el.css("height", el.prop("scrollHeight"))
+				curHeight = el.outerHeight()
+				fitHeight = el.prop("scrollHeight")
+				
+				if fitHeight > curHeight and el.val() != ""
+					el.css("height", fitHeight) 
 
 			scope.$watch (() -> el.val()), resetHeight
 
-			resetHeight()
-
-
 	
\ No newline at end of file
diff --git a/services/web/public/stylesheets/app/editor/review-panel.less b/services/web/public/stylesheets/app/editor/review-panel.less
index da9fa7eb43..86bdedfff1 100644
--- a/services/web/public/stylesheets/app/editor/review-panel.less
+++ b/services/web/public/stylesheets/app/editor/review-panel.less
@@ -451,6 +451,7 @@
 		resize: vertical;
 		color: @rp-type-darkgrey;
 		margin-top: 3px;
+		overflow-x: hidden;
 	}
 
 .rp-icon-delete {

From 6304c213bdce77ea6ae80ea93371c8df33d39013 Mon Sep 17 00:00:00 2001
From: Paulo Reis <paulojreis@gmail.com>
Date: Thu, 26 Jan 2017 12:00:11 +0000
Subject: [PATCH 2/7] Add a min-height to the review panel text areas.

---
 services/web/public/stylesheets/app/editor/review-panel.less | 1 +
 1 file changed, 1 insertion(+)

diff --git a/services/web/public/stylesheets/app/editor/review-panel.less b/services/web/public/stylesheets/app/editor/review-panel.less
index 86bdedfff1..1bac7faf6f 100644
--- a/services/web/public/stylesheets/app/editor/review-panel.less
+++ b/services/web/public/stylesheets/app/editor/review-panel.less
@@ -452,6 +452,7 @@
 		color: @rp-type-darkgrey;
 		margin-top: 3px;
 		overflow-x: hidden;
+		min-height: 3em;
 	}
 
 .rp-icon-delete {

From ce89714a48d9fa6e5ebbbb8626107d6fea1f44bd Mon Sep 17 00:00:00 2001
From: Paulo Reis <paulojreis@gmail.com>
Date: Thu, 26 Jan 2017 14:35:01 +0000
Subject: [PATCH 3/7] Emit event when textarea resizes; capture it in the
 review panel and trigger reflow.

---
 .../web/public/coffee/directives/expandableTextArea.coffee    | 1 +
 .../ide/review-panel/controllers/ReviewPanelController.coffee | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/services/web/public/coffee/directives/expandableTextArea.coffee b/services/web/public/coffee/directives/expandableTextArea.coffee
index 58f8ce13ae..d0bfa9cb99 100644
--- a/services/web/public/coffee/directives/expandableTextArea.coffee
+++ b/services/web/public/coffee/directives/expandableTextArea.coffee
@@ -9,6 +9,7 @@ define [
 				fitHeight = el.prop("scrollHeight")
 				
 				if fitHeight > curHeight and el.val() != ""
+					scope.$emit "expandable-text-area:resize"
 					el.css("height", fitHeight) 
 
 			scope.$watch (() -> el.val()), resetHeight
diff --git a/services/web/public/coffee/ide/review-panel/controllers/ReviewPanelController.coffee b/services/web/public/coffee/ide/review-panel/controllers/ReviewPanelController.coffee
index 5dc2cd3715..1a1a37cf21 100644
--- a/services/web/public/coffee/ide/review-panel/controllers/ReviewPanelController.coffee
+++ b/services/web/public/coffee/ide/review-panel/controllers/ReviewPanelController.coffee
@@ -33,6 +33,10 @@ define [
 		$scope.$on "layout:pdf:resize", (event, state) ->
 			$scope.reviewPanel.layoutToLeft = (state.east?.size < 220 || state.east?.initClosed)
 
+		$scope.$on "expandable-text-area:resize", (event) ->
+			$timeout () ->
+				$scope.$broadcast "review-panel:layout"
+
 		$scope.$watch "ui.pdfLayout", (layout) ->
 			$scope.reviewPanel.layoutToLeft = (layout == "flat")
 

From 27c48f3790df32bd3a99ba3225759d60e515adda Mon Sep 17 00:00:00 2001
From: James Allen <james@sharelatex.com>
Date: Fri, 3 Feb 2017 14:17:09 +0100
Subject: [PATCH 4/7] Clear selection after creating a comment

---
 .../aceEditor/cursor-position/CursorPositionManager.coffee     | 3 +++
 .../ide/review-panel/controllers/ReviewPanelController.coffee  | 1 +
 2 files changed, 4 insertions(+)

diff --git a/services/web/public/coffee/ide/editor/directives/aceEditor/cursor-position/CursorPositionManager.coffee b/services/web/public/coffee/ide/editor/directives/aceEditor/cursor-position/CursorPositionManager.coffee
index b8a3d43819..119aa471e1 100644
--- a/services/web/public/coffee/ide/editor/directives/aceEditor/cursor-position/CursorPositionManager.coffee
+++ b/services/web/public/coffee/ide/editor/directives/aceEditor/cursor-position/CursorPositionManager.coffee
@@ -37,6 +37,9 @@ define [
 						@gotoOffset(offset)
 					, 10 # Hack: Must happen after @gotoStoredPosition
 
+			@$scope.$on "#{@$scope.name}:clearSelection", (e) =>
+				@editor.selection.clearSelection()
+
 		storeScrollTopPosition: (session) ->
 			if @doc_id?
 				docPosition = @localStorage("doc.position.#{@doc_id}") || {}
diff --git a/services/web/public/coffee/ide/review-panel/controllers/ReviewPanelController.coffee b/services/web/public/coffee/ide/review-panel/controllers/ReviewPanelController.coffee
index ac687386f8..40be0ed372 100644
--- a/services/web/public/coffee/ide/review-panel/controllers/ReviewPanelController.coffee
+++ b/services/web/public/coffee/ide/review-panel/controllers/ReviewPanelController.coffee
@@ -306,6 +306,7 @@ define [
 			$http.post("/project/#{$scope.project_id}/thread/#{thread_id}/messages", {content, _csrf: window.csrfToken})
 				.error (error) ->
 					ide.showGenericMessageModal("Error submitting comment", "Sorry, there was a problem submitting your comment")
+			$scope.$broadcast "editor:clearSelection"
 			$timeout () ->
 				$scope.$broadcast "review-panel:layout"
 			event_tracking.sendMB "rp-new-comment", { size: content.length }

From a32ec78a54f3598b24fe95038b2e0a1396349017 Mon Sep 17 00:00:00 2001
From: Joe Green <joe.green0991@gmail.com>
Date: Mon, 6 Feb 2017 11:59:32 +0000
Subject: [PATCH 5/7] added about image for jg

---
 services/web/public/img/about/joe_green.jpg | Bin 0 -> 9566 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 services/web/public/img/about/joe_green.jpg

diff --git a/services/web/public/img/about/joe_green.jpg b/services/web/public/img/about/joe_green.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..0b730673d0a06e38c2c7e665f979217889a86b07
GIT binary patch
literal 9566
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

literal 0
HcmV?d00001


From 7d5dc34b3e64a4fa34eaeda9a42f62054c826dbf Mon Sep 17 00:00:00 2001
From: Shane Kilkelly <shane@kilkelly.me>
Date: Mon, 6 Feb 2017 14:58:54 +0000
Subject: [PATCH 6/7] fix the set-password form for new (admin-created) users

---
 .../PasswordResetController.coffee            |  7 ++++-
 .../PasswordResetControllerTests.coffee       | 31 ++++++++++++-------
 2 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/services/web/app/coffee/Features/PasswordReset/PasswordResetController.coffee b/services/web/app/coffee/Features/PasswordReset/PasswordResetController.coffee
index ec5371f0f2..452193aeb4 100644
--- a/services/web/app/coffee/Features/PasswordReset/PasswordResetController.coffee
+++ b/services/web/app/coffee/Features/PasswordReset/PasswordResetController.coffee
@@ -53,7 +53,12 @@ module.exports =
 					if req.body.login_after
 						UserGetter.getUser user_id, {email: 1}, (err, user) ->
 							return next(err) if err?
-							AuthenticationController.doLogin {email:user.email, password: password}, req, res, next
+							# AuthenticationController.doLogin {email:user.email, password: password}, req, res, next
+							AuthenticationController.afterLoginSessionSetup req, user, (err) ->
+								if err?
+									logger.err {err, email: user.email}, "Error setting up session after setting password"
+									return next(err)
+								res.json {redir: AuthenticationController._getRedirectFromSession(req) || "/project"}
 					else
 						res.sendStatus 200
 			else
diff --git a/services/web/test/UnitTests/coffee/PasswordReset/PasswordResetControllerTests.coffee b/services/web/test/UnitTests/coffee/PasswordReset/PasswordResetControllerTests.coffee
index 89c6479734..d11507361c 100644
--- a/services/web/test/UnitTests/coffee/PasswordReset/PasswordResetControllerTests.coffee
+++ b/services/web/test/UnitTests/coffee/PasswordReset/PasswordResetControllerTests.coffee
@@ -145,18 +145,27 @@ describe "PasswordResetController", ->
 				done()
 			@PasswordResetController.setNewUserPassword @req, @res
 
-		it "should login user if login_after is set", (done) ->
-			@UserGetter.getUser = sinon.stub().callsArgWith(2, null, { email: "joe@example.com" })
-			@PasswordResetHandler.setNewUserPassword.callsArgWith(2, null, true, @user_id = "user-id-123")
-			@req.body.login_after = "true"
-			@AuthenticationController.doLogin = (options, req, res, next)=>
-				@UserGetter.getUser.calledWith(@user_id).should.equal true
-				expect(options).to.deep.equal {
-					email: "joe@example.com",
-					password: @password
-				}
+		describe 'when login_after is set', ->
+
+			beforeEach ->
+				@UserGetter.getUser = sinon.stub().callsArgWith(2, null, { email: "joe@example.com" })
+				@PasswordResetHandler.setNewUserPassword.callsArgWith(2, null, true, @user_id = "user-id-123")
+				@req.body.login_after = "true"
+				@res.json = sinon.stub()
+				@AuthenticationController.afterLoginSessionSetup = sinon.stub().callsArgWith(2, null)
+				@AuthenticationController._getRedirectFromSession = sinon.stub().returns('/some/path')
+
+			it "should login user if login_after is set", (done) ->
+				@PasswordResetController.setNewUserPassword @req, @res
+				@AuthenticationController.afterLoginSessionSetup.callCount.should.equal 1
+				@AuthenticationController.afterLoginSessionSetup.calledWith(
+					@req,
+					{email: 'joe@example.com'}
+				).should.equal true
+				@AuthenticationController._getRedirectFromSession.callCount.should.equal 1
+				@res.json.callCount.should.equal 1
+				@res.json.calledWith({redir: '/some/path'}).should.equal true
 				done()
-			@PasswordResetController.setNewUserPassword @req, @res
 
 	describe "renderSetPasswordForm", ->
 

From 6a161b4071055ed050cf3d59f930a9fe55a7c064 Mon Sep 17 00:00:00 2001
From: Shane Kilkelly <shane@kilkelly.me>
Date: Mon, 6 Feb 2017 16:35:52 +0000
Subject: [PATCH 7/7] remove commented out code

---
 .../coffee/Features/PasswordReset/PasswordResetController.coffee | 1 -
 1 file changed, 1 deletion(-)

diff --git a/services/web/app/coffee/Features/PasswordReset/PasswordResetController.coffee b/services/web/app/coffee/Features/PasswordReset/PasswordResetController.coffee
index 452193aeb4..618e9e0a7d 100644
--- a/services/web/app/coffee/Features/PasswordReset/PasswordResetController.coffee
+++ b/services/web/app/coffee/Features/PasswordReset/PasswordResetController.coffee
@@ -53,7 +53,6 @@ module.exports =
 					if req.body.login_after
 						UserGetter.getUser user_id, {email: 1}, (err, user) ->
 							return next(err) if err?
-							# AuthenticationController.doLogin {email:user.email, password: password}, req, res, next
 							AuthenticationController.afterLoginSessionSetup req, user, (err) ->
 								if err?
 									logger.err {err, email: user.email}, "Error setting up session after setting password"