18211 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
James Allen	a0b02d85f5	Load changes in batches of 25	2014-03-07 13:31:30 +00:00
James Allen	9851321429	Merge branch 'track_changes_integration'	2014-03-07 13:17:30 +00:00
James Allen	548d7d98a4	Allow history view to be closed	2014-03-07 13:05:59 +00:00
James Allen	e0cd9ba163	Improve the description above each change	2014-03-07 12:54:08 +00:00
James Allen	ebe4e5b1d8	Show consistent colors for different users	2014-03-07 12:00:31 +00:00
James Allen	36faedeeb3	Make the history entries pretty	2014-03-07 11:24:11 +00:00
James Allen	be8035faa8	Include names in view	2014-03-06 18:13:07 +00:00
James Allen	b45db3aa2b	Return user details like email and name in updates	2014-03-06 18:04:00 +00:00
James Allen	9329213d94	Allow multiple diffs to be selected	2014-03-06 16:32:18 +00:00
James Allen	1a91036bb6	Show nice diffs using ace and markers	2014-03-06 14:08:12 +00:00
Henry Oswald	7efa51fb62	Merge pull request #51 from cwoac/reduce_doclines_logging ... don't log doc contents if file is unchanged.	2014-03-06 12:50:52 +00:00
Henry Oswald	38d3bbb556	changed underscore templating to be standard syntax thoughout fixing main.tex name inserting bug, added tests to catch it in future	2014-03-06 12:28:07 +00:00
Henry Oswald	92928c35ab	removed old email tempaltes	2014-03-06 11:53:24 +00:00
James Allen	5fc139db00	Return version numbers of updates	2014-03-06 11:00:49 +00:00
Oliver Matthews	b73d7f23c3	don't log doc contents if file is unchanged.	2014-03-06 10:53:59 +00:00
James Allen	aadce232a1	Use version numbers for sorting and querying, not dates	2014-03-06 10:45:51 +00:00
Henry Oswald	5fc620dc10	move when template publish status is refreshed to avoid loop	2014-03-06 10:13:24 +00:00
James Allen	98514dd49c	Add in Docker based install instructions	2014-03-06 10:12:53 +00:00
Henry Oswald	f5e802a7d1	added null check for email property #ugly	2014-03-06 09:51:19 +00:00
Henry Oswald	9ae85abb74	got my email null check the wrong way around	2014-03-05 22:57:28 +00:00
Henry Oswald	e433eca157	added null checks into email sender for from address	2014-03-05 22:37:55 +00:00
Henry Oswald	e8b245e857	check that res has not already been sent before sending catch 500	2014-03-05 18:13:40 +00:00
James Allen	bf21305c68	Add in basic list of changes in track changes view	2014-03-05 17:55:47 +00:00
Henry Oswald	2f22563d59	changed key for templates to put /v/ in for version	2014-03-05 17:39:27 +00:00
James Allen	8bf12f3286	Wrap editor in wrapper div and remove orchard CSS	2014-03-05 16:55:03 +00:00
James Allen	0468cbc300	Add in proxy to track changes api	2014-03-05 16:31:52 +00:00
James Allen	2e1307bd82	Doc is always one version ahead of latest op version	2014-03-05 16:31:38 +00:00
Henry Oswald	32f9e33f71	removed heap analytics for the time being	2014-03-05 15:59:48 +00:00
James Allen	3660253fd4	Add in /updates end point to get updates	2014-03-05 15:59:40 +00:00
Henry Oswald	64257a7b2c	testing out new google analytics	2014-03-05 15:45:24 +00:00
James Allen	a46963a349	Refactor arguments to MongoManager.getUpdatesBetweenDates	2014-03-05 15:06:46 +00:00
Henry Oswald	1842a65b83	Merge branch 'master' of github.com:sharelatex/web-sharelatex	2014-03-05 15:05:43 +00:00
Henry Oswald	ffe690afa3	hooked up lifetime emails	2014-03-05 14:56:52 +00:00
James Allen	a0b6896246	add in track-changes settings	2014-03-05 13:41:00 +00:00
James Allen	66ab033ebe	Make track changes api a first class citizen	2014-03-05 13:39:21 +00:00
Henry Oswald	a9327cb7c5	replyTo is overridable when sending email	2014-03-05 13:33:41 +00:00
James Allen	188d620ce1	Log out and put the last update back when an error occurs	2014-03-05 13:22:38 +00:00
James Allen	26cd9c78be	Fix typo	2014-03-05 12:52:04 +00:00
James Allen	718bfbf771	Update README.md	2014-03-05 12:51:42 +00:00
James Allen	d3efdea7ed	Use file storage out of the box	2014-03-05 12:49:51 +00:00
Henry Oswald	274682a83d	deleted email manager	2014-03-05 12:07:09 +00:00
Henry Oswald	3431cf9070	share project email uses new email sender	2014-03-05 12:06:28 +00:00
Henry Oswald	8ba1a08245	hooked up password reset to use new email sending	2014-03-05 11:57:57 +00:00
Henry Oswald	3c18cc5553	email sending options are configurable from settings	2014-03-05 11:31:40 +00:00
Henry Oswald	5bacb2d784	added settings check on sending lifcycle emails out	2014-03-05 11:22:52 +00:00
Henry Oswald	eb92e5832b	renamed email templator -> email builder	2014-03-05 11:22:34 +00:00
James Allen	f781001280	Don't return current prefix in auto-complete list	2014-03-05 11:16:33 +00:00
James Allen	06831e555e	Add in some basic snippets	2014-03-05 11:06:12 +00:00
James Allen	d221e336f0	Match auto complete font size to editor font size	2014-03-05 11:06:12 +00:00
James Allen	934f3cbcd8	Use Ace's built in auto-completer	2014-03-05 11:06:12 +00:00