1476 commits

Author	SHA1	Message	Date
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
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
James Allen	988005e929	Send and get comments via the chat api	2016-12-16 16:42:41 +00:00
James Allen	5717cafcec	Create comments via comment ops	2016-12-13 17:57:46 +00:00
James Allen	898277b4af	Refactor ops model so it all happens in Document	2016-12-13 17:34:29 +00:00
James Allen	0a6a6c3c28	Keep files ordered in overview panel in the same was as the file tree	2016-12-09 16:17:28 +00:00
James Allen	293ba1fc4c	Fetch all ranges from docstore when viewing overview panel	2016-12-09 15:43:08 +00:00
James Allen	1d426e538f	Load ranges from docupdater and toggle track changes when possible	2016-12-08 14:10:30 +00:00
Shane Kilkelly	853dad95f3	After account delete, bounce to login after 1-second delay	2016-11-28 12:01:32 +00:00
James Allen	65c1a62cb7	Add in null check for user when getting hue in chat	2016-11-25 11:08:32 +00:00
James Allen	04c151eed0	Only bind to Ace if track changes is enabled	2016-11-24 16:56:50 +00:00
Paulo Reis	8d933d9b5f	Toggler style adjustments.	2016-11-23 16:10:35 +00:00
Paulo Reis	e655e85e6d	Integrate toggler in review panel.	2016-11-23 14:34:55 +00:00
Paulo Reis	ed20f8533f	Add toggler directive.	2016-11-23 14:34:21 +00:00
Paulo Reis	ba5118d02a	Merge branch 'master' into ja-review-panel	2016-11-23 10:41:20 +00:00
James Allen	33f6c0dd1b	Jump to position based on offset since we don't know doc lines for unopen docs	2016-11-22 16:34:39 +00:00