698 commits

Author	SHA1	Message	Date
Shane Kilkelly	6e8185aeaf	Merge branch 'master' into sk-passport	2016-09-23 10:28:35 +01:00
Shane Kilkelly	6c716ca252	Fix acceptance tests by updating invite-accept url	2016-09-23 10:28:17 +01:00
Shane Kilkelly	72ca1d6316	Merge branch 'master' into sk-passport ... # Conflicts: # app/coffee/Features/Collaborators/CollaboratorsInviteController.coffee	2016-09-23 10:01:11 +01:00
James Allen	e15976be21	Use token in URL to force its precense when invite and allow easy dynamic notifications	2016-09-22 17:24:06 +01:00
Shane Kilkelly	dbac4bd008	update session when user settings change	2016-09-22 16:58:25 +01:00
Shane Kilkelly	7e449c60ed	fix tests	2016-09-22 16:04:42 +01:00
Shane Kilkelly	ff1c72ee14	Fix up more session access	2016-09-22 14:30:34 +01:00
Shane Kilkelly	7f24dd6f55	Fix tests for UserInfoController.	2016-09-22 13:37:27 +01:00
Shane Kilkelly	a3ace1fccd	Increase timeout because slow tests	2016-09-22 11:33:54 +01:00
Shane Kilkelly	dde5b7b830	Regenerate session on login, protect against session-fixation attack.	2016-09-21 13:03:37 +01:00
Shane Kilkelly	bb71433727	Remove getLoggedInUser	2016-09-21 09:27:51 +01:00
Shane Kilkelly	4eada48638	Merge branch 'master' into sk-passport	2016-09-19 15:40:25 +01:00
James Allen	0917fe10ca	Return type when finding element by path so that we don't need a heuristic	2016-09-19 14:35:25 +01:00
Shane Kilkelly	2119dcbb58	Finalise login workflow, works with login form again.	2016-09-15 14:36:11 +01:00
Shane Kilkelly	438ac45854	fix unit tests	2016-09-07 16:40:49 +01:00
Shane Kilkelly	8e0103a1bc	wip: fix unit tests for AuthenticationController	2016-09-07 14:05:51 +01:00
Shane Kilkelly	3a5b3a8e8d	wip: acceptance tests working	2016-09-06 15:55:34 +01:00
Shane Kilkelly	b0a10c948c	wip refactor	2016-09-06 15:22:13 +01:00
Henry Oswald	ddc0023c64	make forceCreate the default for creating notifications	2016-08-30 13:07:37 +01:00
Henry Oswald	114dbf9f3f	Merge branch 'master' of https://github.com/sharelatex/web-sharelatex	2016-08-23 15:34:55 +01:00
James Allen	bcc8bfbe6c	Redirect to working update billing details end point that shows a nice message	2016-08-22 17:36:33 +01:00
Henry Oswald	130fece0f6	track when users accept invites	2016-08-19 18:33:03 +01:00
Shane Kilkelly	a904427531	Fix broken test	2016-08-19 11:57:44 +01:00
Shane Kilkelly	ece0491e3d	Refactor. Handle republishing of notifications on resend.	2016-08-17 16:27:15 +01:00
Shane Kilkelly	da40f54d55	Improve logging, add acceptance tests for joinProject json	2016-08-16 11:17:45 +01:00
Shane Kilkelly	158afbb157	Merge branch 'master' into pr-email-tokens ... Conflicts: app/coffee/Features/Notifications/NotificationsBuilder.coffee public/coffee/ide/share/controllers/ShareController.coffee	2016-08-15 10:29:21 +01:00
Shane Kilkelly	f92767f7b5	Address feedback, add ? checks where appropriate	2016-08-12 15:26:20 +01:00
Shane Kilkelly	e53394919f	Rework how invite expiry functions.	2016-08-12 14:40:59 +01:00
Shane Kilkelly	a7bc8bffe0	Update markAsReadByKeyOnly url.	2016-08-12 09:59:25 +01:00
Shane Kilkelly	276241495b	Fix tests	2016-08-11 14:23:25 +01:00
Shane Kilkelly	ce039f8cd3	Remove the email when user id is added to project	2016-08-11 14:17:01 +01:00
Paulo Reis	228de5332e	Unit test tracking code.	2016-08-11 14:09:57 +01:00
Shane Kilkelly	826295167f	Mark Notification as read by key alone	2016-08-11 14:04:11 +01:00
Shane Kilkelly	3cec6affab	Test creating two invites at once	2016-08-10 15:24:09 +01:00
Shane Kilkelly	5351e79c7a	Test creating, listing and revoking invites as owner	2016-08-10 14:39:27 +01:00
Brian Gough	abcfb2dd16	Merge pull request #290 from sharelatex/enable-chktex ... Enable chktex	2016-08-10 11:49:31 +01:00
Shane Kilkelly	0e0ccb41ff	cancel notification when accepting invite	2016-08-08 13:57:33 +01:00
Shane Kilkelly	110082390e	Test the _trySendInviteNotfification helper	2016-08-08 10:34:54 +01:00
Shane Kilkelly	eafd61a90e	Refresh members and invites in client when status changes	2016-08-05 14:01:08 +01:00
Shane Kilkelly	8f7603c324	Add an endpoint to access project members	2016-08-04 16:47:48 +01:00
Shane Kilkelly	a5ddcc3df7	Allow resending of invites	2016-08-03 15:42:19 +01:00
Shane Kilkelly	6ea690225f	Refactor view-invite to not use model calls.	2016-08-03 10:23:34 +01:00
Shane Kilkelly	5f8952450e	Test getInviteCount	2016-08-02 16:08:05 +01:00
Shane Kilkelly	3a3688d3d0	Include invites count in canAddXCollaborators	2016-08-02 15:42:50 +01:00
Henry Oswald	2ad0bab976	use underscore.each so it doesn’t blow up on non array.	2016-08-02 15:33:41 +01:00
Shane Kilkelly	abbd059eae	Refactor to existing addUserIdToProject function	2016-08-02 13:51:00 +01:00
Shane Kilkelly	63f8fe453a	Use UserGetter rather than User model	2016-08-02 09:48:09 +01:00
Shane Kilkelly	dca1c9be5d	Load invites on project load, rather than asynchronously.	2016-08-01 17:05:37 +01:00
Shane Kilkelly	9787edd716	Add more assertions about project access	2016-08-01 15:55:56 +01:00
Shane Kilkelly	9e0ff3f628	test when the token is invalid	2016-08-01 15:21:06 +01:00