101 commits

Author	SHA1	Message	Date
Brian Gough	73ad1fde5c	comment out disabling of per user compiles	2016-06-30 15:15:37 +01:00
Brian Gough	c04e00026b	remove scaffolding for per-user compiles so that it is always by default	2016-06-30 14:43:03 +01:00
Brian Gough	2b23e13619	Merge pull request #261 from sharelatex/use-parameter-for-bcrypt-rounds ... use parameter for bcrypt rounds, rehash passwords on login if necessary	2016-06-28 10:49:33 +01:00
Henry Oswald	cc9f90c3e8	don't set referneces and notifications urls in default as open source does not use them yet	2016-06-24 15:03:15 +01:00
Henry Oswald	8b79587c9b	add settings as a value to reference in defaults file	2016-06-17 14:22:20 +01:00
Brian Gough	0906bef5f9	change default bcrypt rounds to 12, to match default in AuthenticationManager	2016-06-17 13:50:32 +01:00
Brian Gough	98a0c54004	use parameter for bcrypt rounds, rehash passwords on login if necessary	2016-06-17 12:22:03 +01:00
Shane Kilkelly	4e63a3c7bd	Move betaProgram flag up to top-level of user object	2016-06-06 13:12:24 +01:00
Shane Kilkelly	a5aab40320	Add the betaProgram feature to User model.	2016-06-01 16:17:28 +01:00
Henry Oswald	c918028d14	removed clsi priorty url	2016-05-20 12:46:14 +01:00
Henry Oswald	2abebd850c	Merge branch 'project_url_query' into clsi-dynamic-load	2016-05-19 13:08:20 +01:00
Henry Oswald	9db647491a	added different ldap config example	2016-04-28 17:21:07 +01:00
Henry Oswald	4d54de8b9a	renamed ClsiRequestManager to ClsiCookieManager and improved logging	2016-04-20 15:06:39 +01:00
Caleb Cooper	145b201087	Put brackets around the example ca path for ldap starttls support in the default config. This resolves an issue where the system was breaking the path into an array and trying to act on the first item in that array, "/", rather than the full path.	2016-04-15 13:46:11 -04:00
Henrique Dias	ae79ce75b7	Update settings.defaults.coffee	2016-04-06 11:32:08 -03:00
James Allen	de02928454	Merge branch 'master' into ja_email_tokens	2016-03-17 17:01:26 +00:00
James Allen	724e6b5263	Require explicit value of true for ENV variables in config	2016-03-15 14:14:33 +00:00
Henry Oswald	bf8f9f6d41	change key to maxEntitiesPerProject	2016-03-09 15:53:03 +00:00
James Allen	2116d0271c	Update acceptance tests for public projects	2016-03-09 15:30:23 +00:00
Henry Oswald	8f0d1dc73e	add in the calls to block large projects	2016-02-29 13:05:17 +00:00
Henry Oswald	5c5888b5dc	Merge branch 'pr/221'	2016-02-11 11:44:45 +00:00
Henry Oswald	f136486f4b	cleanup layout of notifications	2016-02-04 14:28:31 +00:00
James Allen	f55b0b3819	Add in default config for references api	2016-02-02 14:36:30 +00:00
Henrique Santos	25f9bd30b6	fix config file	2016-01-22 03:54:38 -02:00
Henrique Santos	476eaa8b84	add notification backend and unit test ... add notification init frontend	2016-01-21 18:42:50 -02:00
James Allen	5125aa0089	Make templates a premium feature	2016-01-19 13:37:22 +00:00
Henry Oswald	5f66dbebf4	2015 -> 2016	2016-01-04 11:12:10 +00:00
Henry Oswald	1ddf95e746	accesabble != accessible	2015-11-24 16:53:44 +00:00
Henry Oswald	dc066dfbdb	added adminDN and adminPW fields to ldap settings	2015-11-19 11:52:11 +00:00
Henry Oswald	f40e984e10	Updated ldap settings to make them clearer	2015-11-17 16:27:29 +00:00
Henry Oswald	377cc11c3b	added sixpack to server side	2015-11-12 09:29:44 +00:00
Henry Oswald	c8ba7b72ab	Merge branch 'master' of https://github.com/sharelatex/web-sharelatex	2015-11-10 10:36:06 +00:00
James Allen	a153c6682a	Put in client side check for document getting too long	2015-11-06 12:51:43 +00:00
James Allen	16b7bf222a	Merge branch 'contacts'	2015-11-05 10:14:25 +00:00
Henry Oswald	c4d3537e1d	remove sixpack from default settings	2015-11-02 16:28:30 +00:00
Henry Oswald	6c75a6dbe5	change six pack key and add into default settings	2015-10-27 11:37:11 +00:00
Henry Oswald	084b0d8548	update ldap default settings for server pro	2015-10-22 10:42:50 +01:00
Henry Oswald	aba8f164fc	copy right 2015 not 2014	2015-10-14 14:44:48 +01:00
James Allen	8cc7869b03	Pull in contacts from contacts api and send to tag-input for autocomplete	2015-10-07 17:32:35 +01:00
Shane Kilkelly	ae10cc5755	Update default raven version to 1.1.22	2015-09-30 10:40:20 +01:00
Henry Oswald	702fdc1480	improved views for domain licence invites	2015-05-29 12:09:28 +01:00
Henry Oswald	481bd67fbd	changed paths to use hyphens and add succesfull join page	2015-05-26 15:26:45 +01:00
Henry Oswald	cad8d8a23b	v1 basic invite works, not pretty or tested	2015-05-22 13:57:15 +01:00
Henry Oswald	8fc41e9e05	added templateLinks property to example config for ShareLaTeX server pro	2015-05-10 13:10:03 +01:00
Henry Oswald	11a5c009a6	make default password rules very permisive	2015-04-28 17:42:30 +01:00
Henry Oswald	cdbc239a62	config the password options via the settings	2015-04-28 17:39:35 +01:00
James Allen	5c30a7de67	Add in option for global login requirement (defaults to on)	2015-04-15 11:14:53 +01:00
James Allen	8b4ccae60a	Read cookie session length from settings file	2015-04-14 13:04:29 +01:00
Henry Oswald	5f6bdaf700	show the social buttons by default in settings	2015-04-13 11:30:59 +01:00
James Allen	8483f249ee	Actually proxy websocket connections	2015-03-20 19:08:48 +00:00