20319 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Paulo Reis	64a73b0356	Disable default 4px margin on grunt-sprity, also add the built files.	2016-07-01 16:02:40 +01:00
Paulo Reis	4f49a25639	Use a figure element instead of an img, as there is no src attribute.	2016-07-01 16:02:01 +01:00
Shane Kilkelly	6f20f565fe	Add early-return guards	2016-07-01 15:55:50 +01:00
Shane Kilkelly	0ac9b05d02	Add ip_address and session_created to the session user object.	2016-07-01 15:49:07 +01:00
Shane Kilkelly	f1653d01b7	Refactor method names in UserSessionsManager	2016-07-01 15:33:59 +01:00
Henry Oswald	6f4a7f4779	mvp for using sprites for flags, needs border removing	2016-07-01 15:04:39 +01:00
Shane Kilkelly	6938f1d055	No need to build extra string	2016-07-01 15:04:13 +01:00
Shane Kilkelly	8855d0fa0f	Clear out sessions	2016-07-01 13:38:13 +01:00
Shane Kilkelly	5ae0aeaf94	Fix logging.	2016-07-01 13:37:56 +01:00
Shane Kilkelly	d8ffa5b4b1	set expiry on the user sessions set.	2016-07-01 11:24:46 +01:00
Shane Kilkelly	ab26edb44b	Adjust UserController unit tests	2016-07-01 10:20:22 +01:00
Shane Kilkelly	88bef5c5ea	Add revokeAllSessions handler, when password is reset	2016-07-01 09:51:22 +01:00
Henry Oswald	3d33e5bc98	add echo for finished migrations in	2016-06-30 16:47:35 +01:00
Henry Oswald	cb459a94b9	add permissions change for templates dir	2016-06-30 16:47:23 +01:00
Henry Oswald	60bfe17f2c	move install latexmk and path higher up	2016-06-30 16:47:13 +01:00
Henry Oswald	e5808c2933	added example docker compose file	2016-06-30 16:35:26 +01:00
Brian Gough	ea942fe255	Merge pull request #269 from sharelatex/remove-migration-to-per-user-containers ... remove scaffolding for per-user compiles so that it is always by default	2016-06-30 15:16:28 +01:00
Brian Gough	73ad1fde5c	comment out disabling of per user compiles	2016-06-30 15:15:37 +01:00
Henry Oswald	7cb266d904	removed imagemin	2016-06-30 14:59:05 +01:00
Henry Oswald	5bc0e529d5	upgrade east and check for null ids	2016-06-30 14:52:45 +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
James Allen	882e28a811	Don't choke on null projects	2016-06-30 14:30:04 +01:00
James Allen	b76cc7e314	Remove a user from being a collaborator when their account is deleted	2016-06-30 14:21:44 +01:00
James Allen	a0fcc7e3ed	Skip null user objects when getting collaborators	2016-06-30 13:56:21 +01:00
Paulo Reis	d93c96d43c	Improve log hints ids.	2016-06-30 11:30:43 +01:00
Paulo Reis	c5f53ef431	Track log hints feedback.	2016-06-30 11:30:30 +01:00
Brian Gough	64271c2a27	Merge pull request #41 from sharelatex/per-user-containers-part-3 ... Reduce number of cached builds for per-user containers	2016-06-30 08:06:01 +01:00
James Allen	149351aa49	Remove debugging log lines	2016-06-29 21:18:13 +01:00
Brian Gough	dd4e1e17b5	keep one extra build until per-page pdf serving is enabled	2016-06-29 16:31:16 +01:00
Henry Oswald	05dedeebb8	Merge branch 'master' of https://github.com/sharelatex/web-sharelatex	2016-06-29 15:36:53 +01:00
Henry Oswald	000c862ae1	return 404 if blog returns 403, caused by file not existing	2016-06-29 15:36:33 +01:00
Shane Kilkelly	03fedafaf5	save the session key string, rather than just the id	2016-06-29 15:12:12 +01:00
Paulo Reis	536c1ac65e	Merge branch 'pr-project-filepath-regex'	2016-06-29 14:19:37 +01:00
Paulo Reis	36e09e3b0c	Make the user id portion of the path optional.	2016-06-29 14:19:16 +01:00
Brian Gough	16b58a9420	Merge pull request #268 from sharelatex/per-user-containers-part-3 ... add support for on-demand viewing of pdfs for per-user compiles	2016-06-29 14:16:24 +01:00
James Allen	fde334acc4	Create script that will ensure data is migrate between redis backends	2016-06-29 12:57:56 +01:00
Paulo Reis	72d498c6c8	Merge branch 'master' into pr-contact-form-suggestions	2016-06-29 11:58:07 +01:00
Paulo Reis	f50c73642a	Integrate with KB index.	2016-06-29 11:57:43 +01:00
Shane Kilkelly	db213c0621	Begin keeping record of user sessions in reds.	2016-06-29 11:35:25 +01:00
Paulo Reis	d037cb93a9	Wiki styles clean-up.	2016-06-29 10:42:51 +01:00
Paulo Reis	5ad0c06770	Regex now matches new folder nomenclature.	2016-06-28 17:19:02 +01:00
Henry Oswald	d58ebb2dd4	added custom footer for email option	2016-06-28 17:08:00 +01:00
Henry Oswald	8f14526354	added custom footer in email option	2016-06-28 17:07:27 +01:00
Henry Oswald	88fb955884	hook notifications handler up to make request which doesn't make request if url not set	2016-06-28 16:52:27 +01:00
James Allen	dbe03e2757	Track metrics of when backends match or disagree	2016-06-28 16:49:15 +01:00
Paulo Reis	a6d184358f	Avoid inline-styles.	2016-06-28 15:51:50 +01:00
Paulo Reis	88564ea126	Dynamically determine if the files dropdown should drop up or drop down.	2016-06-28 15:48:11 +01:00
James Allen	0b9e85ea50	Update ioredis version	2016-06-28 15:47:06 +01:00
Shane Kilkelly	9e16f250f9	Merge branch 'sk-subscription-address'	2016-06-28 14:16:34 +01:00
Shane Kilkelly	6581bc4ecf	set postal_code as zip	2016-06-28 14:15:47 +01:00