2158 commits

Author	SHA1	Message	Date
Hugh O'Brien	b377b89447	Merge pull request #933 from sharelatex/bg-avoid-exception-for-no-emails ... fix exception when user has no emails field	2018-09-19 11:33:03 +01:00
Brian Gough	02854274a7		2018-09-18 14:09:05 +01:00
Timothée Alby	b16cffe587	Merge pull request #932 from sharelatex/as-redirect-query-string ... Support passing through query params in redirects	2018-09-18 12:35:21 +01:00
Timothée Alby	b6925647ef	Merge pull request #922 from sharelatex/ta-forbid-null-query ... Prevent Calls to UserGetter.getUser with Null Query	2018-09-18 12:24:19 +01:00
Alasdair Smith	7e358ab318	Support passing through query params	2018-09-18 11:34:04 +01:00
hugh-obrien	39f580d6ba	fixing broken exports test	2018-09-18 10:13:33 +01:00
James Allen	15103ac894	Support the same URL with multiple methods in redirects	2018-09-17 15:38:58 +01:00
James Allen	83a1039b7e	Add acceptance tests for RedirectManager	2018-09-17 15:38:58 +01:00
James Allen	40f08d1592	Add additional functionality to RedirectManager	2018-09-17 15:38:45 +01:00
Alasdair Smith	42cef8e393	Merge pull request #920 from sharelatex/mm-gallery-exports ... Add gallery fields to export controller and handler	2018-09-17 09:42:26 +01:00
Alasdair Smith	e1e7091f30	Merge pull request #905 from sharelatex/as-project-intelligent-redirect ... Intelligently redirect to v1 if no v2 project found	2018-09-17 09:40:52 +01:00
Tim Alby	41b92d4647	prevent calls to UserGetter.getUser with null query	2018-09-14 12:46:00 +01:00
Michael Mazour	10fcdd6daf	Add optional gallery fields to export request ... Support the optional (well, gallery-only) fields `title`, `description`, `author`, `license`, and `show_source` in export requests.	2018-09-14 11:02:51 +01:00
Tim Alby	0051e59309	remove unused call to UserGetter.getUser	2018-09-13 17:39:30 +01:00
James Allen	ef11161ddb	Revert "Record and show last modified by user for projects"	2018-09-13 14:00:30 +01:00
Michael Mazour	1f976a0e04	Improve ExportsController unit tests ... Test the params the handler's called with.	2018-09-13 12:24:03 +01:00
Alasdair Smith	8a969d1c25	Redirect directly from controller instead of via handler	2018-09-13 12:09:19 +01:00
Alasdair Smith	0c658127ef	Add tests for ProjectNotTokenAccessError	2018-09-13 12:09:19 +01:00
Alasdair Smith	893e2dd235	Add test for location of redirect to v1	2018-09-13 12:09:19 +01:00
Alasdair Smith	cf8ae7c28c	Add test for redirecting to v1 if project unimported	2018-09-13 12:09:19 +01:00
James Allen	ab10336110	Record last update time and user from project-history	2018-09-13 10:38:52 +01:00
Hugh O'Brien	24c479e984	Merge pull request #885 from sharelatex/hb-ip-matcher-notifications ... IP matcher affiliation CTA notifications	2018-09-13 08:59:25 +01:00
Ersun Warncke	7d3e17651f	set options and method for request, pass cookies and form body	2018-09-10 06:10:36 -04:00
Ersun Warncke	dd056e36ae	add overleaf method	2018-09-10 06:10:36 -04:00
hugh-obrien	8ef90a0dcb	move call for creating ip matched notifcation to project controller	2018-09-05 15:40:59 +01:00
Tim Alby	9ec60a128a	add userHasSubscriptionOrIsGroupMember alias	2018-09-05 11:37:37 +01:00
hugh-obrien	23e6292fd7	updating tests for ip matcher logic	2018-09-05 11:22:26 +01:00
hugh-obrien	de83df2703	adding tests for ip matching notifications	2018-09-05 11:22:25 +01:00
James Allen	24f60bf791	Don't include the license name twice in invite emails	2018-09-05 11:05:38 +01:00
Shane Kilkelly	d432b6799f	Merge pull request #888 from sharelatex/ta-v1-subscription-check-fix ... Don't Regard v1 Teams as Paid Subscriptions	2018-09-05 10:22:46 +01:00
Ersun Warncke	e4e6a0fa1b	add new tag methods	2018-09-03 10:40:28 -04:00
Tim Alby	3324796086	don't regard v1 teams as paid subscriptions ... - use `userHasV1Subscription` instead of `userHasV1SubscriptionOrTeam` in `LimitationsManager.userHasSubscriptionOrIsGroupMember ` - remove `userHasV1SubscriptionOrTeam` - rename `LimitationsManager.userHasSubscriptionOrIsGroupMember` to `LimitationsManager.hasPaidSubscription` - rename some variables for clarity	2018-09-03 15:09:57 +01:00
James Allen	52381c8fb7	Merge pull request #851 from sharelatex/jel-remove-a-b-test ... Remove Plans and Pricing A/B Test	2018-08-30 15:19:56 +01:00
Paulo Jorge Reis	cb4d4145a1	Merge pull request #855 from sharelatex/pr-v2-light-theme ... v2 light theme	2018-08-30 11:24:52 +01:00
Ersun Warncke	9feb8ef39f	Revert "Merge pull request #843 from sharelatex/ew-collabratec" ... This reverts commit 223beab491d2f8dcf4c7285267fda355cfce3f05, reversing changes made to a726537c4372641bfca0eb37fc130ca3a932d433.	2018-08-29 12:00:53 -04:00
Ersun Warncke	afc22dc5c2	Revert "Merge pull request #790 from sharelatex/ew-add-cookie-and-form-to-proxy" ... This reverts commit ebefc2f28c6e88bbfa632f2b22cb8b99b75e95ec, reversing changes made to 223beab491d2f8dcf4c7285267fda355cfce3f05.	2018-08-29 12:00:20 -04:00
Ersun Warncke	e7eefc0474	Merge pull request #790 from sharelatex/ew-add-cookie-and-form-to-proxy ... set options and method for request, pass cookies and form body	2018-08-29 10:17:21 -04:00
Ersun Warncke	c1859f3e80	Merge pull request #843 from sharelatex/ew-collabratec	2018-08-29 10:17:02 -04:00
Jessica Lawshe	8889f2aed2	Remove Plans and Pricing A/B Test ... Remove all layouts, analytics events, and scope related to the A/B test. The group modal from the default layout of the A/B test should be maintained though for v2.	2018-08-28 12:42:09 -05:00
Paulo Reis	76fcee721e	Update unit tests.	2018-08-28 14:24:05 +01:00
Paulo Reis	efc926ffc5	Load theme as a user setting; allow the user to change it; update tests.	2018-08-27 15:25:00 +01:00
Tim Alby	ef37902dfc	check institution confirmation status	2018-08-27 15:45:31 +02:00
Hugh O'Brien	29253c5a93	Merge branch 'master' into hb-fetch-licences-graph	2018-08-23 16:11:43 +01:00
Tim Alby	753fb02c05	always return an array when getting affiliations	2018-08-23 15:15:53 +02:00
Paulo Jorge Reis	d838f8778a	Merge pull request #832 from sharelatex/pr-change-free-history-limits ... Change history limits for free users	2018-08-23 14:02:08 +01:00
Ersun Warncke	8f21ab7f10	add overleaf method	2018-08-22 13:44:40 -04:00
hugh-obrien	8d72fc78fc	send licences graph request to v1 for data instead of analytics	2018-08-22 18:31:29 +01:00
Hugh O'Brien	eeadd1e9bb	Merge pull request #797 from sharelatex/hb-inform-v1-affiliation-confirms ... Tell v1 confirmation status of affiliation emails	2018-08-22 08:34:33 +01:00
Paulo Reis	54e0a7cfd2	Merge branch 'master' into pr-change-free-history-limits	2018-08-21 11:23:28 +01:00
Alasdair Smith	d99a42e678	Merge pull request #824 from sharelatex/as-redirect-sl-login-to-v2-login ... Allow for redirection of unlinked SL account to /user/login_to_ol_v2	2018-08-21 10:13:52 +01:00
Paulo Reis	4dee3fd5e1	Update frontend unit tests.	2018-08-20 17:02:55 +01:00
Tim Alby	8d6505b518	log institutions API errors	2018-08-17 17:48:00 +02:00
Tim Alby	f5513f36ca	add param to skip affiliation creation on user create	2018-08-17 17:48:00 +02:00
Alasdair Smith	9bc3fa2df0	Pass req to preDoPassportLogin module hook	2018-08-17 12:04:05 +01:00
hugh-obrien	96ffeef73d	send fixed confirmed date to v1 for affiliations	2018-08-16 13:50:34 +01:00
hugh-obrien	55597b9279	inform v1 when confirming affiliation emails	2018-08-16 13:50:34 +01:00
Paulo Reis	713a39171a	Fix history frontend tests.	2018-08-16 13:44:48 +01:00
Henry Oswald	5ed95694da	Merge pull request #801 from sharelatex/ho-mailchimp ... Add non checked checkbox for newsletter subscription on signup and use mailchimp as newsletter provider.	2018-08-16 11:40:39 +01:00
Brian Gough	c2828c8ca5	add unit tests	2018-08-13 10:53:43 +01:00
Tim Alby	197e7ce8ab	refactor institutions getter	2018-08-10 13:40:25 +02:00
James Allen	69e8eddff0	Merge pull request #796 from sharelatex/pr-history-labels-ui ... History labels UI	2018-08-09 10:50:28 +01:00
James Allen	9cbb51bbbc	Merge pull request #793 from sharelatex/sk-sl-login-v2 ... If we're creating v1 accounts, don't allow login for users already linked up	2018-08-08 15:51:25 +01:00
Henry Oswald	687637eec7	change email address in newsletter when changing default email ... put mongo_id into mailchimp merge fields	2018-08-08 13:50:03 +01:00
Henry Oswald	6cf1f71604	add newsletter checkbox to user register forms	2018-08-06 17:43:03 +01:00
Brian Gough	efcd3577ce	avoid clobbering imported image names	2018-08-06 16:56:44 +01:00
Shane Kilkelly	05df55c89e	Add a unit test for the preDoPassportLogin module hook.	2018-08-03 16:10:50 +01:00
Shane Kilkelly	d8c9a96619	If we're creating v1 accounts, don't allow login for users already linked up	2018-08-03 14:58:29 +01:00
Paulo Reis	80eeaaaaea	Update web acceptance tests.	2018-08-02 17:19:16 +01:00
Hugh O'Brien	22b664da1a	Merge pull request #792 from sharelatex/hb-fetch-export-zips ... Fetch export zips	2018-08-02 13:50:11 +01:00
hugh-obrien	395406407e	add test for export fetch zip	2018-07-30 19:39:35 +01:00
Ersun Warncke	426c391153	set options and method for request, pass cookies and form body	2018-07-27 10:43:03 -04:00
Michael Mazour	ddbe1a5b22	Add compiler and imageName to export API request	2018-07-27 15:42:37 +01:00
Tim Alby	66bcdbcac9	institution upgrade	2018-07-26 13:01:44 +02:00
Tim Alby	63c7f756ce	refactor into InstitutionsAPI	2018-07-26 13:01:42 +02:00
James Allen	7dc82597e1	Merge pull request #765 from sharelatex/ja-update-email-in-v1 ... Update email in v1 when setting as default in v2	2018-07-26 10:58:57 +01:00
James Allen	f99b6b6f0a	Merge pull request #746 from sharelatex/ta-refresh-features ... Refresh Features After Confirming Email	2018-07-24 10:04:48 +01:00
James Allen	faf36f0265	Merge pull request #775 from sharelatex/revert-774-revert-750-hof-labels ... Add v2 history labels endpoints	2018-07-24 10:04:13 +01:00
James Allen	5b989f0a8e	Merge pull request #759 from sharelatex/sk-login-with-v1-credentials ... Login with v1 credentials	2018-07-24 10:04:02 +01:00
Alberto Fernández-Capel	8fb9554c3f	Revert "Revert "add v2 history labels endpoints""	2018-07-20 15:36:03 +01:00
Alberto Fernández-Capel	f260f42466	Revert "add v2 history labels endpoints"	2018-07-20 12:39:01 +01:00
Alberto Fernández-Capel	da632c3117	Merge pull request #750 from sharelatex/hof-labels ... add v2 history labels endpoints	2018-07-20 11:07:29 +01:00
Shane Kilkelly	c423672b55	Unit test for finishLogin	2018-07-18 12:08:34 +01:00
Shane Kilkelly	943bfe98aa	Unit test for _loginAsyncHandlers	2018-07-18 11:13:42 +01:00
Shane Kilkelly	dae9506f84	Un-break unit tests	2018-07-18 09:57:05 +01:00
Alasdair Smith	62f69a4bcd	Fix case sensitivity	2018-07-18 09:26:03 +01:00
Alasdair Smith	823e12e4a8	Fix tests to add new Features dependency	2018-07-18 09:26:03 +01:00
James Allen	c2777918fa	Add some missing unit test mocks	2018-07-17 11:26:07 +01:00
James Allen	2c25cbaf25	Update error handling on backend	2018-07-17 11:12:09 +01:00
Alberto Fernández-Capel	e7738b851d	Merge pull request #764 from sharelatex/afc-import-managers ... Import managers	2018-07-17 10:10:51 +01:00
James Allen	ca97698724	Handle v1 response when email is already in use	2018-07-16 17:27:01 +01:00
Hayden Faulds	04bb83f3de	add v2 history labels endpoints	2018-07-16 16:06:17 +01:00
Alberto Fernández Capel	66b492ba5f	Use id to find subscription ... It's the new method signature.	2018-07-16 14:42:41 +01:00
Alberto Fernández Capel	ae440f2ee6	Better variable name in test ... It should be a subscription id, instead of an admin id. The test passes anyway because the db calls are mocked, but the wrong variable name can cause confusion.	2018-07-16 14:40:53 +01:00
James Allen	d0f77abc70	Update email in v1 when setting default in v2	2018-07-16 13:26:52 +01:00
James Allen	b150a7b4ae	Merge pull request #735 from sharelatex/pr-affiliations-ui-adjustments ... Affiliations UI, second round	2018-07-16 10:08:47 +01:00
Alberto Fernández Capel	0bf807fa9f	Remove SubscriptionLocator.getManagedSubscription ... It was used as a kind of access control check, but it's clearer if the check is in the only controller that actually needs it.	2018-07-13 11:47:26 +01:00
James Allen	476f4e55c3	Just generate a new token on resending confirmation email	2018-07-13 10:42:31 +01:00
Alberto Fernández Capel	46a1cdc510	Use the admin_ids array to query for subscriptions	2018-07-13 09:38:58 +01:00
James Allen	33b28db061	Add backend endpoint for resending confirmation email	2018-07-12 16:39:04 +01:00
Alberto Fernández Capel	abcfa0b0d2	Store manager ids in an array	2018-07-12 16:35:27 +01:00
Tim Alby	35cb3924e2	refresh features after confirming email	2018-07-11 14:57:35 +02:00
Alberto Fernández Capel	3586fe8406	Update var name	2018-07-11 11:50:14 +01:00
Alberto Fernández Capel	4e8185d369	Use the id in methods that modify a subscription ... This will make it easier to allow a user to manage multiple groups.	2018-07-11 09:56:36 +01:00
Tim Alby	791dc0df5b	check institution features on features update	2018-07-10 17:53:37 +02:00
James Allen	91079f3af2	Fix unit tests	2018-07-10 11:32:19 +01:00
James Allen	cb449f4b75	Delete a subscription on expiry, rather than set personal plan code	2018-07-10 10:31:25 +01:00
James Allen	7a1bb30952	Merge pull request #699 from sharelatex/ja-fix-bonus-feature-allocation ... Don't consider current features when assigning bonus	2018-07-06 11:06:34 +01:00
Tim Alby	b78212290a	handle dynamic Proxy URLs	2018-07-06 12:03:47 +02:00
Tim Alby	cfd5c65be4	add affiliation before confirming email	2018-07-05 16:02:55 +02:00
Tim Alby	9d4df4271a	try adding affiliation on user creation	2018-07-05 16:01:15 +02:00
Tim Alby	3e1d61438f	add endpoint to endorse affiliation	2018-07-05 15:59:36 +02:00
Timothée Alby	958012533d	Merge pull request #724 from sharelatex/ta-parse-email ... parse email in UserUpdater	2018-07-05 15:57:20 +02:00
Hugh O'Brien	a230b5efab	Merge pull request #720 from sharelatex/mm-export-v1projectid ... Include project's and user's v1 ID in export requests	2018-07-05 12:12:35 +01:00
Shane Kilkelly	0777e44abf	Merge branch 'sk-linked-files-mendeley'	2018-07-04 12:16:39 +01:00
Shane Kilkelly	b32c9be8ca	Linked files from Mendeley.	2018-07-04 10:05:03 +01:00
Tim Alby	3a541307b4	parse email in UserUpdater	2018-07-03 20:59:38 +02:00
Alberto Fernández-Capel	f1ef053caf	Merge pull request #705 from sharelatex/afc-import-team-from-v1 ... Changes to allow importing a team from v1	2018-07-03 13:39:19 +01:00
Alberto Fernández-Capel	d904622b05	Merge pull request #695 from sharelatex/sk-fix-validation-on-refresh-output-file ... Fix validation of project-output-file, no build_id when imported from v1	2018-07-03 13:38:59 +01:00
Michael Mazour	235534d269	Also include user's v1 ID in export requests	2018-07-03 10:15:51 +01:00
Douglas Lovell	260f927980	Merge pull request #719 from sharelatex/dcl-test-fix ... Small repair to SubscriptionController Test	2018-07-02 13:16:10 -03:00
Paulo Reis	80b7641652	Update UserEmails acceptance tests to use the new POST-based email deletion endpoint.	2018-07-02 12:31:36 +01:00
Alasdair Smith	ec1dbc47bf	Merge pull request #703 from sharelatex/as-cm-pos-assertion ... Add assertion method for CodeMirror Pos objects	2018-07-02 11:35:26 +01:00
Michael Mazour	8436b67260	Include project's v1 ID in export requests ... If a project was imported from v1, include its v1 ID when making an export request back to v1. Use case: v1 project exported via ScholarOne and then migrated to v2 needs to be linked up to its earlier v1 export records.	2018-07-02 11:12:42 +01:00
Douglas Lovell	1df5b0b942	Fixup mixed indentation	2018-06-29 19:36:59 -03:00
Douglas Lovell	20835a79e2	Repair not logged in subscription controller test	2018-06-29 19:36:40 -03:00
Alberto Fernández Capel	18ded60619	Fix unit tests	2018-06-28 15:28:44 +01:00
Alberto Fernández Capel	193579070c	Ensure features are updated for users but not for stubs	2018-06-28 13:25:04 +01:00
Tim Alby	fe0fdd11bf	call v1 affiliation deletion endpoint with POST instead of DELETE	2018-06-28 13:48:28 +02:00
Tim Alby	1d80878bf8	delete affiliations on user deletion	2018-06-28 13:47:19 +02:00
Tim Alby	837f614df4	refactor affiliation requests	2018-06-28 13:47:16 +02:00
Alberto Fernández Capel	4366a0ea2c	Remove trailing whitespace	2018-06-28 11:08:20 +01:00
Tim Alby	8c70ba88b7	Add missing greater-than character in tests	2018-06-28 10:15:55 +02:00
Alberto Fernández Capel	c19fc6d245	Fetch the whole user doc ... Other attributes are needed to calculate features.	2018-06-27 12:52:47 +01:00
Alberto Fernández Capel	8b8742d60f	Fix ReferalFeatures tests	2018-06-27 12:28:22 +01:00
Alasdair Smith	3a90a2d004	Add custom assertion method to chai for comparing CM Pos objects	2018-06-27 11:28:29 +01:00
James Allen	156c417df0	Don't consider current features when assignin bonus	2018-06-26 11:26:07 +01:00
Henry Oswald	c1a8d8b31a	Merge branch 'master' into ho-clsi-double-backend	2018-06-25 13:43:40 +01:00
Tim Alby	c6de896bb5	decorate emails list with affiliation data	2018-06-25 13:47:04 +02:00
Tim Alby	c81f9c24ed	mock affiliations API in acceptance tests	2018-06-25 13:45:46 +02:00
Tim Alby	e41391fb4a	ignore affiliations if v1 is not configured	2018-06-25 13:45:46 +02:00
Tim Alby	d3b2a2650f	add/remove affiliations when adding/removing emails	2018-06-25 13:45:46 +02:00
Shane Kilkelly	04be842b30	Fix validation of project-output-file, no build_id for imported v1 projects	2018-06-25 12:27:56 +01:00
Tim Alby	b65ba388ba	replace OldAssetProxy	2018-06-25 12:36:51 +02:00
Shane Kilkelly	f6424ada40	Merge pull request #655 from sharelatex/sk-linked-files-output-redux ... Linked files from project output	2018-06-25 10:28:29 +01:00
James Allen	0a2fe7e941	Merge pull request #687 from sharelatex/ja-fix-subscription-upsell ... Fix check for hasSubscription	2018-06-22 15:59:51 +01:00
James Allen	0edd2b5fe7	Fix check for hasSubscription	2018-06-22 14:10:20 +01:00
Shane Kilkelly	d76c6c2c22	Merge pull request #682 from sharelatex/sk-copy-linked-file-data-on-clone ... Copy linkedFileData when cloning a project	2018-06-22 13:22:45 +01:00
Shane Kilkelly	a8222f2e31	Fix tests after sync with master	2018-06-22 13:20:13 +01:00
Shane Kilkelly	ebe828aa62	Refactor, and remove the source_project_display_name prop from linkedFileData	2018-06-22 13:09:18 +01:00
Shane Kilkelly	6058f3ef9b	Refactor the LinkedFiles/Agent system, and track build_id for output files	2018-06-22 13:09:18 +01:00
Shane Kilkelly	2ade78783b	Add acceptance test for refreshing output file from v1 project	2018-06-22 13:09:18 +01:00
Shane Kilkelly	28257462ae	Acceptance tests for project-output-file	2018-06-22 13:09:18 +01:00
Shane Kilkelly	fadbd72837	Add unit test for copying project with linked files	2018-06-22 10:52:49 +01:00
Alberto Fernández-Capel	d36dbfda07	Merge pull request #665 from sharelatex/afc-import-team-invites ... Add method to import invites	2018-06-22 09:55:19 +01:00
Timothée Alby	caee25d85d	Revert "Replace OldAssetsProxy"	2018-06-21 15:52:20 +02:00
Timothée Alby	c30cdf955b	Merge pull request #666 from sharelatex/ta-smart-proxy ... Replace OldAssetsProxy	2018-06-21 14:35:16 +02:00
James Allen	de45c08585	Restrict token look ups by id to not conflict with other tests	2018-06-21 11:00:25 +01:00
James Allen	46fbf0c641	Merge pull request #672 from sharelatex/ja-refactor-email-templating ... Refactor email templating	2018-06-21 10:28:26 +01:00
James Allen	4608a59e3d	Store OneTimeTokens in mongo rather than redis	2018-06-21 10:22:08 +01:00
James Allen	0dcbc5facb	Send out confirmation emails on register and record confirmedAt date	2018-06-21 10:21:15 +01:00
Henry Oswald	5a7b8f4887	fix broken test for compile controller	2018-06-20 13:44:07 +01:00
Alasdair Smith	6c1994e25b	Stub errors in tests to cache	2018-06-20 11:19:23 +01:00
Henry Oswald	e60157094b	improve logging for 2 compile backends	2018-06-20 11:07:34 +01:00
Tim Alby	bbed5fca9a	simplify proxy	2018-06-20 10:58:19 +02:00
Henry Oswald	b5581c4d40	Merge branch 'master' into ho-clsi-double-backend	2018-06-19 14:55:18 +01:00
Henry Oswald	ab0f258c03	don't make request to google cloud clsi if there is no url	2018-06-19 14:22:34 +01:00
Michael Mazour	0246631443	Add public API endpoints to reach CLSIs ... - `/api/clsi/compile/:submission_id` - `/api/clsi/compile/:submission_id/build/:build_id/output/:file` Also per review: - DRY up ClsiManager.sendRequestOnce and ClsiManager.sendExternalRequest - Include submission_id in a log message - Don't include timeout in limits when getting file	2018-06-19 12:04:02 +01:00
Tim Alby	3d272ca297	replace OldAssetProxy	2018-06-18 18:37:58 +02:00
Alberto Fernández Capel	81c102b501	Add method to import invites	2018-06-18 14:48:27 +01:00
Henry Oswald	5f8985811d	mvp to send requests to 2 backends	2018-06-14 17:41:30 +01:00
Timothée Alby	55112dc7dc	Merge pull request #648 from sharelatex/hb-export-status ... Export status endpoint	2018-06-14 13:59:11 +02:00
Timothée Alby	984d81f5b8	Merge pull request #649 from sharelatex/ta-emails-endpoints ... Add Emails Endpoints	2018-06-14 13:59:00 +02:00
hugh-obrien	0321780eba	adding tests for exports status checker	2018-06-14 09:44:05 +01:00
James Allen	c60b74a2b1	Merge pull request #652 from sharelatex/ja-fix-front-end-test ... Fix frontend HistoryV2ManagerTests	2018-06-14 09:11:32 +01:00
James Allen	82c6d9b293	Merge pull request #629 from sharelatex/ja-display-subscriptions ... Link subscriptions to v1	2018-06-13 13:55:57 +01:00
Shane Kilkelly	3baf0836bc	Support project-linked-files originating from imported v1 projects	2018-06-13 10:02:54 +01:00
James Allen	6e2ec2f982	Update remaining unit tests	2018-06-12 13:52:47 +01:00
James Allen	28f51cd4b4	Update SubscriptionController unit tests	2018-06-12 13:52:47 +01:00
James Allen	606419476f	Update LimitationsManager unit tests	2018-06-12 13:52:47 +01:00
James Allen	f7532e5854	Merge pull request #619 from sharelatex/afc-email-tokens ... Use emails with tokens for team invites	2018-06-12 08:30:23 +01:00
James Allen	d4efdb3ede	Fix frontend HistoryV2ManagerTests	2018-06-11 15:47:23 +01:00
James Allen	155102df64	Use Error classes, and ensure invited_emails is cleared on new invite	2018-06-11 14:20:35 +01:00
Tim Alby	97c145433e	use EmailHelper.parseEmail on registration ... Also changed EmailHelper to use the regexp already used in UserRegistrationHandler rather than the `mimelib` package as it is deprecated.	2018-06-11 12:31:18 +02:00
Tim Alby	e614ed9248	add emails endpoints	2018-06-11 10:35:23 +02:00
Tim Alby	5438a565b9	use multiple emails when relevant	2018-06-08 17:53:45 +02:00
Tim Alby	31827ae6b5	add emails attribute on user creation	2018-06-08 17:53:45 +02:00
Jessica Lawshe	d57660aeb5	Merge pull request #632 from sharelatex/jel-plans-pricing-fix ... Plans and Pricing fixes	2018-06-08 07:17:28 -05:00
Alberto Fernández Capel	59688efb56	Merge remote-tracking branch 'origin/master' into afc-email-tokens	2018-06-08 12:21:17 +01:00
Alberto Fernández Capel	57775e60b1	Merge remote-tracking branch 'origin/master' into afc-update-user-references	2018-06-08 11:28:58 +01:00
Alberto Fernández Capel	c45b4463bb	Fix unit test	2018-06-08 10:05:26 +01:00
Alberto Fernández Capel	5159f6f33d	Check the subscription is in a group plan before adding new members	2018-06-08 09:58:51 +01:00
Timothée Alby	7cdcd725fd	Revert "Use Multiple Emails"	2018-06-07 18:44:59 +02:00
Jessica Lawshe	484ee9ad61	Should not AB test when signed up before 2018-06-06	2018-06-07 10:30:21 -05:00
Alberto Fernández Capel	a3bb99d755	Honour invited_emails for the team being ... We'll remove them soon, but we want to keep them for a while so recent invites can join their teams.	2018-06-07 16:22:38 +01:00
Alberto Fernández Capel	670f24ef6f	Simplify method name	2018-06-07 16:12:02 +01:00
Hugh O'Brien	6f5c777163	Merge pull request #622 from sharelatex/hb-take-emis-names-as-input ... Take user entered first and last names for EMIS	2018-06-07 15:52:33 +01:00
Timothée Alby	f422b7242d	Merge pull request #603 from sharelatex/ta-use-multi-emails ... Use Multiple Emails	2018-06-07 15:40:43 +02:00
James Allen	c2ef93b212	Merge pull request #610 from sharelatex/ja-sync-from-v2 ... Tell v1 when refreshing features in v2	2018-06-07 13:30:34 +01:00
Alberto Fernández Capel	959db80177	Check all emails to prevent invite duplicates	2018-06-07 12:49:46 +01:00
Alberto Fernández Capel	566c41cafd	Merge remote-tracking branch 'origin/master' into afc-email-tokens	2018-06-07 11:40:03 +01:00
Alberto Fernández Capel	1fc047d08e	Fix invitation resend	2018-06-06 17:11:25 +01:00
Alberto Fernández Capel	553878064b	Resend email if the user has already been invited	2018-06-06 15:36:53 +01:00
Alberto Fernández Capel	e753ef3af5	Invite users in the invited_emails array ... We'll remove that attribute soon, but for the time being we want users to still be able to join the team.	2018-06-06 15:36:53 +01:00
Tim Alby	7726314e7c	add test to explicitely check filter	2018-06-06 15:45:12 +02:00
Tim Alby	e4da748257	add filter to query on emails attribute	2018-06-06 14:52:09 +02:00
Tim Alby	813289f5de	use multiple emails when relevant	2018-06-06 11:45:01 +02:00
Tim Alby	c5530163f5	add emails attribute on user creation	2018-06-06 11:45:01 +02:00
Alberto Fernández Capel	6fb6119ca8	Merge remote-tracking branch 'origin' into afc-email-tokens	2018-06-05 15:42:17 +01:00
Tim Alby	613c9193e3	implement multi emails logic	2018-06-05 16:42:12 +02:00
Jessica Lawshe	b63384cbf1	Merge pull request #537 from sharelatex/jel-pricing-plans ... Plans and pricing variant	2018-06-05 09:30:43 -05:00
Hayden Faulds	0bb37d4991	move tk call to before sandboxed module call	2018-06-05 13:42:26 +01:00
Jessica Lawshe	8b672dea0d	Add unit tests	2018-06-04 14:42:26 -05:00
hugh-obrien	54ce196500	test custom first and last name for exports	2018-06-04 13:16:21 +01:00
hugh-obrien	b02eea1e7e	update tests for exports name options	2018-06-04 13:16:21 +01:00
Alberto Fernández Capel	58c4e72b2a	Update references to UserLocator ... UserLocator was refactored in another branch: UserLocator -> UserGetter	2018-06-01 16:53:16 +01:00
Alberto Fernández Capel	25d7196570	Merge remote-tracking branch 'origin/master' into afc-email-tokens	2018-06-01 16:49:47 +01:00
Alberto Fernández Capel	7fcdf68296	Remove dead code	2018-06-01 16:05:44 +01:00
Alberto Fernández Capel	3bd18715db	Add some tests	2018-06-01 15:37:09 +01:00
Hugh O'Brien	a79c9b94a8	Merge pull request #613 from sharelatex/hb-extract-v1-templates-to-web ... Extract v1 templates code to web	2018-06-01 11:29:36 +01:00
Alberto Fernández Capel	9b18e58b68	Choose a better method name ... This method is now only notifying users about a potential domain licence	2018-06-01 11:28:06 +01:00
Alberto Fernández Capel	385fec1914	Clean up code that uses invited_emails	2018-06-01 11:23:25 +01:00
hugh-obrien	d47e845367	add v1 template tests	2018-05-31 13:26:54 +01:00
Shane Kilkelly	d3ae276091	Merge pull request #579 from sharelatex/sk-linked-files-from-project ... Linked Files from Project	2018-05-31 11:08:08 +01:00
James Allen	c5b553d4a6	Notify v1 by default	2018-05-29 17:31:15 +01:00
James Allen	301ae80f99	Allow refreshFeatures to notify v1 to update its features	2018-05-29 17:21:42 +01:00
Alberto Fernández Capel	b52fbdbfa4	Unit test SubscriptionGroupHandler.replaceUserReferencesInGroups	2018-05-29 15:37:04 +01:00
Shane Kilkelly	14898acd7f	Update linked-file acceptance tests	2018-05-29 10:40:38 +01:00
Tim Alby	5fbe5c5537	remove UserLocator ... Use UserGetter instead	2018-05-28 14:11:13 +02:00
Tim Alby	bbaca91e57	add UserGetter#getUserByMainEmail ... Use only that method to find users by email.	2018-05-28 14:11:09 +02:00
Tim Alby	5a590aa021	remove getUserOrCreateHoldingAccount function ... The function is deprecated	2018-05-28 14:09:13 +02:00
Shane Kilkelly	0cb5beb689	Merge branch 'master' into sk-linked-files-from-project	2018-05-24 13:47:28 +01:00
Alasdair Smith	81fdca91c1	Fix failing test	2018-05-24 10:27:36 +01:00
Shane Kilkelly	3181f624a7	Remove obsolete auth check	2018-05-24 10:22:17 +01:00
Shane Kilkelly	78f87c0ecf	Add acceptance test for the project-list and project-entities endpoints	2018-05-23 15:02:45 +01:00
Shane Kilkelly	4daf062be9	Add unit test for ProjectController.projectEntitiesJson	2018-05-22 16:40:39 +01:00
Shane Kilkelly	b1c1cdecef	Add unit test for ProjectController.userProjectsJson	2018-05-22 16:17:59 +01:00
Shane Kilkelly	bc5769cd73	Stub out the ProjectEntityHandler in ProjectController tests	2018-05-22 15:56:01 +01:00
Shane Kilkelly	691eec48ba	Merge branch 'master' into sk-linked-files-from-project	2018-05-22 15:39:09 +01:00
Shane Kilkelly	e34131ed45	Add acceptance test for project linked files	2018-05-22 15:01:51 +01:00
James Allen	701a803da7	Fix ProjectInvite tests since the user no longer had the features	2018-05-22 10:19:47 +01:00
James Allen	1d0be569a6	Fix SubscriptionUpdater -> FeaturesUpdater miscall	2018-05-22 10:05:08 +01:00
James Allen	50bd60dd51	Split FeaturesUpdater out of SubscriptionUpdater	2018-05-22 10:05:08 +01:00
James Allen	0830c473ad	Update unit tests and refactor to make more testable	2018-05-22 10:05:08 +01:00
James Allen	b1f378208d	Properly merge subscriptions from different places	2018-05-22 10:05:08 +01:00
Alasdair Smith	5b3fbe47db	Merge pull request #528 from sharelatex/as-cm-spelling ... Rich text spelling	2018-05-21 11:50:30 +01:00
Hugh O'Brien	346f37011f	Merge pull request #546 from sharelatex/ns-allow-latexmkrc ... Allow for latexmkrc files in project zip upload	2018-05-21 09:03:40 +01:00
Alasdair Smith	681e67ecea	Be more consistent with naming	2018-05-18 11:29:27 +01:00
Alasdair Smith	9c56f6c2fc	Add init test for SpellCheckManager	2018-05-18 11:29:27 +01:00
Michael Mazour	3922b8b916	Add project export acceptance tests ... - Add acceptance tests - Add `MockV1Api` helper - Add flush endpoint to `MockProjectHistoryApi` helper	2018-05-16 14:58:34 +01:00
Michael Mazour	e34dd90a1f	Add project export route and controller	2018-05-16 14:58:34 +01:00
Michael Mazour	a661084485	Add ExportsHander for project exports performed via v1	2018-05-16 14:58:34 +01:00
Shane Kilkelly	06c0b45ef7	Merge branch 'master' into sk-fix-references-full-index	2018-05-14 13:45:12 +01:00
Shane Kilkelly	43d00a2e5f	Account for the new referencesSearch flag when deciding to do fullIndex	2018-05-14 11:31:59 +01:00
Nate Stemen	d108b11bc0	Add latexmkrc in FileTypeManager	2018-05-10 16:59:58 -04:00
Hayden Faulds	9ccdf073c4	accept attributes rather than projectHistoryId to ProjectCreationHandler	2018-05-10 11:39:23 +01:00
Brian Gough	1278e2da45	fix project structure version when deleting folder	2018-05-08 13:37:33 +01:00
Brian Gough	afd4a10a19	retry lock with exponential backoff	2018-05-04 15:02:36 +01:00
Brian Gough	e414100c41	add support for unique lock values	2018-05-04 13:22:33 +01:00
James Allen	40da785363	Fix test for sampling front users	2018-05-01 09:02:43 +01:00
James Allen	6399621d1f	Show front widget for paid and sampled free users	2018-04-30 17:13:57 +01:00
Jessica Lawshe	820f9c7acc	Merge pull request #506 from sharelatex/as-document-event-emitter ... Add documentation and tests of EventEmitter implementation	2018-04-23 11:33:40 -05:00
Alasdair Smith	152c816b5c	Add documentation and tests of EventEmitter implementation	2018-04-23 11:01:19 +01:00
Alasdair Smith	ad1df3532f	Merge pull request #490 from sharelatex/hof-deleted-project-history ... Pass project history id with updates	2018-04-23 10:05:07 +01:00
Alasdair Smith	61648e1f19	Merge pull request #497 from sharelatex/as-naming-consistency ... Include snake_case named file in frontend tests	2018-04-23 10:03:54 +01:00
Alasdair Smith	d524249fc8	Include snake_case named tests	2018-04-17 15:03:52 +01:00
James Allen	37f009c3cd	Remove blank test causing race condition	2018-04-17 10:00:06 +01:00
James Allen	d6605610f5	Fix HistoryV2Manager front end tests	2018-04-16 16:31:49 +01:00
James Allen	d1b68ddf7c	Fix RestoreManager unit tests	2018-04-16 16:27:24 +01:00
James Allen	9e525702c1	Merge branch 'master' into ja-restore-files	2018-04-16 16:14:31 +01:00
Hayden Faulds	7755a7cc1f	add overleaf to projections for project structure updates	2018-04-13 13:45:07 +01:00
Hayden Faulds	3006d018d9	send projectHistoryId with project structure updates	2018-04-13 13:45:03 +01:00
Hayden Faulds	e5f3c472e3	return projectHistoryId in DocumentController.getDoc	2018-04-13 13:45:02 +01:00
Alberto Fernández Capel	1b8f4bff2f	Ensure dump folder exists before running LinkedFiles tests ... The folder is also created in another test, so it will work the second time the tests are executed, but it fails the first time.	2018-04-12 10:29:24 -05:00
Hayden Faulds	50686090c8	push doc pathname logic into DocController	2018-04-12 16:16:44 +01:00
Brian Gough	882b555433	create new file on replace	2018-04-09 12:05:08 +01:00
Brian Gough	baec4eb195	move uploads outside the lock	2018-04-09 12:05:07 +01:00
James Allen	2c0bd94fa7	Use mkdirp when restoring a file if the folder doesn't exist	2018-04-06 15:20:51 +01:00
James Allen	1e8439a2c6	Fix restore of docs from old deleted docs	2018-04-06 10:30:13 +01:00
James Allen	b4fa47d664	Add unit tests for RestoreManager	2018-04-06 10:30:13 +01:00
James Allen	0a1c543841	Hook up front end to restore documents	2018-04-06 10:30:13 +01:00
James Allen	3832850be6	Implement restore end point with acceptance tests	2018-04-06 10:30:13 +01:00
James Allen	beee86f1ce	First pass at restore end point	2018-04-06 10:30:13 +01:00
Alasdair Smith	e9de83789a	Rename tests to match their purpose better	2018-03-23 12:37:47 +00:00
Alasdair Smith	4ad0416f24	Extract cmEditor tests to RT module	2018-03-23 12:37:47 +00:00
Alasdair Smith	74099440f3	Generate webpack entry points including modules	2018-03-23 12:37:16 +00:00
Hayden Faulds	57de597e60	404 when resyncing deleting projects	2018-03-16 15:26:19 +00:00
Hayden Faulds	d22d8324af	disable history resync when project-history is not enabled	2018-03-15 16:57:39 +00:00
James Allen	371caa41ca	Merge pull request #378 from sharelatex/hof-history-resync ... resync project history endpoint	2018-03-13 13:33:08 +00:00
Shane Kilkelly	2ceb7daa97	Merge pull request #361 from sharelatex/ta-record-new-project-event ... Record New Project Event	2018-03-12 13:11:20 +00:00
Shane Kilkelly	9dc8600588	Add a unit test for the analytics events sent from project-creation	2018-03-12 10:50:15 +00:00
Hayden Faulds	75f5fbcdbf	refactor DocumentUpdaterHandler	2018-03-09 11:15:18 +00:00
Hayden Faulds	5b2e7d981a	resyncProject -> resyncProjectHistory	2018-03-09 11:11:06 +00:00
Hayden Faulds	50fdfec6e8	add unit tests for project history resync	2018-03-09 11:11:06 +00:00
Alasdair Smith	9ed4f121b1	Append fixture el to actual DOM	2018-03-07 09:51:54 +00:00
Tim Alby	4b291fab2a	Record new project event	2018-03-06 18:13:24 -05:00
Shane Kilkelly	84fff5e9b7	Merge pull request #379 from sharelatex/sk-geolocate-user-sessions ... Geolocate user, and pass country-code to editing-sessions	2018-03-06 11:33:50 +00:00
Shane Kilkelly	feee992b43	Reverse an un-necessary re-arrangement of tests	2018-03-06 10:13:39 +00:00
Alasdair Smith	6d9a7e90f5	Add simple fixtures support	2018-03-06 10:11:04 +00:00
Shane Kilkelly	b3f47ea44a	Remove obsolete segmentation payload in editing-session request	2018-03-05 11:15:41 +00:00
Shane Kilkelly	f625b22ec5	Move the geolocation out of login, to the editingSession action	2018-03-05 10:46:51 +00:00
James Allen	a99f55891f	Use external proxy	2018-03-05 10:37:53 +00:00
James Allen	cae09028ff	Fix tests	2018-03-05 10:37:53 +00:00
James Allen	01d84bd983	Handle error cases when downloading URL	2018-03-05 10:37:00 +00:00
James Allen	85f25b810c	First pass at URL based linked files	2018-03-05 10:37:00 +00:00
Brian Gough	3bbd49c7eb	Merge pull request #377 from sharelatex/bg-add-project-structure-version-number ... add project structure version number	2018-03-05 08:41:14 +00:00
Shane Kilkelly	1629f68d5e	Geolocate user on login, and pass country-code to editing-sessions	2018-03-02 12:02:45 +00:00
Alasdair Smith	68d85f03c2	Clean up frontend stub	2018-03-02 10:41:58 +00:00
Brian Gough	af494dedf2	check project structure version in unit tests	2018-03-01 12:32:09 +00:00
Brian Gough	e6020e2e9b	update acceptance tests to include project structure version ... this tests the version sent to the docupdater	2018-03-01 12:32:09 +00:00
Brian Gough	389f2d64ef	prepare tests for versioning	2018-03-01 12:32:09 +00:00
Brian Gough	792c0135a0	update acceptance tests helper to include version	2018-03-01 12:32:09 +00:00
Brian Gough	f7e70e8228	add acceptance tests	2018-03-01 12:32:09 +00:00
Brian Gough	67d784a74a	increment project version on every structure change	2018-03-01 12:32:08 +00:00
James Allen	becb76d69b	Don't allow backslashes in file names	2018-03-01 11:42:44 +00:00
Alasdair Smith	1f450085e9	Fix mocha complaining about returning Promise-like object	2018-02-27 15:57:40 +00:00
Alasdair Smith	f11f208772	Revert "Revert "Upgrade to mocha 5.0.1""	2018-02-27 15:03:21 +00:00
Alasdair Smith	315587605c	Revert "Upgrade to mocha 5.0.1"	2018-02-27 12:25:42 +00:00
Alasdair Smith	2a2eb23c78	Fix bug where tests from new ES code being included in requirejs wrapped code	2018-02-26 16:56:04 +00:00
Alasdair Smith	19cec9451d	Switch to using scoped variable instead of variables on context ... Changes to mocha mean that a new context is passed to each describe block instead of it persisting between them. This means that this test cannot be parallelised, however this was the case beforehand (subsequent tests are dependent on earlier tests).	2018-02-26 15:31:41 +00:00
Alasdair Smith	3217a3fbf0	Fix mocha complaining about returning Promise-like object	2018-02-26 15:31:34 +00:00
Alasdair Smith	46ac74a160	Fix incorrectly scoped variable	2018-02-26 14:26:04 +00:00
Alasdair Smith	2247e4d465	Fix scoping issues where stubs were defined in wrong describe blocks	2018-02-26 14:21:14 +00:00
Alasdair Smith	abf53625fe	Fix scope not being applied through callback	2018-02-26 14:02:08 +00:00
Alasdair Smith	136fd84810	Fix module stub in incorrect scope	2018-02-26 13:52:58 +00:00
Alasdair Smith	be6fa346d5	Fix bug where incorrect variable was used	2018-02-26 13:37:17 +00:00
Alasdair Smith	ec7237b7e8	Fix callback stub being defined in wrong scope	2018-02-26 12:33:48 +00:00
Alasdair Smith	2529ed756a	Fix callback being defined in wrong describe block	2018-02-26 12:27:54 +00:00
Alasdair Smith	fd8c61985f	Fix bug where stubs were attached to undefined variables	2018-02-26 12:19:56 +00:00
Alasdair Smith	5d017beac5	Fix stub incorrectly overriding top level beforeEach	2018-02-26 11:46:06 +00:00
Alasdair Smith	cfc9dbdbb3	Fix bad scoping of user agent	2018-02-26 11:34:08 +00:00
Alasdair Smith	34b53726d4	Fix error not being defined in wrong describe block	2018-02-26 11:19:52 +00:00
Alasdair Smith	192eb8b44f	Fix error not being defined in wrong describe block	2018-02-26 11:16:04 +00:00
Alasdair Smith	d79e226a20	Fix callback defined in wrong describe block scope	2018-02-26 10:58:20 +00:00
Alasdair Smith	29410b7aab	Fix applyAsync from not evaluating expression in tests ... See https://github.com/angular/angular.js/issues/10788#issuecomment-70376834 which explains that applyAsync is scheduled to evaluate in the next tick, but this is managed by $browser. Therefore we can manually flush the trigger	2018-02-22 13:28:16 +00:00
Alasdair Smith	791c126df6	Fix test to match implementation	2018-02-22 12:09:51 +00:00
Alasdair Smith	eae8b5a592	Merge pull request #330 from sharelatex/as-karma-tests ... Karma tests	2018-02-22 11:06:56 +00:00
Hayden Faulds	adc90b68e7	use gauge not inc	2018-02-21 13:25:25 +00:00
Alasdair Smith	00f1450b94	Rename test files to match source directory and name	2018-02-20 14:01:50 +00:00
Alasdair Smith	c7957b8ad4	Convert existing frontend tests to run in karma	2018-02-20 14:01:50 +00:00
Alasdair Smith	3faa0556e8	Add test for cmEditor directive	2018-02-20 14:01:50 +00:00
Alasdair Smith	89c9475d29	Configure karma to load angular, requirejs and test/source files ... Use test-main.js file to configure requirejs so that AMD loader can be used	2018-02-20 14:01:02 +00:00
Alasdair Smith	0b77e97df2	Added angular mocks for testing and stub out globals	2018-02-20 14:01:02 +00:00
Hayden Faulds	d924dbd1ed	improve metrics	2018-02-20 13:58:09 +00:00
Hayden Faulds	e50c3837bc	add extra metrics around locking	2018-02-19 12:15:02 +00:00
Hayden Faulds	23c7ab0529	add locking tests	2018-02-16 16:57:12 +00:00
Hayden Faulds	dd582d1b2e	type-check ProjectGetter.getProject and getProjectWithoutLock arguments	2018-02-16 14:44:21 +00:00
Hayden Faulds	693c8e8c60	move where lock keys are defined	2018-02-16 14:44:21 +00:00
Hayden Faulds	66cd5cd24b	use ProjectGetter.getProject in other ProjectGetter methods	2018-02-16 14:44:21 +00:00
Hayden Faulds	95b82a3c9d	use ProjectGetter in ProjectLocator.findElementByPath	2018-02-16 14:44:21 +00:00
Hayden Faulds	cbc6fb232d	add mongo transaction lock when getting or updating projects	2018-02-16 14:44:21 +00:00
Brian Gough	fc1e94b14a	Merge pull request #343 from sharelatex/bg-block-javascript-property-names ... block javascript property names being used as file names	2018-02-16 14:07:12 +00:00
Hayden Faulds	eb198cd8c3	make getSafePathname a method in CompileController rather than Project	2018-02-16 13:10:48 +00:00
Brian Gough	8a10e98b56	block javascript property names being used as file names	2018-02-16 10:31:47 +00:00
Hayden Faulds	304a6bc332	use ProjectGetter rather than Project directly	2018-02-16 08:55:09 +00:00
Hayden Faulds	aa89b7e70b	Merge pull request #327 from sharelatex/hof-entity-refactoring ... Refactor ProjectEntityHandler	2018-02-14 13:28:41 +00:00
Hayden Faulds	e9b218fe5f	allow the updating of doc lines for deleted docs	2018-02-13 14:39:38 +00:00
Shane Kilkelly	9c83ff5353	Merge pull request #316 from sharelatex/afc-fix-typo-in-path ... Update analytics manager to use new path	2018-02-13 09:39:09 +00:00
Hayden Faulds	458bbc7cfd	refactor ProjectEntityHandler ... - moves project locking into ProjectEntityHandler - splits ProjectEntityHandler into ProjectEntityHandler, ProjectEntityUpdateHandler and ProjectEntityMongoUpdateHandler - adds upsertDoc/upsertFile and upsertDocWithPath/upsertFileWithPath to EditorController and ProjectEntiyUpdateHandler	2018-02-12 13:33:59 +00:00
Brian Gough	ecea3dd1be	add an extra test for invalid element names	2018-02-09 15:13:58 +00:00
Brian Gough	2c2b6e5f36	fix filename length check	2018-02-09 15:05:52 +00:00
Brian Gough	cba4a391a9	Merge pull request #314 from sharelatex/bg-validate-filenames-server ... server side check for valid filenames	2018-02-08 09:16:31 +00:00
Brian Gough	c6f74d24f1	add missing SafePath.clean function	2018-02-07 15:21:04 +00:00
Alberto Fernández Capel	413e81f29a	Update analytics manager to use new path ... It fixes a typo in the path. Related to https://github.com/sharelatex/analytics-sharelatex/pull/43	2018-02-07 09:39:00 +00:00
Brian Gough	7f727d434e	server side check for valid filenames	2018-02-06 10:44:58 +00:00
Michael Walker	5987d6d79c	Add unit tests for failing history API	2018-02-02 10:12:57 +00:00
Michael Walker	217940d76f	Fix failing unit tests	2018-02-02 10:12:57 +00:00
Hayden Faulds	9955fd570c	Merge pull request #299 from sharelatex/hof-tpds-locking ... Project Locking: TPDS locking	2018-02-02 09:20:07 +00:00
Shane Kilkelly	19c97cb15b	Merge pull request #289 from sharelatex/afc-track-edit-sessions ... Send editing session heartbeat to the analytics service	2018-02-01 12:31:38 +00:00
Hayden Faulds	a9be50ebcd	stream request to file outside of project lock	2018-02-01 10:44:53 +00:00
Hayden Faulds	9496480a29	test project lock is taken	2018-02-01 10:44:53 +00:00
Hayden Faulds	22737e8bd6	group together tests	2018-02-01 10:44:53 +00:00
Hayden Faulds	a6666bee62	group together private in UpdateMerger tests	2018-02-01 10:44:53 +00:00
Hayden Faulds	44d4a1dbe2	replace mocks with stubs in UpdateMerger tests	2018-02-01 10:44:52 +00:00
Hayden Faulds	e214347ede	add locking around project structure updates in TPDS	2018-02-01 10:44:52 +00:00
Brian Gough	b7b40faefe	fix unit test	2018-01-31 13:28:11 +00:00
Brian Gough	c19acd82a4	Merge pull request #291 from sharelatex/bg-fix-project-get-exclusion ... fix typo in project getter exclusions	2018-01-31 11:51:01 +00:00
Brian Gough	5e52ade1ff	Merge pull request #286 from sharelatex/bg-prevent-duplicate-filenames ... prevent duplicate filenames	2018-01-31 11:50:45 +00:00
Brian Gough	21c1ea6687	remove comment in test	2018-01-31 10:26:06 +00:00
Brian Gough	2f52e6c4b4	remove comments	2018-01-29 10:38:25 +00:00
Brian Gough	cd2688a740	added tests for rename/move	2018-01-26 17:00:33 +00:00
Brian Gough	69bed6dbb2	fix MockFileStoreApi to record uploaded files	2018-01-25 17:09:31 +00:00
Brian Gough	68ac597a93	initial acceptance tests	2018-01-25 17:09:31 +00:00
Brian Gough	ea9976994a	update unit tests for duplicate checks	2018-01-25 17:09:31 +00:00
James Allen	626f652c77	Update User acceptance test helper to expose methods for modules	2018-01-24 16:56:31 +00:00
Brian Gough	77adb60a8a	fix typo in project getter exclusions	2018-01-24 10:06:53 +00:00
Alberto Fernández Capel	8dbb89c09e	Add test for the updateEditingSession endpoint	2018-01-23 10:29:11 +00:00
James Allen	d79d6b4ede	Fix call of UpdateMerger.deleteUpdate in TpdsController.deleteProjectContents	2018-01-22 16:25:11 +00:00
James Allen	6d04eeaa03	Merge pull request #256 from sharelatex/ja-display-v2-history-users ... Inject v2 user details into project-history updates and diffs	2018-01-15 14:21:14 +00:00
Hayden Faulds	e781779c24	use LockManager.runWithLock in EditorController	2018-01-12 10:53:36 +00:00
Hayden Faulds	76c7dff33a	rename EditorController.replaceFile -> replaceFileWithoutLock	2018-01-12 10:06:18 +00:00
Hayden Faulds	a8818a4149	add locking for EditorController.renameEntity	2018-01-12 10:06:18 +00:00
Alberto Fernández-Capel	4dce9e36c3	Merge pull request #251 from sharelatex/fix-group-member-subscription-page ... Fix subscription page for members of a group	2018-01-11 14:41:31 +00:00
Alberto Fernández-Capel	feaa7c6d3f	Merge pull request #242 from sharelatex/rename-entity-bugfix ... Ensure the dirname is not affected when we rename an entity	2018-01-11 14:41:21 +00:00
James Allen	17a5dfa5a5	Inject v2 user details into project-history updates and diffs	2018-01-11 11:32:16 +00:00
James Allen	945ef25ef5	Merge pull request #244 from sharelatex/hof-lock-file-upload ... Project Locking: ProjectUploadController	2018-01-11 08:42:36 +00:00
Timothée Alby	859e03cd4f	Merge pull request #234 from sharelatex/hof-remove-unused-method ... remove unused EditorController.getListOfDocPaths	2018-01-10 15:26:02 +02:00
Alberto Fernández Capel	0200fd66cd	Mock LimitationsManager as well	2018-01-10 10:26:16 +00:00
Alberto Fernández Capel	a81b56556f	Add test for SubscriptionViewModelBuilder	2018-01-09 17:00:56 +00:00
Hayden Faulds	817840840a	use LockManger.runWithLock	2018-01-09 16:37:34 +00:00
James Allen	bbfcff30fb	Enable project history for new projects if enabled in settings	2018-01-03 16:55:33 +00:00
James Allen	ada76e820a	Merge pull request #238 from sharelatex/as-ol-emails ... v2 themed emails	2018-01-03 11:30:28 +00:00
James Allen	2dcc17ad09	Merge pull request #235 from sharelatex/ja-show-deleted-files-in-v2-history ... Handle deleted and renamed files better in v2 history UI; Fixes #226	2018-01-03 11:29:59 +00:00
Hayden Faulds	fe62db05a0	lock project when uploading a file	2018-01-02 12:43:41 +00:00
Alberto Fernández Capel	bf324b5e04	Ensure the dirname is not affected when we rename an entity ... Fixes https://github.com/sharelatex/web-sharelatex-internal/issues/93	2017-12-22 14:24:00 +00:00
Alasdair Smith	562534034f	Stub out brandPrefix for email tests	2017-12-21 17:18:10 +00:00
James Allen	d0fee7e76c	Show a file tree of changed paths, so we can work with renamed and deleted files	2017-12-20 16:22:32 +00:00
Hayden Faulds	8663dba37c	remove unused EditorController.getListOfDocPaths	2017-12-20 15:14:56 +00:00
Shane Kilkelly	18ae27fd66	Merge branch 'sk-account-sync'	2017-12-20 14:02:45 +00:00
James Allen	339b7ec14f	Merge branch 'ja-allow-importing-without-history'	2017-12-19 15:06:17 +00:00
James Allen	1d89a535a1	Merge pull request #208 from sharelatex/ja-front-end-history ... Add in web front end that supports v2 history; Fixes #168	2017-12-19 15:00:34 +00:00
James Allen	5463b608ad	Add add{File|Doc}WithoutUpdatingHistory methods to allow importing OL projects with existing history	2017-12-19 13:59:06 +00:00
James Allen	ffa2e231fd	Fix up tests	2017-12-19 13:58:47 +00:00
James Allen	810b5e0e9a	Fix front end tests	2017-12-19 13:58:47 +00:00
James Allen	8a3fadbfc1	Style the edit/add/rename options	2017-12-19 13:58:47 +00:00
James Allen	50b12e88a2	Add HistoryV2Manager alongside existing HistoryManager	2017-12-19 13:58:47 +00:00
James Allen	8ea779af58	Add some front end tests for HistoryManager	2017-12-19 13:58:47 +00:00
Hayden Faulds	ac36de9629	make ProjectEntityHandler._clean* argument signatures consistent	2017-12-18 15:15:36 +00:00
Hayden Faulds	938caed4f7	set userId when deleting entities via the tpds	2017-12-18 15:15:36 +00:00
Hayden Faulds	ca15fdb6eb	pass userId to EditorHttpController.deleteEntity	2017-12-18 15:15:36 +00:00
Hayden Faulds	5f6686ed3b	pass userId to ProjectEntityHandler.deleteEntity	2017-12-18 15:15:36 +00:00
Hayden Faulds	2ac74b9adc	pass userId into _clean methods in ProjectEntityHandler	2017-12-18 15:15:36 +00:00
Hayden Faulds	99a52d48c8	acceptance test versioning entity deletions	2017-12-18 15:15:36 +00:00
Hayden Faulds	475e84b039	version entity deletions in ProjectEntityHandler	2017-12-18 15:15:36 +00:00
Hayden Faulds	81c061c6a7	acceptance test moving entities	2017-12-18 15:15:36 +00:00
Hayden Faulds	e5e75a8ccb	update DocumentUpdaterHandler.updateProjectStructure to support entity deletions	2017-12-18 15:15:36 +00:00
Shane Kilkelly	6fe937bcad	Finish unit tests for SubscriptionUpdater	2017-12-13 10:57:56 +00:00
Henry Oswald	3e2c997e8b	added stubs for nodemailer into unit tests	2017-12-11 11:40:25 +00:00
Shane Kilkelly	a1f1c25294	Merge branch 'master' into sk-account-sync	2017-12-07 11:51:41 +00:00
Shane Kilkelly	44c289d8dd	Fix unit tests for SubscriptionUpdater	2017-12-04 15:34:46 +00:00
Hayden Faulds	4094801f18	pass object to DocumentUpdater.updateProjectStructure instead of separate arrays	2017-12-04 09:42:10 +00:00
Hayden Faulds	19643f4bb5	pass user_id into editorController.addDoc in ThirdPartyDataStore/UpdateMerger	2017-12-04 09:42:10 +00:00
Hayden Faulds	497c6facd5	fix ProjectEntityHandler.replaceFile	2017-12-04 09:42:10 +00:00
Hayden Faulds	77eac423c7	add tpds project structure acceptance tests	2017-12-04 09:42:09 +00:00
Hayden Faulds	3466db0aae	add acceptance tests	2017-12-04 09:42:09 +00:00
Hayden Faulds	61a1336ec6	pass userId into ProjectEntiyHandler.copyFileFromExistingProjectWithProject	2017-12-04 09:42:09 +00:00
Hayden Faulds	feee582368	pass user_id into EditorController.replaceFile	2017-12-04 09:42:09 +00:00
Hayden Faulds	08891c7a7f	pass userId into ProjectEntityHandler.replaceFile	2017-12-04 09:42:09 +00:00
Hayden Faulds	088ce33cbc	version ProjectEntityHandler.copyFileFromExistingProjectWithProject	2017-12-04 09:42:09 +00:00
Hayden Faulds	60ee78704a	return url from FileStoreHandler.copyFile	2017-12-04 09:42:09 +00:00
Hayden Faulds	4ec0d07aae	remove unused ProjectEntityHandler.copyFileFromExistingProject	2017-12-04 09:42:09 +00:00
Hayden Faulds	90e3b71c1c	version replacing files	2017-12-04 09:42:09 +00:00
Hayden Faulds	980e43e478	pass user_id into EditorController.addDoc	2017-12-04 09:42:09 +00:00
Hayden Faulds	e4ca3bc5ad	pass user_id into EditorController.addDocWithoutLock	2017-12-04 09:42:09 +00:00
Hayden Faulds	7d63939f79	pass owner_id to ProjectEntityHandler.addDoc from ProjectDuplicator	2017-12-04 09:42:09 +00:00
Hayden Faulds	300f76bc5c	pass user_id into ProjectEntityHandler.addDoc / addDocWithProject	2017-12-04 09:42:09 +00:00
Hayden Faulds	bfd22899a0	fix DocumentUpdaterHandler.updateProjectStructure	2017-12-04 09:42:09 +00:00
Hayden Faulds	ef68c6a531	avoid N+1 lookups in DocumentUpdaterHandler	2017-12-04 09:42:09 +00:00
Hayden Faulds	953dba0ede	pass userId into Editorcontroller.addFile / addFileWithoutLock	2017-12-04 09:42:09 +00:00
Hayden Faulds	42a1deaaca	pass userId into ProjectEntityHandler.addFile	2017-12-04 09:42:09 +00:00
Hayden Faulds	c1481d596f	call DocumentUpdaterHandle.updateProjectStructure from ProjectEntityHandler.addDoc and addFile ... pass in user_id as null	2017-12-04 09:42:09 +00:00
Hayden Faulds	6e84c635cf	return url from FileStoreHandler.uploadFileFromDisk	2017-12-04 09:42:09 +00:00
Hayden Faulds	0178f78249	handle file additions in DocumentUpdaterHandler.updateProjectStructure	2017-12-04 09:42:09 +00:00
Hayden Faulds	28bcf83d87	better error when project creation fails	2017-12-04 09:25:22 +00:00
Hayden Faulds	eacb19fac9	create user in db and use login endpoint instead of register	2017-12-04 09:25:22 +00:00
Hayden Faulds	938d22da3f	get csrf token from /dev/csrf not /register	2017-12-04 09:25:22 +00:00
James Allen	488e6d7c5d	Merge pull request #158 from sharelatex/ja-dockerise-tests ... Dockerize unit and acceptance tests using docker-compose	2017-11-30 10:09:07 +00:00
Shane Kilkelly	c203a8d80a	Merge branch 'sk-use-recurly-hosted-details-page'	2017-11-29 09:45:54 +00:00
Nate Stemen	2a50a18d23	Merge branch 'ns-package-aware-autocomplete'	2017-11-28 10:24:37 -05:00
Shane Kilkelly	cc9986cefd	Remove the obsolete update-billing-details page	2017-11-28 11:52:14 +00:00
Shane Kilkelly	22c163c60a	Move the recurly-billing-details link up to main subscription page	2017-11-28 11:40:48 +00:00
James Allen	3e90103d9c	No need to bind to 0.0.0.0 when running in same container	2017-11-27 17:10:58 +00:00
James Allen	fbf8cc2d03	Run acceptance tests via docker compose	2017-11-27 17:10:58 +00:00
James Allen	62de9d8946	Move test/UnitTests -> unit/test	2017-11-27 17:10:22 +00:00
Shane Kilkelly	caa65dddc1	Send user to hosted recurly billing-details page. ... And remove our update-billing-details form, the APIs for which will be deprecated soon.	2017-11-23 16:16:13 +00:00
Brian Gough	2c3ee253e1	fix unit tests	2017-11-23 15:47:11 +00:00
Brian Gough	bb2d1321d4	Merge pull request #91 from sharelatex/bg-add-project-history-flag ... route history requests based on project	2017-11-23 15:36:45 +00:00
Hayden Faulds	e54e2c8328	fix acceptance tests	2017-11-23 10:39:30 +00:00
Alasdair Smith	e1fa196de5	Merge pull request #153 from sharelatex/as-remove-old-onboarding ... Remove unused onboarding	2017-11-23 10:28:50 +00:00
Alasdair Smith	8f32f0d65f	Remove old unused track changes onboarding	2017-11-22 14:48:22 +00:00
James Allen	d3f146499c	Merge pull request #135 from sharelatex/ja-disable-account-settings-for-ol-v2 ... Enable the external auth switches when OL OAuth is in use	2017-11-22 11:44:10 +00:00
Henry Oswald	b7dca80294	use /dev/csrf for smoke tests	2017-11-21 12:17:53 +00:00
Henry Oswald	7187f5ed67	use /login for smoke tests not register ... 1) A user needs an OL access token to load the beta - 5001dc48f1/app/coffee/OAuth/OAuthRequest.coffee (L8) 2) If a user has an OL access token they can not use the register endpoint on ShareLaTeX. https://github.com/sharelatex/web-sharelatex-modules/blob/master/public-registration/app/coffee/PublicRegistrationController.coffee#L72	2017-11-21 10:43:24 +00:00
Alasdair Smith	24ceaffd3a	Rename hook for clarity	2017-11-20 11:23:02 +00:00
Alasdair Smith	119be26989	Remove unnecessary project getter ... Had bad assumption about whether ol-integration module would be available in filesystem, now replaced with Module hook	2017-11-20 11:23:02 +00:00
Alasdair Smith	621977c47c	Replace call to V1ProjectGetter with Module hook	2017-11-20 11:23:02 +00:00
Alasdair Smith	3eaf6c5d8e	Stub V1 project getter	2017-11-20 11:23:02 +00:00
Alasdair Smith	47942816ae	Include token based	2017-11-20 11:23:02 +00:00
Alasdair Smith	6822a0d838	Add assertions for integration module call	2017-11-20 11:23:02 +00:00
Alasdair Smith	e32406a4c4	Dynamically monkey patch impl to check integration once instead of each request	2017-11-20 11:23:02 +00:00
Alasdair Smith	56634bdb49	Add assertions for tag properties	2017-11-20 11:23:02 +00:00
Alasdair Smith	9a96f070d5	Add assertions for correctly mapping V1 properties	2017-11-20 11:23:02 +00:00
Alasdair Smith	24166af90e	Add tests for V1ProjectGetter	2017-11-20 11:23:02 +00:00
Alasdair Smith	fff6873e10	Add tests for getting V1 projects	2017-11-20 11:23:02 +00:00
James Allen	311ebf89c4	Refactor to always use req.externalAuthenticationSystemUsed	2017-11-20 10:10:23 +00:00
Shane Kilkelly	5df4556e9c	Set redirect when bouncing away from token route ... This ensures that when the user logs in they will be redirected back to this token, the page they wanted to access in the first place.	2017-11-15 13:30:40 +00:00
Shane Kilkelly	a0c7295b36	Merge branch 'master' of github.com:sharelatex/web-sharelatex-internal	2017-11-13 10:45:29 +00:00
Shane Kilkelly	cac39134cd	Remove stray test lines	2017-11-10 16:20:59 +00:00
Shane Kilkelly	600191b2af	Ensure that different features produce different results	2017-11-10 16:19:43 +00:00
Shane Kilkelly	3a4edeaf4c	Add a unit test for _isInPercentageRollout	2017-11-10 16:13:27 +00:00
Hayden Faulds	3ce03a40f9	send both doc update and file updates to doc-updater	2017-11-08 13:11:17 +00:00
Hayden Faulds	06116dc956	version moving entities	2017-11-08 13:11:17 +00:00
Hayden Faulds	607f0125fc	return project from _removeElementFromMongoArray and _putElement	2017-11-08 13:11:17 +00:00
Hayden Faulds	929b9996d3	version doc renames	2017-11-08 13:11:17 +00:00
Hayden Faulds	599f2cb3ae	add DocumentUpdaterHandler.updateProjectStructure	2017-11-08 13:10:48 +00:00
Shane Kilkelly	2b4d516353	When anon is denied access to read-write token, redirect to restricted	2017-11-06 16:46:42 +00:00
Brian Gough	17a180ea8e	route history requests based on project ... either to track changes or to project history service	2017-11-03 16:44:37 +00:00
Shane Kilkelly	6dc31eebc5	Fix unit tests for ProjectController	2017-11-03 15:08:21 +00:00
Shane Kilkelly	9cd6b4e6ad	Test for when anon write access is disabled	2017-11-02 15:16:04 +00:00
Shane Kilkelly	1cedfed1e4	Merge branch 'master' into sk-unlisted-projects	2017-11-02 10:10:09 +00:00
Shane Kilkelly	0e869fe4e0	Test the case of anonymous read-write token access being turned on	2017-11-01 16:22:23 +00:00
Shane Kilkelly	d8486afe5d	Account for higher-access in the token read-only path too	2017-11-01 14:01:00 +00:00
Shane Kilkelly	9984ab081e	Generalise the higher-access logic for read-write token path	2017-11-01 11:50:04 +00:00
Hayden Faulds	79d9756bea	Merge pull request #81 from sharelatex/hof-init-project-history ... initialize project history on project creation	2017-10-31 14:47:00 +00:00
Hayden Faulds	19bc145ff4	separate overleaf.id from overleaf.history.id	2017-10-27 15:28:42 +01:00
Hayden Faulds	20ea9918c9	allow overleafId to be passed in to avoid history initialization	2017-10-27 14:56:16 +01:00
Shane Kilkelly	ec94e59388	Fix error-handling in setPublicAccessLevel	2017-10-26 16:39:24 +01:00
Shane Kilkelly	e16c8aa8be	Add unit tests for userIsTokenMember	2017-10-25 16:09:16 +01:00
Shane Kilkelly	8561b69ee9	Remove tokenMembers sync to clients	2017-10-25 11:29:05 +01:00
Brian Gough	5999284143	Merge pull request #74 from sharelatex/bg-fix-listen-in-acceptance-tests ... exit if mock servers fail to start	2017-10-25 09:14:29 +01:00
Hayden Faulds	670b183c8e	initialize project history on creation	2017-10-24 13:07:00 +01:00
Nate Stemen	98909026f5	moving data to backend and fixing tests	2017-10-24 10:59:41 +01:00
Hayden Faulds	519f041215	Merge pull request #50 from sharelatex/hof-toggle-projec-history ... toggle project history	2017-10-24 09:13:50 +01:00
Hayden Faulds	299112f6e0	toggle project history using setting	2017-10-23 15:49:10 +01:00
Brian Gough	dcdcbd8388	exit if mock servers fail to start	2017-10-20 16:00:52 +01:00
Shane Kilkelly	dc39e447b2	Change findAllUsersProjects, produce and object rather than lists	2017-10-20 11:49:20 +01:00
Shane Kilkelly	0e44b319db	Change anonToken and such to anonymousAccessToken	2017-10-20 10:10:21 +01:00
Shane Kilkelly	eab77aba91	Abstract away the token-protection logic	2017-10-19 16:26:01 +01:00
Shane Kilkelly	22795981b9	Add tests to check when tokens are never activated	2017-10-19 15:22:44 +01:00
Shane Kilkelly	d8717a06a2	Fix track-changes with token-access	2017-10-19 14:42:17 +01:00
Shane Kilkelly	43f1cb7d64	Add unit test for token-based access, particularly anon-read-write	2017-10-18 15:31:03 +01:00
Brian Gough	5d116e8ce9	Merge pull request #65 from sharelatex/bg-fix-main-doc-selection ... fix main doc selection (connects to overleaf/sharelatex#222)	2017-10-18 13:11:10 +01:00
Brian Gough	d0f0268783	Merge pull request #57 from sharelatex/bg-handle-undefined-project-name-with-error ... avoid exception in validateProjectName	2017-10-18 13:10:45 +01:00
Shane Kilkelly	7d2bde85ff	Add a setting to enable anonymous read-and-write link sharing	2017-10-18 13:04:37 +01:00
Brian Gough	bcabec1c5d	added tests	2017-10-17 15:50:29 +01:00
Shane Kilkelly	9c247d5f59	On project list, only show projects once, with max access	2017-10-17 11:10:31 +01:00
Shane Kilkelly	855fe2e143	If user is project owner, don't add them as a token user	2017-10-16 16:44:20 +01:00
Shane Kilkelly	5fb86441f6	Add acceptance tests for private-overleaf-project ... ... when accessed via the read-write token by the owner	2017-10-16 14:15:50 +01:00
Brian Gough	96d08e41a7	update tests	2017-10-16 14:15:38 +01:00
Shane Kilkelly	ad999a72b6	If a token-based project not found, check private overleaf project	2017-10-16 13:20:15 +01:00
Shane Kilkelly	ac513a1355	Refactor to not pass req down into Auth modules	2017-10-13 11:20:57 +01:00
Nate Stemen	42412b1bb4	modified labels tests to pass with new metadata	2017-10-12 17:28:11 +01:00
James Allen	f0079bb7a4	Merge pull request #41 from sharelatex/ja-transfer-projects ... Add method to transfer projects from one user_id to another	2017-10-12 16:27:00 +01:00
Brian Gough	8cf3288187	avoid exception in validateProjectName	2017-10-12 16:03:12 +01:00
Shane Kilkelly	dcf601fe80	Only show token-based projects if accessLevel is set to token-based	2017-10-12 15:47:29 +01:00
Shane Kilkelly	9a7c8c5842	Revert "Remove remaining traces of UserStub" ... This reverts commit ab6b4c32254a20b940c489b8b5b56237433cc0f6.	2017-10-12 15:08:48 +01:00
Brian Gough	3d2f9f0219	Merge branch 'bg-auto-doc-flush'	2017-10-12 15:01:27 +01:00
Brian Gough	fdffc92de2	fix unit tests	2017-10-12 15:01:11 +01:00
Shane Kilkelly	16416463c6	Update removeUserFromProject to account for token-access	2017-10-12 11:49:02 +01:00
Brian Gough	45ed090326	Merge pull request #37 from sharelatex/bg-rate-limit-autocompile ... rate limit autocompile (connects to #18)	2017-10-12 09:25:59 +01:00
Brian Gough	c913ec69ef	Merge pull request #34 from sharelatex/bg-fix-double-callback-in-resources-check ... fix double callback in resources check (connects to #18)	2017-10-12 09:20:05 +01:00
Hayden Faulds	f017a94b7e	remove unused HistoryManager	2017-10-11 11:18:20 +01:00
Brian Gough	5b0d3d1429	simplify rate-limit checking code	2017-10-09 16:31:01 +01:00
Shane Kilkelly	1a4ffe7708	Remove un-necessary call to getProject from archiveProject path	2017-10-09 11:30:55 +01:00
Shane Kilkelly	29a584996f	Flesh out acceptance tests for token access	2017-10-06 16:26:47 +01:00
Shane Kilkelly	b5bed1837e	Start acceptance tests for token-based access	2017-10-06 15:58:03 +01:00
Shane Kilkelly	91abb6eed6	If project is not tokenBased, don't count members of token arrays	2017-10-06 15:57:22 +01:00
James Allen	9c1faa4395	Add method to transfer projects from one user_id to another	2017-10-05 14:26:34 +01:00
Shane Kilkelly	b8d90a1a99	Show token-access projects on the dashboard	2017-10-05 13:20:06 +01:00
Shane Kilkelly	6482cd7dd8	Generate tokens on old projects if they're not present	2017-10-04 16:31:24 +01:00
Shane Kilkelly	7b33f8b4c2	Unit test TokenAccessController	2017-10-03 14:04:59 +01:00
Shane Kilkelly	ede497f4b3	Unit test TokenAccessHandler	2017-10-03 10:02:26 +01:00
Brian Gough	e9114551ba	add unit test for precompile resources check	2017-10-02 10:14:05 +01:00
Hayden Faulds	bf1c24f6f9	return pathname from DocumentController.getDoc	2017-09-29 15:37:10 +01:00
Shane Kilkelly	574b115022	Working token-based access	2017-09-27 14:01:52 +01:00
James Allen	63097aaf73	Merge pull request #24 from sharelatex/ja-dockerize-acceptance-tests ... Set up acceptance tests to run in docker container; Fixes overleaf/sharelatex#138	2017-09-27 11:01:49 +02:00
James Allen	23bd840796	Fix MockDocStoreApi name	2017-09-27 10:53:00 +02:00
James Allen	1502da85cf	Set up acceptance tests to run in docker container	2017-09-27 10:37:20 +02:00
Hayden Faulds	4adf88ca01	handle OL or SL ids in UserInfoController.getPersonalInfo	2017-09-26 11:40:05 +01:00
Hayden Faulds	2c0e9bb89a	return overleaf details from ProejctsDetailsHandler.getdetails	2017-09-26 10:19:30 +01:00
Shane Kilkelly	ee32648bf4	Order privileges by highest-to-lowest	2017-09-22 15:55:38 +01:00
Shane Kilkelly	562b2db600	Fix unit test	2017-09-21 15:01:40 +01:00
Shane Kilkelly	7dc759482c	Fix how adding user to project works in acceptance tests	2017-09-21 11:43:16 +01:00
Shane Kilkelly	931ba56e33	Add an 'owner' source tag, for the project owner	2017-09-21 09:35:25 +01:00
Shane Kilkelly	ef7e1ceabf	Rename functions to make distinction between invited/token members	2017-09-21 09:30:38 +01:00
Shane Kilkelly	91ec0da239	Use the invitedMembers function for sending tpds updates	2017-09-20 15:48:20 +01:00
Shane Kilkelly	574baf386e	Alter getProjectsUserIsMemberOf to include token-access projects. ... Also change the api to produce an object with the different project lists attached, rather than a pair of lists.	2017-09-20 15:26:03 +01:00
Shane Kilkelly	ceb7c509d0	Rename getProjectsUserIsCollaboratorOf to ...IsMemberOf ... This brings the naming more in line with current conventions.	2017-09-20 13:16:50 +01:00
Shane Kilkelly	069f49d5a6	Change getCollaboratorCount to getInvitedCollaboratorCount. ... And update the one call-site in LimitationsManager. This function is used to limit invites, so it makes sense to explicitely limit this to Invited members of the project.	2017-09-20 10:29:47 +01:00
Shane Kilkelly	8460160076	Add a getInvitedMembersWithPrivilegeLevels function. ... Then use it to build the loadProject view-model.	2017-09-20 10:02:43 +01:00
Shane Kilkelly	cf54989e6a	Add a getInvitedMemberIds function ... Limited to only members who were invited to the project, not users who have access via a token.	2017-09-20 09:36:56 +01:00
Shane Kilkelly	06966f67db	Differentiate project members by source, include token members	2017-09-20 09:35:19 +01:00
Shane Kilkelly	a06f4b6b28	Remove remaining traces of UserStub	2017-09-19 16:16:39 +01:00
Shane Kilkelly	7919d5342b	Remove obsolete add-email-to-project workflow	2017-09-19 15:57:19 +01:00
Henry Oswald	a7217f1d37	Merge branch 'ho-csrf-acceptence-tests'	2017-09-15 13:50:17 +01:00
Brian Gough	1bca1e11a9	fix broken unit test	2017-09-15 09:20:53 +01:00
Brian Gough	9f9c15f6f5	Merge pull request #599 from sharelatex/bg-reset-project-state ... clear docupdater project state in deleteAuxFiles	2017-09-15 09:09:29 +01:00
Brian Gough	28a80cf23d	Merge pull request #604 from sharelatex/bg-fix-root-doc-in-incremental-compile ... fix root doc in incremental compile	2017-09-13 13:47:22 +01:00
Tim Alby	a04adbf132	remove extra security headers	2017-09-13 11:53:11 +02:00
Brian Gough	51eb94a493	handle incremental compile without root doc	2017-09-13 10:10:44 +01:00
Tim Alby	d6834ff417	add security headers using Helmet ... - use all Helmet's default headers except `X-DNS-Prefetch-Control` - use `Referrer-Policy` - use cache headers when: - a user is logged in, OR - a project is displayed	2017-09-12 11:17:59 +02:00
Brian Gough	2b4c8bd846	clear docupdater project state in deleteAuxFiles	2017-09-08 15:57:29 +01:00
Brian Gough	d9557fcbf5	include the options in the project state hash	2017-09-01 16:36:51 +01:00
Shane Kilkelly	7bb4638186	Restore user features to default after acceptance test. ... Fixes an issue that could come up when running the tests several times.	2017-09-01 14:45:54 +01:00
Shane Kilkelly	c170de7a4f	Add unit test to cover project features.	2017-09-01 13:28:11 +01:00
Henry Oswald	d4b0c740c2	added csrf acceptence tests	2017-08-29 17:45:16 +01:00
James Allen	9c4dc40abf	Merge pull request #583 from sharelatex/ja-import-projects ... Add in UserStub model and support in collaborators view	2017-08-29 16:06:00 +02:00
Brian Gough	f9d1650c6a	Merge pull request #569 from sharelatex/bg-compile-from-redis ... compile from redis	2017-08-25 09:09:52 +01:00
James Allen	d5839437fd	Add in UserStub model and support in collaborators view	2017-08-24 17:48:47 +02:00
Brian Gough	a569303b7e	simplify unusual unit test	2017-08-17 15:36:52 +01:00
Brian Gough	f4da089ee3	added unit tests for project state hash	2017-08-16 11:42:36 +01:00
Brian Gough	c91599bfeb	add unit test for incremental compile	2017-08-15 16:00:40 +01:00
Brian Gough	1179518f4e	unit test for sync conflict	2017-08-15 14:35:02 +01:00
Brian Gough	0347abb13a	added unit tests for ProjectEntityHandler	2017-08-14 15:40:46 +01:00
Brian Gough	f9617034be	add unit test for getProjectDocsIfMatch	2017-08-14 14:33:34 +01:00
Brian Gough	7eb1c01994	add metrics for incremental compiles	2017-08-09 11:41:09 +01:00
Brian Gough	836219584c	fix tests for beta users	2017-08-09 11:33:44 +01:00
Brian Gough	31e71854a4	fix unit tests	2017-08-08 11:38:31 +01:00
James Allen	0be1ee6b6c	Fix smoke test when product name changes	2017-08-08 12:31:36 +02:00
James Allen	3d9da02815	Merge pull request #555 from sharelatex/sk-password-policy ... Enforce stricter password policy.	2017-08-03 10:35:00 +02:00
James Allen	10f362a77a	Add SubscriptionUpdater.deleteSubscription	2017-08-02 09:59:45 +02:00
Brian Gough	3e28eca26f	move docupdater flush to point of use	2017-07-28 15:11:07 +01:00
Shane Kilkelly	0f131d940d	Enforce stricter password policy. ... - Check minimum password lengths - Set default policy to 6-128 chars	2017-07-24 11:06:47 +01:00
Brian Gough	9417266966	fix health checks for web/web-api split	2017-07-04 10:32:31 +01:00
Henry Oswald	3da5ef818c	null check subscription for group admin panel	2017-06-22 14:07:07 +01:00
Shane Kilkelly	9607174b64	Merge branch 'master' into sk-server-side-labels-loading	2017-06-15 08:49:14 +01:00
Shane Kilkelly	b97becc7a2	Change getLabelsForDoc to broadcastLabelsForDoc	2017-06-13 11:38:15 +01:00
Shane Kilkelly	a3dbb16e50	Flush project before getting all project labels	2017-06-13 11:15:26 +01:00
Shane Kilkelly	bd6133aadb	Remove callback-pattern from label parsers	2017-06-13 11:10:21 +01:00
Shane Kilkelly	26be4f84d0	Re-use parser	2017-06-12 15:15:14 +01:00
Shane Kilkelly	ff4991284d	Change docLabelsUpdated socket event to broadcastDocLabels	2017-06-12 13:06:56 +01:00
Shane Kilkelly	9f9468d0e0	Use lowercase project_id	2017-06-12 11:37:05 +01:00
Shane Kilkelly	c9432a1238	Fix unit tests	2017-06-12 10:09:33 +01:00
James Allen	4cecbae6b6	Use an email based invite system for groups, not holding accounts	2017-06-08 12:12:08 +01:00
Shane Kilkelly	feb1d87de1	Add test for LablesHandler	2017-06-08 10:25:39 +01:00
Shane Kilkelly	3c4a6f06be	Add unit tests for LabelsController	2017-06-08 09:22:26 +01:00
James Allen	d7981fd2d4	Merge pull request #512 from sharelatex/ja-project-name-validation ... Refactor project name validation into one place and restrict /s	2017-06-05 11:55:39 +01:00
James Allen	59085c1ddd	Add missing require stubs and remove console.logs in unit tests	2017-05-22 15:33:52 +01:00
James Allen	3105c6743e	Fix unit tests	2017-05-22 15:24:52 +01:00
James Allen	ba62206b91	Refactor project name validation into one place and restrict /s	2017-05-19 17:42:24 +01:00
James Allen	76b8fecde9	Merge pull request #509 from sharelatex/ja-fix-clsi-cookie-cluster ... Don't try to set the server id if it isn't returned in the response	2017-05-19 15:00:18 +01:00
James Allen	01548a0216	Don't try to set the server id if it isn't returned in the response	2017-05-19 10:23:01 +01:00
Paulo Reis	b0b75e2ebb	Update docupdaterhandler tests.	2017-05-18 15:04:12 +01:00
James Allen	39ca6d1e6c	Merge pull request #508 from sharelatex/ja-fix-clsi-cookie-cluster ... Check for blank string in clsi cookie caching	2017-05-18 11:12:11 +01:00
James Allen	f708a0cd81	Check for blank string in clsi cookie caching ... ioredis returns "" for a blank entry, the previous driver returned null, so also check for a blank string	2017-05-18 11:09:33 +01:00
Brian Gough	5237647b8b	Merge pull request #489 from sharelatex/bg-improve-upload-robustness ... improve stream error handling on upload	2017-05-17 15:26:03 +01:00
Shane Kilkelly	6338835baf	Merge branch 'sk-sudo-mode'	2017-05-17 09:48:22 +01:00
Shane Kilkelly	4e3284cec8	Merge branch 'sk-dont-redirect-to-images'	2017-05-17 09:48:16 +01:00
Shane Kilkelly	25e0a19350	Make confirm-password routes more restful	2017-05-16 11:51:06 +01:00
Brian Gough	e23871118d	Merge remote-tracking branch 'origin/master' into bg-improve-upload-robustness	2017-05-15 16:01:01 +01:00
Shane Kilkelly	60d3e4a97b	If external auth system is in use, skip sudo-mode checks	2017-05-15 15:46:24 +01:00
James Allen	5aa8b71832	Allow writing of clsi cookie cache to redis cluster secondary	2017-05-15 15:35:01 +01:00
Brian Gough	0908e36fb7	fix unit tests	2017-05-15 13:46:01 +01:00
Shane Kilkelly	c864288c4e	On logout, clear sudo mode	2017-05-15 11:53:52 +01:00
Shane Kilkelly	0f75d9f4d9	Test SudoModeController	2017-05-15 10:56:43 +01:00
Shane Kilkelly	76285a1554	Start testing SudoModeController	2017-05-15 10:07:22 +01:00
Shane Kilkelly	8605dc83b4	Merge branch 'master' into sk-sudo-mode	2017-05-15 09:21:13 +01:00
Shane Kilkelly	0e26222551	Don't redirect to images, icons, etc, in login workflow	2017-05-12 15:46:16 +01:00
Shane Kilkelly	1640dfa79a	Merge branch 'sk-fix-cooldown-tpds'	2017-05-12 09:11:23 +01:00
James Allen	3bfd92dd9c	Rename lock to avoid potential conflict with doc updater	2017-05-11 15:27:01 +01:00
Shane Kilkelly	7b0aca7f02	add cooldown to tpds mergeUpdate path	2017-05-11 11:29:57 +01:00
Shane Kilkelly	e6286c721d	Merge branch 'master' into sk-fix-large-projects	2017-05-11 08:40:17 +01:00
Shane Kilkelly	08567ff220	if projectId is not defined, error out	2017-05-10 15:25:23 +01:00
Shane Kilkelly	27842996aa	start testing SudoModoController	2017-05-10 15:15:57 +01:00
Shane Kilkelly	4d662f23de	test SudoModeMiddlewear	2017-05-10 14:54:49 +01:00
James Allen	274d6f4ac6	Merge pull request #493 from sharelatex/ja-redis-cluster-refactor ... Move all redis end points to be cluster compatible	2017-05-10 14:38:37 +01:00
Shane Kilkelly	b09a41c557	Fix acceptance tests	2017-05-10 13:45:53 +01:00
Shane Kilkelly	993c261b10	start testing sudo-mode	2017-05-10 11:37:32 +01:00
Shane Kilkelly	149e38855f	Add a cooldown mechanism for projects which go over limits	2017-05-09 11:40:42 +01:00
James Allen	8449b0417c	Move all redis end points to be cluster compatible	2017-05-04 15:22:54 +01:00
Brian Gough	46f693519a	return 404 for api request on missing doc	2017-04-27 16:41:53 +01:00
Shane Kilkelly	a9b8b864df	Move content-disposition setting into a method on res	2017-04-12 16:00:02 +01:00
Shane Kilkelly	02d75deaa0	when setting content-disposition, uri-encode names	2017-04-12 09:31:59 +01:00
Shane Kilkelly	bb65da88fe	Merge branch 'master' into node-6.9	2017-04-05 10:15:51 +01:00
Shane Kilkelly	043520fc28	Remove the Metrics module, use metrics-sharelatex	2017-04-03 16:18:30 +01:00
Shane Kilkelly	49de7bf315	mock out metrics in test	2017-03-31 14:54:20 +01:00
Shane Kilkelly	bee62400a6	Merge branch 'master' into sk-upgrade-metrics	2017-03-31 14:08:12 +01:00
James Allen	3bf19a38ee	Merge pull request #467 from sharelatex/ja-validate-recurly-subscription-on-creation ... Handle a 404 from Recurly if account doesn't exist	2017-03-28 16:06:25 +01:00
James Allen	08699d7aa2	Handle a 404 from Recurly if account doesn't exist	2017-03-28 15:46:58 +01:00
James Allen	f53234271f	Merge pull request #465 from sharelatex/sk-hide-email-errors ... If sending email fails, return a generic error.	2017-03-28 13:16:43 +01:00
James Allen	2e6e51eb6d	Merge pull request #464 from sharelatex/ja-validate-recurly-subscription-on-creation ... Check Recurly for subscription as well before creating subscription	2017-03-28 13:15:58 +01:00
Brian Gough	835d8d618d	use error handler	2017-03-28 11:33:37 +01:00
Brian Gough	f433510e61	return NotFound error in ProjectDetailsHandler	2017-03-28 10:12:52 +01:00
Brian Gough	4e66b045e3	fix unhandled exception in ProjectDetailsHandler	2017-03-28 09:44:50 +01:00
Shane Kilkelly	d2e1efe4a9	fix a daft mistake	2017-03-27 17:45:19 +01:00
Shane Kilkelly	69b9b308d4	If sending email fails, return a generic error. ... This prevents us from leaking juicy details of our aws/ses setup via the password-reset form.	2017-03-27 16:17:38 +01:00
James Allen	7aa4c0c030	Check Recurly for subscription as well before creating subscription	2017-03-27 12:07:43 +01:00
Henry Oswald	e22da8e530	rename unit test	2017-03-27 09:57:15 +01:00
Henry Oswald	9c7465fd64	Merge pull request #461 from sharelatex/ho-annom-user-events ... add identify on login	2017-03-27 09:28:34 +01:00
Henry Oswald	379efcb04a	Merge branch 'master' into ho-annom-user-events	2017-03-27 09:28:03 +01:00
Henry Oswald	cff922a0f5	idendify -> identify	2017-03-22 16:01:26 +00:00
Henry Oswald	ebdce6169e	idendifyUser on login	2017-03-22 15:50:49 +00:00
Henry Oswald	f910bb58de	add tests for AnalyticsController	2017-03-22 13:11:45 +00:00
Shane Kilkelly	a64f890ed0	Upgrade metrics api	2017-03-17 14:55:41 +00:00
Henry Oswald	625fa810c2	validate mongo id in getPrivilegeLevelForProject ... https://sentry.io/sharelatex-1/sl-web-server-prod/issues/204397665/	2017-03-17 14:44:51 +00:00
Henry Oswald	8ee2e5ba63	null check folder in findElement ... https://sentry.io/sharelatex-1/sl-web-server-prod/issues/236000085/	2017-03-17 13:29:20 +00:00
Henry Oswald	e5468983ce	clone project plow though null doc/file/folders ... https://sentry.io/sharelatex-1/sl-web-server-prod/issues/227107799/	2017-03-17 13:21:30 +00:00
Henry Oswald	d453a4d5c7	null check stat when we check file on disk ... https://sentry.io/sharelatex-1/sl-web-server-prod/issues/125814174/	2017-03-17 13:03:16 +00:00
Shane Kilkelly	5e112043ca	Fix unit tests for modules now using metrics.timeAsyncMethod	2017-03-16 11:08:17 +00:00
Shane Kilkelly	1ce48e971a	Merge branch 'sk-fix-file-upload'	2017-03-10 11:30:03 +00:00
Shane Kilkelly	ec25ee9045	When upload to filestore fails, produce an error	2017-03-09 10:11:45 +00:00
James Allen	b75d0ab3eb	Don't show onboarding for newly registered users	2017-03-09 09:13:49 +00:00
James Allen	2b36a443c9	Pull track changes backend into a module	2017-03-02 16:45:24 +00:00
Shane Kilkelly	9a641d43eb	Remove cruft	2017-02-27 14:00:45 +00:00
Shane Kilkelly	98d7dc6f88	Make work on both 0.10 and 6.9	2017-02-27 13:54:57 +00:00
James Allen	c8096facfb	Merge pull request #421 from sharelatex/ho-announcments ... mark announcments before user signs up as read	2017-02-14 15:12:10 +01:00
Henry Oswald	27caf4d555	mark announcments before user signs up as read	2017-02-14 12:29:48 +00:00
James Allen	03ecf4b4ae	Only show track changes onboarding once based on analytics API events	2017-02-14 10:25:46 +01:00
Shane Kilkelly	7d5dc34b3e	fix the set-password form for new (admin-created) users	2017-02-06 14:58:54 +00:00
James Allen	b086d7afa2	Refactor rate limiting code around sending invites	2017-01-27 16:26:58 +01:00
James Allen	757c7002eb	Merge pull request #397 from sharelatex/ja-modify-threads ... Allow editing/deleting of comments and threads	2017-01-25 15:50:00 +01:00
Shane Kilkelly	239164fe26	Merge branch 'master' into sk-rate-limit-cluster	2017-01-25 09:56:08 +00:00
Henry Oswald	cc717f0357	domainAnnouncementsToShow -> domainAnnouncements	2017-01-25 09:44:13 +00:00
Henry Oswald	02e6eb4dd1	Merge pull request #399 from sharelatex/ho-promote-case-study ... promote domain alerts	2017-01-25 09:41:50 +00:00
Henry Oswald	1280a2313d	add check for id to exist in domain announcments ... null check user at start of getUnreadAnnouncements fix spelling mistake	2017-01-25 09:35:11 +00:00
Henry Oswald	13d21b881f	use new annoncments feature for case study info	2017-01-24 16:03:05 +00:00
James Allen	f9ba7392e9	Allow editing/deleting of comments and threads	2017-01-24 16:21:14 +01:00
Shane Kilkelly	a148eb1f43	Merge branch 'master' into sk-rate-limit-cluster	2017-01-24 09:24:47 +00:00
Henry Oswald	6d35585847	limit number of invites each user can do ... done with the number of collaborators a user can add prevents notifications getting filled up as well	2017-01-21 12:43:15 +00:00
James Allen	3413687833	Merge pull request #393 from sharelatex/ja-track-changes ... Ja track changes	2017-01-18 15:32:16 +01:00
Shane Kilkelly	1137ab0715	Don't record redirect to static asset paths	2017-01-17 14:35:37 +00:00
James Allen	9c0bf885be	Merge branch 'master' into ja-track-changes	2017-01-17 10:16:41 +01:00
Shane Kilkelly	82ddeab2bd	If user tries to invite themselves to project, don't.	2017-01-16 13:45:01 +00:00
Shane Kilkelly	635b935acc	Add an acceptance test for login rate limits, cleanup	2017-01-16 11:46:59 +00:00
Henry Oswald	fed88504f8	rate limit emails sent sharing projects by users	2017-01-14 14:52:32 +00:00
Shane Kilkelly	25956d4c62	Fix up tests	2017-01-13 16:04:26 +00:00
Shane Kilkelly	525e871d55	Merge branch 'master' into sk-rate-limit-cluster	2017-01-13 14:17:18 +00:00
James Allen	aab4dea8ae	Merge branch 'master' into ja-track-changes	2017-01-13 13:46:01 +01:00
Shane Kilkelly	f5ced03074	Set redirect when sending user to login page. ... Allows smart redirecting to work when public access is turned off.	2017-01-10 15:42:36 +00:00
James Allen	d03aa7056e	Rename /ranges/users end point to /changes/users	2017-01-10 13:43:53 +01:00
James Allen	4e128b6ab7	Send user data in /threads dat	2017-01-09 17:25:06 +01:00
James Allen	9379cff89d	Add end point for accepting change in doc updater	2017-01-09 15:25:27 +01:00
James Allen	3a5d45fa32	Get user info via web, not chat	2017-01-06 13:41:58 +01:00
Shane Kilkelly	259c589076	Add option to restrict invites to existing user accounts.	2016-12-20 09:54:42 +00:00
Shane Kilkelly	822f76a883	Add unit tests for RedisWrapper	2016-12-19 15:12:22 +00:00
Shane Kilkelly	d428f9adbc	Make LoginRateLimiter a thin wrapper around RateLimiter	2016-12-19 14:10:51 +00:00
Shane Kilkelly	ef0a5801d5	Create a RedisWrapper, and use it for rate limiting.	2016-12-19 12:17:02 +00:00
James Allen	988005e929	Send and get comments via the chat api	2016-12-16 16:42:41 +00:00
James Allen	293ba1fc4c	Fetch all ranges from docstore when viewing overview panel	2016-12-09 15:43:08 +00:00
James Allen	1830d41eba	Proxy ranges between doc updater and docstore	2016-12-08 14:09:06 +00:00
Henry Oswald	e6eeb86046	add read property to announcments	2016-12-07 11:39:22 +00:00
Shane Kilkelly	58280bf6ee	Merge branch 'master' into sk-user-delete-with-cancelled-sub	2016-12-06 09:31:42 +00:00
James Allen	48cc5a992f	Merge branch 'master' into ja-set-version-in-docstore	2016-12-01 09:30:53 +00:00
Shane Kilkelly	e03d16e0cd	Deleting user: if subscription is already cancelled, ignore and proceed.	2016-11-30 16:03:18 +00:00
James Allen	eb648b9bc8	Proxy version number to and from docstore	2016-11-29 17:16:56 +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	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
Shane Kilkelly	22101d0305	If user is sent to login page with explicit redirect, obey	2016-11-24 11:38:13 +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	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
Henry Oswald	d87067bc2f	Merge branch 'announcments'	2016-11-15 10:38:01 +00:00
Shane Kilkelly	b212c00311	Fix acceptance tests, use the correct method of getting redis key.	2016-11-14 16:33:54 +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	5f3098df38	Replace multi-ops with Async.series, tests passing	2016-11-09 11:03:03 +00:00
Shane Kilkelly	a373868862	Fix unit tests	2016-11-08 16:00:18 +00:00
Shane Kilkelly	e7b09a81a7	Merge branch 'sk-passport-ldap'	2016-11-02 15:39:32 +00:00
Paulo Reis	c5e793125e	Update unit tests.	2016-11-01 16:55: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	dc62b1a86e	Remove deprecated endpoint for old delete-user	2016-10-26 11:18:36 +01:00
Shane Kilkelly	a4167fcccd	Unit tests for tryDeleteUser	2016-10-26 11:01:35 +01:00
Shane Kilkelly	6069d4dba3	Merge branch 'master' into sk-plans-tidy	2016-10-25 13:14:44 +01:00
Henry Oswald	1c3edcd627	added some debug lines	2016-10-24 23:36:49 +01:00
Henry Oswald	91e9447fe5	added logging to smoke test	2016-10-21 19:20:21 +01:00