18117 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
James Allen	a3a5524778	Fix broken unit test from merge	2017-03-20 10:37:02 +00:00
James Allen	c8f0d0920e	Merge pull request #28 from sharelatex/ja-cut-and-paste-comments ... Update RangeTracker to support upserting and moving comments for cut …	2017-03-20 10:29:37 +00:00
James Allen	199079a5b7	Merge branch 'master' into ja-cut-and-paste-comments	2017-03-20 10:29:01 +00:00
James Allen	0b3c61e9c6	Merge pull request #27 from sharelatex/ja-verify-ranges ... Add in a consistency check after applying updates that ranges still match	2017-03-20 10:28:34 +00:00
James Allen	9a933ee47b	Merge branch 'master' into ja-verify-ranges	2017-03-20 10:23:49 +00:00
Shane Kilkelly	9846703be5	Bump version	2017-03-20 10:17:09 +00:00
Brian Gough	4806da00a4	additional check for valid rootResource	2017-03-20 10:03:48 +00:00
Shane Kilkelly	60393ac44f	Merge branch 'master' into sk-upgrade-metrics	2017-03-20 09:45:50 +00:00
Shane Kilkelly	e3ca46705c	Merge branch 'master' of github.com:sharelatex/docstore-sharelatex	2017-03-20 09:45:42 +00:00
Shane Kilkelly	118511ae4a	Remove commented-out code	2017-03-20 09:39:51 +00:00
Paulo Reis	beac43741c	New add comment button.	2017-03-17 17:05:38 +00:00
Paulo Reis	c74449b2e3	Don't show the mini review panel when the only visible entry is the add comment one.	2017-03-17 16:28:21 +00:00
Henry Oswald	8b02ba95b6	add missing error handler	2017-03-17 15:58:01 +00:00
Shane Kilkelly	5f0bf16c75	update to new metrics api	2017-03-17 15:54:15 +00:00
James Allen	667fb91567	Update RangesTracker to include undo logic	2017-03-17 15:44:37 +00:00
Shane Kilkelly	c6dd68a3e6	update to new metrics api	2017-03-17 15:30:38 +00:00
Shane Kilkelly	bc37c844ea	update to new metrics api	2017-03-17 15:27:36 +00:00
Shane Kilkelly	31128a2580	update to new api	2017-03-17 15:19:25 +00:00
Shane Kilkelly	619e49ab04	update to new api	2017-03-17 15:16:38 +00:00
Shane Kilkelly	fa7ee739bb	Update to new metrics api	2017-03-17 14:58:35 +00:00
Shane Kilkelly	a64f890ed0	Upgrade metrics api	2017-03-17 14:55:41 +00:00
James Allen	3c2f5525a1	Show an explanation error message on too many track changes error	2017-03-17 14:49:32 +00:00
Henry Oswald	625fa810c2	validate mongo id in getPrivilegeLevelForProject ... https://sentry.io/sharelatex-1/sl-web-server-prod/issues/204397665/	2017-03-17 14:44:51 +00:00
Shane Kilkelly	be2c6a96af	Log args and their indexes, if they look like object ids	2017-03-17 14:20:13 +00:00
Henry Oswald	8ee2e5ba63	null check folder in findElement ... https://sentry.io/sharelatex-1/sl-web-server-prod/issues/236000085/	2017-03-17 13:29:20 +00:00
Henry Oswald	31b1c53faa	proxy jpg to blog backend ... https://sentry.io/sharelatex-1/sl-web-server-prod/issues/212236471/	2017-03-17 13:24:50 +00:00
Henry Oswald	e5468983ce	clone project plow though null doc/file/folders ... https://sentry.io/sharelatex-1/sl-web-server-prod/issues/227107799/	2017-03-17 13:21:30 +00:00
Henry Oswald	d453a4d5c7	null check stat when we check file on disk ... https://sentry.io/sharelatex-1/sl-web-server-prod/issues/125814174/	2017-03-17 13:03:16 +00:00
Shane Kilkelly	e7f71a25d8	Use an explicit prefix	2017-03-17 11:47:38 +00:00
Henry Oswald	9a8ee112a5	null check path.split ... https://sentry.io/sharelatex-1/sl-web-client-prod/issues/202702369/	2017-03-17 10:35:07 +00:00
Shane Kilkelly	e67c546254	Upgrade metrics	2017-03-17 09:47:45 +00:00
Shane Kilkelly	64fc6ef2e3	Upgrade metrics	2017-03-17 09:31:12 +00:00
James Allen	a4d6d5c53f	Add opacity to comment and insert ranges so they can be seen overlapping	2017-03-16 17:33:01 +00:00
Shane Kilkelly	e879f9c742	Upgrade metrics	2017-03-16 16:46:58 +00:00
Shane Kilkelly	54af5fec96	Upgrade metrics	2017-03-16 16:35:51 +00:00
Shane Kilkelly	f58f256864	upgrade metrics	2017-03-16 16:08:57 +00:00
James Allen	aa36768d8a	Remove debugging line	2017-03-16 16:01:03 +00:00
James Allen	9c5299ec7c	Update RangeTracker to support upserting and moving comments for cut and paste	2017-03-16 15:49:41 +00:00
James Allen	6c1a15a698	Move comments when cutting and pasting	2017-03-16 15:48:57 +00:00
Shane Kilkelly	c30e672549	Merge branch 'master' into sk-upgrade-metrics	2017-03-16 15:17:57 +00:00
Shane Kilkelly	c303a1a386	wip: upgrade metrics	2017-03-16 15:17:38 +00:00
Shane Kilkelly	f397678589	Clean up, don't allocate an extra date	2017-03-16 15:07:25 +00:00
Shane Kilkelly	5e112043ca	Fix unit tests for modules now using metrics.timeAsyncMethod	2017-03-16 11:08:17 +00:00
Shane Kilkelly	f2b5901776	wip: use new metrics.timeAsyncMethod	2017-03-16 10:59:18 +00:00
Shane Kilkelly	5ea83947dd	remove stray compiled js file	2017-03-16 10:10:40 +00:00
Shane Kilkelly	1f9d4950a2	Update gitignore	2017-03-16 10:09:16 +00:00
Shane Kilkelly	772f950d7c	Test failure when wrapped method is not async/callback	2017-03-16 10:07:52 +00:00
Shane Kilkelly	a5aec5b812	Test failure to wrap method	2017-03-16 10:02:19 +00:00
Shane Kilkelly	40b238271d	Add tests for methods producing errors, and logger	2017-03-16 09:55:07 +00:00
Shane Kilkelly	c3b18618bf	Add unit tests	2017-03-16 09:49:45 +00:00