43 commits

Author	SHA1	Message	Date
James Allen	5ec9e587f0	Roll back real-time settings for now	2014-11-19 11:09:32 +00:00
James Allen	e559c72491	Connect to configurable websocket service	2014-11-17 13:38:44 +00:00
Henry Oswald	7ba6689ea0	add clsi2_priority to settings.defaults	2014-10-20 12:21:58 +01:00
Henry Oswald	2538d16e63	Merge branch 'master' of https://github.com/sharelatex/web-sharelatex	2014-10-14 11:50:10 +01:00
James Allen	5edefe2498	Add in compile timeout and group feature options	2014-10-13 15:42:11 +01:00
Henry Oswald	36264706f6	hooked the plans page up to the geo ip lookup	2014-10-13 14:10:15 +01:00
Henry Oswald	9924882b59	Merge branch 'master' of https://github.com/sharelatex/web-sharelatex	2014-10-09 16:45:26 +01:00
Henry Oswald	c2c29bb282	university site renders via prozy ok	2014-10-08 16:07:44 +01:00
James Allen	8f7dff1518	Don't show empty sync menu list for collaborators	2014-10-08 15:57:56 +01:00
James Allen	becb294c5c	Create basic module loading system	2014-09-08 14:19:24 +01:00
watercrossing	e5218af015	fix typo in settings	2014-09-01 23:15:38 +01:00
James Allen	456d194dbb	Merge branch 'james_tmp'	2014-08-22 12:51:35 +01:00
Henry Oswald	04e50f8ba6	changed cookie name from hard coded to be config option, defaults to sharelatex.sid	2014-08-20 18:01:21 +01:00
James Allen	d0eee7a1e5	Refactor template settings	2014-08-20 14:47:27 +01:00
Henrique Dias	a3f9f5a729	fix identation	2014-08-18 14:35:16 -03:00
Henrique Dias	e0e9949da5	dynamic template menu by config settings	2014-08-18 14:26:47 -03:00
Henrique Dias	acf392eb4e	init chance in config	2014-08-18 13:59:34 -03:00
Henry Oswald	2222b32321	added message at top of page offering redirect to local lng	2014-08-13 12:31:14 +01:00
James Allen	5ec1c59a31	Add in i18n defaults	2014-08-07 17:03:47 +01:00
Henry Oswald	377acfaa56	added default lang of en-US and translations package does the set lang based on subdomain	2014-08-05 11:15:17 +01:00
Henry Oswald	2be22d7ca7	cookies work accross different subdomains, added translations middlewear into stack to render based on domain	2014-08-04 16:47:14 +01:00
James Allen	e0f1ed3c10	Use internal url for chat	2014-07-17 11:43:12 +01:00
Henry Oswald	8f6dac77d0	added asset proxying from templates in, used for old images etc which people linked to	2014-07-01 16:00:42 +01:00
Henry Oswald	978e3262b5	added redirects from config file in, used for old template paths	2014-07-01 15:44:12 +01:00
Henry Oswald	17537b0d7a	client side js for templates loads and works	2014-07-01 14:27:20 +01:00
James Allen	9dfbb36a83	Update project settings over http	2014-06-25 13:51:02 +01:00
James Allen	d214b5dc5e	Merge branch 'master' into master-redesign	2014-06-25 12:14:26 +01:00
James Allen	cb682ac584	Add in more robust support for being behind a proxy	2014-06-25 10:34:23 +01:00
James Allen	e5ca033538	Add in configurable headings/footers	2014-06-20 21:35:42 +01:00
Henry Oswald	fd53cf0124	tell tpds sender to use pub url for docstore	2014-05-21 09:15:50 +01:00
James Allen	e72dd50089	Use configurable uploads folder location	2014-05-15 16:32:17 +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	465b5ca9db	Get doc lines from docstore when performing batch operations	2014-04-30 15:49:07 +01:00
James Allen	f3314437ab	Create default settings file	2014-04-30 11:33:31 +01:00
James Allen	355a5a020e	Keep reference to deleted docs and delete via docstore	2014-04-30 11:15:29 +01:00
Henry Oswald	fc2b42400f	Merge pull request #54 from cwoac/nodemailer-passthrough ... Nodemailer passthrough	2014-03-18 13:09:14 +00:00
Oliver Matthews	efbb17a3b9	move all parameter handling to nodemailer.	2014-03-12 15:38:40 +00:00
Henry Oswald	f2069c6208	converted all analytics to use new google analytics, removing mixpanel ... and heap. Not tracking subscriptions or cancelations yet.	2014-03-08 19:00:26 +00:00
Henry Oswald	5bacb2d784	added settings check on sending lifcycle emails out	2014-03-05 11:22:52 +00:00
Henry Oswald	fe026b4b0b	changed templates port to 3007 which is line with elsewhere	2014-03-03 16:19:52 +00:00
James Allen	ca1ebd0413	Take default features from settings	2014-02-22 10:50:59 +00:00
James Allen	8715690ce9	Intial open source comment	2014-02-12 10:23:40 +00:00