3967 commits

Author	SHA1	Message	Date
Shane Kilkelly	621a07aff2	Merge branch 'master' into node-6.9	2017-02-14 11:01:14 +00:00
Shane Kilkelly	4d2f21e42e	update nvm version	2017-02-14 10:04:44 +00:00
James Allen	61ef158f76	Don't show review panel if user doesn't have track changes	2017-02-14 09:38:58 +01:00
James Allen	bf5f5f832d	Use correct flag for determining mini panel visibility	2017-02-13 14:39:43 +01:00
James Allen	f840a20f5c	Merge pull request #417 from sharelatex/pr-track-changes-upgrade-prompt ... Turn on track changes for beta users with upgrade prompt	2017-02-13 12:44:04 +01:00
James Allen	1d58efbca0	Don't enable for beta users just yet	2017-02-13 12:42:53 +01:00
James Allen	3334078fe6	Merge pull request #415 from sharelatex/ja-track-changes ... Don't animate review panel entries on toggle and resize	2017-02-13 12:17:45 +01:00
James Allen	e99c9a2065	Enable track changes for beta users	2017-02-13 12:09:47 +01:00
James Allen	47a66eed50	Merge branch 'ja-include-track-changes-feature' into pr-track-changes-upgrade-prompt	2017-02-13 11:50:56 +01:00
James Allen	4728077cca	Add track changes feature flag into model	2017-02-13 11:50:32 +01:00
James Allen	a9c89635bd	Also scroll long deletes and insertions if would overflow	2017-02-13 10:16:16 +01:00
James Allen	f590b9c97a	Scroll when long words would overflow comment entry	2017-02-13 10:09:35 +01:00
James Allen	d7c40fa6ef	Run comments through same URL linking filter as chat	2017-02-13 10:05:48 +01:00
James Allen	85c2910738	Don't animate review panel entries on toggle and resize	2017-02-13 09:49:51 +01:00
James Allen	51b76d2cf9	Merge pull request #413 from sharelatex/ja-abort-in-progress-spell-checks ... Abort any inprogress spell checks when switching document	2017-02-08 11:38:05 +01:00
James Allen	87aea41bed	Abort any inprogress spell checks when switching document	2017-02-08 11:32:19 +01:00
James Allen	d44a0ece97	Merge pull request #411 from sharelatex/ja-fix-cursor-on-resize ... Ja fix cursor on resize	2017-02-08 11:30:37 +01:00
James Allen	123300cdfb	Clear highlighted word manager on session change	2017-02-08 11:08:26 +01:00
James Allen	f6743b839f	Reflow review panel as editor pane changes size	2017-02-07 16:45:45 +01:00
James Allen	11a104ef96	Move spelling marker to back marker layer where it is updated properly by Ace	2017-02-07 15:55:00 +01:00
James Allen	c1a2779d9e	Merge branch 'master' into ja-fix-cursor-on-resize	2017-02-07 15:27:01 +01:00
James Allen	d00619ff3d	Keep the cursor in the same position on screen when the editor resizes	2017-02-07 15:23:44 +01:00
Shane Kilkelly	1d09fe2861	Merge branch 'sk-fix-password-set'	2017-02-07 09:17:56 +00:00
James Allen	1b06af766d	Merge pull request #406 from sharelatex/pr-expandable-text-area-fixes ... Expandable text area fixes	2017-02-07 09:04:10 +01:00
James Allen	c97ded201f	Merge pull request #408 from sharelatex/ja-track-changes ... Clear selection after creating a comment	2017-02-07 08:55:39 +01:00
Shane Kilkelly	6a161b4071	remove commented out code	2017-02-06 16:35:52 +00:00
Shane Kilkelly	7d5dc34b3e	fix the set-password form for new (admin-created) users	2017-02-06 14:58:54 +00:00
Paulo Reis	38e1b66fdc	Use slightly slower video.	2017-02-06 14:06:08 +00:00
Paulo Reis	31102d30da	Update prompt title.	2017-02-06 12:24:20 +00:00
Joe Green	a32ec78a54	added about image for jg	2017-02-06 11:59:32 +00:00
James Allen	6e39824e41	Fix language icons in language recommendation	2017-02-03 16:31:42 +01:00
James Allen	935847f2a1	Add track changes flag into user model	2017-02-03 14:47:04 +01:00
James Allen	343abfde23	Use user feature flags to determine track changes state	2017-02-03 14:36:11 +01:00
James Allen	27c48f3790	Clear selection after creating a comment	2017-02-03 14:17:09 +01:00
Paulo Reis	6ef8d2d46d	Merge branch 'master' into pr-expandable-text-area-fixes	2017-02-02 14:38:09 +00:00
Paulo Reis	9d1d2df977	Disable mocked feature flag behaviour.	2017-02-02 12:19:44 +00:00
Paulo Reis	8f9e43f339	Handle track changles toggling when the feature is not enabled.	2017-02-02 12:12:14 +00:00
Paulo Reis	f50967295d	Support disabling the review-panel toggle, like a standard checkbox.	2017-02-02 12:08:17 +00:00
Paulo Reis	fe33fa1f65	Add modal controller.	2017-02-02 10:19:00 +00:00
Paulo Reis	98b98005a6	Create and integrate track changes upgrade prompt.	2017-02-01 16:52:18 +00:00
Paulo Reis	ad3a30b1b3	Add track changes teaser assets.	2017-02-01 16:51:37 +00:00
Shane Kilkelly	5be65431f7	Fix sentry config	2017-02-01 10:55:01 +00:00
Shane Kilkelly	efdd777c89	Add a _headLinks block to layout	2017-01-31 15:43:53 +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	e2a207d618	Merge branch 'master' into sk-pug	2017-01-31 09:39:06 +00:00
James Allen	e7efa40c75	Merge pull request #401 from sharelatex/ja-spam-code-fixes ... Refactor rate limiting code around sending invites	2017-01-31 10:21:55 +01:00
Shane Kilkelly	21986694d8	update gitignore	2017-01-30 15:13:03 +00:00
James Allen	9663df3457	Jump to text when clicking change icon as well	2017-01-30 16:00:32 +01:00