752 commits

Author	SHA1	Message	Date
James Allen	343abfde23	Use user feature flags to determine track changes state	2017-02-03 14:36:11 +01:00
Paulo Reis	8f9e43f339	Handle track changles toggling when the feature is not enabled.	2017-02-02 12:12:14 +00:00
Paulo Reis	98b98005a6	Create and integrate track changes upgrade prompt.	2017-02-01 16:52:18 +00:00
Shane Kilkelly	b0dd7475b0	fix pug syntax	2017-01-31 14:57:22 +00:00
Shane Kilkelly	83d0f26011	Merge branch 'master' into sk-pug	2017-01-31 10:18:53 +00:00
James Allen	ca11f5fa18	Merge pull request #400 from sharelatex/ja-goto-code-from-rp ... Jump to code when clicking on review panel entries	2017-01-31 10:49:13 +01:00
Shane Kilkelly	4e9426e6bf	Merge branch 'master' into sk-pug	2017-01-30 14:36:10 +00:00
Paulo Reis	15ad3f4769	Avoid stopping propagation, check event target instead.	2017-01-26 16:11:02 +00:00
James Allen	0479b01b9d	Jump to code when clicking on review panel entries	2017-01-26 16:04:08 +01:00
James Allen	abb4ef14d8	Streamline the update/rendering process to not do extra work	2017-01-26 15:08:30 +01:00
James Allen	32b0c6a4fb	Merge pull request #398 from sharelatex/ja-track-changes ... Fix style issues in IE 10	2017-01-25 15:55:15 +01:00
James Allen	757c7002eb	Merge pull request #397 from sharelatex/ja-modify-threads ... Allow editing/deleting of comments and threads	2017-01-25 15:50:00 +01:00
Paulo Reis	a924794a5a	Add expandable text area directive; apply it to review panel text areas.	2017-01-25 13:51:33 +00:00
Henry Oswald	69ab275404	Update list.jade	2017-01-25 09:14:21 +00:00
James Allen	59c40ea5cc	Only show delete options when thread has more than one message!	2017-01-24 17:03:32 +01:00
Henry Oswald	13d21b881f	use new annoncments feature for case study info	2017-01-24 16:03:05 +00:00
James Allen	798e09f011	Don't show 'no comments' when submitting	2017-01-24 16:56:08 +01:00
James Allen	f9ba7392e9	Allow editing/deleting of comments and threads	2017-01-24 16:21:14 +01:00
Henry Oswald	2341a8481a	Merge branch 'master' into ho-promote-case-study	2017-01-24 14:49:35 +00:00
Shane Kilkelly	57cd54bf55	WIP: migrate from jade to pug	2017-01-20 12:03:02 +00:00
Paulo Reis	76ea469970	Reposition the track-changes indicator element to avoid issues with IE positioning.	2017-01-19 12:12:34 +00:00
Paulo Reis	5489514d7a	Add some compatibility style rules for IE10.	2017-01-18 15:38:34 +00:00
James Allen	f97d36eb73	Merge branch 'ja-track-changes' of github.com:sharelatex/web-sharelatex into ja-track-changes	2017-01-18 14:07:29 +01:00
Paulo Reis	329c6af168	Add a track-changes indicator in the editor, for when the review panel is closed.	2017-01-17 17:20:51 +00:00
James Allen	786c92b2fc	Don't show delete comment button (until it works)	2017-01-17 17:34:11 +01:00
James Allen	4d15fc30ba	Don't flash resolved comments when editor is loading	2017-01-17 16:55:18 +01:00
James Allen	5a34d17947	Toggle track changes in a project based on the owner's feature switch	2017-01-17 15:59:18 +01:00
James Allen	960d1e8b2f	Only call /project/.../threads if we need the threads	2017-01-17 15:04:49 +01:00
James Allen	9c0bf885be	Merge branch 'master' into ja-track-changes	2017-01-17 10:16:41 +01:00
Paulo Reis	36f15ff56e	Avoid empty comment submission.	2017-01-16 17:14:06 +00:00
Paulo Reis	121629426e	Avoid empty comment replies.	2017-01-16 17:06:57 +00:00
James Allen	bf56952f88	Make overview panel entries jump to place in doc again	2017-01-16 15:31:51 +01:00
James Allen	d4f60977fd	Add loading indicator while submitting new comments	2017-01-16 15:25:10 +01:00
James Allen	e5c96eb619	Focus on text area when adding a comment	2017-01-16 15:17:56 +01:00
James Allen	278bfc1f50	Use 'show all' instead of 'more'	2017-01-16 15:06:47 +01:00
Shane Kilkelly	82ddeab2bd	If user tries to invite themselves to project, don't.	2017-01-16 13:45:01 +00:00
Paulo Reis	3968761ac8	Add collapsing behaviour to resolved comments.	2017-01-13 15:37:24 +00:00
Paulo Reis	5eece9f5d9	Add collapsing behaviour to long entries.	2017-01-13 15:30:31 +00:00
James Allen	b6ea338ff8	Separate resolved comments so they don't affect review panel	2017-01-13 15:27:45 +01:00
James Allen	bf7038f506	Adapt review panel line height to editor	2017-01-13 14:52:08 +01:00
James Allen	aab4dea8ae	Merge branch 'master' into ja-track-changes	2017-01-13 13:46:01 +01:00
Paulo Reis	823c2c854a	Add styling to have left-based layout when there is no space on the right.	2017-01-12 17:06:08 +00:00
Paulo Reis	e3e8541a63	Add class when review panel should layout to the left.	2017-01-12 16:49:47 +00:00
James Allen	a42cc48be8	Fix doc names and sort order in resolved comments dropdown	2017-01-12 13:44:54 +01:00
James Allen	8e0c2ff0b3	Adjust resolved comments buttons and add tooltip	2017-01-12 13:37:44 +01:00
Paulo Reis	0b57cc650b	Fix merge mistake; adjust animation timings.	2017-01-12 11:56:04 +00:00
Paulo Reis	88b694f894	Animate comment resolving.	2017-01-12 11:25:36 +00:00
James Allen	9a867438b2	Always show user name next to comment	2017-01-12 12:06:02 +01:00
James Allen	e7ab92b7c9	Only show users controls they have permission to use	2017-01-12 11:52:39 +01:00
Paulo Reis	d701c1ef5e	Make the dropdown scrollable.	2017-01-11 11:25:18 +00:00