1089 commits

Author	SHA1	Message	Date
James Allen	48cc5a992f	Merge branch 'master' into ja-set-version-in-docstore	2016-12-01 09:30:53 +00:00
James Allen	eb648b9bc8	Proxy version number to and from docstore	2016-11-29 17:16:56 +00:00
Henry Oswald	68ddf04fe8	to string record event check	2016-11-29 14:38:45 +00:00
Shane Kilkelly	a03ac8fe72	More robust session destruction after deleting user account.	2016-11-28 12:37:53 +00:00
Shane Kilkelly	52462d7020	Merge branch 'sk-sync-details-from-sso'	2016-11-28 10:11:59 +00:00
Shane Kilkelly	395135a655	Merge branch 'sk-post-login-redirect'	2016-11-28 09:52:14 +00:00
Shane Kilkelly	acce8853ba	Remove redundant baseUrl from plans page.	2016-11-25 15:24:50 +00:00
Shane Kilkelly	2ab5ad4230	If we're updating details from a SSO source, don't allow editing on settings page.	2016-11-25 14:38:00 +00:00
Henry Oswald	4b59fdd453	added missing settings file to announcments controller	2016-11-25 11:59:50 +00:00
Henry Oswald	f130470971	log ip address of user when logging in	2016-11-25 11:59:50 +00:00
Shane Kilkelly	167f01857a	Remove stray next params.	2016-11-24 14:15:01 +00:00
Shane Kilkelly	22101d0305	If user is sent to login page with explicit redirect, obey	2016-11-24 11:38:13 +00:00
Shane Kilkelly	cee3326ce3	fix omission of 'length'	2016-11-22 17:06:05 +00:00
Shane Kilkelly	8a4352fff2	Set redirect when redirecting from restricted	2016-11-22 16:54:03 +00:00
Shane Kilkelly	8089bb55a4	use session for the post-login redirect, remove redir query string.	2016-11-22 14:24:36 +00:00
Shane Kilkelly	da1be67aff	Merge branch 'sk-ext-auth-show-email'	2016-11-18 09:34:05 +00:00
Shane Kilkelly	6606375cd7	Remove dead code: SessionInvalidator	2016-11-17 15:27:58 +00:00
Shane Kilkelly	fa146a1558	Remove redundant !!	2016-11-17 14:48:15 +00:00
Shane Kilkelly	3b8fbe8249	If using external auth, show non-editable email field. ... Also defend server-side against setting email when using external auth.	2016-11-17 14:34:02 +00:00
Shane Kilkelly	f9774141b1	Fix up makeRequest, so it copes with analytics.url being un-configured.	2016-11-16 14:40:38 +00:00
Henry Oswald	5b3cd7ed2b	use makeRequest func in analytics manager	2016-11-15 15:36:26 +00:00
Henry Oswald	a822cc0c92	don't log events from health check user	2016-11-15 13:41:15 +00:00
Henry Oswald	6776aa61f1	use new way to send status in express for healthcheck controlller	2016-11-15 11:04:13 +00:00
Henry Oswald	411b5324df	don't try and send requests when analytics isn't enabled	2016-11-15 10:54:48 +00:00
Henry Oswald	d87067bc2f	Merge branch 'announcments'	2016-11-15 10:38:01 +00:00
Henry Oswald	15564102a0	Update ProjectController.coffee	2016-11-15 10:34:57 +00:00
Henry Oswald	666bfdf967	stop the /announcements call at controller level	2016-11-11 17:15:36 +00:00
Henry Oswald	5a13ee1077	use anlaytis api ... - don’t talk to postgres - show recent blog post announcments - proxy all events to analytics api	2016-11-11 17:03:09 +00:00
James Allen	593e59450b	Use different UserSessions keys for cluster vs normal redis session store	2016-11-10 14:31:48 +00:00
Shane Kilkelly	c3860dd7a7	Remove stray commented-out code, use mapSeries instead of map.	2016-11-09 14:36:25 +00:00
Shane Kilkelly	f6de4cbb44	Merge branch 'master' into sk-sessions-cluster	2016-11-09 12:10:46 +00:00
Shane Kilkelly	5f3098df38	Replace multi-ops with Async.series, tests passing	2016-11-09 11:03:03 +00:00
Shane Kilkelly	bfa0e7cf89	WIP: start moving web sessions to cluster	2016-11-08 15:32:36 +00:00
David J. Weller-Fahy	5efee51ed8	Pass ignoreTLS option to nodemailer	2016-11-02 13:14:54 -04:00
Shane Kilkelly	e7b09a81a7	Merge branch 'sk-passport-ldap'	2016-11-02 15:39:32 +00:00
Paulo Reis	840d52ef1a	Remove default value from user model, but add it upon creation (i.e. affecting new users).	2016-11-01 16:36:26 +00:00
Shane Kilkelly	9cb3d8c4b8	Enable hook from module into passport init.	2016-11-01 14:06:54 +00:00
Shane Kilkelly	5c8cdd22cc	Merge branch 'sk-account-delete-pass'	2016-10-28 11:02:41 +01:00
Shane Kilkelly	4c092e7ff1	Remove deprecated "projectSharedWithYou" email.	2016-10-28 10:37:10 +01:00
Shane Kilkelly	751a116921	add plainTextTemplate to all emails	2016-10-27 14:41:13 +01:00
Shane Kilkelly	1538f140f3	update test timestamp	2016-10-27 09:41:51 +01:00
Shane Kilkelly	dfd13e0815	Update AB test timestamp	2016-10-26 14:24:00 +01:00
Shane Kilkelly	d912c3b487	Merge branch 'master' into sk-plans-tidy	2016-10-26 13:47:26 +01:00
Shane Kilkelly	dc62b1a86e	Remove deprecated endpoint for old delete-user	2016-10-26 11:18:36 +01:00
Shane Kilkelly	fc7bd4c2d3	fix logging	2016-10-26 10:57:34 +01:00
Shane Kilkelly	1c8721ceab	Functioning account deletion with password	2016-10-25 16:23:50 +01:00
Brian Gough	bb06b97b3c	avoid exception in logging null user	2016-10-25 15:01:59 +01:00
Shane Kilkelly	efe6df145c	WIP: ask for password when deleting account	2016-10-25 14:33:47 +01:00
Shane Kilkelly	6069d4dba3	Merge branch 'master' into sk-plans-tidy	2016-10-25 13:14:44 +01:00
Henry Oswald	450946212a	log out health check failures	2016-10-21 18:59:28 +01:00