4274 commits

Author	SHA1	Message	Date
Henry Oswald	1a9c035647	bring system message checks down to 1 min. ... can take ages when at 5 mins	2017-02-28 18:53:34 +00:00
Paulo Reis	cf896b5a5d	Keep original text alignment; use a min-width.	2017-02-28 11:37:58 +00:00
Paulo Reis	e5533b91be	Allow the global alerts area to expand according to text sizing.	2017-02-28 11:37:29 +00:00
Shane Kilkelly	9a641d43eb	Remove cruft	2017-02-27 14:00:45 +00:00
Shane Kilkelly	98d7dc6f88	Make work on both 0.10 and 6.9	2017-02-27 13:54:57 +00:00
Shane Kilkelly	8d7c39ff42	Merge branch 'master' into node-6.9	2017-02-27 11:25:39 +00:00
Shane Kilkelly	bd997fc574	pin sinon js to 1.17, version 2 betas cause breakage	2017-02-27 11:01:25 +00:00
James Allen	0bf1bd2701	Merge pull request #438 from sharelatex/ja-track-changes-style-tweaks ... Don't overlap border of overview panel with PDF bar	2017-02-27 11:10:41 +01:00
Paulo Reis	1646496f19	Patch overflow behaviour so that z-index is always higher by 1.	2017-02-24 14:38:46 +00:00
Paulo Reis	3bdbe7e538	Set synctex controls z-index to the minimum working value.	2017-02-24 14:36:08 +00:00
James Allen	dd0271e799	Only cancel deletes with inserts on undo and reject	2017-02-24 14:20:26 +01:00
Shane Kilkelly	34a1bd0e91	Merge branch 'master' into node-6.9	2017-02-24 11:27:32 +00:00
James Allen	40f61bfa66	Don't overlap border of overview panel with PDF bar	2017-02-23 15:10:03 +01:00
James Allen	7418d12bf8	Defer updates of remote ops until Ace has been updated	2017-02-23 11:34:58 +01:00
James Allen	f4bbd8ea10	Use dirty state rather events to avoid O(N^2) behaviour	2017-02-23 11:27:19 +01:00
James Allen	e83c7dfe05	Merge pull request #429 from sharelatex/pr-collapse-overview-entries ... Collapse overview entries	2017-02-22 13:45:23 +01:00
Paulo Reis	519cd3c0bd	Avoid showing files in overview if the associated review entries object is still undefined.	2017-02-21 15:20:00 +00:00
Paulo Reis	96c44eec38	Support values other than objects in the numKeys filter, returning zero if so.	2017-02-21 14:48:21 +00:00
Paulo Reis	7f6941677d	Check local storage on load; use explicit condition syntax.	2017-02-21 14:43:05 +00:00
Paulo Reis	2e8f917318	Support initial closed state.	2017-02-21 14:27:57 +00:00
James Allen	2df8479db3	Move translations back to devDependencies so it's not missed by shrinkwrap	2017-02-21 15:25:28 +01:00
Paulo Reis	5c7fc66964	Merge branch 'pr-collapse-overview-entries' of github.com:sharelatex/web-sharelatex into pr-collapse-overview-entries	2017-02-21 14:21:10 +00:00
Paulo Reis	33c8bc8684	Support saving state to local storage.	2017-02-21 14:20:51 +00:00
James Allen	1b6cbdba1b	Merge pull request #428 from sharelatex/ja-translate-track-changes ... Translate track changes	2017-02-21 15:10:47 +01:00
James Allen	00fce4d2da	Merge branch 'master' into pr-collapse-overview-entries	2017-02-21 14:25:45 +01:00
James Allen	53a127cc65	Make consistent with file tree	2017-02-21 14:25:26 +01:00
James Allen	2553dfbf82	Translate placeholders	2017-02-21 14:19:46 +01:00
Paulo Reis	0b7863185c	Make expand/collapse indicator consistent with the one used in filetree.	2017-02-21 11:05:55 +00:00
Paulo Reis	4dc13134e7	Kill overflow rule, allowing focused items to appear off-panel.	2017-02-21 10:40:28 +00:00
James Allen	2c2f7c5625	Animate call outs along with review entries	2017-02-21 11:20:08 +01:00
James Allen	5a62fec179	Merge pull request #434 from sharelatex/ja-scroll-review-panel-past-ace ... Ja scroll review panel past ace	2017-02-21 10:59:16 +01:00
James Allen	d120dc5a2f	Merge pull request #427 from sharelatex/pr-blank-screen-large-comments ... Avoid blank screen bug, when triggered by very large comments.	2017-02-21 10:56:51 +01:00
James Allen	f1baa1b8ad	Merge pull request #432 from sharelatex/ja-hide-offscreen-review-panel-entries ... Only render the entries that are visible in the text	2017-02-21 10:28:45 +01:00
James Allen	582eff77ba	Merge pull request #430 from sharelatex/pr-fix-border-retina ... Use solid color instead of opacity, to avoid rendering issues.	2017-02-21 10:28:00 +01:00
James Allen	7eab8329b1	Merge pull request #431 from sharelatex/ja-scroll-review-panel-past-ace ... Scroll the review panel past the limits of Ace	2017-02-21 10:27:49 +01:00
James Allen	f466be96dd	Make sure first change isn't hidden under toolbar	2017-02-21 09:58:49 +01:00
Paulo Reis	e6997a8af0	Add jank-free image.	2017-02-20 16:14:23 +00:00
Paulo Reis	5e07565c8e	Add retina icon for review features.	2017-02-20 15:37:12 +00:00
James Allen	3af7cdf0a9	Merge branch 'ja-scroll-review-panel-past-ace' into ja-hide-offscreen-review-panel-entries	2017-02-20 16:24:26 +01:00
James Allen	6c21d19894	Increase offscreen lines considered for visibility	2017-02-20 16:24:19 +01:00
James Allen	ad05cc288c	Do DOM reads first to prevent thrashing	2017-02-20 16:22:18 +01:00
James Allen	8c5800ceaf	Only render the entries that are visible in the text	2017-02-20 16:03:02 +01:00
James Allen	b52e4a5d1c	Reset scroll margins when changing document	2017-02-20 15:46:53 +01:00
James Allen	995fa6122b	Scroll the review panel past the limits of Ace	2017-02-20 12:56:26 +01:00
Paulo Reis	7ffb6edd1c	Use solid color instead of opacity, to avoid rendering issues.	2017-02-20 11:21:56 +00:00
Shane Kilkelly	9734f29086	Merge branch 'master' into node-6.9	2017-02-20 11:07:14 +00:00
James Allen	637cfa2e18	Translate tooltips	2017-02-20 11:51:06 +01:00
James Allen	44377ed03c	Fix typo	2017-02-17 16:37:49 +01:00
James Allen	71b13b3f43	Fix translation string	2017-02-17 16:30:06 +01:00
James Allen	f180b25850	Convert track changes text to translation strings	2017-02-17 16:28:53 +01:00
Paulo Reis	2eb9058c7c	Add max-height to comment inputs.	2017-02-17 15:16:35 +00:00
Paulo Reis	e9752b4d10	Avoid blank screen bug, when triggered by very large comments.	2017-02-17 14:32:40 +00:00
Paulo Reis	121b783b4a	Show number of entries per file, when collapsed.	2017-02-17 14:32:06 +00:00
Paulo Reis	1e66c46ca7	Add filter to retrieve number of keys in objects.	2017-02-17 14:31:50 +00:00
Paulo Reis	1f92a494e7	Remove unneeded CSS animation.	2017-02-17 11:55:20 +00:00
Paulo Reis	cd2c8e7199	Add directive based on jQuery animation API.	2017-02-17 11:54:33 +00:00
Paulo Reis	71cfc863b5	Avoid blank screen bug, when triggered by very large comments.	2017-02-17 11:24:50 +00:00
Paulo Reis	0841ab8278	Add directive to collapse elements via height.	2017-02-17 11:24:21 +00:00
Henry Oswald	58c7dda945	fix couple of bad translations	2017-02-17 11:05:32 +00:00
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	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	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	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	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
Paulo Reis	52c601965b	Improve button styling and paragraph width.	2017-02-10 15:28:57 +00:00
Paulo Reis	faef71d812	Wording.	2017-02-10 15:28:44 +00:00
Paulo Reis	481f9bbadc	Add re-encoded videos (all forced to have the same size).	2017-02-10 15:28:22 +00:00
Paulo Reis	a8a7589973	More style adjustments.	2017-02-09 17:13:23 +00:00
Paulo Reis	dd15cc06a0	Integrate playback state directive in tutorial videos; style adjustments.	2017-02-09 15:44:38 +00:00
Paulo Reis	1263532271	Add a directive to control the playback state of media elements.	2017-02-09 15:44:15 +00:00
Paulo Reis	d137b00822	Relayout the onboarding, making a video slideshow.	2017-02-08 17:19:29 +00:00
Paulo Reis	1ef5cc97fc	Rename stuff to refer to the new onboarding feature.	2017-02-08 17:19:13 +00: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
Paulo Reis	6d35703963	Add clip showing review panel toggling.	2017-02-07 15:28:50 +00:00
Paulo Reis	d792230bf0	Basic onboarding tutorial for track-changes.	2017-02-07 15:07:26 +00: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
Paulo Reis	73835f004d	Add onboarding-related assets.	2017-02-07 14:13:25 +00: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
Paulo Reis	d19cb2a31b	Fix border-radius in entries.	2017-02-03 15:20:50 +00:00
James Allen	4a80f0de5a	Clear selection after creating a comment	2017-02-03 15:09:40 +00: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
Shane Kilkelly	4e9426e6bf	Merge branch 'master' into sk-pug	2017-01-30 14:36:10 +00:00
Shane Kilkelly	3ed85dad42	Merge branch 'master' into sk-upgrade-uuid	2017-01-30 11:09:50 +00:00
James Allen	30618d33db	Add in extra check to set ui state	2017-01-27 17:13:11 +01:00
James Allen	d9b774bb9b	Sycn track changes based on doc state, not editor state	2017-01-27 17:12:17 +01:00
James Allen	ff7c5a0954	Merge branch 'master' into ja-track-changes	2017-01-27 17:11:49 +01:00
James Allen	b086d7afa2	Refactor rate limiting code around sending invites	2017-01-27 16:26:58 +01:00
Paulo Reis	15ad3f4769	Avoid stopping propagation, check event target instead.	2017-01-26 16:11:02 +00:00
James Allen	68aab6e05c	Don't use code check on .bib files	2017-01-26 16:13:21 +01:00
James Allen	0479b01b9d	Jump to code when clicking on review panel entries	2017-01-26 16:04:08 +01:00
Paulo Reis	ce89714a48	Emit event when textarea resizes; capture it in the review panel and trigger reflow.	2017-01-26 14:35:01 +00:00
James Allen	76328ff93f	Tell other clients when threads are deleted	2017-01-26 15:12:59 +01:00
James Allen	abb4ef14d8	Streamline the update/rendering process to not do extra work	2017-01-26 15:08:30 +01:00
Paulo Reis	6304c213bd	Add a min-height to the review panel text areas.	2017-01-26 12:00:11 +00:00
Paulo Reis	1a1320b561	Avoid shrinking the expandable text area.	2017-01-26 11:59:55 +00:00
James Allen	32b0c6a4fb	Merge pull request #398 from sharelatex/ja-track-changes ... Fix style issues in IE 10	2017-01-25 15:55:15 +01:00
James Allen	757c7002eb	Merge pull request #397 from sharelatex/ja-modify-threads ... Allow editing/deleting of comments and threads	2017-01-25 15:50:00 +01:00
James Allen	406181b05d	Remove a console.log	2017-01-25 15:49:38 +01:00
Paulo Reis	a924794a5a	Add expandable text area directive; apply it to review panel text areas.	2017-01-25 13:51:33 +00:00
Shane Kilkelly	e2f4fc3653	Merge branch 'master' into sk-rate-limit-cluster	2017-01-25 10:52:34 +00:00
Shane Kilkelly	60500bc4ea	update shrinkwrap	2017-01-25 10:52:08 +00:00
Henry Oswald	3eb13ccdd1	fix stupid mistake	2017-01-25 10:38:39 +00:00
Henry Oswald	2a00b9c7a2	use user._id for error log	2017-01-25 10:33:30 +00:00
Paulo Reis	f11926d0a9	Make sure layout math is done on load.	2017-01-25 10:31:02 +00:00
Shane Kilkelly	f7b4e00466	Restore npm-shrinkwrap.json	2017-01-25 10:30:53 +00:00
Shane Kilkelly	239164fe26	Merge branch 'master' into sk-rate-limit-cluster	2017-01-25 09:56:08 +00:00
Henry Oswald	cc717f0357	domainAnnouncementsToShow -> domainAnnouncements	2017-01-25 09:44:13 +00:00
Henry Oswald	02e6eb4dd1	Merge pull request #399 from sharelatex/ho-promote-case-study ... promote domain alerts	2017-01-25 09:41:50 +00:00
Henry Oswald	1280a2313d	add check for id to exist in domain announcments ... null check user at start of getUnreadAnnouncements fix spelling mistake	2017-01-25 09:35:11 +00:00
Henry Oswald	69ab275404	Update list.jade	2017-01-25 09:14:21 +00:00
James Allen	59c40ea5cc	Only show delete options when thread has more than one message!	2017-01-24 17:03:32 +01:00
Henry Oswald	13d21b881f	use new annoncments feature for case study info	2017-01-24 16:03:05 +00:00
James Allen	798e09f011	Don't show 'no comments' when submitting	2017-01-24 16:56:08 +01:00
James Allen	f9ba7392e9	Allow editing/deleting of comments and threads	2017-01-24 16:21:14 +01:00
Paulo Reis	1de8b3bce7	Disable text selection with right click on file tree.	2017-01-24 15:19:48 +00:00
Henry Oswald	2341a8481a	Merge branch 'master' into ho-promote-case-study	2017-01-24 14:49:35 +00:00
Shane Kilkelly	a148eb1f43	Merge branch 'master' into sk-rate-limit-cluster	2017-01-24 09:24:47 +00:00
Shane Kilkelly	0add3ed66e	Merge branch 'master' into sk-upgrade-uuid	2017-01-23 10:04:31 +00:00
Shane Kilkelly	abbffb8e4b	Remove deprecated node-uuid package, replace with uuid.	2017-01-23 10:03:16 +00:00
James Allen	2813b16ebf	Use thread id for comment id	2017-01-23 09:45:37 +01:00
Henry Oswald	9153ffac41	limit project name in email to 40 chars	2017-01-21 12:58:16 +00:00
Henry Oswald	74240e28c7	rate limit via ip the number of invite to project requests	2017-01-21 12:44:09 +00:00
Henry Oswald	6d35585847	limit number of invites each user can do ... done with the number of collaborators a user can add prevents notifications getting filled up as well	2017-01-21 12:43:15 +00:00
Henry Oswald	6f2c7ba6c6	Merge branch 'master' of https://github.com/sharelatex/web-sharelatex	2017-01-20 14:51:23 +00:00
Henry Oswald	03555f0339	added chris and removed geri from pics	2017-01-20 14:50:38 +00:00
Shane Kilkelly	cfa2777d62	Merge branch 'sk-launchpad'	2017-01-20 13:58:16 +00:00
Shane Kilkelly	36eb453aed	Clarify logic of asyncform onsuccess and onerror handlers	2017-01-20 13:52:31 +00:00
Shane Kilkelly	57cd54bf55	WIP: migrate from jade to pug	2017-01-20 12:03:02 +00:00
Paulo Reis	73c1016f4a	Avoid using 0px, because minifiers might convert the value to 0, which will still cause issues on IE.	2017-01-19 16:58:16 +00:00
Paulo Reis	1970ab4e63	Ensure that the change text fits the entry UI in IE.	2017-01-19 16:55:21 +00:00
Paulo Reis	a4ca7e2ca9	Fix padding in the review panel toolbar for IE.	2017-01-19 16:54:34 +00:00
Paulo Reis	cd975c6190	Make resolved comments dropdown scrollable in IE.	2017-01-19 15:43:26 +00:00
Paulo Reis	76ea469970	Reposition the track-changes indicator element to avoid issues with IE positioning.	2017-01-19 12:12:34 +00:00
Paulo Reis	3b9a599276	Fix entries z-index issues on IE10.	2017-01-19 11:57:49 +00:00
Paulo Reis	5489514d7a	Add some compatibility style rules for IE10.	2017-01-18 15:38:34 +00:00
Paulo Reis	e0f3593bff	Add autoprefixer to Grunt tasks.	2017-01-18 15:38:18 +00:00
Shane Kilkelly	8922c9dbf5	New email layout for "testEmail"	2017-01-18 15:28:51 +00:00
James Allen	3413687833	Merge pull request #393 from sharelatex/ja-track-changes ... Ja track changes	2017-01-18 15:32:16 +01:00
James Allen	f97d36eb73	Merge branch 'ja-track-changes' of github.com:sharelatex/web-sharelatex into ja-track-changes	2017-01-18 14:07:29 +01:00
Paulo Reis	2589ac7d58	Remove unneeded review panel layout event.	2017-01-18 10:55:51 +00:00
Paulo Reis	49fe8ef3a3	Update entry truncating logic while typing.	2017-01-18 10:53:59 +00:00
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