7076 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Henry Oswald	debe78030a	use html from jade as strings now fully html escaped	2017-02-17 11:05:32 +00:00
James Allen	8e3c9b7079	Merge pull request #424 from sharelatex/pr-fix-invisible-scrollbar-safari ... Give the scrollbar a background-color, so that Safari knows that it s…	2017-02-17 09:25:30 +01:00
James Allen	3611d05d56	Merge pull request #425 from sharelatex/ja-track-changes ... Ja track changes	2017-02-17 09:24:54 +01:00
James Allen	31ae2e7124	Update RangesTracker	2017-02-17 09:24:25 +01:00
James Allen	c8a6555cb1	Update RangesTracker	2017-02-16 17:07:56 +01:00
James Allen	04b9f8d249	Merge branch 'master' into ja-track-changes	2017-02-16 17:07:12 +01:00
Paulo Reis	a639f13cb6	Bootstrap collapsing behavior in files list. Store state.	2017-02-16 15:48:58 +00:00
Shane Kilkelly	4945c0d478	Merge branch 'master' into node-6.9	2017-02-16 09:33:20 +00:00
Paulo Reis	36e5ac74dc	Give the scrollbar a background-color, so that Safari knows that it should paint it.	2017-02-15 15:11:01 +00:00
Henry Oswald	bb7ededaaf	announcementClicked -> logAnnouncementClick	2017-02-15 12:43:13 +00:00
Henry Oswald	5626be2913	change free trial from track changes to real-time-track-changes, conflict with old event	2017-02-15 12:39:29 +00:00
Henry Oswald	8cd3d21792	track read more clicks in announcements	2017-02-15 12:17:10 +00:00
James Allen	936c4a181d	Merge pull request #423 from sharelatex/ja-fix-onboarding-events ... Only create Controller when showing onboarding	2017-02-15 11:10:33 +01:00
James Allen	d01d6a35cf	Only create Controller when showing onboarding	2017-02-15 09:47:37 +01:00
James Allen	bdee15128b	Remove click handler on dismiss	2017-02-14 22:31:49 +01:00
Shane Kilkelly	2d0a7b2bdb	Merge branch 'master' into node-6.9	2017-02-14 14:42:35 +00:00
Paulo Reis	badc4ecb7a	Show add comment tooltip to the left when appropriate.	2017-02-14 14:40:21 +00:00
James Allen	b40b9add5a	Turn on track changes for beta users	2017-02-14 15:28:21 +01:00
James Allen	a0a4509edc	Avoid underscore (_) name overwriting	2017-02-14 15:26:36 +01:00
James Allen	03ceb23fcf	Update wording slightly	2017-02-14 15:23:02 +01:00
James Allen	c8096facfb	Merge pull request #421 from sharelatex/ho-announcments ... mark announcments before user signs up as read	2017-02-14 15:12:10 +01:00
James Allen	4dbc2c3066	Merge pull request #418 from sharelatex/pr-review-panel-onboarding ... Pr review panel onboarding	2017-02-14 15:00:39 +01:00
James Allen	bb3589ab2d	Merge pull request #420 from sharelatex/ja-track-changes ... List track changes in beta program	2017-02-14 14:41:57 +01:00
James Allen	091de23a95	Merge pull request #419 from sharelatex/pr-track-changes-upgrade-prompt ... Show message asking owner to upgrade if user is not owner	2017-02-14 14:41:24 +01:00
James Allen	b48f57c2cb	Submit comment on blur or selection change	2017-02-14 13:41:04 +01:00
Henry Oswald	27caf4d555	mark announcments before user signs up as read	2017-02-14 12:29:48 +00:00
Paulo Reis	594f2024d1	Style the onboarding prompt as a modal; close it when clicked outside.	2017-02-14 12:09:05 +00:00
James Allen	cc0986b4da	List track changes in beta program	2017-02-14 12:22:53 +01:00
Paulo Reis	12730caa63	Make the dismiss option more obvious.	2017-02-14 11:22:53 +00:00
Shane Kilkelly	621a07aff2	Merge branch 'master' into node-6.9	2017-02-14 11:01:14 +00:00
Paulo Reis	e5c33e7b71	Merge branch 'pr-review-panel-onboarding' of github.com:sharelatex/web-sharelatex into pr-review-panel-onboarding	2017-02-14 10:21:58 +00:00
Paulo Reis	1eed10b4e7	Add keyboard navigation	2017-02-14 10:21:45 +00:00
James Allen	3f2ebbcf91	Show message asking owner to upgrade if user is not owner	2017-02-14 11:18:22 +01:00
James Allen	34c07b97b9	Ensure showTrackChangesOnboarding is a boolean	2017-02-14 11:13:12 +01:00
James Allen	c08c8e09ff	Only show onboarding for users with track changes enabled	2017-02-14 11:09:37 +01:00
Shane Kilkelly	4d2f21e42e	update nvm version	2017-02-14 10:04:44 +00:00
James Allen	03ecf4b4ae	Only show track changes onboarding once based on analytics API events	2017-02-14 10:25:46 +01: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	c8baae84da	Merge branch 'pr-review-panel-onboarding' of github.com:sharelatex/web-sharelatex into pr-review-panel-onboarding	2017-02-13 16:51:16 +01:00
Paulo Reis	7dd9a3fa44	Add a dismiss button.	2017-02-13 15:49:58 +00:00
James Allen	6a4f0ace3b	Merge branch 'master' into pr-review-panel-onboarding	2017-02-13 16:19:56 +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	644e45c4b9	Merge pull request #416 from sharelatex/ja-include-track-changes-feature ... Add track changes feature flag into model	2017-02-13 12:17:20 +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