2784 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Paulo Reis	71b8f86e89	Track editor macro views.	2016-07-05 15:07:16 +01:00
Shane Kilkelly	a1c662b9d8	Test session revocation on password change.	2016-07-05 14:55:08 +01:00
Shane Kilkelly	3f1a47eccb	map the 'retain' values to session ids	2016-07-05 14:54:26 +01:00
Paulo Reis	a40cbdd84e	Track share modal opening.	2016-07-05 14:32:56 +01:00
Shane Kilkelly	2caa80bbcb	acceptance test for logging in two sessions.	2016-07-05 14:21:38 +01:00
Shane Kilkelly	5b9903551a	add an array of session ids to retain.	2016-07-05 14:20:47 +01:00
Shane Kilkelly	6e282ab308	clear sessions on password reset	2016-07-05 14:19:59 +01:00
Paulo Reis	fac3698c40	Better namespacing of sprite CSS classes.	2016-07-05 11:08:58 +01:00
Shane Kilkelly	bec3d2ad42	start acceptance tests for sessions	2016-07-05 10:24:24 +01:00
Paulo Reis	7dd1906eaf	Initial Countly integration.	2016-07-04 16:51:31 +01:00
Paulo Jorge Reis	95fcc22af9	Merge pull request #271 from sharelatex/sprites ... Sprites	2016-07-04 16:15:05 +01:00
Paulo Reis	040739ef7f	Comment out sprity and leave a not in README.md.	2016-07-04 16:03:29 +01:00
Shane Kilkelly	df0a7bc547	test the _checkSessions function.	2016-07-04 14:04:10 +01:00
Shane Kilkelly	699ba21032	test revokeAllUserSessions	2016-07-04 11:15:28 +01:00
Shane Kilkelly	dfcb47fb5c	test untrackSession	2016-07-04 10:56:13 +01:00
Shane Kilkelly	2ae2e6ed4f	Test trackSession	2016-07-04 10:37:01 +01:00
Shane Kilkelly	a869c99c60	Begin testing UserSessionsManager.	2016-07-04 10:05:34 +01:00
Shane Kilkelly	5a1af9a5f3	check sessions on login and logout.	2016-07-04 09:27:38 +01:00
Paulo Reis	11f198d970	Merge branch 'master' into sprites	2016-07-01 16:27:09 +01:00
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
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
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
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
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	8f14526354	added custom footer in email option	2016-06-28 17:07:27 +01:00