907 commits

Author	SHA1	Message	Date
Henry Oswald	b9dd2d826e	added null check on subscription for group plans	2014-11-04 10:53:03 +00:00
James Allen	22f5c5dcb9	Keep spacing consistent	2014-11-03 14:25:53 +00:00
James Allen	1d6647e67d	Add in github to plans page	2014-11-03 14:23:12 +00:00
Henry Oswald	16e93b6f1b	Merge branch 'master' of https://github.com/sharelatex/web-sharelatex	2014-11-03 12:07:53 +00:00
Henry Oswald	edf715919d	send user to 404 if templates returns 404	2014-11-03 11:48:56 +00:00
Henry Oswald	4c7293f8c2	remove lang from page title in wiki article	2014-11-03 11:48:43 +00:00
James Allen	528ff743e8	Remove github feature flat	2014-11-03 10:55:35 +00:00
Henry Oswald	30100f2a07	fixed badly called flushProjectToThirdPartyDataStore causing issues with initial drobox sync	2014-10-31 12:41:06 +00:00
Henry Oswald	aeb956c8a4	wiki will try and get spanish version of page then fall back to english if it is not there	2014-10-31 12:15:03 +00:00
Henry Oswald	e0aae65050	added file ref null check	2014-10-31 10:50:20 +00:00
Henry Oswald	0f4d9771aa	added null check to where we insert elements into a project	2014-10-31 10:37:44 +00:00
Henry Oswald	d428e7e5b4	handle a null in the file refs list ... this seems to happen now and then when there is networking issues	2014-10-31 10:34:21 +00:00
Henry Oswald	56efefd6d4	renamed variable	2014-10-30 08:33:18 +00:00
James Allen	ca664e0063	Get subscription status correctly for showing upgrade/bonus link	2014-10-27 15:00:46 +00:00
James Allen	f1ddff4061	Only ignore hidden files from Dropbox, not GitHub	2014-10-27 14:39:20 +00:00
Henry Oswald	011bdc4617	explicitly set the file types to delete ... the wild card version can get mixed up with app.del '/project/:project_id/contents/*', httpAuth, TpdsController.deleteProjectContents	2014-10-24 12:01:52 +01:00
Henry Oswald	0a123418ac	insert ref data into uni page	2014-10-23 14:13:40 +01:00
Henry Oswald	fab0dc5cbc	change button to a	2014-10-23 11:51:35 +01:00
Henry Oswald	b067e0d0a4	fixed email us button on templates	2014-10-23 11:18:04 +01:00
Henry Oswald	8097e6ad71	made 7 day free trial the default	2014-10-21 13:48:46 +01:00
Henry Oswald	4bd0708029	put the compile group on the session so proxied requests are sent to the correct place ... I know this is premature optimisation however we do make a lot of requests to the clsi for each compile and this will save mongo a lot of calls	2014-10-21 09:34:58 +01:00
Henry Oswald	fb53be7ce4	Revert "priority compiles are proxyed to the priority servers" ... This reverts commit 5375af085a1fc20def19a858e3f63c52f3bec9b0.	2014-10-21 09:16:23 +01:00
Henry Oswald	250606472d	priority compiles are proxyed to the priority servers	2014-10-20 17:48:00 +01:00
Henry Oswald	36136a99ca	fixed escaping of html	2014-10-20 15:46:42 +01:00
Henry Oswald	9be31a2ac1	removed type: from log lines	2014-10-20 14:24:39 +01:00
Henry Oswald	3cf64ce34f	pass new compile features to client side, don't show timeout upgrade for premium users	2014-10-20 12:21:40 +01:00
Henry Oswald	fc4bc08fc2	added upgrade to get faster compiles message to timeout	2014-10-17 16:01:26 +01:00
Henry Oswald	b9d6d5bbf1	set the request timeout to a few mins for the compile	2014-10-17 13:23:29 +01:00
Henry Oswald	e7906f7018	timeout option passed to clsi	2014-10-16 18:43:48 +01:00
Henry Oswald	7293ccf06d	if user has premium compile send them to a different server set	2014-10-16 17:52:21 +01:00
Henry Oswald	5a4a90924b	added default opts for users compile features	2014-10-16 16:57:51 +01:00
Henry Oswald	1506f86a5f	Merge branch 'master' of https://github.com/sharelatex/web-sharelatex	2014-10-16 16:34:25 +01:00
Henry Oswald	d97e42a959	get users features for compile options i.e. timeout and which compiler	2014-10-16 16:34:21 +01:00
James Allen	8fa8a64c6f	Update email templates	2014-10-16 12:46:38 +01:00
James Allen	f3a1ba93a4	Fix argument signature of mergeUpdate and deleteUpdate	2014-10-16 11:43:54 +01:00
James Allen	46ecaf9f6c	Fix broken argument signature of addFolder	2014-10-16 11:27:10 +01:00
James Allen	9f1a7c7396	Send source of update to doc updater and allow external updates to be ignored in UI	2014-10-16 11:27:10 +01:00
Henry Oswald	1b893ff502	Merge branch 'master' of https://github.com/sharelatex/web-sharelatex	2014-10-15 16:22:01 +01:00
Henry Oswald	750b050358	added ab test in for multi currency	2014-10-15 16:21:45 +01:00
James Allen	7e9318814d	Send source of update to doc updater on setDocument request	2014-10-15 15:36:08 +01:00
James Allen	6800c1a15e	Track the source of updates through the system on adding/updating of docs and files	2014-10-15 15:18:31 +01:00
James Allen	4f2ab51ebd	Merge branch 'master' of github.com:sharelatex/web-sharelatex	2014-10-15 14:11:11 +01:00
James Allen	941f550d6c	Remove all traces of soa-req-id	2014-10-15 14:11:02 +01:00
Henry Oswald	af769c7871	allow ip to set via query string for plans page	2014-10-15 11:58:35 +01:00
Henry Oswald	e443809206	free trial length is show correctly at bottom of plans page	2014-10-15 11:49:20 +01:00
James Allen	fd8991f62e	Sort out responsive flow	2014-10-15 10:23:08 +01:00
James Allen	64fe2a2404	Improve CSS and layout of feature list on new subscription page	2014-10-15 10:22:03 +01:00
James Allen	b32375530c	Refactor card css for use in new subscription page	2014-10-14 15:46:44 +01:00
Henry Oswald	b2b13ef9a7	pass plan to payment page to get the number of collaborators	2014-10-14 12:14:24 +01:00
Henry Oswald	19a08f82a6	default to USD if there is no match	2014-10-14 12:14:03 +01:00