10360 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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	a8618fa4d9	Merge branch 'ja-track-changes' of github.com:sharelatex/web-sharelatex into ja-track-changes	2017-01-17 17:36:30 +01:00
James Allen	786c92b2fc	Don't show delete comment button (until it works)	2017-01-17 17:34:11 +01:00
Shane Kilkelly	707838baa4	Merge branch 'master' into sk-launchpad	2017-01-17 16:25:59 +00:00
Shane Kilkelly	59ab66fca2	Fix double-callback	2017-01-17 16:25:18 +00:00
Paulo Reis	f27118084c	Make review header icon behave like font-awesome icons.	2017-01-17 16:03:41 +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
Shane Kilkelly	d7251c6bfe	Merge branch 'master' into sk-launchpad	2017-01-17 14:55:08 +00:00
Paulo Reis	2f119e5787	Track review features usage.	2017-01-17 14:39:31 +00:00
Shane Kilkelly	1137ab0715	Don't record redirect to static asset paths	2017-01-17 14:35:37 +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
Shane Kilkelly	70c7e32e58	Add a 'testEmail' email type	2017-01-17 10:52:04 +00:00
James Allen	eb8e801dea	Merge branch 'ja-track-changes' of github.com:sharelatex/web-sharelatex into ja-track-changes	2017-01-17 11:51:11 +01:00
James Allen	1b63db91d0	Add in a null check	2017-01-17 11:51:02 +01:00
Paulo Reis	d66f2033bb	Ensure that review panel elements are above, z-index-wise, Ace elements.	2017-01-17 10:16:10 +00:00
Shane Kilkelly	06bba062a4	Merge branch 'master' into sk-launchpad	2017-01-17 09:29:37 +00: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
Paulo Reis	1c8942c5c6	Merge branch 'ja-track-changes' of github.com:sharelatex/web-sharelatex into ja-track-changes	2017-01-16 16:28:27 +00:00
Paulo Reis	65e257ca37	Change text marker colors on Ace dark themes.	2017-01-16 16:25:38 +00:00
James Allen	f12aeedb35	Tweak padding around track changes toggle loading indicator	2017-01-16 16:57:20 +01:00
James Allen	5fb54d8447	Don't refresh resolved comments every times an entry changes	2017-01-16 16:55:14 +01: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
Shane Kilkelly	635b935acc	Add an acceptance test for login rate limits, cleanup	2017-01-16 11:46:59 +00:00
Brian Gough	962a4d5039	roll out math mode linter for all users ... from our ace commit 953ff92c3283f03da94559d50a933fe685b05631	2017-01-16 09:17:38 +00:00
Henry Oswald	21411e83f3	Merge pull request #394 from sharelatex/ho-rate-limit-email-send ... rate limit emails sent sharing projects by users	2017-01-14 14:53:18 +00:00
Henry Oswald	fed88504f8	rate limit emails sent sharing projects by users	2017-01-14 14:52:32 +00:00
Paulo Reis	1ed0ccf854	Improve hovering behaviour for entries in mini mode.	2017-01-13 16:07:08 +00:00
Shane Kilkelly	25956d4c62	Fix up tests	2017-01-13 16:04:26 +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
Shane Kilkelly	1ef1912cf8	Point to fork of rolling-rate-limiter that supports ioredis	2017-01-13 15:21:05 +00:00
James Allen	b6ea338ff8	Separate resolved comments so they don't affect review panel	2017-01-13 15:27:45 +01:00
Shane Kilkelly	525e871d55	Merge branch 'master' into sk-rate-limit-cluster	2017-01-13 14:17:18 +00: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	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	3d5691ddaf	Merge branch 'ja-track-changes' of github.com:sharelatex/web-sharelatex into ja-track-changes	2017-01-12 16:49:56 +00:00