180 commits

Author	SHA1	Message	Date
Henry Oswald	133c4759f8	fix tests, whoops	2014-05-15 18:26:00 +01:00
Henry Oswald	e1b3f3542c	added some logging	2014-05-15 18:14:05 +01:00
Henry Oswald	24c50189b6	Merge branch 'master' of github.com:sharelatex/web-sharelatex	2014-05-15 18:01:49 +01:00
Henry Oswald	f7245f32d0	cleaned up old password reset cruft	2014-05-15 18:01:43 +01:00
Henry Oswald	96d98329f1	token based reset works	2014-05-15 17:58:25 +01:00
Henry Oswald	1ffd19099b	writen getUserIdFromToken	2014-05-15 17:20:42 +01:00
Henry Oswald	9f901fb1ba	added the token generator and its getNewToken function	2014-05-15 17:16:20 +01:00
Henry Oswald	64688e661d	written password reset controller	2014-05-15 16:50:38 +01:00
James Allen	e72dd50089	Use configurable uploads folder location	2014-05-15 16:32:17 +01:00
Henry Oswald	551e1d465a	written password reset handler	2014-05-15 16:20:23 +01:00
James Allen	93883c7a03	Fix calling of updateDoc	2014-05-15 15:43:04 +01:00
James Allen	f6e85c4140	Don't proxy version number to/from docstore	2014-05-15 12:44:08 +01:00
James Allen	4a27342b01	Merge branch 'docstore_integration'	2014-05-12 14:23:41 +01:00
James Allen	0bddc5552e	Use docstore for updating documents	2014-05-08 15:47:50 +01:00
James Allen	8315de58c7	Proxy get doc requests to the docstore	2014-05-08 13:42:30 +01:00
Henry Oswald	9a81f85b41	added gauge metrics for number of open socket.io http and https ... connections	2014-05-08 11:33:46 +01:00
Henry Oswald	a8571653db	added timeouts to filestore handler	2014-05-08 10:55:44 +01:00
James Allen	b29e94b4d5	Use new metrics package	2014-05-07 15:29:04 +01:00
James Allen	c73b7fae69	Use docstore when creating a new doc	2014-05-07 14:31:46 +01:00
James Allen	628fb65bc3	Work with ObjectId's passed to ProjectGetter	2014-05-06 13:34:37 +01:00
James Allen	2fb8b0e807	Get project without doc lines in getAllFolders	2014-05-06 13:15:18 +01:00
James Allen	6a2370b5be	Use docstore for CLSI request building	2014-05-06 12:54:26 +01:00
James Allen	ca6be52fa0	Revert "Revert "Get doclines from docstore when cloning project"" ... This reverts commit ff79e4d2e659751ec88b3791566f3de24e6b67f4.	2014-05-06 12:36:00 +01:00
James Allen	8af372aff3	Revert "Revert "Get doc lines from docstore when performing batch operations"" ... This reverts commit a700665650b5984fdb3afe5565d62ba810100ebe.	2014-05-06 12:35:27 +01:00
James Allen	9be4feaae1	Revert "Get doc lines from docstore when performing batch operations" ... This reverts commit 9fab27158cb02b0268f8e6aec090f275f062d885.	2014-05-01 17:19:21 +01:00
James Allen	fee632cfc9	Revert "Get doclines from docstore when cloning project" ... This reverts commit 9ab3f5b3fba8a1324c576bbdb9614f70f4c719aa.	2014-05-01 17:19:09 +01:00
James Allen	82b56d0b4f	Get doclines from docstore when cloning project	2014-04-30 16:45:53 +01:00
James Allen	465b5ca9db	Get doc lines from docstore when performing batch operations	2014-04-30 15:49:07 +01:00
Henry Oswald	3b1cc6e500	removed metrics from http logging but added key in ... having the key in there means its easy to analyise the logs based on the route	2014-04-30 13:14:41 +01:00
James Allen	355a5a020e	Keep reference to deleted docs and delete via docstore	2014-04-30 11:15:29 +01:00
James Allen	0c0548ea85	Don't crash when route path is a regex	2014-04-30 09:42:20 +01:00
James Allen	f8dec76464	Add DocstoreManager	2014-04-29 17:22:37 +01:00
Henry Oswald	0b93a719f0	added statsd metrics timing for each request	2014-04-29 15:20:31 +01:00
Henry Oswald	2cdadf1a4b	check for error when doing a password reset	2014-04-29 11:59:23 +01:00
Henry Oswald	bf2c60f84d	added rename project to list page	2014-04-28 17:47:47 +01:00
Henry Oswald	3655e83ff9	Merge branch 'master' of github.com:sharelatex/web-sharelatex	2014-04-28 16:27:19 +01:00
Henry Oswald	a0fb170878	updated archive module to latest version	2014-04-28 16:27:15 +01:00
James Allen	d528ac21a3	Mark projects as archived, but don't actually delete them	2014-04-28 12:53:43 +01:00
Yimin	295b438498	fix typo	2014-04-22 04:21:42 -05:00
Henry Oswald	0a093b779e	fixed #100, if tags is not running you should be able to delete a project still	2014-04-16 17:44:57 +01:00
Henry Oswald	8795a8a921	if retore url is not in mongo don't blow up	2014-04-15 14:19:20 +01:00
Henry Oswald	4b11790a54	Merge branch 'master' of github.com:sharelatex/web-sharelatex	2014-04-15 13:59:04 +01:00
Henry Oswald	aca2e5639e	added referal allocator to user controller	2014-04-15 13:59:00 +01:00
James Allen	ea651ee9bd	Add in restore page	2014-04-14 06:17:07 +01:00
Henry Oswald	c23f9aa056	be able to get build templates from web as well as templates	2014-04-11 15:15:32 +01:00
Henry Oswald	dbe2dd3078	fix case problem with require of newsletter manager	2014-04-10 22:21:20 +01:00
Henry Oswald	51e69392a7	cleaned up and fixed problem with open user opening pojrect	2014-04-10 17:49:39 +01:00
Henry Oswald	9355632f30	deleted user controller. The end of /controllers	2014-04-10 17:29:46 +01:00
Henry Oswald	f7ea925e67	Merge branch 'master' of github.com:sharelatex/web-sharelatex	2014-04-10 17:26:14 +01:00
Henry Oswald	5df01acfe1	moved reset password to new controler, not tests as it will be rewritten soon. Just want to kill off /controllers	2014-04-10 17:26:09 +01:00