20619 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
James Allen	64ab1a4f59	Remove restore warning message	2014-04-28 12:54:16 +01:00
James Allen	d528ac21a3	Mark projects as archived, but don't actually delete them	2014-04-28 12:53:43 +01:00
James Allen	c6f1c53d21	Merge pull request #117 from davidediger/master ... Adding fairy configuration	2014-04-28 10:26:10 +01:00
David Ediger	5b67fc9981	Adding fairy configuration	2014-04-25 16:17:17 -04:00
Henry Oswald	6dd792e5e9	Merge pull request #66 from GaZ3ll3/patch-1 ... fix typo in logging reciving -> receiving	2014-04-22 11:18:00 +01:00
Yimin	295b438498	fix typo	2014-04-22 04:21:42 -05:00
Henry Oswald	39b9c99735	fix unit tests I broke by adding timeout to tags	2014-04-16 17:51:40 +01: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	eebfa6499e	Be more forgiving with version mismatches	2014-04-15 08:02:49 +01:00
James Allen	c249ea91f9	Restore button doesn't work	2014-04-14 06:28:36 +01:00
James Allen	ea651ee9bd	Add in restore page	2014-04-14 06:17:07 +01:00
James Allen	6aee795e67	Add project URL to message	2014-04-14 00:03:42 +01:00
James Allen	c750797ca4	Update message	2014-04-13 23:38:44 +01:00
Henry Oswald	c2cb6e2c1f	updated wording again	2014-04-13 23:18:13 +01:00
Henry Oswald	255b932079	added message explainging potential data reverted	2014-04-13 22:59:41 +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
Henry Oswald	5760e51d6e	moved password change to new user controller with tests	2014-04-10 17:15:18 +01:00
Henry Oswald	cc68fe443f	Moved register function into user registration handler and new user ... controller	2014-04-10 16:32:47 +01:00
James Allen	573c877a57	Remove unneeded/broken stream.resume()	2014-04-10 12:57:49 +01:00
James Allen	049dcc2780	Split lines on Windows line endings too	2014-04-10 12:45:42 +01:00
James Allen	c2ebaaa338	Split lines on Windows line endings too	2014-04-10 12:44:46 +01:00
Henry Oswald	2ca7c344a3	reformtted reg handler tests	2014-04-10 12:39:13 +01:00
Henry Oswald	e4223c9b5e	fixed test for logout	2014-04-09 17:07:19 +01:00
Henry Oswald	b6b30c3d37	moved logout to new user controller	2014-04-09 16:59:28 +01:00
Henry Oswald	b46576e91f	Merge branch 'master' of github.com:sharelatex/web-sharelatex	2014-04-09 16:33:58 +01:00
Henry Oswald	bb7025ad6e	moved user update user settings to user controller	2014-04-09 16:33:54 +01:00
James Allen	f931f5f5ce	Only show if sidebar is open and meant to be shown	2014-04-09 15:57:55 +01:00
Henry Oswald	bcfc1bee0c	moved unsubscribe endpoint to new user controller	2014-04-09 15:41:19 +01:00
James Allen	52b22a41c8	Use simpler exec command with a timeout	2014-04-09 15:34:54 +01:00
Henry Oswald	d611984948	Merge branch 'master' of github.com:sharelatex/web-sharelatex	2014-04-09 15:26:13 +01:00
Henry Oswald	0d1421b7ee	fix user deleter test	2014-04-09 15:26:07 +01:00
James Allen	81378f43c1	Make a few UI improvements to syncing	2014-04-09 15:24:37 +01:00
Henry Oswald	026ad8089d	Merge branch 'master' of github.com:sharelatex/web-sharelatex	2014-04-09 15:04:51 +01:00
Henry Oswald	12773c26c2	moved user settings page to the user pages controller	2014-04-09 15:04:47 +01:00
Henry Oswald	823f4a5eb9	created new UserController and put delete user in it	2014-04-09 14:50:12 +01:00
Henry Oswald	37fb959b00	renamed UserController to UserInfoController	2014-04-09 14:45:46 +01:00
Henry Oswald	c55c5032b0	moved delete user to the user controller	2014-04-09 14:43:08 +01:00
James Allen	b53fed1243	Rearrange compile flags	2014-04-09 12:44:51 +01:00
James Allen	173e0a80c6	Compile binary with install	2014-04-09 12:37:04 +01:00
James Allen	79cb8270e5	Add in floating buttons for syncing between code and PDF	2014-04-09 12:35:33 +01:00
Henry Oswald	5f72f13528	moved password reset to user pages controller	2014-04-09 12:26:59 +01:00
Henry Oswald	434fca8874	moved login page to new user page controller	2014-04-09 12:22:57 +01:00