2815 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Shane Kilkelly	21eb104928	Merge branch 'master' of github.com:sharelatex/web-sharelatex	2016-07-06 15:39:12 +01:00
Shane Kilkelly	dda0841af3	Return early if there are no keys to delete	2016-07-06 15:39:03 +01:00
Paulo Reis	b867c37d49	Merge branch 'master' into pr-log-dropdown	2016-07-06 15:35:28 +01:00
Paulo Jorge Reis	59065395ef	Merge pull request #273 from sharelatex/pr-countly-integration ... Countly integration	2016-07-06 15:00:47 +01:00
Paulo Reis	7a3d3d3ffd	Make Countly track by internal ids.	2016-07-06 14:44:28 +01:00
Paulo Reis	8e2475afdc	Track hints feedback in both GA and Countly; clean-up.	2016-07-06 14:24:50 +01:00
MCribbin	95f1435920	Update HumanReadableLogsRules.coffee	2016-07-06 14:16:21 +01:00
Shane Kilkelly	fc6cf75ad5	Merge branch 'master' into sk-session-revocation	2016-07-06 13:19:15 +01:00
Paulo Reis	0dd3a70b4b	Use Countly tracking method where appropriate.	2016-07-06 12:32:33 +01:00
Paulo Reis	b841d41b68	Actually send the data to Countly.	2016-07-06 12:26:21 +01:00
Shane Kilkelly	9f724d0a04	Add tests to check if users can access a restricted page.	2016-07-06 12:14:01 +01:00
Paulo Reis	5c121a5f05	Track user log in and sign up.	2016-07-06 12:12:54 +01:00
Paulo Reis	7e1c1f7414	Remove heap integration.	2016-07-06 12:12:22 +01:00
Paulo Reis	c9b1faa1a1	Add user info to correlate with events.	2016-07-06 11:59:33 +01:00
Paulo Reis	909f7c15b5	Track log-related actions.	2016-07-05 16:27:14 +01:00
Paulo Reis	d5efe81a46	Track recompiles.	2016-07-05 16:02:46 +01:00
Paulo Reis	96f6603bd3	Track settings changes.	2016-07-05 15:37:13 +01:00
Shane Kilkelly	0362fee60f	test the retain option to revokeAllUserSessions.	2016-07-05 15:32:32 +01:00
Paulo Reis	304529754d	Track editor modals.	2016-07-05 15:16:55 +01:00
Shane Kilkelly	464866847f	Fix name of UserSessionsManager test module.	2016-07-05 15:14:29 +01:00
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