21941 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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
Henry Oswald	bb8d2aa409	Merge pull request #69 from cwoac/refactor_config ... refactor config settings.	2014-03-05 10:48:18 +00:00
Henry Oswald	1e1c14e5fe	Merge pull request #11 from cwoac/FSPersistorManager ... Fs persistor manager - merge from cwoac	2014-03-05 10:39:26 +00:00
Henry Oswald	360fac9510	setup basic new email feature which is tested, not linked up to real ... events yet	2014-03-04 18:10:06 +00:00
Oliver Matthews	4196e823ab	refactor config settings.	2014-03-04 15:35:32 +00:00
Henry Oswald	67e9d0724d	increased auto compile limits	2014-03-04 15:29:45 +00:00
James Allen	e4d8cc7a11	Add in acceptance tests for getting a diff	2014-03-04 15:27:03 +00:00
Oliver Matthews	f920fd0b16	match refactor_config on cwoac/sharelatex	2014-03-04 15:24:50 +00:00
Oliver Matthews	957df0eb04	Don't dump streams to log files.	2014-03-04 14:45:32 +00:00
Henry Oswald	711e95a82a	delete converted file when finished to clean up	2014-03-04 14:30:52 +00:00
James Allen	8b71d222d4	Create DiffManager.getDiff	2014-03-04 14:05:17 +00:00
James Allen	1d1dcdfa2f	Add in methods for retrieving updates and doc version	2014-03-04 13:02:48 +00:00
Henry Oswald	94a6504635	cranked up kill to child processes to killSignal: "SIGKILL"	2014-03-04 12:44:16 +00:00
James Allen	5d45e191f3	Don't crash when logging out error	2014-03-04 12:39:02 +00:00
Henry Oswald	149b51ddc6	put published date on template publishing area	2014-03-03 23:04:30 +00:00
Henry Oswald	413ef7440f	added a republish button to templates	2014-03-03 22:55:12 +00:00
Henry Oswald	07fe9c36a9	use window.csrftoken for adding user to group subscription	2014-03-03 17:58:26 +00:00
Henry Oswald	a0805f97e0	added bulk removing of users to group admin panel	2014-03-03 17:48:48 +00:00
James Allen	20d70859aa	Create buildDiff function	2014-03-03 17:39:59 +00:00
Henry Oswald	c991625a27	added uni message to plans page back in	2014-03-03 16:41:59 +00:00
Henry Oswald	99dc141693	deleteing user account cancels any subscription	2014-03-03 16:22:55 +00:00