9288 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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
James Allen	6630e227c6	Merge pull request #439 from sharelatex/pr-zindex-synctex-review ... z-index syntax & review panel	2017-02-27 11:10:24 +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
Paulo Reis	de4134208f	Styling of loading screen.	2017-02-23 15:47:48 +00:00
Paulo Reis	d9c467e354	Update grey version of new lion.	2017-02-23 15:47:40 +00:00
Paulo Reis	b7dfbc13f8	Add new logo assets.	2017-02-23 14:55:19 +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	01755ff360	Merge pull request #435 from sharelatex/ja-track-changes ... Animate call outs along with review entries	2017-02-21 11:39:42 +01: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	dfe2969da2	Merge pull request #433 from sharelatex/pr-review-logo-retina ... Add retina icon for review features.	2017-02-21 10:27:31 +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