1873 commits

Author	SHA1	Message	Date
James Allen	43f6b9de7c	Inform other clients when we accept a change	2017-01-09 15:54:12 +01:00
James Allen	7e33d1a24e	Fix generation of thread id	2017-01-09 15:30:48 +01: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	037b61cbba	Further styling.	2017-01-06 17:22:22 +00: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
Paulo Reis	1599c41670	Sizing adjustments.	2017-01-04 15:34:24 +00:00
James Allen	60152e219b	Merge branch 'ja-track-changes' of github.com:sharelatex/web-sharelatex into ja-track-changes	2017-01-04 16:26:08 +01:00
James Allen	84d9b2aa49	Save resolve and reopened state	2017-01-04 16:26:02 +01:00
Paulo Reis	fdafcf9677	Restyle insertions and deletions - increasing info density.	2017-01-04 15:24:49 +00: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
James Allen	dcc9a5de32	Merge pull request #382 from sharelatex/sk-spellcheck-underline-retina ... Sk spellcheck underline retina	2016-11-30 15:51:34 +00:00
Shane Kilkelly	e081409b09	Update to modern images	2016-11-30 14:34:50 +00:00
Shane Kilkelly	ef115e2f91	add a 2x version of the spellcheck-underline image.	2016-11-30 11:25:47 +00:00
Shane Kilkelly	cf94429e05	Add a user_email option to the nav "Account" dropdown.	2016-11-29 16:04:20 +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	ecd81738cb	Restyle toggle.	2016-11-24 15:55:09 +00:00
Paulo Reis	bf5aa5e253	Fix review panel toolbar in flex contexts.	2016-11-23 17:04:55 +00:00
Paulo Reis	1148b00c9a	Add review header item.	2016-11-23 16:53:13 +00:00
Paulo Reis	8d933d9b5f	Toggler style adjustments.	2016-11-23 16:10:35 +00:00
Paulo Reis	f61aac0bb3	Make toggler label clickable.	2016-11-23 14:44:04 +00:00
Paulo Reis	e655e85e6d	Integrate toggler in review panel.	2016-11-23 14:34:55 +00:00
Paulo Reis	aba6c90524	Add styling for toggler.	2016-11-23 14:34:40 +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
Paulo Reis	0bc52412ea	Hide header labels in XS resolutions (i.e. up to 768px).	2016-11-22 10:59:20 +00:00
Paulo Reis	fab7ec3e98	Remove test-related tracking and analytics code.	2016-11-22 10:50:29 +00:00
Paulo Reis	decaaab7ea	Fix CSS property typo.	2016-11-22 10:36:13 +00:00
Paulo Reis	f7d2fa9382	Avoid avatar resizing in flexbox contexts.	2016-11-22 09:03:52 +00:00
Paulo Reis	a84e52bc92	Merge branch 'ja-review-panel' of github.com:sharelatex/web-sharelatex into ja-review-panel	2016-11-21 17:14:08 +00:00
James Allen	db93bc8cff	Grey out and add extra info to resolved comments	2016-11-21 17:13:17 +00:00