1601 commits

Author	SHA1	Message	Date
James Allen	d9b774bb9b	Sycn track changes based on doc state, not editor state	2017-01-27 17:12:17 +01:00
James Allen	ff7c5a0954	Merge branch 'master' into ja-track-changes	2017-01-27 17:11:49 +01:00
Paulo Reis	15ad3f4769	Avoid stopping propagation, check event target instead.	2017-01-26 16:11:02 +00:00
James Allen	68aab6e05c	Don't use code check on .bib files	2017-01-26 16:13:21 +01:00
Paulo Reis	ce89714a48	Emit event when textarea resizes; capture it in the review panel and trigger reflow.	2017-01-26 14:35:01 +00:00
James Allen	76328ff93f	Tell other clients when threads are deleted	2017-01-26 15:12:59 +01:00
James Allen	abb4ef14d8	Streamline the update/rendering process to not do extra work	2017-01-26 15:08:30 +01:00
Paulo Reis	1a1320b561	Avoid shrinking the expandable text area.	2017-01-26 11:59:55 +00: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
James Allen	406181b05d	Remove a console.log	2017-01-25 15:49:38 +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
Paulo Reis	f11926d0a9	Make sure layout math is done on load.	2017-01-25 10:31:02 +00:00
Henry Oswald	02e6eb4dd1	Merge pull request #399 from sharelatex/ho-promote-case-study ... promote domain alerts	2017-01-25 09:41:50 +00:00
Henry Oswald	13d21b881f	use new annoncments feature for case study info	2017-01-24 16:03:05 +00: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
James Allen	2813b16ebf	Use thread id for comment id	2017-01-23 09:45:37 +01:00
Shane Kilkelly	cfa2777d62	Merge branch 'sk-launchpad'	2017-01-20 13:58:16 +00:00
Shane Kilkelly	36eb453aed	Clarify logic of asyncform onsuccess and onerror handlers	2017-01-20 13:52:31 +00:00
Shane Kilkelly	57cd54bf55	WIP: migrate from jade to pug	2017-01-20 12:03:02 +00:00
Paulo Reis	2589ac7d58	Remove unneeded review panel layout event.	2017-01-18 10:55:51 +00:00
Paulo Reis	49fe8ef3a3	Update entry truncating logic while typing.	2017-01-18 10:53:59 +00:00
James Allen	318313d66c	Merge branch 'ja-track-changes' of github.com:sharelatex/web-sharelatex into ja-track-changes	2017-01-17 16:55:25 +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
Paulo Reis	2f119e5787	Track review features usage.	2017-01-17 14:39:31 +00:00
James Allen	e15d01874d	Remove comment from dropdown when it is reopened	2017-01-17 15:13:50 +01:00
James Allen	dec9b5bf1e	Use email if name is blank	2017-01-17 15:10:44 +01:00
James Allen	960d1e8b2f	Only call /project/.../threads if we need the threads	2017-01-17 15:04:49 +01:00
James Allen	4a47d135c7	Reapply ops to track changes as current user when reconnecting	2017-01-17 14:54:22 +01:00
James Allen	1b63db91d0	Add in a null check	2017-01-17 11:51:02 +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	5fb54d8447	Don't refresh resolved comments every times an entry changes	2017-01-16 16:55:14 +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
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	718f3dc388	Fix slightly broken callout positioning behaviour	2017-01-13 14:30:04 +01:00
James Allen	6c49b95538	Don't allow overlapping comments ... Note that this is only a 'soft' don't allow. You could resolve a comment, comment in the same area, and get them to overlap. It's not a problem if they overlap, just a bit ugly UI wise	2017-01-13 14:17:47 +01:00
James Allen	aab4dea8ae	Merge branch 'master' into ja-track-changes	2017-01-13 13:46:01 +01:00
Paulo Reis	3d5691ddaf	Merge branch 'ja-track-changes' of github.com:sharelatex/web-sharelatex into ja-track-changes	2017-01-12 16:49:56 +00:00
Paulo Reis	e3e8541a63	Add class when review panel should layout to the left.	2017-01-12 16:49:47 +00:00
Paulo Reis	9f008318cc	Emit event after linking the layout directive.	2017-01-12 16:49:29 +00:00
James Allen	2052ee63a3	Recover tracked changes after a disconnect	2017-01-12 17:19:19 +01:00
James Allen	a42cc48be8	Fix doc names and sort order in resolved comments dropdown	2017-01-12 13:44:54 +01:00
James Allen	f9b8ada215	track changes for anonymous users	2017-01-12 13:29:57 +01:00
James Allen	0d02b860d9	Merge branch 'ja-track-changes' of github.com:sharelatex/web-sharelatex into ja-track-changes	2017-01-12 13:08:57 +01:00
Paulo Reis	0b57cc650b	Fix merge mistake; adjust animation timings.	2017-01-12 11:56:04 +00:00
James Allen	64b9fe52dd	Handle deleted users in comments gracefully	2017-01-12 12:31:01 +01:00
Paulo Reis	88b694f894	Animate comment resolving.	2017-01-12 11:25:36 +00:00
James Allen	6cd8e2a935	Add user data to comments correctly	2017-01-12 12:05:35 +01:00
James Allen	e7ab92b7c9	Only show users controls they have permission to use	2017-01-12 11:52:39 +01:00
James Allen	953371ad2d	Don't double track a reject	2017-01-12 10:59:16 +01:00
James Allen	0264efccae	Don't let review panel entries go off the top of the screen	2017-01-11 14:57:00 +01:00
James Allen	a081ae7307	Properly sync resolved comments dropdown to entries	2017-01-11 14:13:49 +01:00
James Allen	4ee4aa9f0a	Merge branch 'ja-track-changes' of github.com:sharelatex/web-sharelatex into ja-track-changes	2017-01-11 13:41:16 +01:00
James Allen	2e5c6d4570	Don't remove add comment marker when updating entries	2017-01-11 13:41:07 +01:00
Paulo Reis	931187bd8b	Add a backdrop to the dropdown (to close when clicked outside).	2017-01-11 10:53:46 +00:00
Paulo Reis	72baed60ef	Merge branch 'ja-track-changes' of github.com:sharelatex/web-sharelatex into ja-track-changes	2017-01-10 16:29:36 +00:00
Paulo Reis	010612aacc	Keep track of resolved threads in the dropdown.	2017-01-10 16:29:27 +00:00
James Allen	f17ce2705c	Don't include wrapper for resolved comments, since it throws the review panel layout off	2017-01-10 17:17:07 +01:00
James Allen	3668d7dd1f	Remove global debugging hook	2017-01-10 16:58:59 +01:00
James Allen	f31fa98679	Sync track changes state between sessions and client	2017-01-10 16:11:12 +01:00
Shane Kilkelly	f3af44fab0	add on-success and on-error handlers to async-form.	2017-01-10 14:46:09 +00:00
James Allen	85c613e161	Merge branch 'ja-track-changes' of github.com:sharelatex/web-sharelatex into ja-track-changes	2017-01-10 13:44:01 +01:00
James Allen	d03aa7056e	Rename /ranges/users end point to /changes/users	2017-01-10 13:43:53 +01:00
Paulo Reis	5bd49c08f8	Simpler resolved comments dropdown data structure.	2017-01-10 12:16:58 +00:00
Paulo Reis	9c7d89c5bd	Merge branch 'ja-track-changes' of github.com:sharelatex/web-sharelatex into ja-track-changes	2017-01-10 11:23:15 +00:00
Paulo Reis	072044ee90	Remove thread from view collection; some clean-up.	2017-01-10 11:23:06 +00:00
James Allen	7ae33041b5	Don't enter infinite loop generating id	2017-01-10 11:58:55 +01:00
James Allen	12e1b2bc3d	Don't show resolved comments highlighted in the text	2017-01-10 11:55:59 +01:00
Paulo Reis	32fb317820	Add delete action to the dropdown.	2017-01-10 10:33:54 +00:00
Paulo Reis	70134d44d0	Add unresolve action to the dropdown.	2017-01-09 17:22:01 +00:00
Paulo Reis	1a100b77df	Hide resolved comments from the review panel.	2017-01-09 15:15:03 +00:00
James Allen	35bdb4383a	Merge branch 'ja-track-changes' of github.com:sharelatex/web-sharelatex into ja-track-changes ... Conflicts: public/coffee/ide/review-panel/controllers/ReviewPanelController.coffee	2017-01-09 16:11:59 +01:00
James Allen	dbe5331566	Tell other clients when comments are resolved and reopened	2017-01-09 16:09:29 +01:00
Paulo Reis	037389b7dd	Decouple ranges update from the overview panel; integrate it with the dropdown.	2017-01-09 14:59:01 +00:00
James Allen	43f6b9de7c	Inform other clients when we accept a change	2017-01-09 15:54:12 +01:00
Paulo Reis	5e483f2a97	Merge branch 'ja-track-changes' of github.com:sharelatex/web-sharelatex into ja-track-changes	2017-01-09 14:31:31 +00:00
James Allen	7e33d1a24e	Fix generation of thread id	2017-01-09 15:30:48 +01:00
Paulo Reis	f0ab1fa2d4	Merge branch 'ja-track-changes' of github.com:sharelatex/web-sharelatex into ja-track-changes	2017-01-09 14:30:40 +00:00
Paulo Reis	4871d56725	Isolate overview panel overrides.	2017-01-09 14:30:29 +00:00
James Allen	9379cff89d	Add end point for accepting change in doc updater	2017-01-09 15:25:27 +01:00
James Allen	a4097b4709	Merge branch 'ja-track-changes' of github.com:sharelatex/web-sharelatex into ja-track-changes	2017-01-09 10:52:01 +01:00
James Allen	14c624614d	Update RangesTracker	2017-01-09 10:51:55 +01:00
James Allen	ae30f32481	Use deterministic ids based on a seed	2017-01-09 10:49:03 +01:00
Paulo Reis	0478fcd925	Add comment resolution info.	2017-01-06 15:24:33 +00:00
James Allen	beb94b0756	Merge branch 'ja-track-changes' of github.com:sharelatex/web-sharelatex into ja-track-changes	2017-01-06 13:42:08 +01:00
James Allen	3a5d45fa32	Get user info via web, not chat	2017-01-06 13:41:58 +01:00
Paulo Reis	42585085c0	Integrate new directive, plumb data into it. More styling.	2017-01-06 12:00:17 +00:00
Paulo Reis	f2e6e69df6	Add an entry directive for resolved comments, with file and quoted text.	2017-01-06 11:59:49 +00:00
Paulo Reis	a1435d13a3	Basic structure for the resolved comments dropdown.	2017-01-05 17:15:27 +00:00
Paulo Reis	22db36d21b	Merge branch 'ja-track-changes' of github.com:sharelatex/web-sharelatex into ja-track-changes	2017-01-05 11:51:00 +00:00
Paulo Reis	d13035a4f4	Simpler UI for comments; remove some unused code.	2017-01-05 11:50:43 +00:00
James Allen	5155ebaeec	Don't show resolved comments when loading editor	2017-01-05 10:55:16 +01:00
James Allen	898d20a6fc	Fix signature of call to unresolveComment	2017-01-05 10:34:28 +01:00
James Allen	84d9b2aa49	Save resolve and reopened state	2017-01-04 16:26:02 +01:00