1599 commits

Author	SHA1	Message	Date
Shane Kilkelly	fdacf13782	Merge branch 'master' of github.com:sharelatex/web-sharelatex	2016-06-06 13:12:31 +01:00
Shane Kilkelly	4e63a3c7bd	Move betaProgram flag up to top-level of user object	2016-06-06 13:12:24 +01:00
Henry Oswald	829b37cd74	set user email on session again on change email	2016-06-06 10:50:45 +01:00
Henry Oswald	2339cda318	added contentful uni pages as fallback	2016-06-06 09:28:53 +01:00
Shane Kilkelly	a5aab40320	Add the betaProgram feature to User model.	2016-06-01 16:17:28 +01:00
James Allen	41f789a313	Add in metric to track client side error count	2016-05-27 10:46:14 +01:00
Brian Gough	b55c469b91	use Url instead for url for "url" module ... to avoid possible conflicts with use of url as a variable	2016-05-26 16:24:18 +01:00
Brian Gough	d83cd547fb	Merge pull request #247 from sharelatex/add-query-string-to-proxy-and-filter-synctex-requests ... Add query string to proxy and filter synctex requests	2016-05-25 15:08:49 +01:00
Brian Gough	c7363a9df6	provide separate routes for sync-pdf and sync-code with error checking	2016-05-25 15:00:31 +01:00
James Allen	36ba88297b	Don't hang request in the event of a spelling backend error	2016-05-24 15:11:14 +01:00
James Allen	35442f7ce9	Prompt the user to open a file on the left if no doc is open	2016-05-23 15:03:26 +01:00
James Allen	887631e661	Don't error if the rootDoc_id no longer exists in the project when copying	2016-05-23 14:58:28 +01:00
Henry Oswald	a24f635531	removed uneeded passing of clsiServer to _parseOutputFiles and improve logging	2016-05-21 10:23:17 +01:00
Brian Gough	7f332c0436	support url object with query-string when proxying to clsi	2016-05-20 16:51:19 +01:00
Brian Gough	3c5eb9a730	clean up whitespace	2016-05-20 16:35:00 +01:00
Shane Kilkelly	0c454f5ddd	Merge branch 'master' of github.com:sharelatex/web-sharelatex	2016-05-20 14:34:55 +01:00
Shane Kilkelly	2441930fe9	Add a spinner when waiting for image preview to load.	2016-05-20 14:28:51 +01:00
Henry Oswald	c918028d14	removed clsi priorty url	2016-05-20 12:46:14 +01:00
Henry Oswald	11724fce13	Merge branch 'master' into clsi-dynamic-load	2016-05-20 12:34:42 +01:00
Shane Kilkelly	9a6876d237	Toggle the dots at the end of bib preview, based on size of payload.	2016-05-20 09:17:25 +01:00
Henry Oswald	61b9a683aa	put clsiCookie vals into subobject in settings	2016-05-19 16:55:58 +01:00
Henry Oswald	04e70735d2	Merge branch 'master' into clsi-dynamic-load	2016-05-19 16:26:54 +01:00
Shane Kilkelly	0ea16f0bcc	Index '.bib' file objects.	2016-05-19 14:58:12 +01:00
Henry Oswald	789257fd4a	use cookie key when setting cookie for jar	2016-05-19 13:52:18 +01:00
Henry Oswald	2abebd850c	Merge branch 'project_url_query' into clsi-dynamic-load	2016-05-19 13:08:20 +01:00
Shane Kilkelly	b649c13c17	Eliminate weird flicker when loading bibtex	2016-05-19 11:25:24 +01:00
Shane Kilkelly	b70a993572	Make bib previews more robust.	2016-05-19 11:11:23 +01:00
Shane Kilkelly	5df5ba868c	Fix logic for showing error or loading message.	2016-05-19 10:02:07 +01:00
James Allen	d813f45d28	Cherry-pick 0e70320 (Select icon based on file extension) from datajoy	2016-05-18 15:58:01 +01:00
Henry Oswald	dba8d96d11	pass clsiServerId to the client and use it as query stirng for requests	2016-05-18 12:50:50 +01:00
Shane Kilkelly	8621d497b4	Fix view so that bib preview only shows for bib files	2016-05-18 11:14:24 +01:00
Henry Oswald	b0baea5073	add query string to end of project resources	2016-05-18 10:09:22 +01:00
Shane Kilkelly	eae82a2b20	Preview bib files.	2016-05-17 17:00:14 +01:00
Shane Kilkelly	4f533147b1	enable range requests on files via ?range=m-n query string.	2016-05-17 16:59:47 +01:00
Brian Gough	ee15bbeee0	support the direct path to a clsi output file /project/project_id/build/build_id/output/* ... this avoids use of the query string ?build=... and so we can match the url directly with the nginx location directive	2016-05-13 10:33:38 +01:00
James Allen	aafdc794cd	Remove text limit in content box of contact us	2016-05-10 10:44:51 +01:00
Henry Oswald	b8510301b6	expire cookie key from setting file length	2016-05-06 12:19:22 +01:00
Henry Oswald	ed4fdd48d7	clsi cookies are given an expire time via settings file	2016-05-05 16:50:18 +01:00
Henry Oswald	618935b643	hide hidden domains in hreflang head of html	2016-05-04 22:01:02 +01:00
Shane Kilkelly	48b7800c7f	Revert, because mistake.	2016-05-04 10:43:40 +01:00
Shane Kilkelly	9738703424	If image preview fails to load, just show the "no preview" message	2016-05-04 09:32:59 +01:00
Shane Kilkelly	aa301dacb9	Return callback with error if an error is emitted on filestore stream.	2016-05-04 09:32:13 +01:00
Henry Oswald	b237a022c3	added rate limiting on wiki endpoint	2016-04-28 17:24:00 +01:00
Shane Kilkelly	74205ce11b	Remove features.mendeley and features.zotero from User model	2016-04-28 16:01:47 +01:00
Henry Oswald	b00bd5cd94	if clsi cookies are not enabled don't call redis, return empty	2016-04-27 17:05:12 +01:00
Henry Oswald	78b08060ab	redis get not multi used for _getServerId	2016-04-27 16:56:21 +01:00
Henry Oswald	1ee94f9bf5	return server id for set server id and _populateServerIdViaRequest	2016-04-27 16:20:10 +01:00
Henry Oswald	ae522e8b9b	Merge pull request #235 from mdamien/patch-1 ... Correct alignment for word count dialog	2016-04-27 16:12:03 +01:00
Shane Kilkelly	07ad6eb704	actually use the rendering-error state.	2016-04-25 12:42:03 +01:00
Henry Oswald	616630200a	improve send calls and return correct stuff from _makeRequest	2016-04-20 17:08:11 +01:00