3616 commits

Author	SHA1	Message	Date
Jessica Lawshe	6737637b39	Merge pull request #2190 from overleaf/as-invalid-password-errors ... Throw Error instead of plain object if email/password is invalid GitOrigin-RevId: 2a1b040b07834064d547cef7890676ca014ec0ae	2019-10-02 14:22:34 +00:00
Jessica Lawshe	b5f4e26840	Merge pull request #2118 from overleaf/cmg-convert-array-archiving ... New archiving endpoint to convert to array GitOrigin-RevId: a6f5d3e2363afcbcd5719731261b85a0ae7a1e25	2019-10-02 14:22:28 +00:00
Simon Detheridge	11ce07ec50	Merge pull request #1999 from overleaf/spd-migrations ... Add database migrations using 'east' GitOrigin-RevId: da067292e9db1fad050545858bc7cc39245d3395	2019-10-01 12:09:58 +00:00
Simon Detheridge	2eb1f510c1	Merge pull request #2182 from overleaf/ta-remove-user-stubs ... Remove Usages of UserStub GitOrigin-RevId: 6896d0d3594d12ffa06211838ae2274661c77f4f	2019-10-01 12:09:49 +00:00
Eric Mc Sween	3ec74ac6f2	Merge pull request #2164 from overleaf/em-ownership-transfer ... Project ownership transfer backend endpoint GitOrigin-RevId: b7d267f2c105e8f51d5013289ac4afeb077c1e21	2019-09-30 15:01:03 +00:00
Eric Mc Sween	acd926e2e0	Merge pull request #2178 from overleaf/sk-hide-ui-anon-read-only-token ... Handle anonymous users when deciding to restrict view of the editor GitOrigin-RevId: 617f7ef2c8cc34142a6b8187c467fadb90745863	2019-09-30 13:36:54 +00:00
Eric Mc Sween	a87a731d25	Merge pull request #2176 from overleaf/em-ta-json-auth ... Make ensureUserCanAdminProject always raise a 403 GitOrigin-RevId: 4dd1eca1cfb171d92392bc3c8208b61cbf7c6815	2019-09-30 13:36:48 +00:00
Eric Mc Sween	039b5eaba0	Merge pull request #2167 from overleaf/jel-saml-account-settings-layout ... Account settings layout for institution SSO GitOrigin-RevId: d9c9e5eeb3b4a215456b0f5294139c1b8d4968c3	2019-09-30 13:36:41 +00:00
Eric Mc Sween	16ac5126cb	Merge pull request #2181 from overleaf/sk-exclude-smoketest-user-from-rate-limits ... Exclude smokeTest user from rate limits GitOrigin-RevId: 01197ce9971477550e73989067adc631189382b1	2019-09-26 14:38:13 +00:00
Eric Mc Sween	9cd5af840a	Merge pull request #2152 from overleaf/as-per-user-trash-backend ... Add per-user trash endpoint GitOrigin-RevId: 94a6e3416b047e1f8721159ac0d049e98785e5ce	2019-09-26 12:56:02 +00:00
Eric Mc Sween	9a31361795	Merge pull request #2175 from overleaf/ta-user-membership-refactor-fix ... UserMembershipAuthorization Refactor Fix GitOrigin-RevId: ac404324728f4a3fe18e122c9e52ad4956ae47d7	2019-09-26 12:55:56 +00:00
Simon Detheridge	6e7007ef3e	Merge pull request #2170 from overleaf/ta-confirmation-email-missing-fix ... Prevent Email Confirmation If Email Is Missing for User GitOrigin-RevId: cab9667103b0a5596cf067f85f747b1481ca4e66	2019-09-25 14:48:25 +00:00
Simon Detheridge	8ec2f1a896	Merge pull request #2157 from overleaf/jel-saml-logout-redirect ... Redirect handling after logging out GitOrigin-RevId: 01562dbe71ff4f3571fb0d433b96ccca34aad24e	2019-09-25 14:48:19 +00:00
Simon Detheridge	111d22d260	Don't leave dangling users in mailchimp when change-address fails (#2165) ... * Don't leave dangling users in mailchimp when change-address fails Also prevents upserting of users when unsubscribing bug: overleaf/issues#2220 bug: overleaf/issues#2301 bug: overleaf/issues#2302 * Tidy up NewsletterManager. Enable deletion of contacts on account delete. GitOrigin-RevId: ab7cde7a7b7018b37dea54ffa154e02c5aea0244	2019-09-25 14:47:57 +00:00
Brian Gough	13a53b8fbc	Merge pull request #2177 from overleaf/bg-add-docstore-request-timeouts ... add 30 second timeout on requests to docstore GitOrigin-RevId: b5e7a8926113fb50ad9931c89061d665a8d1b1e0	2019-09-25 13:03:35 +00:00
Ersun Warncke	3c1f64782f	convert UserCreator to async/promises ... GitOrigin-RevId: a040b9dd65aa834d1dd9e552ffc1434a17c43eae	2019-09-25 12:33:43 +00:00
Timothée Alby	b43d26b543	Merge pull request #2140 from overleaf/as-decorate-archive-manager-errors ... Decorate archive manager errors with OError GitOrigin-RevId: 2795e5aaf172fd3b2b3a396b90b486b4ce5cfa4f	2019-09-24 08:58:11 +00:00
Timothée Alby	a23ecc9bf8	Merge pull request #2105 from overleaf/ta-user-membership-refactor ... UserMembershipAuthorization Refactor GitOrigin-RevId: 7711cda4a134823cbacee42731319fbb8aa648d0	2019-09-24 08:58:05 +00:00
Simon Detheridge	696527df8d	Merge pull request #2153 from overleaf/spd-subscription-indexes ... Make default for Subscription.manager_ids 'required' GitOrigin-RevId: 18aa899736270bbb7eacbda53824a2ed52ca936f	2019-09-18 10:14:45 +00:00
Simon Detheridge	deaf76be39	Merge pull request #2135 from overleaf/sk-hide-info-readonly-token-access ... Restrict information and features for token-read-only users of a project GitOrigin-RevId: 98512fb9a916f430fd635fd5634c37799476010d	2019-09-18 10:14:39 +00:00
Brian Gough	837599d89c	Merge pull request #2146 from overleaf/bg-fix-redis-user-session-expiry ... fix expiry of user sessions in redis GitOrigin-RevId: e53aa93bba99fe0cd632ac8bce36c0228e20d04a	2019-09-12 08:18:43 +00:00
Timothée Alby	0c9bf05a0a	Merge pull request #2139 from overleaf/ta-subscription-restore-misc ... Restore Deleted Subscriptions Extra GitOrigin-RevId: 6fceb1142af8ba510dc266ef31acc86ddca69f0e	2019-09-10 14:44:18 +00:00
Timothée Alby	71060e8d57	Merge pull request #2123 from overleaf/ta-subscription-restore ... Restore Deleted Subscriptions GitOrigin-RevId: 4df1d2116e5502235e06f47d7317d97ad458b75b	2019-09-10 14:28:55 +00:00
Hugh O'Brien	a319073a08	Merge pull request #2132 from overleaf/spd-collabratec-tests ... Make collabratec tests not depend on previous run state GitOrigin-RevId: 264f946e05b848fa253b6fbdd8e97a4998e4158e	2019-09-10 10:08:59 +00:00
Eric Mc Sween	abae7ef2a3	Merge pull request #2113 from overleaf/em-project-details-handler-async ... Move ProjectDetailsHandler to async/await GitOrigin-RevId: 5ec9343d6203850641174cc728db9a2e56f44775	2019-09-09 12:05:38 +00:00
Eric Mc Sween	797595bb1a	Merge pull request #2128 from overleaf/em-clsi-error-logs ... Avoid logging document content in failed compile GitOrigin-RevId: 7ca296ccb28d814b9fa5610c0ee065e4614875a6	2019-09-09 12:05:32 +00:00
Eric Mc Sween	d0fc8d90e5	Merge pull request #2119 from overleaf/ta-subscription-deletion ... Store Deleted Subscriptions GitOrigin-RevId: c7004f1807dee6b6ec82eeb2a8fe939801ce3e8b	2019-09-09 12:05:23 +00:00
Miguel Serrano	dc6e4b3a12	Added missing email field when registering user token (#2130) ... GitOrigin-RevId: f7aaeae1f82e0188c838d7d1d975a81664950f78	2019-09-04 11:17:15 +00:00
Eric Mc Sween	869fcf7952	Merge pull request #2089 from overleaf/em-mailchimp-unsubscribe ... Handle error on Mailchimp unsubscribe when deleting users GitOrigin-RevId: 8923480e6d50de45003fd7741610f995753a412b	2019-09-03 15:25:01 +00:00
Eric Mc Sween	3791b8d288	Merge pull request #2104 from overleaf/ta-user-membership-acceptance-tests ... Acceptance Tests for UserMembership Authorization GitOrigin-RevId: caad99727fd2fedc91f2b2063ed83a1e02d9ea1d	2019-09-03 15:24:53 +00:00
Chrystal Maria Griffiths	6f2b4d3da3	Merge pull request #2081 from overleaf/cmg-per-user-trash ... Add per-user trashed state to project model GitOrigin-RevId: 16a753702d3503eee011dd2adca5dc8df3da87f4	2019-08-27 10:50:05 +00:00
Chrystal Maria Griffiths	1335d21136	Merge pull request #2097 from overleaf/em-chai-spies ... Remove chai-spies GitOrigin-RevId: 7fa41fe32c1be985d761b7327950995d6afe7c4e	2019-08-27 10:49:50 +00:00
Timothée Alby	03460ba229	Merge pull request #2020 from overleaf/ta-recurly-sca ... SCA Integration GitOrigin-RevId: d7935584f87ec7c7339d050430efc87420a39de1	2019-08-22 12:10:46 +00:00
Eric Mc Sween	358cd22f54	Merge pull request #2087 from overleaf/subscription-invoices-link ... Add Link to Invoices for Recurly Subscriptions GitOrigin-RevId: dd3aa999c26988f2bd42b0db83dbfb0ce586a0a7	2019-08-20 12:59:58 +00:00
Miguel Serrano	9a8a182c1b	Fix UserGetter email retrieval with affiliations disabled (#2085) ... GitOrigin-RevId: f868333f3c18f674b7ba9c387315c2d5ad1fd80b	2019-08-19 15:19:57 +00:00
Miguel Serrano	9386bdeaff	Delete copybara sync server pro (#2082) ... This actually reverts https://github.com/overleaf/web-internal/pull/2052 GitOrigin-RevId: c282655cf29533e8cb523f854247bd37396b1346	2019-08-16 14:27:30 +00:00
Miguel Serrano	e8790a638c	affiliations flag checks Settings.overleaf (#2080) ... GitOrigin-RevId: c0dc5a8c1e6ad6c5ddb055ccfc21c901d66a9827	2019-08-15 14:00:24 +00:00
Brian Gough	9833f1ec93	Merge pull request #2060 from overleaf/spd-linkedfiletests-nondependent ... Refactor and clean up LinkedFileTests to not be dependent on previous run GitOrigin-RevId: 199a4ab6b463b2248244a067c765078816da182b	2019-08-14 15:19:40 +00:00
Eric Mc Sween	df2d46b332	Merge pull request #2074 from overleaf/em-o-error ... Introduce OError in CLSI manager GitOrigin-RevId: 4299de10a21242be4a127e761720de48f587412b	2019-08-13 12:50:25 +00:00
Eric Mc Sween	72ea7eb5f0	Merge pull request #1992 from overleaf/pr-history-file-selection-improvements ... History file selection and scrolling improvements GitOrigin-RevId: e5f31eca07a72b25245f8883aec1664c320c0788	2019-08-13 12:49:32 +00:00
Simon Detheridge	6defe1a693	Make tests in RegistrationTests not depend on previous run state ... GitOrigin-RevId: 68bcf9530ec6f5831c67449f35d0f010e5104f78	2019-08-13 08:50:19 +00:00
Ersun Warncke	c0cc8fdd3f	add tests for error handling, clean up ... GitOrigin-RevId: 8b102d54fd3d7f703dca81da182d3ab8eae3c9c2	2019-08-13 08:50:01 +00:00
Miguel Serrano	6006c8ca79	Fixed incompatibilities between overleaf.com and community (#2028) ... GitOrigin-RevId: fc1e4e3e179cab75144043d83197f09e4f6c7642	2019-08-12 11:39:17 +00:00
Simon Detheridge	67b68b0171	Change token-access acceptance tests to not depend on previous test runs (#2063) ... GitOrigin-RevId: 3727af6743cc530fe4a9dc7ec787dad25f1eadef	2019-08-10 01:58:33 +00:00
Alasdair Smith	3422c17dc4	Merge pull request #1948 from overleaf/cmg-allow-array-archiving ... Make checking for project.archived array-friendly GitOrigin-RevId: 2902a12fb4611a5786d4b10feba534b1cd29668b	2019-08-09 09:54:27 +00:00
Alasdair Smith	5b458e32ac	Merge pull request #2057 from overleaf/spd-promisify-userhelper ... Add promisified version of User helper in acceptance tests GitOrigin-RevId: ce2c28dd0d8ec66edaef54a260a3944f4cdd55d6	2019-08-09 09:53:58 +00:00
Simon Detheridge	a815c6a3e8	Merge pull request #2016 from overleaf/sk-fix-session-data ... Fix mismatched user session data GitOrigin-RevId: d464d05431ac86e279109aa3f7bc26dcf76662f4	2019-08-07 15:29:31 +00:00
Simon Detheridge	7588393580	Merge pull request #2047 from overleaf/spd-eslint-mocha-arrows ... Enforce consistent callback style in mocha tests GitOrigin-RevId: a64c293dae6926ef5831abe97eaf2044942a5c85	2019-08-07 15:29:25 +00:00
Eric Mc Sween	2269e4c4f1	Merge pull request #2031 from overleaf/bg-avoid-binary-text-mismatch-on-dropbox-updates ... avoid writing binary data into existing docs via dropbox GitOrigin-RevId: c6bc0ee3854c737ad80ea10a91bc27c88db2f838	2019-08-06 12:34:32 +00:00
Eric Mc Sween	7fcfbe8930	Merge pull request #2038 from overleaf/spd-refactor-project-structure-tests ... Refactor ProjectStructureTests to not depend on previous run state GitOrigin-RevId: c004e980406db0f0c547b9407a6f5a76cccabe03	2019-08-06 12:34:21 +00:00
Eric Mc Sween	1c43219315	Merge pull request #2039 from overleaf/spd-more-nondependent-tests ... Replace before with beforeEach in (most) acceptance tests GitOrigin-RevId: 888c320d5616d541c112c007c488c38448c4c88d	2019-08-06 12:34:15 +00:00
Eric Mc Sween	5d0c6cddf6	Merge pull request #2040 from overleaf/spd-projectinvite-tests ... Ensure tests ProjectInviteTests are not dependent on previous test state GitOrigin-RevId: 0db825789f86d2a22a8ad981d4d1875a93c83017	2019-08-06 12:34:10 +00:00
Timothée Alby	018b2cc474	Merge pull request #2010 from overleaf/ta-http-errors ... Add More Http Errors GitOrigin-RevId: d7aab42e1c7cec8757d6f2c6fc839a6c3f204351	2019-07-31 08:33:25 +00:00
Simon Detheridge	d9d9ee9541	Merge pull request #2023 from overleaf/spd-fix-deleted-project-expiry ... Fix not-found error when cleaning up deleted projects GitOrigin-RevId: db3d0f8756319dbeb7ff753a8603cf61b9fb8a0c	2019-07-30 08:40:37 +00:00
Hugh O'Brien	a638f9e567	Merge pull request #1976 from overleaf/hb-v1-history-metadata-from-mongo ... Fetch history metadata for v1 users GitOrigin-RevId: a65971dbef2be02c17ff07b1bf22c0f7b15c1780	2019-07-29 09:58:35 +00:00
Simon Detheridge	d7bee9a7d8	Merge pull request #2014 from overleaf/spd-deleted-project-collab-ids ... Store and backfill collaborator and overleaf history IDs in deleted projects GitOrigin-RevId: 34950e29d6910c22f1f6f153f8035a96a1ea8360	2019-07-26 14:39:18 +00:00
Simon Detheridge	285edfff36	Merge pull request #1994 from overleaf/ta-missing-stub ... Add missing EmailHandler stub GitOrigin-RevId: d497807068623e1338a95d2dfa02c56726ca39d1	2019-07-25 15:20:51 +00:00
Ersun Warncke	d9b5941642	do not use v1 for setting default email ... GitOrigin-RevId: 00d4610ae55c0a90699d4bc79e7d08d432087abe	2019-07-23 10:59:58 +00:00
Simon Detheridge	4cf480a448	Merge pull request #1965 from overleaf/jel-remove-v1-login ... Remove login to v1 via v2 GitOrigin-RevId: e5ba86786d14c5a2be87aff6b38cfd807b5cd053	2019-07-22 15:31:24 +00:00
Simon Detheridge	0b938927af	Fix response when learning custom words ... GitOrigin-RevId: fe7c8a2862532b83e650d3ecfae2ae5245394620	2019-07-20 12:54:34 +00:00
Timothée Alby	e38a86d9f4	Merge pull request #1934 from overleaf/ta-error-type-handler ... Implement ErrorType Handler GitOrigin-RevId: 7cd735bb248c74815182e10fd54d687dd35914b8	2019-07-19 09:51:05 +00:00
Alasdair Smith	827814175f	Remove sixpack (#1974) ... * Remove unused sixpack AB test * Remove unused sixpack AB test * Remove unused sixpackDomain global * Remove unused Sixpack file * Remove sixpack from frontend * Remove unused sixpack-client package GitOrigin-RevId: cdd4acf91cb045db93485f09dcb5ec63e43d01dc	2019-07-18 14:35:29 +00:00
Simon Detheridge	bf740f1e25	Merge pull request #1959 from overleaf/spd-integration-soft-deletion ... Integration: Merge soft-deletion features into master GitOrigin-RevId: 83baf730be2f256ad0d02271600392fda144b761	2019-07-18 14:34:22 +00:00
mserranom	d1011b74c0	server returns 422 on no language indicated ... GitOrigin-RevId: e2b0d1bee77b5d7aef5673e9d80f90265b3841e3	2019-07-18 11:13:19 +00:00
mserranom	111453c075	server returns 422 on incorrect language ... GitOrigin-RevId: cce8d0274476aed2b48a6908df3a44a7ea9ff186	2019-07-18 11:13:14 +00:00
mserranom	5835e9dc25	added stub for log.info ... GitOrigin-RevId: ed1041905b8b96869cd69518ada9fd253be51ca4	2019-07-18 11:13:09 +00:00
mserranom	b3501a40e3	added test for a 200 status on unsupported language ... GitOrigin-RevId: 802dc736969bbc48aa3beb9eb90b17dfdb59fff2	2019-07-18 11:12:57 +00:00
mserranom	762fde5ae7	disabled call to spelling service for unsupported languages ... GitOrigin-RevId: 329bf8cd95d5800a6850ece2887477348a104b27	2019-07-18 11:12:52 +00:00
Ersun Warncke	23ff7c23e8	add custom error page for v1 project if no overleaf id ... GitOrigin-RevId: 538c68c568c9138f26353d5492f4aa9d66fbae19	2019-07-18 11:12:47 +00:00
Ersun Warncke	d624c29b6f	remove v1 deps for password change/reset ... GitOrigin-RevId: be25f19ae589c50bfde0b170860127fa8d6f63b7	2019-07-17 15:09:24 +00:00
Ersun Warncke	a61a59be20	remove user.overleaf.id dependencies ... GitOrigin-RevId: ca495010a4f0ee462bde696dd0c442b2bd57bf30	2019-07-17 15:09:18 +00:00
Eric Mc Sween	d7549544d6	Merge pull request #1950 from overleaf/em-password-reset ... Fetch user by email when validating password reset GitOrigin-RevId: 9f113f1393e322611b1e7af5aec1ac25a38a122d	2019-07-16 09:22:15 +00:00
Timothée Alby	109585d20c	Merge pull request #1947 from overleaf/ta-cleanup-guard-1 ... Remove __guard__ Function Used to Access Settings GitOrigin-RevId: 15e3749990a9fc68f8d344390b1bf0d09d839106	2019-07-15 13:23:38 +00:00
Shane Kilkelly	238e2b2565	Merge pull request #1937 from overleaf/spd-sandboxedmodule-global-console ... Add 'console' to SandboxedModule globals GitOrigin-RevId: fad442ca128561a4fa193b929f217cf31ad0f043	2019-07-15 10:44:47 +00:00
Jessica Lawshe	ed6891e66d	Merge pull request #1961 from overleaf/jel-remove-force-import-feature-check ... Remove checks for `force-import-to-v2` GitOrigin-RevId: f94e8b0fb2f7f4416759583d5ca02babec345120	2019-07-11 15:35:36 +00:00
Jessica Lawshe	c8b6b83848	Merge pull request #1903 from overleaf/jel-oauth-email-notification ... OAuth link/unlink email notification via v2 GitOrigin-RevId: 36b0c6153d3eb8174adc4fd684837d81be95b644	2019-07-11 15:35:25 +00:00
Eric Mc Sween	a31090daab	Merge pull request #1944 from overleaf/em-password-reset ... Store the email address in the password reset token data GitOrigin-RevId: 9aa2eaff49de9ac88258cb996202934dab71cc0a	2019-07-04 12:51:16 +00:00
Jessica Lawshe	f8d895100a	Return custom error if provider linked to another account ... GitOrigin-RevId: c34a615b210a22e220736c9ba44d17be5add491b	2019-07-03 08:50:51 +00:00
Miguel Serrano	27985458ea	Uploading an empty zipfile throws specific error (#1909) ... Added a counter for the total files extracted from a zip. If no files are extracted a specific error is thrown. GitOrigin-RevId: 391bb669500c86e2e7fecebd90e2201248a8afd3	2019-07-02 10:58:58 +00:00
Timothée Alby	b1e8cb9cf0	Merge pull request #1924 from overleaf/ta-full-error ... Don't Callback with String GitOrigin-RevId: 82e3efb055ef197d95ff9c8a876bee0d6a0327a3	2019-07-01 14:06:54 +00:00
Timothée Alby	e73a5d9103	Merge pull request #1923 from overleaf/ta-error-log-level ... Reduce Log Level GitOrigin-RevId: 63a8859e6b78cb0774a28069089f4bce73eb91ec	2019-07-01 14:06:36 +00:00
Brian Gough	cf940cc835	Merge pull request #1916 from overleaf/ta-join-project-404 ... Return 404 on JoinProject When Project Is Not Found GitOrigin-RevId: cd87ce6e2564fd4a80faa66e8b22edec7b0c783c	2019-07-01 09:25:41 +00:00
Miguel Serrano	0e52453931	Merge pull request #1908 from overleaf/as-remove-tags-on-leave ... Remove tags when leaving project GitOrigin-RevId: 833412264d09348b02f57fb60cd0f07d81cfc037	2019-06-27 10:32:12 +00:00
Miguel Serrano	dc54a261e3	Merge pull request #1907 from overleaf/as-fix-tag-project-count ... Fix tag project count GitOrigin-RevId: 60236571403f8cc02f70bbe49e652ef18bbeab4d	2019-06-27 10:32:01 +00:00
Miguel Serrano	f8ad17c01b	Merge pull request #1910 from overleaf/msm-project-cleanedup-after-failed-upload ... Project is cleaned up after zip upload fails GitOrigin-RevId: a09bb51161d0565a5c7eb55a5e29530f8ec65eb6	2019-06-27 10:31:48 +00:00
Miguel Serrano	8a825bb065	Merge pull request #1902 from overleaf/msm-return-429-tdps-update-too-many-connections ... Project on cooldown returns 429 on TDPS update GitOrigin-RevId: b8da35a61be7508bc56d7798d233c186f694c364	2019-06-27 10:31:38 +00:00
Miguel Serrano	ab07761eef	Merge pull request #1863 from overleaf/msm-refactor-project-upload-manager-promises ... Refactored ProjectUploadManager to support Promises GitOrigin-RevId: 1d747f5ca07164299060bb27c6f14fa9e2968fdf	2019-06-24 13:31:35 +00:00
Simon Detheridge	757ae39487	Merge pull request #1899 from overleaf/spd-implicit-return-tests ... Decaf cleanup: Remove implicit return from 'it' and 'describe' in tests GitOrigin-RevId: f297820e6212dddc0d60697a2fe1612ef27403b6	2019-06-21 13:58:57 +00:00
Simon Detheridge	d1e587a51e	Merge pull request #1864 from overleaf/ta-analytics-backoff-strategy ... Update Analytics Backoff Strategy GitOrigin-RevId: 9a3dc11ee19ff03432730a36617208ac7f58c5be	2019-06-21 10:10:52 +00:00
Simon Detheridge	c30e83a4ed	Merge pull request #1877 from overleaf/em-filestore-range-request ... Get file size before truncating files for preview GitOrigin-RevId: 0822691d75bd8bfe3d6cfd23f9ca4b1c3be20585	2019-06-20 11:30:50 +00:00
Ersun Warncke	8cc9bc5335	write to v1/v2 on register, password change and reset ... GitOrigin-RevId: 29045912319d1d387613ec55c6620852d8857614	2019-06-19 11:06:21 +00:00
Simon Detheridge	d189dad162	Merge pull request #1865 from overleaf/ta-group-invite-self-view ... Return User Data when Inviting Self in Group GitOrigin-RevId: 5aeb9f0b21b84184a612ed730ac08dcb1c434f6e	2019-06-17 15:14:11 +00:00
Timothée Alby	e659703745	Merge pull request #1842 from overleaf/ta-remove-v1-sync ... Remove v1 Sync on Features Refresh GitOrigin-RevId: a99e0a74c4fc503bf81d0b847b3f331b3228e24f	2019-06-11 13:34:11 +00:00
Timothée Alby	8caea13193	Merge pull request #1845 from overleaf/ta-invite-self ... Don't Send Invite when Group Manager Invite Self GitOrigin-RevId: 35d7aecc82cf1124fbdac7fe986081b9556c23f9	2019-06-11 13:34:00 +00:00
Ersun Warncke	35138e6763	remove v1 oauth (#1846) ... remove oauth token v1 fallback GitOrigin-RevId: 621e75024d8ae877c821b9bfed9b2a19fdbbf9f7	2019-06-06 13:01:38 +00:00
Eric Mc Sween	15db8d3711	Merge pull request #1828 from overleaf/msm-fix-zip-upload-ignored-extensions-js ... Fixes files with full name equals to an ignored extension being ignored (JS version) GitOrigin-RevId: 94d84c2b3e6c7e7219397b0a982117f9c88bcf5d	2019-06-05 16:19:31 +00:00
Eric Mc Sween	5d2d7b894a	Merge pull request #1833 from overleaf/em-edit-subscription-admin ... Change admin button in subscription admin page GitOrigin-RevId: d446f54299578c3806ef7146d2163ec24e831b6d	2019-06-05 16:19:26 +00:00
Timothée Alby	a8edafe104	Merge pull request #1825 from overleaf/ta-institutions-staff-hub ... Create Institutions Staff Hub GitOrigin-RevId: 6926406951796d2e7dd0903c3d3c4dae87545390	2019-06-04 11:24:02 +00:00
Timothée Alby	14cbeef31d	Merge pull request #1806 from overleaf/ta-use-billing-name ... Use Billing Name when Creating Subscription GitOrigin-RevId: 66744faa7edde241340016bbb6c1bbc5fb53ede2	2019-06-04 11:23:55 +00:00
Timothée Alby	2deac5f3a1	Merge pull request #1805 from overleaf/csh-issue-1457-recurly-xml-builder ... Don't Build Recurly XML Requests Manually GitOrigin-RevId: bebe7f747715a33e681dc58fb89b529411a13860	2019-06-04 11:23:49 +00:00
Timothée Alby	0b8a2b0157	Merge pull request #1832 from overleaf/ta-fix-test-typo ... Fix typo in UserMembershipAuthorization tests GitOrigin-RevId: ccb6e88297367a2986ffa6c6c74cd8f26089298e	2019-06-04 11:23:43 +00:00
Timothée Alby	8330c6ae61	Merge pull request #1835 from overleaf/hb-analytics-template-ids ... Set template ids on cloned projects on creation GitOrigin-RevId: 6b7ef72d148774c3d5ea7b65cde0e6a8fdfa2ceb	2019-06-04 11:23:37 +00:00
Miguel Serrano	9226237a36	Merge pull request #1837 from overleaf/msm-revert-commit-by-error-master ... Revert "disabled logging during acceptance test execution" GitOrigin-RevId: 5d613ef0abeb00b2c4b42a660fac95876aebcd46	2019-06-03 09:38:54 +00:00
Miguel Serrano	df026f9f81	disabled logging during acceptance test execution ... GitOrigin-RevId: 185077cc0f0c8791bc063bd8da6dd755f94c74d6	2019-06-01 01:57:49 +00:00
Alasdair Smith	0ca81de78c	Merge pull request #1717 from overleaf/as-decaffeinate-backend ... Decaffeinate backend GitOrigin-RevId: 4ca9f94fc809cab6f47cec8254cacaf1bb3806fa	2019-05-29 09:32:21 +00:00
Hugh O'Brien	d4eb71b525	Merge pull request #1788 from overleaf/ta-ensure-can-delete-account ... Prevent Subscription Owner from Deleting their Account GitOrigin-RevId: bd60484bdfb6381216cfc0799e45b28300014ca0	2019-05-28 15:51:27 +00:00
Hugh O'Brien	29408b301c	Merge pull request #1750 from overleaf/cmg-project-metadata ... Preserve project metadata when deleting GitOrigin-RevId: 38efb139406d6111f5b6186d82c3fbfb5ab9b2b9	2019-05-28 15:51:21 +00:00
Alasdair Smith	b84c24520c	Merge pull request #1804 from overleaf/msm-removed-collaborator-as-first-step-transfer-ownership ... Removing user as collaborator as a pre-step for project ownership transfer GitOrigin-RevId: dbfe1553ae7277863908341fdd2af709dc019692	2019-05-28 11:25:43 +00:00
Alasdair Smith	a3bcc71df9	Merge pull request #1807 from overleaf/as-global-sinon-chai ... Globally load sinon-chai GitOrigin-RevId: b0175e021b98d6338171108c6778de80ee58479a	2019-05-28 11:25:26 +00:00
Alasdair Smith	4e8facf3cc	Merge pull request #1776 from overleaf/pr-history-ui-filenames-overflow ... History filenames overflow + full history for admins GitOrigin-RevId: b52d79e0aa1cb600eacb475d21b603f42c8cf18c	2019-05-28 11:25:17 +00:00
Simon Detheridge	561f54c1a3	Merge pull request #1816 from overleaf/spd-user-delete-newsletter ... Don't fail to delete a user if unsubscribing from newsletter fails GitOrigin-RevId: 8764717220d906a20a7dd0a90879a45d9dd8a7ce	2019-05-28 09:32:57 +00:00
Timothée Alby	d86abf49e6	Merge pull request #1729 from overleaf/ta-show-last-modified ... Show LastUpdatedBy on Dashboard GitOrigin-RevId: 11760e575a46f061d4aa9059a0c1e813b9adb1f9	2019-05-21 13:39:29 +00:00
Jessica Lawshe	e03b5ae691	Merge pull request #1741 from overleaf/jel-manage-linked-accounts ... Manage linked accounts via v2 GitOrigin-RevId: 09a7af361e1fc3c30bd01f7876fc17d651f60f06	2019-05-20 16:10:46 +00:00
Simon Detheridge	004272619e	Merge pull request #1781 from overleaf/ta-institution-subscriptions ... List Institution Subscriptions GitOrigin-RevId: b259b4729f031bb6a50b27f6740df3df21017818	2019-05-20 12:18:57 +00:00
Simon Detheridge	efd7cf5b01	Merge pull request #1793 from overleaf/fix-name-removed-transfer-ownership ... Fix name removed transfer ownership GitOrigin-RevId: ccbc681746033017686c4e36040a71ab7f98ad16	2019-05-20 12:18:49 +00:00
Simon Detheridge	c07c44f366	Merge pull request #1644 from overleaf/spd-reconcile-accounts ... Add account-reconciliation script GitOrigin-RevId: e20a8b9531126d91baaa9da5c77ab6e971b43e67	2019-05-16 10:59:53 +00:00
Timothée Alby	0e38ca1fd7	Merge pull request #1775 from overleaf/ta-fetch-user-before-confirm ... Check User Exists Before Confirming Email GitOrigin-RevId: 3622044f31f78e8499ccd084ca99297ca297ca97	2019-05-16 07:34:23 +00:00
Timothée Alby	276310bd23	Merge pull request #1778 from overleaf/hb-password-reset-sl ... Handle users who haven't migrated better on password reset GitOrigin-RevId: f123a6fe4a5a958f558e3cf34c3180e8fc96d159	2019-05-16 07:34:18 +00:00
Brian Gough	c6c948e9f9	Merge pull request #1769 from overleaf/bg-record-date-for-doc-deletion ... record timestamp for doc deletion GitOrigin-RevId: 3ae38c94918d3400ad9aa821e1e1ef1bcde6373b	2019-05-15 12:41:42 +00:00
Brian Gough	e252c64996	Merge pull request #1763 from overleaf/bg-preserve-file-hash-on-copy-and-delete ... preserve file hash on copy and delete GitOrigin-RevId: 2dc000255dcfe875a30a7e7f878aaa09fea367dc	2019-05-15 12:41:37 +00:00
Brian Gough	833caf4acd	Merge pull request #1765 from overleaf/bg-avoid-exception-in-token-access ... handle exception in crypto.timingSafeEqual when checking token GitOrigin-RevId: ba23aa4d4fe1e212c776965c0a58a90ecd846052	2019-05-15 12:41:31 +00:00
Timothée Alby	bd722dda8e	Merge pull request #1759 from overleaf/sk-disable-bcrypt-rounds-upgrade ... Temporarily de-activate automatic upgrade of bcrypt rounds GitOrigin-RevId: 66dbe344c00253e4b6a8f883735e61d9133da62e	2019-05-15 07:28:54 +00:00
Ersun Warncke	6513cc7b7a	Revert "Revert "complete v2 collabratec api"" ... This reverts commit 378825fae46cef6f19c8f908a1d6cf9c837cd1d6. GitOrigin-RevId: cf38aa3b4ec53ec6741389885ebe882476cb9297	2019-05-14 10:24:11 +00:00
Ersun Warncke	8377005187	Revert "Revert "oauth and collabratec migration"" ... This reverts commit c8814e7fd85776feb37bf8fad95038349b36cd9a. GitOrigin-RevId: 9deeb445917c856acee54ef793575c8ab9c81304	2019-05-14 10:24:04 +00:00
Ersun Warncke	7883554d73	Revert "Revert "add oauth2-server"" ... This reverts commit 946a7c2494d39fd7581cb8a068af7df647fb3bda. GitOrigin-RevId: 2f02e9d9e2d0348e4ea1d447e0291fae72c0008a	2019-05-14 10:23:51 +00:00
Ersun Warncke	9b24ed6daa	Revert "Revert "add thirdPartyIdentifiers to User model and add manager class"" ... This reverts commit df1b9355b1b28e3311bb9e5748df9db673d32ce5. GitOrigin-RevId: bba2cc5217ce1d2b50a596be07a086b4d716786e	2019-05-14 10:23:46 +00:00
Ersun Warncke	934b70e96a	Revert "add thirdPartyIdentifiers to User model and add manager class" ... This reverts commit 5839f1f43237c19efed7f4ce1dfb500da9327f70. GitOrigin-RevId: df1b9355b1b28e3311bb9e5748df9db673d32ce5	2019-05-13 15:52:47 +00:00
Ersun Warncke	a00f4b219e	Revert "add oauth2-server" ... This reverts commit d10f565973f8b762c5aa51aa11e73105b016d3ae. GitOrigin-RevId: 946a7c2494d39fd7581cb8a068af7df647fb3bda	2019-05-13 15:52:41 +00:00
Ersun Warncke	89ee728514	Revert "oauth and collabratec migration" ... This reverts commit 4ac63921b030a01ed79bc0da1666d3c9f9545248. GitOrigin-RevId: c8814e7fd85776feb37bf8fad95038349b36cd9a	2019-05-13 15:52:30 +00:00
Ersun Warncke	4189f2e6ec	Revert "complete v2 collabratec api" ... This reverts commit 9c75b657c11f98e3f927dd01a422157f53a5672d. GitOrigin-RevId: 378825fae46cef6f19c8f908a1d6cf9c837cd1d6	2019-05-13 15:52:25 +00:00
Ersun Warncke	65cbfbaeae	complete v2 collabratec api ... * remove proxies to v1 * allow oauth tokens with user stubs * add profile/unlink end points * fix Makefile issue GitOrigin-RevId: 9c75b657c11f98e3f927dd01a422157f53a5672d	2019-05-13 12:05:04 +00:00
Ersun Warncke	935877222a	oauth and collabratec migration ... * make v2 system of record for collabratec id * migrate oauth apps, tokens to v2 * set collabratec id on reg/link from ctec * copy collabratec id from user stub to user on merge GitOrigin-RevId: 4ac63921b030a01ed79bc0da1666d3c9f9545248	2019-05-13 12:04:56 +00:00
Ersun Warncke	dc06069dff	add oauth2-server ... GitOrigin-RevId: d10f565973f8b762c5aa51aa11e73105b016d3ae	2019-05-13 12:04:46 +00:00
Ersun Warncke	8f339603f4	add thirdPartyIdentifiers to User model and add manager class ... GitOrigin-RevId: 5839f1f43237c19efed7f4ce1dfb500da9327f70	2019-05-13 12:04:40 +00:00
Brian Gough	07b7566466	Merge pull request #1089 from overleaf/bg-compute-filestore-hash ... compute filestore hash GitOrigin-RevId: 23a909d2c2ea7aba3abfdb8f0c060e414a17e52e	2019-05-13 08:49:42 +00:00
Alasdair Smith	36035e8ccd	Merge pull request #1746 from overleaf/sk-fix-stale-pdf-download-3 ... Pass build-id when downloading pdf GitOrigin-RevId: bc4b1558170661172304df1b71f9b859a59abc5b	2019-05-08 09:09:11 +00:00
Timothée Alby	5b7b9fc97b	Store lastUpdatedBy Value on Projects (#1727) ... Store lastUpdatedBy Value on Projects GitOrigin-RevId: bdb12c55732bc726151135b28a03e722bf3fdb39	2019-05-02 14:17:41 +00:00
Timothée Alby	5b7974065d	Prevent registration of new accounts with existing secondary emails (#1696) ... Prevent registration of new accounts with existing secondary emails GitOrigin-RevId: 004cf9d31064fc5b7deb621c95c38f103397ff15	2019-05-02 14:17:34 +00:00
Alasdair Smith	028c3bc94c	Merge pull request #1742 from sharelatex/bg-avoid-unnecessary-callback-for-emit-to-room ... remove unnecessary callback on emitToRoom GitOrigin-RevId: a34006d6f72862b1f2e0b88d20ad8003ea5b8883	2019-05-01 09:38:30 +00:00
Alasdair Smith	2c30ae0f8a	Merge pull request #1738 from sharelatex/spd-dumpfolder ... Ensure dump folder exists before opening templates GitOrigin-RevId: 3c7269fbcdff45a06e505154a35ce6d2bd4b7ae1	2019-05-01 09:38:24 +00:00
Brian Gough	77a711f7a3	Merge pull request #1732 from sharelatex/bg-avoid-null-in-remove-element ... make removeElementFromMongoArray atomic GitOrigin-RevId: 3c4cf50caed9b3197ee0ec7fe4c89738d368a966	2019-04-29 09:31:09 +00:00
Simon Detheridge	5517adcbd1	Merge pull request #1726 from sharelatex/hb-sso-password-setting ... Check for password from v1 before showing password change form GitOrigin-RevId: 58ef0f9d3c8ce3ab7ca51d3538f1be13f05d4658	2019-04-25 14:37:38 +00:00
Simon Detheridge	9808eb7f55	Merge pull request #1722 from sharelatex/jel-password-descriptive-message ... Use descriptive error message for password reset GitOrigin-RevId: f1f0bacd6397f2068ed2abc71ee6ec54b3a51aff	2019-04-25 14:37:21 +00:00
Simon Detheridge	3990a5d736	Merge pull request #1724 from sharelatex/ta-subscription-canceled-page ... Add Subscription Canceled Page GitOrigin-RevId: b490ff008dd888911e8168606d90ae92662c0745	2019-04-25 14:37:15 +00:00
Simon Detheridge	cc96ecfd74	Merge pull request #1734 from sharelatex/spd-delete-user-crash ... Don't fail in refreshFeatures if the v1 user doesn't exist GitOrigin-RevId: 7849f5f942ef39762b40c31a616b51b4b1fe0706	2019-04-25 14:36:58 +00:00
Brian Gough	e1ec01eb0f	Merge pull request #1719 from sharelatex/ja-restore-doc-snapshots ... Show and restore doc snapshots from admin panel GitOrigin-RevId: 22339644d48a8698df97f7d5fc1eecfaf27c6fab	2019-04-24 13:24:46 +00:00
Timothée Alby	d3f0285fd2	Ensure project name is unique when transferring to another user (#1712) ... Ensure project name is unique when transferring to another user GitOrigin-RevId: 0742fcbd958b5801ed155214f403a74d17236859	2019-04-23 14:35:27 +00:00
Timothée Alby	85e7f688d5	Display Pricing Exceptions on Subscription Dashboard (#1720) ... Display Pricing Exceptions on Subscription Dashboard GitOrigin-RevId: 31de89824db70b7af1f8704e6da592064ce44bfd	2019-04-23 14:35:21 +00:00
Timothée Alby	2a73d8106b	Send Email on Subscription Reactivation (#1721) ... Send Email on Subscription Reactivation GitOrigin-RevId: 388f3490eddba0507e8c66e45d9ee4d185119c1e	2019-04-23 14:35:05 +00:00
Timothée Alby	6232854ff7	Remove User Memberships on Deletion (#1688) ... Remove User Memberships on Deletion GitOrigin-RevId: d6e6a4cc01e31288f660c2fd36a0cee174ee5dd1	2019-04-23 14:34:40 +00:00
Jessica Lawshe	f455a11aa8	Merge pull request #1655 from sharelatex/jel-user-must-reconfirm ... Reconfirm user accounts GitOrigin-RevId: 0343ff745e881cd51b5efbfb97404b6b926905c8	2019-04-17 14:14:19 +00:00
Hugh O'Brien	5edead4446	Merge pull request #1694 from sharelatex/hb-clear-ip-notifications ... Remove notification for university enrolment on affiliation add GitOrigin-RevId: 67df66ad6c6e9e16b6573fa15eb34293adaa0287	2019-04-15 16:09:16 +00:00
Paulo Jorge Reis	9c5c6922b9	Merge pull request #1626 from sharelatex/pr-history-drag-and-drop-selection ... History drag and drop selection GitOrigin-RevId: d2bc0dfc2e2634553224b7bef2ac5d926d42bf01	2019-04-09 10:11:13 +00:00
Simon Detheridge	385da07930	Merge pull request #1675 from sharelatex/spd-zip-file-limit-ui ... Display more descriptive errors when uploading a project fails GitOrigin-RevId: e206ca0d595f927ab141fb901644906f000160f8	2019-03-28 15:14:30 +00:00
Simon Detheridge	bb81a47d58	Merge pull request #1641 from sharelatex/spd-soft-delete-users ... Add initial support for soft-deletion of users GitOrigin-RevId: 22e47536732c5aec843d120773d2565112ad80b7	2019-03-26 13:59:49 +00:00
Simon Detheridge	d9522f563d	Merge pull request #1631 from sharelatex/ho-remove-recurly-sign ... remove RecurlyWrapper.sign and recurly private api key GitOrigin-RevId: ceec49bcb9b66a6ad3cbf2b436c87cf0008ab152	2019-03-25 15:52:54 +00:00
Shane Kilkelly	90cb50f4ac	Merge pull request #1609 from sharelatex/sk-upgrade-bcrypt-3 ... Upgrade bcrypt to version 3, and specify minor-version of hash function GitOrigin-RevId: 9282664a628e4b50839a1bb6f7ee895f3f9f15ca	2019-03-25 09:50:41 +00:00
Simon Detheridge	d184087a53	Merge pull request #1643 from sharelatex/spd-transfer-projects ... Add support for transferring project ownership GitOrigin-RevId: 088e02bb5be67033dba8e24c11660a1e200a3258	2019-03-22 12:28:24 +00:00
Shane Kilkelly	a5ad2e48d4	Merge pull request #1629 from sharelatex/sk-censor-token-prefix ... Censor `tokens.readAndWritePrefix` when building project model GitOrigin-RevId: 0fe3fc2657aa191808ea282dfcd2ea5506e93fee	2019-03-22 10:27:56 +00:00
Shane Kilkelly	a51fefae6c	Merge pull request #1630 from sharelatex/as-allow-deleted-inviter-import ... Allow deleted v1 user when importing project invite inviter GitOrigin-RevId: be8fc8f09452b72128592f9c00859aaa0b535c3d	2019-03-22 10:27:45 +00:00
Brian Gough	0305ba0c6b	Merge pull request #1639 from sharelatex/bg-add-message-ids ... include a unique id in every message published to redis GitOrigin-RevId: f2843e5bb570247f03b260fa0f82f562c9c6014d	2019-03-21 16:17:37 +00:00
Timothée Alby	5de25032d8	Merge pull request #1634 from sharelatex/ta-no-institution-autocreate ... Don't Auto-Create Institutions GitOrigin-RevId: 8be3a0d9f3f3814396a58d2fd131a62c9f196861	2019-03-19 23:51:53 +00:00
Brian Gough	c704312c85	Merge pull request #1625 from sharelatex/bg-move-entities-safely ... move project entities safely without losing data on error GitOrigin-RevId: 864fcf14af1045154e9deb7d02a4f2d508e6021e	2019-03-18 09:30:28 +00:00
Timothée Alby	429709dfcb	Merge pull request #1621 from sharelatex/ns-update-spam-regexes ... allow hyphen in email hostname and ' in project name GitOrigin-RevId: d108b7d42372dee4250157e2830cbc800851afc1	2019-03-14 16:02:45 +00:00
Timothée Alby	ca2c854452	Merge pull request #1622 from sharelatex/sk-add-unit-test-for-bcrypt ... Add unit test for 'real' bcrypt GitOrigin-RevId: 670282b5235484ac03d3451dc2685af18d84a4e3	2019-03-14 16:02:38 +00:00
Timothée Alby	970ca2e122	Merge pull request #1604 from sharelatex/ns-fix-capitalization ... improve project invite email wording GitOrigin-RevId: a15c2db992a000d3d1b2e49878380532d9b48e37	2019-03-14 16:02:27 +00:00
Timothée Alby	e4c684786d	Merge pull request #1580 from sharelatex/ta-entity-create-form-fix-2 ... Fix Publisher Creation Form Take2 GitOrigin-RevId: a51512cc48067f50ba05fa371ed1d759d3fca985	2019-03-14 13:43:12 +00:00
Jessica Lawshe	0b841aacef	Merge pull request #1605 from sharelatex/jel-portal-team-data ... Refactor portals GitOrigin-RevId: c75eb5fc17b2755070dfe48eb85845c690fe0230	2019-03-13 16:51:52 +00:00
Brian Gough	32925f0c4e	Merge pull request #1608 from sharelatex/bg-allow-reserved-names-safely ... allow reserved names safely GitOrigin-RevId: d0c5f287411f5cd6d0639f57ef925409571acf8a	2019-03-13 11:18:06 +00:00
Brian Gough	0f22a626c8	Merge pull request #1595 from sharelatex/bg-remove-old-project-version-request ... remove old project version request GitOrigin-RevId: 1c0a36ddfde4852b4cae90f5f4c4cfcb727eff77	2019-03-13 09:12:42 +00:00
nate stemen	f699877959	Merge pull request #1540 from sharelatex/ns-less-spam-mail ... add spam checkers on project invite emails GitOrigin-RevId: 305825efe6a824b1c0f5b347d2ed2427165d2cef	2019-03-11 11:07:09 +00:00
Brian Gough	01fd6e9c8a	Merge pull request #626 from sharelatex/bg-use-atomic-project-structure-version ... use atomic project structure version GitOrigin-RevId: ac61039a63af3e94fe842031e90e0aac802ff2b8	2019-03-11 11:06:45 +00:00
Douglas Lovell	ce8695c951	Merge branch 'dcl-i1261b' ... GitOrigin-RevId: 2d6c318e12220f39309238a2c7c76650cefa8be6	2019-03-11 11:05:47 +00:00
Simon Detheridge	3553fb2d9d	Merge pull request #1581 from sharelatex/spd-wearing-middle ... Fix spelling of "middleware" GitOrigin-RevId: d2b2b20ad8a6871cd6366303e75b340f0f2f2dda	2019-03-11 11:05:12 +00:00
Simon Detheridge	939922485c	Merge pull request #1555 from sharelatex/spd-email-escape-html ... HTML-escape user-supplied data in HTML emails GitOrigin-RevId: 7535ee8d0ac2c7c772a175ea5058e8cfc7f20e91	2019-03-11 11:05:01 +00:00
Simon Detheridge	870f183595	Merge pull request #1476 from sharelatex/spd-character-sets ... Detect encoding of non-utf8 files and convert during load GitOrigin-RevId: 1856a42457c52b125793dd001b92a014f358da69	2019-03-11 11:04:22 +00:00
Simon Detheridge	838fe00058	Merge pull request #1531 from sharelatex/spd-notify-users-on-affiliation-upgrade ... Notify users when affiliations are upgraded GitOrigin-RevId: 0f9e92b6a49f2ddef559e9e23fc73436910fb9f6	2019-03-11 11:00:01 +00:00
Ersun Warncke	57450bb0fb	Merge pull request #1522 from sharelatex/ew-smoke-test-remove-rate-limit ... Remove smoke test rate limit, use POST for logout GitOrigin-RevId: 0152f259b4a4375147857cc25156621de87f8bc9	2019-03-11 10:59:09 +00:00
Brian Gough	43899589dc	Merge pull request #1514 from sharelatex/bg-avoid-text-html-content-type-in-responses ... use explicit json content-type to avoid security issues with text/html GitOrigin-RevId: 0c8d96a61380231c5f878572ed91b8ab24375f56	2019-03-11 10:58:32 +00:00
Brian Gough	2ab346e762	Merge pull request #1511 from sharelatex/as-inc-linked-file-rev ... Increment rev of linked file to fix bug where dropbox not syncing GitOrigin-RevId: 6779d10f9ed64eeca901590cc888f35382a2b284	2019-03-11 10:58:21 +00:00
Brian Gough	cc613f4370	Merge pull request #1507 from sharelatex/mm-pubmodal-show-errors ... Return error status to the publish modal on export creation error GitOrigin-RevId: e46e9c1244ee540a4687240e8ecbb14ff36bd2e8	2019-02-14 15:03:42 +00:00
Shane Kilkelly	349d731745	Merge pull request #1493 from sharelatex/sk-read-write-token-match-on-prefix ... Constant-time comparison for read-write tokens GitOrigin-RevId: ddd83de551c540544fde426d7d5aca9f4c83fcc7	2019-02-14 11:09:40 +00:00
Timothée Alby	b39626751a	Merge pull request #1499 from sharelatex/ta-open-redirect-fix ... Prevent Open Redirects GitOrigin-RevId: 8cd2ead74de60f47b728ac227c21440281b111a5	2019-02-12 15:47:41 +00:00
Simon Detheridge	7dcc807caf	Merge pull request #1479 from sharelatex/sk-check-read-token-against-v1 ... Check generated read-tokens against v1 GitOrigin-RevId: 15749a41a295c0401b0a39968f2c3657f8abebb8	2019-02-11 11:42:29 +00:00
Simon Detheridge	ea807d053e	Merge pull request #1489 from sharelatex/spd-mendeley-csrf ... Enforce use of csrf token in Mendeley / tpr OAuth GitOrigin-RevId: b615ee195442123e0cd8ff19a864909ac2e6496d	2019-02-11 11:42:15 +00:00
Ersun Warncke	81e3db260c	Merge pull request #1472 from sharelatex/ew-add-close-site-and-private-disconnect-route ... Add close site setting and private disconnect all users route GitOrigin-RevId: d078c053ba4e5f5c048f30f2a6d509966736b3e0	2019-02-06 14:24:52 +00:00
nate stemen	4840d9e9bd	Merge pull request #1469 from sharelatex/ns-ta-refresh-features-on-donmain-confirm ... refresh features on donmain confirm GitOrigin-RevId: e1c29f1c590aafefef188ddfbc50654194b0747f	2019-02-05 15:58:58 +00:00
Chrystal Maria Griffiths	ef1bbba618	Merge pull request #1478 from sharelatex/cmg-fix-subscription-tests ... Fix subscription page failing tests GitOrigin-RevId: dc8bef0aa4996b457d3c770e3ad446315b8bed6f	2019-02-04 16:25:12 +00:00
Chrystal Maria Griffiths	e73a7dbe9c	Merge pull request #1431 from sharelatex/mm-pubmodal-show-errors ... Show export creation errors to the user GitOrigin-RevId: fc116cfcfc2ca49d19188f01ef7b3460e4619503	2019-02-04 16:24:30 +00:00
Timothée Alby	01a8cc9aea	Merge pull request #1460 from sharelatex/ns-remove-only ... remove only call GitOrigin-RevId: cfe130bec782079cce9aa8bf7e5c7541def6159d	2019-01-30 20:11:45 +00:00
Timothée Alby	9a0dd31d8c	Merge pull request #1061 from sharelatex/ja-remove-domain-license-code ... Remove deprecated domain license code GitOrigin-RevId: c9eebe1a657b07b69d618cdb5e73b64782109714	2019-01-29 12:08:29 +00:00
James Allen	286dd564e2	Merge pull request #1413 from sharelatex/pr-fix-history-default-file-selection ... Fix history default file selection and bug when comparing with version zero GitOrigin-RevId: 7a123eaec908abd0178eba435f6820ad1e858da1	2019-01-29 10:12:17 +00:00
Timothée Alby	b311f997aa	Merge pull request #1444 from sharelatex/ta-ns-check-institution-users ... add script to check all if users on institution are upgraded GitOrigin-RevId: 903f3a65fc038862178a82f43d97a5a4630cf470	2019-01-28 14:38:29 +00:00
Douglas Lovell	d2bccbec25	Merge remote-tracking branch 'origin/sk-admin-panel-projects' ... GitOrigin-RevId: 56f17fe3bec6252bd3d933899e540813550a36ff	2019-01-24 12:13:16 +00:00
Douglas Lovell	bd9adbae52	Merge remote-tracking branch 'origin/bg-case-sensitive-import' ... GitOrigin-RevId: d8d4fff4b4803f3cae6195ce1b60628cca326296	2019-01-24 12:13:11 +00:00
Alasdair Smith	3af1ef48c2	Merge pull request #1423 from sharelatex/as-fix-non-existent-v1-token ... Fix import page showing for non-existent v1 token GitOrigin-RevId: cdce007b64d153505a15ec7b16fb4b9311ebf11b	2019-01-22 11:38:55 +00:00
Simon Detheridge	64f69529e0	Merge pull request #1406 from sharelatex/spd-more-rate-limits ... Add additional rate limits to prevent resource-exhaustion attacks GitOrigin-RevId: 428cf8a16e062267dd92e7fba73ef5c192a8e668	2019-01-18 10:37:18 +00:00
Brian Gough	205da19173	Merge pull request #1408 from sharelatex/bg-increase-timeout-on-clone-project ... increase timeout for cloning project to 5 minutes GitOrigin-RevId: 949c7553f331573b391ff37f180e80b60c260cf5	2019-01-16 13:17:46 +00:00
Ersun Warncke	330f878085	Merge pull request #1378 from sharelatex/ew-post-logout ... POST logout instead of GET GitOrigin-RevId: b502a6ed945acd336d1a921e5c4c5433d8b7c7b7	2019-01-15 16:48:00 +00:00
Brian Gough	f1179f0fa7	Merge pull request #1384 from sharelatex/bg-use-queued-lock ... use queued locks GitOrigin-RevId: b5a3bfb55af201392a50ffb3fe30e740e56da30d	2019-01-15 10:55:32 +00:00
Brian Gough	724e2e8fcd	Merge pull request #1344 from sharelatex/bg-handle-filestore-errors ... handle non-sucess responses from filestore copy GitOrigin-RevId: f00766066a5a2cf20116aa9c8d876f78fae8953f	2019-01-15 10:55:27 +00:00
Simon Detheridge	da6711dc99	Merge pull request #1275 from sharelatex/hb-authorization-flags ... Authorization flags for metrics GitOrigin-RevId: 651587c11317bfc8bb7b1e8143e8c2c820683cb5	2019-01-11 14:44:17 +00:00
Simon Detheridge	7807435c2d	Merge pull request #1353 from sharelatex/spd-incorrect-test-description ... Fix incorrect test description (copy-paste error) GitOrigin-RevId: f45b5baec2c65d459324668e9cfca02c946c07f3	2019-01-11 14:43:54 +00:00
Simon Detheridge	4c191953d3	Merge pull request #1356 from sharelatex/spd-password-complexity ... Make password validation more consistent between backend and frontend GitOrigin-RevId: 6ba729da842bf474cf7e9b5e0b2435db0544737c	2019-01-11 14:43:49 +00:00
Simon Detheridge	f49523f6bc	Merge pull request #1375 from sharelatex/spd-open-in-overleaf-brand-variation-ids ... open-in-overleaf: Add support for 'brand_variation_id' parameter GitOrigin-RevId: 65c7732c3a3b85e524e9ac1ae6f13cd322ef8ccb	2019-01-11 14:43:44 +00:00
Simon Detheridge	a107b0cc33	Merge pull request #1380 from sharelatex/ew-fix-project-getter-error ... fix callback is not a function error GitOrigin-RevId: 1bbe80f4086a17576f21ca9fc7b96f59d1b0614c	2019-01-11 14:43:34 +00:00
Simon Detheridge	4360a55fdc	Merge pull request #1383 from sharelatex/spd-rate-limits ... Add rate limits to email-related endpoints GitOrigin-RevId: 05a8b40eb65a55aba35788e2401e6988b672b389	2019-01-11 14:43:29 +00:00
Brian Gough	eb5738886a	Merge pull request #1382 from sharelatex/bg-fix-locking-for-copy ... fix locking for copy file method in ProjectEntityUpdateHandler GitOrigin-RevId: a0c2a69f31bd17d8ae5cbfbc1047db22207f9bbe	2019-01-11 10:27:20 +00:00
James Allen	b969526c19	Merge pull request #1371 from sharelatex/as-fix-dash-user-stubs ... Handle UserStubs when linking projects with owners GitOrigin-RevId: eb54df048ccf7fffd3feac14fbb5c8991efd47c3	2019-01-09 13:41:06 +00:00
Henry Oswald	68a0ff08ea	Merge pull request #1366 from sharelatex/ho-bump-compile-size ... Bump compile size GitOrigin-RevId: 087e8556a7e2e39bed486cdd8829bf427aaed68b	2019-01-08 16:37:00 +00:00
James Allen	8653a3d9cd	Merge pull request #1364 from sharelatex/ja-fix-user-stub-owner-imports ... Handle UserStubs for project owner GitOrigin-RevId: ab3d9edf6e44a7867285430c14c73b3e64fd4c04	2019-01-08 13:02:14 +00:00
Ersun Warncke	c303af5d4d	Merge pull request #1354 from sharelatex/ew-async-zip-download ... use async project history zip download api GitOrigin-RevId: 847e22eb3bf89e2e9e3c86bcc9ae92f8c90b25b1	2019-01-07 17:38:33 +00:00
James Allen	e624f697d2	Merge pull request #1352 from sharelatex/spd-zip-files-with-backslashes ... Handle import of zip files that include filenames with backslashes GitOrigin-RevId: 9f84cf6e0a648ee04bac89fe385931d603709a41	2019-01-07 11:33:35 +00:00
James Allen	12a2d71ac9	Merge pull request #1346 from sharelatex/ew-use-new-api-for-project-importing ... use different api to check if project is exporting GitOrigin-RevId: 720012669c833f7482be087ac9d588c354c45147	2019-01-07 11:33:14 +00:00
Ersun Warncke	985f0a97bc	Merge pull request #1332 from sharelatex/ew-block-while-project-importing ... block loading project while importing GitOrigin-RevId: b96589e5cae9faf269abefd4ea732992a350e68c	2019-01-03 18:14:19 +00:00
Simon Detheridge	ec1867198f	Merge pull request #1313 from sharelatex/as-import-copy ... Improved copy for import status page GitOrigin-RevId: fa3e6792e7c703ea3a5127186385dcf661fef5e8	2019-01-03 12:19:35 +00:00
Ersun Warncke	c313b255bb	Merge pull request #1309 from sharelatex/sk-git-bridge-acceptance-tests-2 ... Add more acceptance tests for git-bridge api GitOrigin-RevId: 404c857fb73686d7073cd314dd4ee050a5b2e3bc	2018-12-21 12:23:02 +00:00
Alasdair Smith	7112e65dc5	Merge pull request #1303 from sharelatex/project-import-refactor ... Project import refactor GitOrigin-RevId: b4edc35cd4a14db0f4e6746d3da28cd94c351117	2018-12-20 12:06:15 +00:00
Shane Kilkelly	0c1e754736	Merge pull request #1289 from sharelatex/sk-labeled-versions-in-git-bridge-v2 ... Add support for labeled-versions in git-bridge api. GitOrigin-RevId: 94858627034ffd000d49b92ba5c7ab45e7294840	2018-12-20 10:55:59 +00:00
Shane Kilkelly	97e357f772	Merge pull request #1260 from sharelatex/ja-remove-deprecated-v1-team-status ... Remove deprecated display of v1 team data in v2 GitOrigin-RevId: d0198e5ed325ff689f5381a0be05493af35e5f8d	2018-12-20 10:55:52 +00:00
Simon Detheridge	531f5fb6ee	Merge pull request #1280 from sharelatex/spd-open-in-overleaf-conversions ... open-in-overleaf: Add support for partner and client_media_id parameters GitOrigin-RevId: a4c18a03affa62a1ef2cfb0c595766724ba8969b	2018-12-19 16:02:47 +00:00
Simon Detheridge	b0b87a7b6e	Merge pull request #1299 from sharelatex/spd-redirect-bypass-header ... Add support for header to allow bypass of redirects GitOrigin-RevId: 2d40c51c23809c19f0a053093e8ee0719a0190e2	2018-12-19 16:02:29 +00:00
Chrystal Maria Griffiths	2b556df43c	Merge pull request #1294 from sharelatex/mm-exportstatus-fields ... F1000 export fixes GitOrigin-RevId: 8f9a149cded8f204949750fc2788bc02223b84af	2018-12-19 10:38:29 +00:00
Ersun Warncke	bfeefe8406	Merge pull request #1282 from sharelatex/ew-collabratec-support-imported-projects ... Support importing projects with collabratec users to v2 GitOrigin-RevId: 2dd3781dde158cdab6bf95138311224a032ab8a4	2018-12-18 15:14:37 +00:00
Douglas Lovell	740dce07a9	Merge remote-tracking branch 'origin/hb-publisher-management' ... GitOrigin-RevId: 746cb15097cdc7c4f4cbd9f029d5e456c9bfe3ad	2018-12-18 13:42:56 +00:00
Paulo Jorge Reis	e139abb110	Merge pull request #1273 from sharelatex/ja-password-reset-v1 ... Handle v1-only users in v2 password reset flow GitOrigin-RevId: 38ce8e9aebd3330b980e73640a23661d8015d4f3	2018-12-18 11:48:53 +00:00
Alasdair Smith	1160620afc	Merge pull request #1278 from sharelatex/revert-1240-as-import-status-page ... Revert "Import status page" GitOrigin-RevId: aa667a7b158b38aeccc8251931cc20589dcb2bdd	2018-12-17 15:45:36 +00:00
Alasdair Smith	56784c4089	Merge pull request #1240 from sharelatex/as-import-status-page ... Import status page GitOrigin-RevId: 8855b910e8cdebb81d7b424e2e07b83e6bf2762a	2018-12-17 14:01:24 +00:00
Paulo Jorge Reis	217bc180ac	Merge pull request #1251 from sharelatex/pr-history-labels-compare ... History labels compare GitOrigin-RevId: bd06223344e391ba8e6017ebb27bdc3920cf754c	2018-12-17 10:10:48 +00:00
Jessica Lawshe	7666c8a481	Merge pull request #1236 from sharelatex/jel-password-reset ... Reset password via API request to v1 GitOrigin-RevId: 00b0306ca77df650595a762382a8a63b05a945f6	2018-12-14 16:02:14 +00:00
Shane Kilkelly	1836932256	Merge pull request #1247 from sharelatex/sk-git-bridge-acceptance-tests ... Git bridge acceptance tests (initial) GitOrigin-RevId: 66736ed568296674046b368861446eeb6eae664b	2018-12-13 15:09:53 +00:00
Shane Kilkelly	c423e483ba	Merge pull request #1256 from sharelatex/sk-file-upload-retry ... Add a retry around `FileStoreHandler.uploadFileFromDisk` GitOrigin-RevId: 2fc54036acdeda15c00a3d0222fd1a83683a5798	2018-12-13 15:09:48 +00:00
Ersun Warncke	362c1f64db	Merge pull request #1252 from sharelatex/ew-collabratec-upload-fix-v1-proxy ... upgrade to latest (forked) version of multer, proxy collabratec uploads GitOrigin-RevId: 682caf12a81ee828e544a5e3903ea49bbd173fe0	2018-12-13 13:09:26 +00:00
James Allen	3bc9ce995a	Merge pull request #1264 from sharelatex/hb-set-reversedHostname-on-user-create ... Set reversedHostname on user creation GitOrigin-RevId: 35ba4a5ae6aa792ee1c46e8b2b99d2e6ed00af17	2018-12-13 09:25:58 +00:00
James Allen	65c1943c63	Merge pull request #1249 from sharelatex/ja-single-process-acceptance-tests-2 ... Move to running acceptance tests in same process as web server GitOrigin-RevId: 65757f0b57ac621cafb0066b5c5a7abb30333edd	2018-12-13 09:25:50 +00:00
Simon Detheridge	22cd3f9273	Merge pull request #1237 from sharelatex/spd-open-in-overleaf-zip_uri ... Add zip_uri and publisher_slug to Open In Overleaf API GitOrigin-RevId: 2be4b7a0fe521fc4a4415100ac20190bf6e0df6a	2018-12-10 13:28:06 +00:00
Brian Gough	e42a3d1dc5	Merge pull request #1227 from sharelatex/spd-better-project-name-parsing ... Handle embedded commands when parsing project name from title GitOrigin-RevId: 09c1720897056a40d38b4f2f80f9d48caad4258b	2018-12-10 09:51:42 +00:00
Brian Gough	bed59cf8f6	Merge pull request #1223 from sharelatex/bg-fast-import ... parallelise file uploads for v1 project import GitOrigin-RevId: d4ae617b26e6d341bccd6202a1697a6ba3fc01ad	2018-12-10 09:51:38 +00:00
Shane Kilkelly	231d89477b	Merge pull request #1234 from sharelatex/ta-teamplate-without-brand-metrics ... Handle Access for Template Without Brands GitOrigin-RevId: f1127298fcede8075b31f6b1bc7161f474817a7e	2018-12-06 14:09:15 +00:00
Simon Detheridge	f3a10ac221	Merge pull request #1192 from sharelatex/ta-publisher-create ... Add Interface to Create Publishers GitOrigin-RevId: 50af2d1c05821d20b1ec33e8f68a05d824e55c46	2018-12-06 11:10:20 +00:00
Simon Detheridge	0097564754	Merge pull request #1220 from sharelatex/spd-open-in-overleaf-file-arrays ... Open in Overleaf: Add support for arrays of files GitOrigin-RevId: 5ef6d1ace6b7c6c041f2846f2f433b39fb137372	2018-12-06 11:10:08 +00:00
Timothée Alby	fde672542e	Merge pull request #1193 from sharelatex/ta-template-metrics ... Template Metrics GitOrigin-RevId: 0a8648aec3a9446426c70cd8220bb1f776313303	2018-12-05 15:12:14 +00:00
Timothée Alby	e0148bf69b	Merge pull request #1213 from sharelatex/ta-fix-mocks ... Fix Missing Mocks GitOrigin-RevId: 1ef7359eb65dd7dc0a4b48547b0a8b47e5dc318e	2018-12-05 15:12:05 +00:00
Simon Detheridge	2973302e73	Merge pull request #1230 from sharelatex/spd-fix-projectrootdocmanager-tests ... Fix tests in ProjectRootDocManager GitOrigin-RevId: b68c4b597f24a009c35a0f83f4573fdf84959cd7	2018-12-05 13:40:16 +00:00
James Allen	79a7a596b0	Merge pull request #1228 from sharelatex/ja-fix-subscription-tests ... Remove redundant sandboxed module require in tests GitOrigin-RevId: 957af70aacefed34f853549ef2357f59c01a4b3e	2018-12-05 12:32:41 +00:00
James Allen	16e1980b41	Merge pull request #1225 from sharelatex/spd-ensure-zip-file-project-name-valid ... Ensure project names are valid when importing from zip GitOrigin-RevId: db36dde6d756e6577d7e89f9f50f76c40575a5f0	2018-12-05 12:32:36 +00:00
James Allen	e603afe106	Merge pull request #1217 from sharelatex/ja-download-zip-version ... Add option to download zip file of version in history GitOrigin-RevId: 11ffb9a3305e1e5e0492fccf2be41be7beb67d68	2018-12-05 12:32:26 +00:00
Ersun Warncke	28c934e8ff	Merge pull request #1194 from sharelatex/ew-collabratec-link-project-apis ... collabratec link/unlink apis, auth refactor GitOrigin-RevId: dc901494197334e87d3e6702c789654ccef5e56a	2018-12-04 11:38:57 +00:00
Jessica Lawshe	f02e3e604b	Merge pull request #1172 from sharelatex/jel-portal-templates-link ... Link to portal templates from project dash GitOrigin-RevId: 303f65b9c5b85a23535479a7d06e70e75069db6c	2018-12-03 19:13:45 +00:00
James Allen	fc069c1752	Merge pull request #1216 from sharelatex/ja-remove-only-from-tests ... Remove stray 'only' in acceptance tests GitOrigin-RevId: 37417cfb98a512584723f5eaf6c3c684b5c60f68	2018-12-03 18:02:11 +00:00
Simon Detheridge	eed29c0adc	Merge pull request #1189 from sharelatex/spd-open-in-overleaf-zip-files ... open-in-overleaf: Zip file support GitOrigin-RevId: 06442e44d5333fab5df3e48e76fc13c5bcbbd7ba	2018-12-03 11:20:49 +00:00
Simon Detheridge	3138919cb7	Merge pull request #1184 from sharelatex/spd-zip-project-name-from-tex-content ... zip upload: Read project name from title in zip contents GitOrigin-RevId: 27122674a0374f86a10c04485d787f4caaf21f5b	2018-12-03 11:20:44 +00:00
Douglas Lovell	aae0484458	Merge branch 'master' into dcl-i1207 ... GitOrigin-RevId: c947041ca99860d4afb62ecfd28ba6fe1c717bfc	2018-11-30 13:24:27 +00:00
Douglas Lovell	ed3147a58f	Allow open from template button when lacking source ... GitOrigin-RevId: 8fd49bff6cc0f66d041bb70f9345b2744978be3a	2018-11-30 13:24:23 +00:00
James Allen	ee800f7448	Merge pull request #1176 from sharelatex/ja-manage-v1-subs ... Manage v1 subscriptions from v2 GitOrigin-RevId: 1fd63b3630f781e8b4cc3dc1413966540e8d0076	2018-11-30 10:43:37 +00:00
Timothée Alby	dffb6bc7a2	Merge pull request #1187 from sharelatex/ta-publisher-membership ... Add Publisher Entity for UserMemberships GitOrigin-RevId: 862b1e4fe6d33b63ddfdaef47c02809c4558f9cc	2018-11-28 10:17:36 +00:00
Simon Detheridge	05801085b0	Merge pull request #1185 from sharelatex/spd-better-unique-filenames ... Use numeric suffixes to disambiguate duplicate project names GitOrigin-RevId: 489b080d0514a33bbbf775095dd587f5e1a254a4	2018-11-26 16:53:42 +00:00
Simon Detheridge	50cba1a86f	Merge pull request #1153 from sharelatex/spd-open-in-overleaf-local-storage ... Use browser local storage instead of session for tex snippets GitOrigin-RevId: 9609dc882c37ccd2f58bf6d36ea851bbe746fa25	2018-11-26 16:53:31 +00:00
Ersun Warncke	87409d4b6a	Merge pull request #1152 from sharelatex/ew-collabratec-delete-project-api ... collabratec delete project api GitOrigin-RevId: f40a8cb7ce13f559842c8f22380976780a1c0ef7	2018-11-26 15:44:56 +00:00
Timothée Alby	210ebbeaf9	Merge pull request #1091 from sharelatex/ta-entity-authorization-refactor ... UserMembershipAuthorization Refactor GitOrigin-RevId: 055cebcd9298ed6dace081198f68491a000cf4a3	2018-11-26 13:42:58 +00:00
James Allen	49e19cad64	Merge pull request #1162 from sharelatex/ja-show-group-management ... Add group and institution membership and management info to subscription dashboard GitOrigin-RevId: 1aba5d5a20cd00ff5090811d0f66dc9c4944dd60	2018-11-20 11:03:56 +00:00
James Allen	0f1c732d15	Merge pull request #1130 from sharelatex/ja-subscription-dashboard ... Refactor subscription dashboard GitOrigin-RevId: 3573822b8b48c7181c661b2c253d7713f4a4328c	2018-11-19 16:01:59 +00:00
Hugh O'Brien	bcd7a740ec	Merge pull request #1154 from sharelatex/ta-display-institution-name ... display institution name on managment and metrics pages GitOrigin-RevId: 302bffee358d9d5090877ca833584f50afc0ff7b	2018-11-16 09:18:58 +00:00
Paulo Jorge Reis	af2d959504	Merge pull request #1072 from sharelatex/spd-open-with-overleaf ... Implement v1 open-with-overleaf API in v2 (part 1) GitOrigin-RevId: 488f4eeefc29086a72295ccbc7c63d2f927add12	2018-11-15 10:04:33 +00:00
James Allen	8c70d680f4	Merge pull request #1145 from sharelatex/ew-collabratec-create-project2 ... Collabratec create project api GitOrigin-RevId: 5f421625baa5c48f1745a15e15fe3a18fc1a4884	2018-11-14 14:44:17 +00:00
Shane Kilkelly	81b09c7800	Merge pull request #1071 from sharelatex/sk-enable-git-bridge-in-v2 ... Enable git-bridge in v2 GitOrigin-RevId: 24586c7c80b53ae171199ecde538df794f78ecc7	2018-11-14 11:29:35 +00:00
James Allen	140f97eb20	Merge pull request #1107 from sharelatex/ja-purchase-groups ... Purchase group/team accounts directly via app GitOrigin-RevId: 1a502878753de77758fb431f45a6366f199f1cb0	2018-11-13 13:50:46 +00:00
Chrystal Maria Griffiths	f1c8dcdf1e	Merge pull request #1127 from sharelatex/as-keep-tags-archive ... Keep tags when archiving project GitOrigin-RevId: 40b23895ef27a69500194cfc149a236ae615f271	2018-11-13 10:54:18 +00:00
Chrystal Maria Griffiths	afbeec3b02	Merge pull request #1099 from sharelatex/ta-management-ui-title ... Management UI Wording Tweaks GitOrigin-RevId: 9e1a8990f226e1fda423f6fa6efa25cf3b924544	2018-11-13 10:53:56 +00:00
Chrystal Maria Griffiths	6ea0b9cf46	Merge pull request #1097 from sharelatex/hb-fix-institutions-callbacks ... Fix multiple callback and silent failures on institutions controller GitOrigin-RevId: 2883445a4d960e7aca2dfbab45b8e268437e4769	2018-11-13 10:53:50 +00:00
Ersun Warncke	59a849d46e	Merge pull request #1117 from sharelatex/ew-collabratec-project-metadata-api2 ... Collabratec project metadata api GitOrigin-RevId: 46f4b84bfb302f68c0a176a8a1686ce22829ba08	2018-11-09 09:11:53 +00:00
Ersun Warncke	de4f1a5abd	Merge pull request #1126 from sharelatex/mm-ensure-valid-rootdoc ... Ensure project's root doc is valid before exporting GitOrigin-RevId: 6f15955015097df9464267f458b8dbb126c22173	2018-11-09 08:26:24 +00:00
Jessica Lawshe	a18176b2fa	Merge pull request #1128 from sharelatex/jel-add-user-to-team-db-op ... Change database operator to add user to team GitOrigin-RevId: 0bf23c1f8958f74fa00a97559ebbf03e4edadfa6	2018-11-08 16:11:58 +00:00
Paulo Jorge Reis	49388c868b	Merge pull request #1093 from sharelatex/pr-editor-cobranding-ui ... Editor cobranding UI GitOrigin-RevId: c6d5fabc23f9105388faeb037d96545bf574f4d5	2018-11-07 11:43:31 +00:00
Ersun Warncke	f3b92bbeec	Collabratec Get Projects API (#1092) ... collabratec get projects api GitOrigin-RevId: c733aecf515cf75ca1ae9c454efa7a35f09cf495	2018-11-06 13:48:49 +00:00
Brian Gough	2ea0644cfa	Merge pull request #1082 from sharelatex/bg-fix-backslash-on-v1-and-template-import ... fix backslash on v1 and template import GitOrigin-RevId: 8410a80a06ef48610f7b18f4556bd073253d4eb7	2018-11-06 08:33:00 +00:00
Alasdair Smith	659242b457	Merge pull request #1037 from sharelatex/as-decaffeinate ... Decaffeinate frontend GitOrigin-RevId: 1c8c53dedecfe55f9936a13408df17b852f996de	2018-11-05 10:19:25 +00:00
Jessica Lawshe	49acb719db	Merge pull request #1102 from sharelatex/mm-ensure-history-before-export ... Ensure project has history before exporting GitOrigin-RevId: 688131fbbca1cd339433d3b9be57a03a32303b3e	2018-11-01 17:48:09 +00:00
Ersun Warncke	365158f283	Merge pull request #1047 from sharelatex/ew-oauth-authorization ... add oauth middlewear GitOrigin-RevId: b68360763e1060fdbcbb4348d3d691a803fbfa41	2018-10-30 18:31:47 +00:00
Timothée Alby	c32a891cc8	Merge pull request #1077 from sharelatex/ta-create-institution ... Create Institution When Confirming New Domain GitOrigin-RevId: c0f5f0edde558eed744e813d6edccfc1f5acf8f0	2018-10-30 14:38:11 +00:00
Timothée Alby	92582fdc38	Merge pull request #1076 from sharelatex/ta-ui-error-handling ... Management UI Error Handling GitOrigin-RevId: a0567b5d54af3a8ca31f7e124c0c2d2d8d26b647	2018-10-30 14:37:59 +00:00
Simon Detheridge	1a9bb5f4eb	Merge pull request #1088 from sharelatex/ta-fix-entity-id-scope ... Fix Scope Bug in Group Access Control GitOrigin-RevId: 7d2cb5fc08e0c7e4bd1b70c03b62620bb7dd8d41	2018-10-30 10:16:25 +00:00
Douglas Lovell	b1bda995a6	Merge branch 'deploy-20181029a' ... GitOrigin-RevId: c51d4da706319564bd31514370fe13413655b6cf	2018-10-29 15:01:41 +00:00
Brian Gough	207b0d84c7	Merge pull request #1074 from sharelatex/bg-fail-gracefully-on-copy-project-error ... handle failure in parallel copy GitOrigin-RevId: 67ad5ab9f31689ef66ea2cce75c99c72bf23df41	2018-10-29 13:57:02 +00:00
Brian Gough	707a258d5b	Merge pull request #1040 from sharelatex/bg-start-history-in-v2-for-old-projects ... allow creating v2 history for existing project without v2 history GitOrigin-RevId: 2ccbe55f5c203c37d37be00306de5e265555f909	2018-10-29 13:56:55 +00:00
Timothée Alby	3d94be22b1	Merge pull request #1065 from sharelatex/ta-manage-group-members ... Manage Group Members GitOrigin-RevId: f0b120630ded1874dfc0352055633afff0015da9	2018-10-25 15:26:00 +00:00
Timothée Alby	aa549dd0d4	Merge pull request #1063 from sharelatex/ta-remove-add-user-to-group ... Remove addUserToGroup Action GitOrigin-RevId: 4f0cbf3dce47ee317b14784402128960a2caffa1	2018-10-25 15:25:55 +00:00
Timothée Alby	edd832b1f2	Merge pull request #1067 from sharelatex/ta-add-missing-mock ... Add Missing Test Mock GitOrigin-RevId: 69a08a1a13a72fe180ab11d1001eca424b149d1f	2018-10-25 15:25:44 +00:00
Timothée Alby	b123f830ff	Merge pull request #1042 from sharelatex/ta-user-membership-access ... User Membership Access Refactor GitOrigin-RevId: 23e8d342bc4829450625146213ff92cb042550dd	2018-10-24 14:02:55 +00:00
Brian Gough	d75d8ee079	Merge pull request #1035 from sharelatex/bg-fix-github-sync-filetypes ... check the filetype before syncing file GitOrigin-RevId: ec1a309e2423c6ff2c73202dcabae610edce4f6e	2018-10-23 13:16:30 +00:00
Simon Detheridge	8b55643f7e	Merge pull request #1030 from sharelatex/spd-bonus-program ... Implement bonus program GitOrigin-RevId: a18dd8a916c6f317a11661f106cdb4a2983c4ad8	2018-10-23 11:36:17 +00:00
Paulo Reis	00a489a000	Fetch brand variation details for branded projects; inject details into the editor page front-end. ... Test brand variation details. Rename BrandVariationsController to BrandVariationsHandler. Use the V1 API helper. Do not swallow errors when fetching brand details for project load. Fix indentation.	2018-10-19 10:47:02 +01:00
Brian Gough	c6ec31c773	Merge pull request #1024 from sharelatex/bg-avoid-duplicate-project-names ... avoid duplicate project names for templates and zips	2018-10-18 13:51:05 +01:00
Simon Detheridge	6ad16c9406	Merge pull request #1028 from sharelatex/spd-no-github-for-new-users ... retry: Don't add old v1 features for new accounts	2018-10-17 14:51:46 +01:00
Hugh O'Brien	3b766bf523	Merge pull request #1015 from sharelatex/pr-create-projects-with-brand-variation-id ... Create projects with brand variation id	2018-10-16 11:17:09 +01:00
Hugh O'Brien	876663f94b	Merge pull request #1006 from sharelatex/hb-v2-affiliations-callback ... Add affiliations on university domain confirmation	2018-10-16 11:17:01 +01:00
Simon Detheridge	0f54bc2c52	Add additional tests for V1SubscriptionManager ... One call was not returning the v1Id correctly. These tests check for that case. Also added some more generic tests for the v1 API call. bug: overleaf/sharelatex#1014	2018-10-16 10:15:42 +01:00
Simon Detheridge	6fc6c44605	Don't add old v1 features for new accounts ... Introduces the notion of v1 'grandfathered features', specifically Gihub and Mendeley integration. This allows us to create new v1 accounts for new users without them automatically getting the new features. Requires a settings change in `settings.web.sl.coffee` to disable these features by default for v1 accounts. bug: overleaf/sharelatex#1014	2018-10-16 09:45:16 +01:00
Simon Detheridge	ec9c38df57	Revert "Don't add old v1 features for new accounts"	2018-10-15 17:46:48 +01:00
Simon Detheridge	85f097343f	Merge pull request #1022 from sharelatex/spd-no-github-for-new-users ... Don't add old v1 features for new accounts	2018-10-15 15:28:34 +01:00
Tim Alby	e646c5c42a	refactor to use config file	2018-10-15 14:46:38 +02:00
Brian Gough	a640397052	make project names unique for zip uploads and template imports	2018-10-15 09:33:39 +01:00
Brian Gough	59cf0aa3cb	fix bug in call to findAllUsersProjects	2018-10-15 09:33:39 +01:00
Simon Detheridge	48995d2d44	Don't add old v1 features for new accounts ... Introduces the notion of v1 'grandfathered features', specifically Gihub and Mendeley integration. This allows us to create new v1 accounts for new users without them automatically getting the new features. Requires a settings change in `settings.web.sl.coffee` to disable these features by default for v1 accounts. bug: overleaf/sharelatex#1014	2018-10-12 17:45:57 +01:00
Hugh O'Brien	b825f0b267	Merge branch 'master' into hb-v2-affiliations-callback	2018-10-11 17:14:35 +01:00
Paulo Reis	b0802380ae	Update tests	2018-10-10 14:09:47 +01:00
Paulo Reis	901fb0fc1e	Unit test brand variation id.	2018-10-10 14:09:47 +01:00
Simon Detheridge	ea2782ff22	Merge pull request #1005 from sharelatex/spd-no-more-asterisks ... Sanitize paths in all relevant ProjectEntityHandler methods	2018-10-10 10:44:13 +01:00
Tim Alby	48e5c6b523	add UserMembership logic	2018-10-09 12:09:11 +01:00
Brian Gough	a68bde819d	Merge pull request #1004 from sharelatex/ta-test-mock-fix ... Fix Test Mock	2018-10-09 10:35:50 +01:00
Simon Detheridge	56dcbefb5b	Check for safe paths in all ProjectEntityHandler methods ... Some import mechanisms (for example, Github project import) call methods such as 'upsert*' directly, bypassing existing filename checks. Added checks to all methods in ProjectEntityHandler that can create or rename a file. bug: overleaf/sharelatex#908 Signed-off-by: Simon Detheridge <s@sd.ai>	2018-10-08 15:31:04 +01:00
Simon Detheridge	e66210d2af	Add method to sanitize full paths ... For convenience, add a method to SafePath to break a path into components and verify the status of each one. bug: overleaf/sharelatex#908 Signed-off-by: Simon Detheridge <s@sd.ai>	2018-10-08 14:48:17 +01:00
hugh-obrien	f6307f9086	store reversedHostname property and update test accordingly	2018-10-08 13:37:12 +01:00
hugh-obrien	3919acad46	store reversed hostname and review fixes for v2 university domain confirmation	2018-10-08 12:08:29 +01:00
Alasdair Smith	e129172553	Fix ordering of boolean check to be more readable	2018-10-08 11:25:24 +01:00
Alasdair Smith	1ef947b1fe	Fix tests after refactoring register validation	2018-10-08 10:44:25 +01:00
Hugh O'Brien	cc962c3e6f	Merge pull request #978 from sharelatex/hb-use-exports-for-pdf-from-publish-modal ... Generic Zip or Pdf Exports endpoint	2018-10-08 10:13:18 +01:00
hugh-obrien	65ecdf84f4	cleanup and tests for v2 affiliations confirmation	2018-10-07 16:40:26 +01:00
Tim Alby	c00a0a435d	remove console.log in tests	2018-10-05 16:24:28 +01:00
Tim Alby	7b4b75b51a	fix incorrect or missing test mocks	2018-10-05 16:24:05 +01:00
Shane Kilkelly	70b56d0362	Fix up acceptance tests	2018-10-04 15:05:40 +01:00
Shane Kilkelly	2ef23194df	WIP: trying to get acceptance tests to pass	2018-10-04 15:05:40 +01:00
Shane Kilkelly	f9ed367148	Move the auth mechanism for sudo-mode into SudoModeHandler	2018-10-04 15:05:40 +01:00
Ersun Warncke	752658f773	Merge pull request #990 from sharelatex/ew-use-v1-doc-info-api ... Use v1 Doc Info API for Token Access	2018-10-03 09:22:41 -04:00
Timothée Alby	c74c782cee	Merge pull request #961 from sharelatex/ta-account-sync-affiliations ... Add getInstitutionsPlan Function	2018-10-03 14:19:56 +01:00
Brian Gough	2b738907aa	Merge pull request #989 from sharelatex/bg-clean-up-broken-project-on-error ... clean up broken project on error in ProjectDuplicator	2018-10-03 10:04:30 +01:00
Ersun Warncke	642b45d0d6	use v1 doc info api	2018-10-02 11:16:46 -04:00
Brian Gough	4621234220	clean up broken project on error in ProjectDuplicator	2018-10-02 12:14:22 +01:00
Alasdair Smith	1330c8da73	Also check if v1 project exported if not found for read-only tokens	2018-09-28 11:47:14 +01:00
Alasdair Smith	435fe11115	Check if v1 project was exported if not found ... This prevents a redirect loop for projects which were exported but then deleted on v2. v2 would not find the project, redirect to v1, which would find that it was exported and redirect back to v2.	2018-09-28 11:47:14 +01:00
Brian Gough	6d5908f2f4	Merge pull request #893 from sharelatex/ja-fix-duplicate-text-in-email ... Don't include the license name twice in invite emails	2018-09-28 11:15:40 +01:00
Brian Gough	1f6abd4e69	fix invalid project names when opening templates	2018-09-28 10:38:25 +01:00
Brian Gough	6b80d3563d	add support for creating unique project names	2018-09-28 09:48:15 +01:00
hugh-obrien	52859cdfaa	make the zip fetching endpoint for exports generic to either zips or pdfs	2018-09-27 16:11:11 +01:00
Alasdair Smith	4f2c91a59a	Add new redirect option to auth with v1, which will urlencode the query string ... This is necessary for the GET /docs endpoint, which can be used to send urls as part of query parameters. If these are not encoded before redirecting, they can become corrupted.	2018-09-27 12:19:16 +01:00
Ersun Warncke	a23f0a3d15	fix test failure from merge	2018-09-25 08:54:01 -04:00
Ersun Warncke	7b90fcb186	Merge pull request #969 from sharelatex/ew-check-doc-token-access ... check access for doc on read only token	2018-09-25 08:35:56 -04:00
Ersun Warncke	eeed857dd9	change api path	2018-09-25 06:45:27 -04:00
Ersun Warncke	f0c0834b0f	only do v1 access check when api config present	2018-09-25 05:42:04 -04:00
James Allen	e2f90ba01a	Merge pull request #966 from sharelatex/as-no-project-token-based ... Redirect logged out users to v1 if project is not found from token based url	2018-09-25 10:25:30 +01:00
Alasdair Smith	298ee2dbb4	Fix v1 return to path	2018-09-25 10:06:24 +01:00
Alasdair Smith	da16e8d01f	Add acceptance test for unimported read only token	2018-09-25 09:43:39 +01:00
Alasdair Smith	ca895ae1b1	Redirect to v1 via sign in link	2018-09-25 09:37:22 +01:00
Brian Gough	89ba3912c0	Merge pull request #964 from sharelatex/csh-issue-963-MultipleProjectDownloads ... Replace ShareLaTeX with Overleaf in name of multiple project download file	2018-09-25 09:33:53 +01:00
Brian Gough	5947294016	Merge branch 'bg-support-main-file-for-templates'	2018-09-25 09:32:14 +01:00
Brian Gough	0d4143205d	strip quotes from mainFile	2018-09-25 09:05:49 +01:00
Ersun Warncke	f89e85231a	check access for doc on read only token	2018-09-24 18:03:28 -04:00
Alasdair Smith	d6350c963e	Remove projectExists flag from higher access check ... Now that find project by read and read/write token methods check whether the project exists, it is not neccessary to check whether the project exists in the higher access check. Therefore it has been removed	2018-09-24 19:00:10 +01:00
Alasdair Smith	99dec02266	If no project found for read/write token, redirect to v1	2018-09-24 19:00:10 +01:00
Alasdair Smith	237810509a	If no project found for read token, redirect to v1	2018-09-24 19:00:10 +01:00
Christopher Hoskin	5c35cc9593	Replace ShareLaTeX with Overleaf in name of multiple project download file (Closes: #963)	2018-09-24 16:33:54 +01:00
Brian Gough	418bc10a18	allow getting doc paths by project id	2018-09-24 16:04:23 +01:00
Brian Gough	5954e45016	add missing require	2018-09-24 15:44:09 +01:00
Brian Gough	2692090f3f	support a mainFile parameter for templates	2018-09-24 15:27:16 +01:00
Tim Alby	51c5228288	add getInstitutionsPlan function	2018-09-24 13:16:31 +01:00
hugh-obrien	c0b32f031e	force gallery items to use legacy OL v1 texlive image	2018-09-24 10:49:01 +01:00
Shane Kilkelly	7d5bd74c43	Enable legacy login for tests	2018-09-24 08:34:50 +01:00
Shane Kilkelly	eff7b4d59e	Add the enableLegacyRegistration option to acceptance test settings	2018-09-20 15:34:14 +01:00
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
Shane Kilkelly	d5a7514923	Add AB test for plans (+15 squashed commits) ... Squashed commits: [45c2237] Add a `subscription-form-switch-to-student` event [1ad9b8f] change experiment name, and re-enable switch-to-student workflow [f7cdb78] Remove debug [4b9778a] Incorporate collaborator alternative plans [701e80b] Add collaborator plans for heron and ibis [287aa0f] AB test plans from editor page [c74052e] Fix change-plan view for default plans [1a947d6] Use correct plan codes [1eecda7] Adjust prices [69c4c7b] Introduce two plans [8b8d5f8] Rename sixpack experiment [c332002] Fix up the change-plan page [c7af52d] Overhaul change-plan page, show only plans from current generation [33d86bf] update plan [5bbd946] Add a basic plans AB test	2016-10-21 16:17:37 +01:00
Henry Oswald	adc6b429e6	record when a subscription is canceled	2016-10-10 15:29:54 +01:00
Shane Kilkelly	0f65e98566	add acceptance test for clearing sessions	2016-10-10 10:55:45 +01:00
Shane Kilkelly	25dd998107	clear-sessions page (+4 squashed commits) ... Squashed commits: [3a56af0] Remove cruft [c5a1f6c] Finalise alignment [82f741a] Working sessions page [d40f069] WIP: display sessions	2016-10-07 16:47:00 +01:00
Shane Kilkelly	95a66bbf00	Merge pull request #328 from sharelatex/sk-plain-text-email ... Sk plain text email	2016-10-05 10:04:08 +01:00
Henry Oswald	3141f91b59	Merge pull request #322 from sharelatex/ho-password-limits ... Ho password limits	2016-10-05 10:03:54 +01:00
Shane Kilkelly	e699fcb1fa	Add plain-text component to the project-invite email	2016-10-03 15:25:38 +01:00
Shane Kilkelly	b497182557	Add an acceptance test for registration and login	2016-09-27 11:55:51 +01:00
Shane Kilkelly	dd14e51713	Handle null, undefined and false in isUserLoggedIn	2016-09-23 16:53:07 +01:00
Henry Oswald	8a2b7d0461	server side protect passwords which are too long	2016-09-23 16:51:46 +01:00
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
Shane Kilkelly	495bc1bcd3	Refactor	2016-08-01 15:16:10 +01:00
Shane Kilkelly	8af1a7b17a	Test login workflow	2016-08-01 15:16:03 +01:00
Shane Kilkelly	263822d665	Also parse out login url	2016-08-01 13:54:49 +01:00
Shane Kilkelly	5f1aa4cc58	test registration with invalid token	2016-08-01 13:30:43 +01:00
Shane Kilkelly	69bd954001	test the registration workflow	2016-08-01 12:14:34 +01:00
Shane Kilkelly	5159cdd0e9	Test when the user recieves second invite to project	2016-08-01 10:57:20 +01:00
Shane Kilkelly	545ce79c71	Test clicking the invite after already accepting	2016-08-01 10:14:08 +01:00
Shane Kilkelly	9c530e1bb6	rename test case	2016-08-01 10:04:42 +01:00
Shane Kilkelly	74c824edde	Test redirect to /register when user not logged in	2016-08-01 09:59:30 +01:00
Shane Kilkelly	7a8142a43c	remove extraneous body parameter	2016-08-01 09:06:02 +01:00
Brian Gough	e99176c0d0	fix tests	2016-07-29 14:59:48 +01:00
Shane Kilkelly	39fc611964	Revoke invite after each test	2016-07-29 13:55:08 +01:00
Shane Kilkelly	e7c1f7f0fc	Refactor, deduplicate tests	2016-07-29 13:39:18 +01:00
Shane Kilkelly	f3a1f32bb1	Test the invalid-invite page	2016-07-29 11:54:08 +01:00
Shane Kilkelly	b33d4e103d	Test when the user does not accept the invite	2016-07-29 11:08:24 +01:00
Shane Kilkelly	f33d01f375	Test acceptance of invite	2016-07-29 11:04:07 +01:00
Shane Kilkelly	563247044b	Start testing the invite page	2016-07-29 09:52:55 +01:00
Shane Kilkelly	23c94c9599	get invite and link for test	2016-07-28 16:00:18 +01:00
Shane Kilkelly	7b18f88145	Merge branch 'master' into pr-email-tokens	2016-07-28 14:53:36 +01:00
Shane Kilkelly	748851b51e	start ProjectInvite acceptance test module	2016-07-28 14:53:22 +01:00
Shane Kilkelly	ed65e16e54	If user is member of project, redirect to project. ... Leave invite in place to expire naturally.	2016-07-28 11:15:11 +01:00
Shane Kilkelly	62d544ccfc	Redirect to project if user is already member. ... If invite is missing, and current user is already a member of the project, then just redirect to the project page	2016-07-27 15:28:22 +01:00
Shane Kilkelly	e46901a21b	Send an empty keys array when there is no data	2016-07-26 14:23:00 +01:00
Shane Kilkelly	855cc28483	Finish adding project and owner details to the accept-invite page	2016-07-26 14:14:14 +01:00
Shane Kilkelly	367b138cae	fix failing tests	2016-07-26 12:09:58 +01:00
Shane Kilkelly	16dcbe2cd4	WIP: wire up share-modal frontend to invite system	2016-07-25 15:07:14 +01:00
Shane Kilkelly	73fed8b0bf	Add a getAllInvites api endpoint	2016-07-25 11:17:47 +01:00
Shane Kilkelly	ccf684cf07	test acceptInvite	2016-07-25 10:19:20 +01:00
Shane Kilkelly	5438f39f9e	Start testing acceptInvite	2016-07-25 09:58:08 +01:00
Shane Kilkelly	78570817d5	Render a separate template if the invite is not found.	2016-07-22 16:28:00 +01:00
Shane Kilkelly	9e0c44573a	Remove expiresAt, use mongo TTL instead.	2016-07-22 16:08:56 +01:00
Shane Kilkelly	b201f1a37a	Test getInviteByToken.	2016-07-22 14:21:34 +01:00
Shane Kilkelly	e34b124c73	Test revokeInvite	2016-07-22 13:33:21 +01:00
Shane Kilkelly	c9cfcddbe9	test error case for inviteToProject	2016-07-22 11:54:16 +01:00
Shane Kilkelly	f866bd03bc	Spy on the randomBytes function	2016-07-22 11:53:55 +01:00
Shane Kilkelly	9fba98cd45	Accept invite, and start testing the invite handler.	2016-07-22 11:38:00 +01:00
Shane Kilkelly	1139444790	add token to body of acceptInvite action.	2016-07-22 09:27:00 +01:00
Shane Kilkelly	4db9d5a466	remove whatespace and comment	2016-07-21 13:34:20 +01:00
Shane Kilkelly	3311b43644	more tests for invite controller	2016-07-21 13:31:54 +01:00
Shane Kilkelly	23a9aadba5	start tests for invite controller	2016-07-21 10:08:22 +01:00
Shane Kilkelly	effc3727be	Don’t show upgrade prompts for users with custom subscription accounts. ... Set `hasValidSubscription` to true if user subscription is custom.	2016-07-19 10:15:45 +01:00
Shane Kilkelly	dda0841af3	Return early if there are no keys to delete	2016-07-06 15:39:03 +01:00
Shane Kilkelly	fc6cf75ad5	Merge branch 'master' into sk-session-revocation	2016-07-06 13:19:15 +01:00
Shane Kilkelly	9f724d0a04	Add tests to check if users can access a restricted page.	2016-07-06 12:14:01 +01:00
Shane Kilkelly	0362fee60f	test the retain option to revokeAllUserSessions.	2016-07-05 15:32:32 +01:00
Shane Kilkelly	464866847f	Fix name of UserSessionsManager test module.	2016-07-05 15:14:29 +01:00
Shane Kilkelly	a1c662b9d8	Test session revocation on password change.	2016-07-05 14:55:08 +01:00
Shane Kilkelly	2caa80bbcb	acceptance test for logging in two sessions.	2016-07-05 14:21:38 +01:00
Shane Kilkelly	5b9903551a	add an array of session ids to retain.	2016-07-05 14:20:47 +01:00
Shane Kilkelly	6e282ab308	clear sessions on password reset	2016-07-05 14:19:59 +01:00
Shane Kilkelly	bec3d2ad42	start acceptance tests for sessions	2016-07-05 10:24:24 +01:00
Shane Kilkelly	df0a7bc547	test the _checkSessions function.	2016-07-04 14:04:10 +01:00
Shane Kilkelly	699ba21032	test revokeAllUserSessions	2016-07-04 11:15:28 +01:00
Shane Kilkelly	dfcb47fb5c	test untrackSession	2016-07-04 10:56:13 +01:00
Shane Kilkelly	2ae2e6ed4f	Test trackSession	2016-07-04 10:37:01 +01:00
Shane Kilkelly	a869c99c60	Begin testing UserSessionsManager.	2016-07-04 10:05:34 +01:00
Shane Kilkelly	0ac9b05d02	Add ip_address and session_created to the session user object.	2016-07-01 15:49:07 +01:00
Shane Kilkelly	f1653d01b7	Refactor method names in UserSessionsManager	2016-07-01 15:33:59 +01:00
Shane Kilkelly	ab26edb44b	Adjust UserController unit tests	2016-07-01 10:20:22 +01:00
Brian Gough	ea942fe255	Merge pull request #269 from sharelatex/remove-migration-to-per-user-containers ... remove scaffolding for per-user compiles so that it is always by default	2016-06-30 15:16:28 +01:00
Brian Gough	c04e00026b	remove scaffolding for per-user compiles so that it is always by default	2016-06-30 14:43:03 +01:00
James Allen	882e28a811	Don't choke on null projects	2016-06-30 14:30:04 +01:00
James Allen	b76cc7e314	Remove a user from being a collaborator when their account is deleted	2016-06-30 14:21:44 +01:00
James Allen	a0fcc7e3ed	Skip null user objects when getting collaborators	2016-06-30 13:56:21 +01:00
Shane Kilkelly	9e16f250f9	Merge branch 'sk-subscription-address'	2016-06-28 14:16:34 +01:00
Shane Kilkelly	6581bc4ecf	set postal_code as zip	2016-06-28 14:15:47 +01:00
Shane Kilkelly	465d09dcfe	Test the createSubscription action (+4 squashed commits) ... Squashed commits: [fc9c8f9] Add tests for createBillingInfo [db9f90e] Test the createSubscription stage [c17151d] Check that userExists gets set [1367c96] Act on buddy-check feedback	2016-06-28 13:59:52 +01:00
Brian Gough	2b23e13619	Merge pull request #261 from sharelatex/use-parameter-for-bcrypt-rounds ... use parameter for bcrypt rounds, rehash passwords on login if necessary	2016-06-28 10:49:33 +01:00
Shane Kilkelly	e194de50cf	test _paypal.checAccountExists.	2016-06-28 10:17:06 +01:00
Shane Kilkelly	6bdfedc1b0	Test when a paypal stage produces an error	2016-06-28 09:09:57 +01:00
Shane Kilkelly	d21eb1b07f	Add tests	2016-06-28 09:04:19 +01:00
Shane Kilkelly	709f8f2bea	start testing the paypal workflow.	2016-06-27 16:34:00 +01:00
Shane Kilkelly	3bf8da3e83	test _createCreditCardSubscription	2016-06-27 14:45:17 +01:00
Shane Kilkelly	2c1b326681	test the createSubscription function.	2016-06-27 14:29:19 +01:00
Shane Kilkelly	95d85538cc	Clean up xml text block in test.	2016-06-27 14:00:30 +01:00
Shane Kilkelly	d853eb5916	Update existing RecurlyWrapper tests.	2016-06-27 13:54:54 +01:00
Shane Kilkelly	eb92cfe8e0	Remove the postal_code from test, until recurly get back to us.	2016-06-27 10:40:08 +01:00
Shane Kilkelly	9938787e4a	fix a few silly issues. Appears to work now	2016-06-27 10:38:10 +01:00
Shane Kilkelly	72c73809f6	Generate address xml from object.	2016-06-27 09:44:40 +01:00
Henry Oswald	9888d6631a	don't error if references is not enabled	2016-06-24 15:46:37 +01:00
Henry Oswald	3887db8898	don't call notifications if notifications has no url	2016-06-24 14:06:04 +01:00
Brian Gough	98a0c54004	use parameter for bcrypt rounds, rehash passwords on login if necessary	2016-06-17 12:22:03 +01:00
Henry Oswald	8a9a65a80a	fix the download and compile endpoint used by zip	2016-06-15 14:45:05 +01:00
Henry Oswald	f3e48e332b	explicit call to UserCreator.createNewUser	2016-06-13 13:38:17 +01:00
Henry Oswald	3bc3153490	Merge branch 'master' of https://github.com/sharelatex/web-sharelatex	2016-06-13 13:24:04 +01:00
Henry Oswald	c52af1393e	should be able to set first and last name via user details on registration	2016-06-13 13:21:44 +01:00
Brian Gough	49a7c3c27b	Merge branch 'per-user-containers-part-2' ... Conflicts: app/coffee/Features/Compile/ClsiManager.coffee app/coffee/Features/Compile/CompileController.coffee app/coffee/Features/Compile/CompileManager.coffee	2016-06-13 12:24:48 +01:00
Brian Gough	8bc5f53562	Merge pull request #253 from sharelatex/per-user-containers-part-1 ... Per user containers part 1	2016-06-10 09:40:00 +01:00
Brian Gough	47574d7c7e	Merge pull request #252 from sharelatex/per-user-containers-part-0 ... Per user containers part 0	2016-06-08 15:55:17 +01:00
Shane Kilkelly	8f1fec8c4f	Add opt-out action to beta page	2016-06-08 15:11:39 +01:00
Shane Kilkelly	90dac348ff	refine beta opt-in workflow.	2016-06-08 11:04:44 +01:00
Shane Kilkelly	d8f1e8ec93	Add basic BetaProgram feature.	2016-06-07 11:15:56 +01:00
Henry Oswald	79929eae73	Merge branch 'clsichecks'	2016-06-06 14:34:22 +01:00
Henry Oswald	829b37cd74	set user email on session again on change email	2016-06-06 10:50:45 +01:00
Brian Gough	55a8e3cffe	extend tests for per-user compiles	2016-06-02 15:48:13 +01:00
Brian Gough	061d4934f1	use url attribute sent back by clsi	2016-06-02 15:46:55 +01:00
Brian Gough	5be1886d43	use path attribute sent back by clsi	2016-06-02 15:43:20 +01:00
Henry Oswald	14cbf4f1c8	removed priority url from proxy to clsi	2016-06-02 13:11:20 +01:00
Henry Oswald	c284465ba5	added clsiformat checker, wired in	2016-06-02 13:09:32 +01:00
Henry Oswald	8a5cb86c31	check _checkRecoursesForErrors before compile	2016-06-01 16:46:41 +01:00
Henry Oswald	1437877b5a	spike to check latex for basic errors before compile ... Aims to solve following problems which are currently not visible to user: - project is too big, which files are worst offenders? - when there are duplicate file names so an 'old' version keeps overrighting a new version - when a file has the same path as a folder which blows up clsi i.e. images/research images/research/1.png	2016-06-01 12:28:54 +01:00
James Allen	887631e661	Don't error if the rootDoc_id no longer exists in the project when copying	2016-05-23 14:58:28 +01:00
Henry Oswald	c918028d14	removed clsi priorty url	2016-05-20 12:46:14 +01:00
Henry Oswald	61b9a683aa	put clsiCookie vals into subobject in settings	2016-05-19 16:55:58 +01:00
Henry Oswald	04e70735d2	Merge branch 'master' into clsi-dynamic-load	2016-05-19 16:26:54 +01:00
Shane Kilkelly	0ea16f0bcc	Index '.bib' file objects.	2016-05-19 14:58:12 +01:00
Henry Oswald	789257fd4a	use cookie key when setting cookie for jar	2016-05-19 13:52:18 +01:00
Henry Oswald	2abebd850c	Merge branch 'project_url_query' into clsi-dynamic-load	2016-05-19 13:08:20 +01:00
Henry Oswald	b0baea5073	add query string to end of project resources	2016-05-18 10:09:22 +01:00
Shane Kilkelly	78e52d8c96	Update FileStoreHandlerTests	2016-05-18 09:58:57 +01:00
Henry Oswald	b8510301b6	expire cookie key from setting file length	2016-05-06 12:19:22 +01:00
Henry Oswald	ed4fdd48d7	clsi cookies are given an expire time via settings file	2016-05-05 16:50:18 +01:00
Henry Oswald	b00bd5cd94	if clsi cookies are not enabled don't call redis, return empty	2016-04-27 17:05:12 +01:00
Henry Oswald	78b08060ab	redis get not multi used for _getServerId	2016-04-27 16:56:21 +01:00
Henry Oswald	1ee94f9bf5	return server id for set server id and _populateServerIdViaRequest	2016-04-27 16:20:10 +01:00
Henry Oswald	616630200a	improve send calls and return correct stuff from _makeRequest	2016-04-20 17:08:11 +01:00
Henry Oswald	18560d8621	set server cookie on every compile response and don't expire on get	2016-04-20 16:17:06 +01:00
Henry Oswald	4d54de8b9a	renamed ClsiRequestManager to ClsiCookieManager and improved logging	2016-04-20 15:06:39 +01:00
Henry Oswald	b37595acf9	persist cookie in redis for compiles.	2016-04-19 16:48:51 +01:00
Henry Oswald	3d719af71e	if subscription is downgraded don't use plan code on subscription, use default instead	2016-03-31 18:04:20 +01:00
Henry Oswald	81cd2adfd3	member_ids != members_id	2016-03-31 17:36:06 +01:00
Henry Oswald	5a201153c7	refactored subscription updater again adding _setUsersMinimumFeatures ... single place you can call and the users minimum features are set	2016-03-31 16:58:16 +01:00
Henry Oswald	cb3eb88af2	Merge branch 'subscriptionimprovements'	2016-03-31 11:58:56 +01:00
Henry Oswald	db8fb63bb5	fixed change payment details page ... also increased size of year field for firefox users and removed unnded options in new plan page	2016-03-31 11:54:52 +01:00
James Allen	ae5467894b	Standardise on one Errors file	2016-03-23 15:14:49 +00:00
James Allen	a95c941cb9	Fix FileStore unit tests	2016-03-23 15:13:32 +00:00
Henry Oswald	a6859e22b3	if user is member of group on downgrade use the group subscription	2016-03-22 16:05:46 +00:00
Henry Oswald	a89edde139	subscription tests fixed	2016-03-22 14:27:05 +00:00
James Allen	f182fbf396	Convert 'anonymous-user' from real-time api in 'null' internally	2016-03-22 09:53:47 +00:00
James Allen	7791805949	Allow admin access to projects	2016-03-21 17:03:41 +00:00
Henry Oswald	840d3b75bb	listen for close not exit when working with unzip command ... sometimes the command will fail because stout has not finished yet	2016-03-21 16:37:29 +00:00
James Allen	9a0ec9c292	Don't throw fatal error when recently compiled	2016-03-21 13:54:45 +00:00
James Allen	6beb29f449	Don't treat no root resource as a fatal error	2016-03-21 13:28:53 +00:00
James Allen	e7d67668e9	Improve error reporting and show 404 when project ids are malformed	2016-03-18 15:59:12 +00:00
James Allen	88b8ce1f80	Enable working settings acceptance tests	2016-03-18 15:59:12 +00:00
Shane Kilkelly	35b5d3cc05	Update ReferencesHandlerTests.	2016-03-18 11:43:39 +00:00
James Allen	de02928454	Merge branch 'master' into ja_email_tokens	2016-03-17 17:01:26 +00:00
James Allen	fe1f71413e	Use ProjectGetter, not Project, in ProjectController.loadEditor	2016-03-15 14:12:43 +00:00
Henry Oswald	76b3a78988	added lock around move element	2016-03-15 12:29:41 +00:00
Henry Oswald	ba9bc3a2e8	check that element being inserted has an _id	2016-03-15 11:29:59 +00:00
James Allen	71ef045728	Implement authorization guards in Authorization{Manager,Controller}	2016-03-14 17:06:57 +00:00
Henry Oswald	3fc357a343	Merge branch 'master' into projectsizelimit	2016-03-14 10:31:07 +00:00
Henry Oswald	15c6e49d1a	if user changes email then check if they have a site licence	2016-03-13 22:31:14 +00:00
Henry Oswald	8812ff445e	change zip size check to spawn	2016-03-12 15:43:16 +00:00
Henry Oswald	f11ba97389	check stat.isFile and isDirectory rather then symlink	2016-03-12 15:05:29 +00:00
Henry Oswald	6664b67fba	check size of zip files	2016-03-12 12:38:21 +00:00
Henry Oswald	da242d90e6	added extra isSymLink checks into reading files	2016-03-12 12:01:36 +00:00
James Allen	1bd8b8d1a3	Delete SecurityManager and replace with (unwritten) AuthorizationManager	2016-03-10 17:17:26 +00:00
James Allen	3e03164ed4	Remove dead auth_token code	2016-03-10 17:15:14 +00:00
Henry Oswald	3c4e74af4b	project duplicator works and tests pass. ... not so bad now.	2016-03-10 12:42:21 +00:00
James Allen	e36be96ec9	Move public access setting to its own end point	2016-03-10 11:13:57 +00:00
James Allen	d235ab22ed	Add in tests for public read-only projects	2016-03-09 16:28:46 +00:00
James Allen	c46c083b31	Check write access to documents via real-time end point	2016-03-09 16:26:18 +00:00
James Allen	2116d0271c	Update acceptance tests for public projects	2016-03-09 15:30:23 +00:00
Henry Oswald	940586f654	sped up unit tests to improve speed ... also removed some unneeded requires.	2016-03-09 12:51:19 +00:00
James Allen	4f9f255153	Extend acceptance tests to include shared projects	2016-03-09 12:31:46 +00:00
Henry Oswald	5be05a35d8	added WithProject versions of functions ... rather than project_or_id	2016-03-09 11:16:27 +00:00
James Allen	e1fa77dd72	Add beginnings of acceptance tests	2016-03-08 15:59:04 +00:00
James Allen	37c966ba7e	Fix unit test	2016-03-08 14:42:11 +00:00
James Allen	76af5e5563	Don't call deprecated findPopulatedById in loadEditor	2016-03-08 14:20:00 +00:00
James Allen	359689ffea	find -> findOne	2016-03-08 14:19:38 +00:00
James Allen	0882eb2a99	Don't use deprecated Project.findPopulatedById in ReferencesManager	2016-03-08 14:05:56 +00:00
James Allen	40048d49a2	Fix unit test	2016-03-08 12:07:42 +00:00
James Allen	5f5445f625	Use TpdsUpdateSender to use CollaboratorsHandler	2016-03-08 11:54:45 +00:00
James Allen	a50bdaf5cc	Refactor LimitationsManager to use CollaboratorsHandler	2016-03-07 15:32:04 +00:00
James Allen	bedc8a0492	Remove ProjectGetter.populateProjectWithUsers	2016-03-07 15:25:10 +00:00
James Allen	2ba2b72fd1	Refactor ProjectDeleter to use CollaboratorHandler	2016-03-07 12:27:40 +00:00
James Allen	6d93076d51	Refactor getCollaborators http method to use CollaboratorsHandler	2016-03-07 12:02:48 +00:00
James Allen	1a689aa1fd	Move findAllUsersProjects from Project to ProjectGetter	2016-03-03 17:19:03 +00:00
James Allen	120a142733	Add in required abstracted functions to CollaboratorsHandler	2016-03-03 16:13:19 +00:00
Henry Oswald	39c7010d72	fixed broken tests	2016-02-29 22:51:46 +00:00
Henry Oswald	76591ebb23	made ProjectGetter.getProject more robust ... it can deal with multiple types of query better, including mongoose ids which are not being matched like mongojs ids.	2016-02-29 19:01:46 +00:00
Henry Oswald	6a7395a287	brought back the project_or_id style ... Added functionality into project getter, its a big performance improvement for things like cloning projects. Clone a 500 element project, 1 mongo get or 500.	2016-02-29 17:34:38 +00:00
Henry Oswald	b5dd96aa71	fixed some mongo calls in project entity handler ... need to specify fields you want to not get array back.	2016-02-29 16:03:22 +00:00
Henry Oswald	8f0d1dc73e	add in the calls to block large projects	2016-02-29 13:05:17 +00:00
Henry Oswald	8aec86af4e	moved count element to project entity handler and added tests	2016-02-26 13:25:09 +00:00
Henry Oswald	eedaa43b58	move project duplicator to mongojs	2016-02-26 08:32:00 +00:00
Henry Oswald	6ca69f88ac	Move project locator to mongojs	2016-02-26 08:31:47 +00:00
Henry Oswald	586d4cbae1	replaced all mongoose Project.find with mongojs calls	2016-02-26 08:23:43 +00:00
Henry Oswald	b6d62a677b	ProjectDeleter.archiveProject doesn't need to get entire project	2016-02-26 08:13:41 +00:00
Henry Oswald	447568aa91	ProjectDetailsHandler.getDetails does not need full project	2016-02-26 07:56:26 +00:00
Henry Oswald	43102e0ffc	lowercase and trim add user to group email address	2016-02-25 14:15:56 +00:00
James Allen	155831c3e7	Skip top-level directory if it exists in zip upload	2016-02-24 17:21:20 +00:00
James Allen	c6dcb64b18	Overwrite text files from uploads	2016-02-24 16:37:03 +00:00
Henry Oswald	09ac8f8c7a	move .putElement into ProjectEntityHandler with tests	2016-02-24 15:36:39 +00:00
Henry Oswald	7a28eeeaa0	ProjectEntityHandler.addFolder take only project id and ... only gets project folder structure	2016-02-23 15:45:40 +00:00
Henry Oswald	2a6e09a41b	remove console.log	2016-02-23 15:37:23 +00:00
Henry Oswald	1278081b51	mkdirp only needs folder strucutre	2016-02-23 15:36:59 +00:00
Henry Oswald	1d76850ebd	copyFileFromExistingProject does not need the whole project	2016-02-23 15:34:31 +00:00
Henry Oswald	b504732733	fixed calls to addUserToGroup and added more logging	2016-02-22 16:50:41 +00:00
Shane Kilkelly	b505f0d455	Merge branch 'sk-references-search' ... Conflicts: app/coffee/Features/References/ReferencesController.coffee	2016-02-19 11:30:55 +00:00
Henry Oswald	29e4b324fd	improve calls for invite notifications and auto mark as read	2016-02-18 11:43:43 +00:00
Henry Oswald	f824a3e28a	kill off dead code in group handler	2016-02-18 11:42:26 +00:00
Henry Oswald	bd54cc722a	fixed broken tests in AuthenticationController	2016-02-18 10:16:50 +00:00
Henry Oswald	fc4bd94a6e	don't create notification if user is already part of group	2016-02-18 10:06:21 +00:00
Henry Oswald	735f7bd51e	change res.send to res.sendStatus for new express	2016-02-16 12:38:27 +00:00
Henry Oswald	5c5888b5dc	Merge branch 'pr/221'	2016-02-11 11:44:45 +00:00
Shane Kilkelly	326d9e59f8	Refactor ReferencesSearch* to just References*.	2016-02-08 17:04:27 +00:00
Henry Oswald	de0589b051	added notifications calls for sending to api and mark as read ... not creating it yet	2016-02-05 14:13:38 +00:00
James Allen	6143b2218c	Send user_id on Dropbox requests through to doc updater	2016-02-04 14:27:00 +00:00
Henry Oswald	7994528c92	make site licence regex more specific	2016-02-03 16:08:29 +00:00
James Allen	4c626f23e7	Merge pull request #224 from sharelatex/ja_draft_mode ... Draft mode for compiles	2016-02-02 15:04:21 +00:00
James Allen	425a9b9db2	Add in option to compile in draft mode	2016-02-02 14:50:48 +00:00
Henry Oswald	aaa258099e	added tests to check rate limiter works without session	2016-02-02 14:26:23 +00:00
James Allen	b32178182d	Explicitly create tags and get their id	2016-02-01 10:18:56 +00:00
James Allen	77cc6af35e	Update add tag end point to use tag_id	2016-02-01 10:18:56 +00:00
James Allen	f1e65cc776	Use tag_id for deleting tags from project	2016-02-01 10:18:56 +00:00
James Allen	1bd5aef85f	Allow renaming of tags	2016-02-01 10:18:56 +00:00
James Allen	1a86e69d1f	Allow tags to be deleted	2016-02-01 10:18:56 +00:00
Shane Kilkelly	50a451970b	Merge branch 'master' into sk-references-2	2016-01-28 10:06:41 +00:00
Shane Kilkelly	3a700a5af2	More tests for indexAll	2016-01-27 16:03:40 +00:00
Shane Kilkelly	cc818695ef	Split References.index into index and indexAll.	2016-01-27 16:00:53 +00:00
Shane Kilkelly	ec8a12d445	Flush changes to mongo before sending request to references service	2016-01-27 13:33:42 +00:00
Shane Kilkelly	fed10280ab	Use docstore url rather than going through web api.	2016-01-27 09:58:54 +00:00
Shane Kilkelly	d1e53f0cb8	Test ReferencesSearchHandler.index	2016-01-26 16:14:17 +00:00
Shane Kilkelly	8a991b0d06	Start testing ReferencesSearch feature	2016-01-26 14:29:23 +00:00
Henry Oswald	690b195f1a	move login success to .json as it sends json over	2016-01-25 17:35:57 +00:00
Henrique Santos	9429e49cf8	finishing frontend	2016-01-22 18:08:39 -02:00
Shane Kilkelly	af75bb8a60	wip: change how indexing of references works.	2016-01-22 14:23:59 +00:00
Henrique Santos	2d11705837	fix issues in first commit	2016-01-22 03:41:22 -02:00
Henrique Santos	476eaa8b84	add notification backend and unit test ... add notification init frontend	2016-01-21 18:42:50 -02:00
Shane Kilkelly	d5d5ba9066	Merge branch 'master' of github.com:sharelatex/web-sharelatex	2016-01-20 14:02:24 +00:00
Shane Kilkelly	6cc18cd2fb	Add test.	2016-01-20 14:02:14 +00:00
Shane Kilkelly	0b28e7e964	send a fullIndex flag along to references service.	2016-01-20 13:53:28 +00:00
James Allen	ed5872702a	Pass image to wordcount end point in CLSI	2016-01-19 14:17:01 +00:00
Shane Kilkelly	2a7894f6e4	Merge branch 'master' of github.com:sharelatex/web-sharelatex	2016-01-15 14:41:12 +00:00
James Allen	03d75944b0	Allow image name to be configured	2016-01-15 10:26:36 +00:00
Shane Kilkelly	ca0a625dcc	Begin work on indexing the references when project is opened.	2016-01-14 14:53:08 +00:00
Shane Kilkelly	a63028bad3	Test the ReferencesSearchHandler	2015-12-31 10:28:19 +00:00
Shane Kilkelly	9280dd240b	Test getKeys.	2015-12-31 09:39:48 +00:00
Shane Kilkelly	d9ca9fc06d	Fix comically long lines.	2015-12-31 09:22:35 +00:00
Shane Kilkelly	877ea1d376	Test remaining failure cases.	2015-12-30 16:20:14 +00:00
Shane Kilkelly	ffb149b923	Test failure conditions.	2015-12-30 16:15:31 +00:00
Shane Kilkelly	5d80ce9ca5	More tests.	2015-12-30 15:24:57 +00:00
Shane Kilkelly	86d69f3275	Start testing ReferencesSearch.	2015-12-30 15:08:12 +00:00
Henry Oswald	501763bb4e	changed add doc to use ligher mongo call (folders only)	2015-12-15 13:27:41 +00:00
Henry Oswald	763f16f43c	Merge branch 'master' of https://github.com/sharelatex/web-sharelatex	2015-12-12 11:39:54 +00:00
James Allen	e8f21986dd	Refactor registration so it can be called from modules	2015-12-11 17:11:20 +00:00
James Allen	1e8ab5357b	Improve pre-registered account activation process	2015-12-11 11:30:06 +00:00
Henry Oswald	13af9b7b56	find project by name should only find active projects	2015-12-10 17:06:00 +00:00
Henry Oswald	5213be4fe9	Merge branch 'master' of https://github.com/sharelatex/web-sharelatex	2015-11-25 11:54:40 +00:00
Henry Oswald	91a84cb232	increase compile throttle limit	2015-11-25 11:07:53 +00:00
Henry Oswald	ba58509a67	increased length rate limit is in effect for	2015-11-16 12:21:06 +00:00
Henry Oswald	4e8eebb482	increase rate limit threshold on pdf downloads	2015-11-11 09:00:38 +00:00
Henry Oswald	16670cb3e3	only rate limit full pdf downloads	2015-11-10 16:23:55 +00:00
Henry Oswald	23fd12c67d	dropped throttle for full pdf download to 30 over 5 mins ... 1 download every 10 seconds which seems ample	2015-11-10 11:53:11 +00:00
Henry Oswald	c8ba7b72ab	Merge branch 'master' of https://github.com/sharelatex/web-sharelatex	2015-11-10 10:36:06 +00:00
James Allen	16b7bf222a	Merge branch 'contacts'	2015-11-05 10:14:25 +00:00
James Allen	c46f62cfc1	Ensure that a user can only be added to project once	2015-11-02 15:21:41 +00:00
Henry Oswald	cf48c94725	rate limit pdf downloads	2015-10-30 11:56:01 +00:00
Henry Oswald	1c91de0395	added function to get project with only folders for quicker adding of files to large projects	2015-10-21 16:56:06 +01:00
Henry Oswald	d9734953a6	don't archive project in track changes for moment	2015-10-20 17:36:37 +01:00
Henry Oswald	a94a03fc3e	added missing stubbed module call breaking tests	2015-10-19 15:48:59 +01:00
Henry Oswald	2c32126f68	archive in track changes as well as docstore	2015-10-19 15:44:50 +01:00
James Allen	d996ed6e47	Refactor addUserToProject for better access by groups	2015-10-14 17:29:58 +01:00
James Allen	c4e4f2c77a	Add modules hook for contacts and support groups in auto complete	2015-10-08 18:17:53 +01:00
James Allen	78c5741d06	Add contact when adding collaborator	2015-10-08 16:42:23 +01:00
James Allen	d11d536994	Refactor adding and removing collaborators to not go through EditorController	2015-10-08 14:15:36 +01:00
James Allen	8cc7869b03	Pull in contacts from contacts api and send to tag-input for autocomplete	2015-10-07 17:32:35 +01:00
Henry Oswald	f1d07811df	update the entire users features on assign bonus bu don't update ... the user features if there is nothing to update when assigning bonus	2015-10-07 13:50:51 +01:00
Henry Oswald	b69ec9768d	bonus allocater does not need to check if user has subscription any more.	2015-10-05 16:50:34 +01:00
Henry Oswald	fae7d431f4	after subscription is updated always check bonus	2015-10-05 16:33:13 +01:00
Henry Oswald	9a60617162	change referral allocated to only upgrade features and to find highest level ... i.e. user has referred 5 users, there are bonus levels for 3 & 6 shares, auto takes 3 users now.	2015-10-05 12:30:03 +01:00
Henry Oswald	5ffd76c670	Merge branch 'master' of https://github.com/sharelatex/web-sharelatex	2015-09-14 15:36:08 +01:00
Henrique Dias	3be0425b45	add unit tests for wordcount	2015-09-11 10:21:05 -03:00
James Allen	639424f664	Don't error on project clone if not root doc is set	2015-09-02 14:32:21 +01:00
Shane Kilkelly	0aaeb6671e	Keep password reset token in session, and strip it from reset page url. ... This fixes an issue where the reset token was leaked in the referrer header when navigating away from the password reset page to an external site. Now we get the token from the query string, store it in the session, then redirect to the bare url of the password reset page, which then uses the stored token to render the reset form.	2015-08-24 11:53:33 +01:00
Shane Kilkelly	23bd5d317c	A few extra cases which should not be treated as html.	2015-08-20 15:58:36 +01:00
Shane Kilkelly	ebf754904f	More thorough tests for the FileStoreController when downloading .html files.	2015-08-20 15:56:56 +01:00
Shane Kilkelly	85c1704fc5	Test that content-type is set for mobile-safari user-agents.	2015-08-20 14:03:12 +01:00
Shane Kilkelly	ce248f56d7	Un-break FileStoreControllerTests by mocking out the req.get method.	2015-08-20 12:28:51 +01:00
Henry Oswald	0e9ec00f85	added stubbed logger in document controller tests	2015-08-19 11:58:59 +01:00
Henry Oswald	63580f6a79	remove useClsi2 flag in project collection	2015-08-19 11:58:41 +01:00
Henry Oswald	50fc886c94	changed inactive to active as its more effienct query in mongo	2015-08-19 11:54:30 +01:00
Henry Oswald	70b825fd2a	fixed call to ProjectUpdateHandler.markAsOpened and made it async	2015-08-14 11:27:11 +01:00
Henry Oswald	68e970cd69	Merge branch 'master' of https://github.com/sharelatex/web-sharelatex	2015-08-14 09:31:25 +01:00
Henry Oswald	a0142d4415	added inactive and reactivate project logic	2015-08-13 22:40:28 +01:00
Henry Oswald	3ecf201eda	send -> sendStatus	2015-07-08 16:56:38 +01:00
Henry Oswald	8020cd8f47	removed tpds from settings.defaults.coffee, if not set updates are now not queued	2015-07-02 12:09:08 +01:00
Henry Oswald	7fd29b18a8	destroy users session before creating a new one for them after login ... session changed to prevent against fixation attacks	2015-07-01 15:29:02 +01:00
Henry Oswald	4f0b922a5d	changed name used when project or file uploaded, this changed when ... we started using https://github.com/expressjs/multer * originalname - Name of the file on the user's computer * name - Renamed file name	2015-07-01 15:28:49 +01:00
Henry Oswald	15a57f5dc4	removed req.session.destorys from endpoints now on the api router which are not needed	2015-07-01 15:26:05 +01:00
Henry Oswald	2ec925b45e	fairy removed from web, makes http request to tpds worker now	2015-06-22 22:33:04 +01:00
Henry Oswald	33aa5c732f	if a domain licence link has expired render a nice message explaining they need to retry	2015-06-01 12:43:42 +01:00
Henry Oswald	d3f6c0c614	Merge branch 'user-csv' of git://github.com/heukirne/web-sharelatex into heukirne-user-csv	2015-05-29 12:17:54 +01:00
Henry Oswald	e4011b9ba1	Merge branch 'emailverification'	2015-05-29 12:10:02 +01:00
Henrique Dias	f709ddf3eb	add csv export unit tests	2015-05-28 17:22:49 -03:00
Henry Oswald	43c4531e51	kill off CollaboratorsHandler. changeUsersPrivilegeLevel as it is not used anywhere	2015-05-28 13:02:08 +01:00
Henry Oswald	b657c5207e	cleaned up the views a bit	2015-05-27 21:45:29 +01:00
Henry Oswald	22b94e9246	renamed SubscriptionDomainAllocator -> SubscriptionDomainHandler	2015-05-27 20:57:54 +01:00
Henry Oswald	4773d6d22f	added tests around new endpoints for joining groups	2015-05-27 20:50:16 +01:00
Henry Oswald	f27c072ae1	pull logic checking if user is already part of a group out of controller into handler	2015-05-27 16:33:47 +01:00
Henry Oswald	72e528e9d1	if you are alread in the group show the custom group page	2015-05-27 15:50:28 +01:00
Henry Oswald	79fa49a43d	if a user is elelable to be part of a group subscription and they go to ... /user/subscription it should redirect them to the group subscription invite	2015-05-27 15:35:31 +01:00
Henry Oswald	841231dbf8	make PasswordResetTokenHandler generic so it can be used for invites	2015-05-26 15:24:09 +01:00
Brian Gough	e51cdb81bd	port leak fixes from smoke-test-sharelatex module	2015-05-26 10:54:55 +01:00
Brian Gough	cc9c8fdc94	freeze Date in Recurly tests before all calls ... beforeEach freezes and resets for each subtest, which does not give the desired result as the time increases between each subtest, we want to freeze once at the beginning and reset at the end using before/after.	2015-05-19 15:00:30 +01:00
Henry Oswald	f5c39efcac	patched xss hole with messages not setting the content type correctly	2015-05-19 11:04:52 +01:00
Brian Gough	3051d7dab6	modify LockManager test to avoid dependence on timing	2015-05-18 09:14:28 +01:00
Henry Oswald	9764ab258b	added complex password validation to password resets	2015-04-30 12:05:46 +01:00
Henry Oswald	a7640b5bbd	changed authentication controller to use req.parsedUrl.pathname as query strings on req.url were breaking the whitelist	2015-04-30 11:57:40 +01:00
Henry Oswald	6669884f44	Merge branch 'tpds-cleanup'	2015-04-23 10:06:26 +01:00
Henry Oswald	7a46b98c82	fixed unit tests for deleting files sent from tpds	2015-04-22 15:08:29 +01:00
James Allen	5c30a7de67	Add in option for global login requirement (defaults to on)	2015-04-15 11:14:53 +01:00
James Allen	893ff85521	Don't allow password resets for holding accounts	2015-04-14 13:11:49 +01:00
James Allen	185514ea35	Fix failing unit test	2015-03-19 16:41:09 +00:00
James Allen	9b8cf7bcfa	Remove public registration and require that a user be registered by an admin	2015-03-19 14:22:48 +00:00
James Allen	93a088618a	Return proper error from registration handler	2015-03-18 16:19:48 +00:00
James Allen	cb948fede2	Move email sending into registration controller	2015-03-18 15:57:01 +00:00
Henry Oswald	fe3b9bf07a	clients can not rename docs/files/folders to blank name. ... Client and server side checks added	2015-03-04 11:10:59 +00:00
Brian Gough	0ff5f54bf6	fix unit test for build parameter	2015-03-02 15:33:45 +00:00
Brian Gough	0315954b47	Merge branch 'master' into support-cached-pdfs	2015-03-02 09:20:00 +00:00
Brian Gough	a64b8724bd	include the build parameter in the compile unit tests	2015-02-26 16:21:44 +00:00
Henry Oswald	a9660a3a07	add err and null project test for locating project element	2015-02-18 21:57:21 +00:00
Henry Oswald	f8e3fa6308	increase the auto compile limit a little	2015-02-18 21:57:21 +00:00
James Allen	1a7d4f6be1	Fix smoke tests	2015-02-17 11:21:14 +00:00
James Allen	8e13ded360	Regenerate the session id after logging in or registering	2015-02-13 11:18:17 +00:00
James Allen	50048a53b5	Don't throw an exception if there is an error with unzip	2015-02-11 11:34:49 +00:00
James Allen	001a5d751b	Pull out templates logic into its own module	2015-02-10 11:24:34 +00:00
James Allen	6c387edbe2	Remove Dropbox front end logic from main sharelatex repo	2015-02-05 18:20:34 +00:00
James Allen	d7afb4e513	Clean up unused real-time code in web	2015-02-05 16:37:37 +00:00
James Allen	366a0403a6	Clear rate limit in smoke tests	2015-02-05 10:18:18 +00:00
James Allen	e35d80211e	Log when rate limit is hit	2015-02-05 09:52:40 +00:00
James Allen	4235c90623	Add in rate limit to opening projets	2015-02-04 15:05:35 +00:00
Henry Oswald	0a64c1c8ac	on register try and auto allocate a group licence if one exists	2015-01-27 18:22:51 +00:00
Henry Oswald	3360b3c35a	added basic domain allocation feature	2015-01-27 18:09:56 +00:00
Henry Oswald	00810eaf21	Merge branch 'recurlyv3'	2015-01-19 13:51:02 +00:00
Henry Oswald	7e64b88fcf	fix cancel subscription on delete user	2015-01-02 10:37:59 +00:00
Henry Oswald	a7eb836c79	redirect to /thank-you on success and fix broken unit test from a few commits ago	2014-12-22 16:37:09 +00:00
Brian Gough	79b560f96b	update tests for new pdf viewer server fixes	2014-12-16 09:44:25 +00:00
Brian Gough	d3b38c8dc2	Revert "Revert test changes for proxied headers when requesting pdfs from clsi" ... This reverts commit ab31d2c3fdc00a38f6444248011a3871b83dbec2.	2014-12-12 15:43:21 +00:00
Brian Gough	f005c5e8dc	Revert test changes for proxied headers when requesting pdfs from clsi	2014-12-11 13:42:51 +00:00
Brian Gough	265ad4439c	Merge branch 'master' of github.com:sharelatex/web-sharelatex into pdfng	2014-12-05 14:43:01 +00:00
Brian Gough	a4ddfd5725	whitelist proxied headers when requesting pdfs from clsi	2014-12-03 15:09:46 +00:00
Brian Gough	35b6abe79c	fix tests for pdf header passing	2014-12-02 16:36:19 +00:00
James Allen	c70c048aae	Send clear cache requests to the correct CLSI group	2014-12-01 12:19:01 +00:00
James Allen	e0178b17b5	Pass compile group correctly to Clsi._buildRequest	2014-12-01 10:28:09 +00:00
Henry Oswald	a570d05132	fixed bug with setting root doc which would fail if the document class isn't on the top line	2014-12-01 01:07:03 +00:00
James Allen	175dfae085	Look up compile group and features from project owner, not current user	2014-11-28 14:26:21 +00:00
Henry Oswald	0bc76b6d92	mkdir p changed so it does not get entire project, now without doc lines	2014-11-27 12:07:49 +00:00
Henry Oswald	63deb0a508	Revert "added lock to update merger" ... This reverts commit 8cdac1d74fd63d6ef83ce1e60ba41b9195ed0cac.	2014-11-27 11:46:17 +00:00
Henry Oswald	280895bdf5	added lock to update merger	2014-11-27 10:46:52 +00:00
Henry Oswald	5e570d52a0	modfied setRootDocAutomatically to work async ... was causing cpu to block for along time on big projects	2014-11-26 17:19:21 +00:00
Henry Oswald	393a637673	remove a couple of required coffee-scritps which are not required	2014-11-26 15:37:53 +00:00
Henry Oswald	857d867191	added locks into editor controller for new/move/deletes ... filesystem import manager uses the unlocked version	2014-11-26 15:32:23 +00:00
Henry Oswald	bd841b4795	coppied the lock manager over from doc updater	2014-11-25 16:52:27 +00:00
Henry Oswald	3bae278c92	Revert "increased timeout for geoip to 3 seconds" ... This reverts commit e4c892b59734a0b6b67ad37a1d09c1618ec389d4.	2014-11-25 13:10:00 +00:00
Henry Oswald	d91064a369	increased timeout for geoip to 3 seconds	2014-11-25 11:51:03 +00:00
James Allen	afca9ba0cb	Fix unit tests	2014-11-24 14:26:51 +00:00
James Allen	c28e09076b	Add missing logger include in smoke test	2014-11-24 13:33:03 +00:00
Henry Oswald	cd8c233c05	Revert robust redis connection code	2014-11-19 15:06:05 +00:00
James Allen	8b9a26d6f3	Add in http health check end points for redis subscription channels	2014-11-19 14:12:37 +00:00
James Allen	d6532c63f8	Use new robust subscription model	2014-11-19 11:09:42 +00:00
Henry Oswald	804bc16bc8	redirect users to /register when coming from templates or share url ... redirect to /login when going anywhere else (/project /project/1234)	2014-11-13 17:12:39 +00:00
Henry Oswald	f5d3801bfb	changed findElementByPath to not call cb more than once & deal with nulls	2014-11-11 14:44:44 +00:00
Henry Oswald	948183b685	return done in smoke test	2014-11-10 16:33:36 +00:00
Henry Oswald	4c905c168a	do null check on csrf token in smoke test	2014-11-10 11:20:34 +00:00
James Allen	6d10e45135	Fix unit test	2014-11-07 12:35:10 +00:00
James Allen	84c08edcf3	Factor out common joinProject logic to provide and HTTP end point for the real-time API	2014-11-07 12:31:47 +00:00
James Allen	d27af25bc9	Convert template publishing to use HTTP end points	2014-11-06 14:39:40 +00:00
James Allen	7b6ec86cef	Access Dropbox status via HTTP end points	2014-11-06 14:39:40 +00:00
James Allen	e596b60af0	Move collaborator HTTP end points into the Collaborators feature	2014-11-06 14:39:40 +00:00
James Allen	5c3e8e6d88	Add and remove collaborators with HTTP requests, not websockets	2014-11-06 14:39:40 +00:00
Henry Oswald	1a2411d4c2	removed bad require in test causing redis to be required in unit test #shouldhavebeenabountyhunter	2014-11-06 12:07:50 +00:00
Henry Oswald	30100f2a07	fixed badly called flushProjectToThirdPartyDataStore causing issues with initial drobox sync	2014-10-31 12:41:06 +00:00
James Allen	f1ddff4061	Only ignore hidden files from Dropbox, not GitHub	2014-10-27 14:39:20 +00:00
Henry Oswald	4bd0708029	put the compile group on the session so proxied requests are sent to the correct place ... I know this is premature optimisation however we do make a lot of requests to the clsi for each compile and this will save mongo a lot of calls	2014-10-21 09:34:58 +01:00
Henry Oswald	fb53be7ce4	Revert "priority compiles are proxyed to the priority servers" ... This reverts commit 5375af085a1fc20def19a858e3f63c52f3bec9b0.	2014-10-21 09:16:23 +01:00
Henry Oswald	250606472d	priority compiles are proxyed to the priority servers	2014-10-20 17:48:00 +01:00
Henry Oswald	3cf64ce34f	pass new compile features to client side, don't show timeout upgrade for premium users	2014-10-20 12:21:40 +01:00
Henry Oswald	b9d6d5bbf1	set the request timeout to a few mins for the compile	2014-10-17 13:23:29 +01:00
Henry Oswald	e7906f7018	timeout option passed to clsi	2014-10-16 18:43:48 +01:00
Henry Oswald	7293ccf06d	if user has premium compile send them to a different server set	2014-10-16 17:52:21 +01:00
Henry Oswald	1506f86a5f	Merge branch 'master' of https://github.com/sharelatex/web-sharelatex	2014-10-16 16:34:25 +01:00
Henry Oswald	d97e42a959	get users features for compile options i.e. timeout and which compiler	2014-10-16 16:34:21 +01:00
Henry Oswald	d8cc3b7b61	fixed leaky test	2014-10-16 16:02:31 +01:00
James Allen	f3a1ba93a4	Fix argument signature of mergeUpdate and deleteUpdate	2014-10-16 11:43:54 +01:00
James Allen	46ecaf9f6c	Fix broken argument signature of addFolder	2014-10-16 11:27:10 +01:00
James Allen	9f1a7c7396	Send source of update to doc updater and allow external updates to be ignored in UI	2014-10-16 11:27:10 +01:00
James Allen	7e9318814d	Send source of update to doc updater on setDocument request	2014-10-15 15:36:08 +01:00
James Allen	6800c1a15e	Track the source of updates through the system on adding/updating of docs and files	2014-10-15 15:18:31 +01:00
James Allen	941f550d6c	Remove all traces of soa-req-id	2014-10-15 14:11:02 +01:00
Henry Oswald	19a08f82a6	default to USD if there is no match	2014-10-14 12:14:03 +01:00
Henry Oswald	4a774981cf	Merge branch 'master' into multicurrency	2014-10-14 11:52:03 +01:00
Henry Oswald	3bac4dc39f	increase auto compile limit	2014-10-14 11:50:06 +01:00
Henry Oswald	6437f74cd3	use req.ip not x-forwarded-for to get ip address for multi currency	2014-10-13 17:55:18 +01:00
Henry Oswald	5a0d74753f	plans page will auto redirect to best guess currency	2014-10-13 17:39:44 +01:00
Henry Oswald	7964616f02	changing email address should lowercase the email	2014-10-13 15:44:45 +01:00
Henry Oswald	36264706f6	hooked the plans page up to the geo ip lookup	2014-10-13 14:10:15 +01:00
Henry Oswald	3ca04e25fd	add 1 second timeout to geoiplookup ... response times generally seem to be around 0.05s from our servers	2014-10-13 13:15:48 +01:00
Henry Oswald	2e6c2c1926	default to USD in geo ip lookup. ... Decided to put default logic in the GeoIpLookup.getCurrencyCode as we are going to want this default everywhere we use it.	2014-10-13 13:08:11 +01:00
Henry Oswald	e78e4d46b0	use first ip passed though in string for ip lookup	2014-10-13 13:04:20 +01:00
Henry Oswald	259871cbdd	added geoip lookup feature	2014-10-13 00:45:45 +01:00
Henry Oswald	b90003b11e	added custom user dashboard page	2014-10-10 15:44:53 +01:00
Henry Oswald	3ba3a91043	if its a custom account redirect to /user/subscription/custom_account	2014-10-10 15:11:22 +01:00
Henry Oswald	e5ab40c911	added example session invalidation code	2014-10-09 18:10:01 +01:00
Henry Oswald	e7984a90d7	unlink dropbox when a user cancels	2014-10-09 17:05:41 +01:00
James Allen	4743b460f5	Only show rename or deleted message once	2014-10-09 09:13:38 +01:00
James Allen	accd8207b2	Show password reset expired message rather than server error if that's what has happened	2014-10-08 17:18:24 +01:00
James Allen	128c672edd	Merge branch 'github-sync' ... Conflicts: package.json	2014-10-08 12:13:37 +01:00
James Allen	dbd85a05f1	Send user features and features switches to views where needed	2014-10-07 13:31:13 +01:00
Henry Oswald	8789a4bde1	server rejects rename of entitys over 150 chars	2014-10-07 11:16:26 +01:00
Henry Oswald	b01b05e49b	server rejects project names over 150 chars	2014-10-07 11:14:02 +01:00
James Allen	6c7c09075c	Treat paths properly in project content update methods	2014-10-03 11:33:18 +01:00
James Allen	13a96c925b	Add in endpoints to allow updating project files when the project id is know	2014-10-02 14:15:30 +01:00
Henry Oswald	2375dbb851	run succesful login before each smoke test to avoid any rate limit issues	2014-09-29 11:45:34 +01:00
Henry Oswald	7f2df4bbd3	renamed rate limiter tests	2014-09-29 11:42:46 +01:00
Henry Oswald	0d056434e6	fixed tests	2014-09-26 17:49:31 +01:00
Henry Oswald	558b6cdfde	remove test which isn't really that important	2014-09-18 14:41:30 +01:00
Henry Oswald	1b02dc72a3	destroy session on dropbox webhook	2014-09-10 14:19:44 +01:00
Henry Oswald	b875864568	check for error on smoke test after	2014-09-04 18:06:24 +01:00
James Allen	971afb7342	Treat large text files as binary	2014-09-04 13:00:51 +01:00
Henry Oswald	c131a9d301	added /logout to smoke tests	2014-09-04 12:35:59 +01:00
Henry Oswald	e740e4913d	if user is already annual tell them so on the annual upgrade page	2014-08-29 14:13:05 +01:00
Henry Oswald	416f41e59d	stopped using proper settings inside of a test	2014-08-29 13:06:50 +01:00
Henry Oswald	aa83b5ca5d	fixed tests whoops	2014-08-29 12:41:42 +01:00
Henry Oswald	350b95a0a5	annual upgrade page works, needs a bit of copy love now	2014-08-28 18:14:31 +01:00
Henry Oswald	f5618e9d9c	added confirm you want to change plan modal ... added page and corisponding endpoint to migrate to annual plan	2014-08-27 17:51:10 +01:00
James Allen	894024ba29	Don't allow folders to be moved into their child folders	2014-08-22 14:38:52 +01:00
James Allen	456d194dbb	Merge branch 'james_tmp'	2014-08-22 12:51:35 +01:00
James Allen	f093c99b96	Remove deprecated background dropbox polling logic	2014-08-21 13:01:27 +01:00
James Allen	d0eee7a1e5	Refactor template settings	2014-08-20 14:47:27 +01:00
Henry Oswald	6bb4c9867e	convert smoke cookie to be unsecure so curl will send it	2014-08-19 15:35:34 +01:00
Henry Oswald	ca5b1e7422	cleaned up smoke tests	2014-08-19 14:35:20 +01:00
Henry Oswald	a082dd0f3b	use cookie domain in smoke test path	2014-08-19 12:05:07 +01:00
Henry Oswald	8895ceea35	write cookies to tmp for smoke test	2014-08-19 12:01:30 +01:00
Henry Oswald	523694c4ff	changed smoke tests to work with curl ... this was needed as there is a bug with request/tough cookie with multi subdomain cookies ie .sharelatex.com https://github.com/goinstant/tough-cookie/issues/16 moving it to request in the future is probably a good idea, if we do move to request then with the current issues we would we need to set jar._jar.rejectPublicSuffixes = false	2014-08-19 11:17:51 +01:00
Henry Oswald	0dc4b3a01b	login works with curl	2014-08-19 10:54:33 +01:00
James Allen	9be7228247	Delay Dropbox polling by 5 seconds and dispatch only a single request	2014-08-14 13:48:23 +01:00
James Allen	670e8e5cb9	Use Dropbox Real-time polling	2014-08-13 17:26:18 +01:00
James Allen	b7ed3bab8f	Merge branch 'redis-queue'	2014-08-11 12:10:25 +01:00
Henry Oswald	b41256b599	Merge branch 'master' of https://github.com/sharelatex/web-sharelatex	2014-08-08 13:15:03 +01:00
Henry Oswald	b48ca2c7ed	fixed smoke test breaking on title, removed "the" as its not great for SEO (i think)	2014-08-08 13:11:49 +01:00
James Allen	b20934e579	Merge branch 'master' of github.com:sharelatex/web-sharelatex	2014-08-08 11:42:02 +01:00
James Allen	10021986c5	Don't error on password reset if no email found, and translate error messages	2014-08-08 11:41:54 +01:00
Henry Oswald	66ba6e612d	Revert "send 401 when login fails" ... This reverts commit fb901c6365d37654ba9058f57a71a4e60366688e.	2014-08-08 10:21:17 +01:00
Henry Oswald	7976f2f0fe	send 401 when login fails	2014-08-07 16:28:00 +01:00
James Allen	b367c4a968	Show group subscription status on subscription dashboard page ... Conflicts: app/views/subscriptions/dashboard.jade	2014-08-07 15:51:43 +01:00
Henry Oswald	9c6f0faff6	Merge branch 'i18n' ... Conflicts: app/coffee/Features/User/UserPagesController.coffee app/views/layout.jade app/views/project/editor/dropbox.jade app/views/project/editor/file-tree.jade app/views/project/editor/pdf.jade app/views/project/list/project-list.jade app/views/user/settings.jade	2014-08-07 14:46:17 +01:00
James Allen	0a44aa9e71	Push into doc updater queue rather than pub/sub for updates	2014-08-07 13:19:10 +01:00
James Allen	dc54fe3d2e	Fix Smoke test to use new title	2014-08-06 11:50:19 +01:00
Henry Oswald	d047d44079	Changed the error messages which are sent down to the client to be translated first ... fixed up tests from titles we check when rendering, deleted them as they never catch anything important, more hastle than they are worth imo.	2014-08-01 14:03:38 +01:00
Henry Oswald	bf56e083cf	removed a load of console.logs	2014-07-25 13:14:19 +01:00
James Allen	1128b45b17	Add in system messages	2014-07-24 13:24:08 +01:00
Henry Oswald	17962426ea	blog returns 404's if the page does not exist in blog	2014-07-23 12:16:52 +01:00
James Allen	1c68ea7328	Don't care if user key has expired when we receive a cursor update	2014-07-21 13:16:07 +01:00
Henry Oswald	554fd7c7d0	change client connection timeout to 15 mins expire in redis	2014-07-17 16:03:53 +01:00
James Allen	37a12e88c1	Show who is online	2014-07-17 15:25:22 +01:00
James Allen	e0f1ed3c10	Use internal url for chat	2014-07-17 11:43:12 +01:00
Henry Oswald	abc4306e06	merge	2014-07-16 13:35:15 +01:00
James Allen	fce271f827	Fix unit tests	2014-07-16 12:01:15 +01:00
Henry Oswald	6982ec63ae	changed get template details to findOne	2014-07-16 11:56:22 +01:00
Henry Oswald	cd60817592	made getting templates details parallel	2014-07-16 11:37:17 +01:00
Henry Oswald	91ca726e66	get template details now includes the markdown description of the project	2014-07-16 11:27:47 +01:00
James Allen	2a3ff3c523	Fix unit tests	2014-07-15 18:33:59 +01:00
Henry Oswald	d39b8a0a05	fixed broken chat test	2014-07-15 14:28:39 +01:00
Henry Oswald	9f82e63a8f	changed :project_id to :Project_id	2014-07-14 22:11:41 +01:00
Henry Oswald	4a71b38721	added route for getting connected users	2014-07-14 16:16:01 +01:00
Henry Oswald	e6dfef6225	added getting connected users controller	2014-07-14 16:01:58 +01:00
Henry Oswald	b0cf0666fa	changed the redis stuf to multi	2014-07-14 15:38:55 +01:00
Henry Oswald	d13676dab2	cursor data is stored in redis	2014-07-14 15:30:55 +01:00
Henry Oswald	61b7bea203	added ttl to the users set to keep redis clean from inactive projects	2014-07-14 13:20:29 +01:00
Henry Oswald	13aaf042d9	connected user manager logic works correctly	2014-07-14 12:41:06 +01:00
Henry Oswald	d737197e95	marksUserAsDisconnected -> markUserAsDisconnected	2014-07-10 17:01:42 +01:00
Henry Oswald	01ad313133	hooked up editor controller to connected users manager	2014-07-10 17:01:19 +01:00
Henry Oswald	e1dd58aca8	fixed algolia settings and removed some console.logs	2014-07-10 16:05:18 +01:00
Henry Oswald	4ccc56723f	added disconnect funtion in connected users manager	2014-07-10 16:05:05 +01:00
Henry Oswald	c0a6f0b7ad	Merge branch 'master-redesign' into master-redesign-templates-and-blog ... Conflicts: public/coffee/ide/editor/directives/aceEditor/auto-complete/AutoCompleteManager.coffee public/coffee/ide/editor/directives/aceEditor/cursor-position/CursorPositionManager.coffee public/coffee/ide/online-users/OnlineUsersManager.coffee public/coffee/ide/track-changes/directives/infiniteScroll.coffee	2014-07-10 15:15:18 +01:00
Henry Oswald	1be8dadbcf	fixed chat tests	2014-07-10 15:12:28 +01:00
Henry Oswald	025d3147ec	blog intergration works	2014-07-10 14:53:53 +01:00
James Allen	6d10c186ad	Sort out escaping issues	2014-07-09 11:05:00 +01:00
James Allen	ff7b7cdd20	Fix smoke tests	2014-07-08 14:29:06 +01:00
James Allen	8c56a46594	Merge branch 'master' into master-redesign	2014-07-08 13:24:48 +01:00
James Allen	2553f51e44	Remove unused subscription downgrade logic	2014-07-08 12:55:29 +01:00
Henry Oswald	581d9ec925	- hooked up chat throughout the stack ... - removed lots of console.logs - working on the auto scrol, doesn't quite work yet	2014-07-08 10:08:38 +01:00
Henry Oswald	d1f907cee5	first simple version of tracking who is active in the editor	2014-07-04 16:18:46 +01:00
Henry Oswald	0d02241b46	linked chat into the editor real time contorller	2014-07-04 13:20:30 +01:00
Henry Oswald	9c35cfd693	very start of chat controllers done	2014-07-04 13:05:55 +01:00
Henry Oswald	77246b2a07	added query string support onto get requests for limit and before	2014-07-02 17:37:30 +01:00
Henry Oswald	8670b543b9	added basic chat handler	2014-07-02 17:28:05 +01:00
Henry Oswald	978e3262b5	added redirects from config file in, used for old template paths	2014-07-01 15:44:12 +01:00
Henry Oswald	000be22f16	Merge branch 'master-redesign' into master-redesign-templates-and-blog ... Conflicts: app/views/project/editor.jade	2014-07-01 15:23:05 +01:00
James Allen	d599cfa7ac	Fix unit tests	2014-07-01 14:19:52 +01:00
Henry Oswald	53fa15d3db	added basic error handling around templates rendering	2014-06-30 17:27:13 +01:00
Henry Oswald	27a97b7fa8	build titles for tempaltes page in web	2014-06-30 17:19:25 +01:00
Henry Oswald	b80f751cb2	templates works basically, needs error handling and few little improvments	2014-06-30 17:08:54 +01:00
James Allen	0d334a560e	fix failing unit test	2014-06-27 14:38:08 +01:00
James Allen	afb953a489	Display cursor name labels	2014-06-26 11:19:05 +01:00
James Allen	9dfbb36a83	Update project settings over http	2014-06-25 13:51:02 +01:00
James Allen	242a866bce	Rename files	2014-06-22 20:08:56 +01:00
James Allen	f931df6084	Allow creation of folders	2014-06-22 14:39:38 +01:00
James Allen	f41534ee4d	Add in creating of files to editor	2014-06-22 12:10:42 +01:00
James Allen	81845dec32	Wire up account settings forms	2014-06-20 11:15:25 +01:00
James Allen	0ef7e54ad3	Allow partial updates to user settings	2014-06-20 09:42:43 +01:00
James Allen	1bcc0a4554	Send 204 rather than redirect when leaving a project	2014-06-19 13:11:01 +01:00
James Allen	2b349039c3	Add in backend multiple project downloading	2014-06-18 16:37:18 +01:00
James Allen	aa8969c652	Merge and fix external forms	2014-06-17 16:19:40 +01:00
James Allen	c56648ab80	Merge branch 'master' into master-redesign ... Conflicts: app/views/project/list.jade public/coffee/list.coffee public/stylesheets/less/list.less public/stylesheets/less/style.less	2014-06-17 11:54:29 +01:00
Henry Oswald	df44792a10	fix tests in user info controller	2014-06-17 11:48:14 +01:00
James Allen	65a1f03768	Send project owner details to client	2014-06-16 13:34:38 +01:00
James Allen	9c5f63817e	Send accessLevel info to client	2014-06-16 12:47:39 +01:00
Henry Oswald	e099a4a100	added default of empty string to user details, fixed route as well	2014-06-11 15:14:07 +01:00
Henry Oswald	473da4fa4c	endpoint for user details is written	2014-06-11 12:46:28 +01:00
Henry Oswald	3aff131428	added controller endpoint for updating user personal info	2014-06-10 22:26:43 +01:00
Henry Oswald	dabed896be	lowercase password reset email	2014-06-10 17:54:29 +01:00
James Allen	5c27ff4430	Don't show diffs of deleted docs (much simpler)	2014-06-06 14:43:45 +01:00
James Allen	02f48be825	Allow docs to be restored	2014-06-06 14:43:45 +01:00
James Allen	cabaf1ae1a	Show deleted documents when viewing history	2014-06-06 14:43:45 +01:00
Henry Oswald	22c467c231	Merge pull request #75 from dfelder/master ... compile current file if top level document #42	2014-06-05 16:42:10 +01:00
James Allen	2fb8620ba0	Allow deleting of projects forever	2014-06-04 12:45:04 +01:00
James Allen	015fd6873f	Allow projects to be restore after being deleted	2014-06-03 17:35:44 +01:00
Daniel Felder	66dcb376a4	added unit tests	2014-06-01 22:28:19 +02:00
Daniel Felder	4320b790bd	adjusting unit tests	2014-06-01 19:26:33 +02:00
Daniel Felder	5ad0ca08f9	adjusting unit tests	2014-06-01 18:16:05 +02:00
James Allen	80c58bb718	Remove deprecated versioning code	2014-05-27 12:56:23 +01:00
James Allen	c1afbc66d9	Don't error if user is not logged in when compiling	2014-05-27 12:33:56 +01:00
James Allen	8f41c6dcb2	Don't automatically clear the cache	2014-05-21 15:20:25 +01:00
Henry Oswald	fd53cf0124	tell tpds sender to use pub url for docstore	2014-05-21 09:15:50 +01:00
James Allen	063f6c7680	Only auto clear CLSI cache on hard error, otherwise prompt user	2014-05-21 08:04:52 +01:00
Henry Oswald	57eb0e2006	Revert "Revert "changed docstore url to /raw for tpds updates"" ... This reverts commit 4af4ff34b0ebad0ce9056a1c1dd5e20f12f6096d.	2014-05-20 13:19:02 +01:00
Henry Oswald	ed9e25450a	Revert "Revert "change send doc lines using tpds to work with stream and doc store"" ... This reverts commit a41299570d07b83111b6a995902a30a67867a5c7.	2014-05-20 13:18:59 +01:00
James Allen	93d418b716	Revert "change send doc lines using tpds to work with stream and doc store" ... This reverts commit ba37710b087b4919c01eed3d8cfeb9d61af43a4d.	2014-05-20 11:14:06 +01:00
James Allen	22c577f9b5	Revert "changed docstore url to /raw for tpds updates" ... This reverts commit f9e60db892d270811c5e38f273d8a1b62b86eeb2.	2014-05-20 11:13:57 +01:00
Henry Oswald	2398b34f28	changed docstore url to /raw for tpds updates	2014-05-20 08:32:39 +01:00
Henry Oswald	d32fe588b7	change send doc lines using tpds to work with stream and doc store	2014-05-19 20:32:48 +01:00
James Allen	a45200dfe3	Automatically clear CLSI cache when compile fails	2014-05-19 16:10:52 +01:00
James Allen	7fed2155be	Differentiate between timeouts, server errors, and LaTeX failures in client	2014-05-19 16:10:52 +01:00
James Allen	6c5a2c2740	Reconfigure internal CLSI call to understand more than just success/failure	2014-05-19 16:10:52 +01:00
Henry Oswald	a53d767eca	changed 412 status code to 400	2014-05-19 14:02:54 +01:00
Henry Oswald	de38cbf595	destroy session when getting project details	2014-05-19 12:01:05 +01:00
Henry Oswald	6f9969d6e1	log out after smoke tests	2014-05-19 11:53:10 +01:00
Henry Oswald	af2de3cdeb	finished off change email	2014-05-19 11:50:32 +01:00
Henry Oswald	7437115967	added controler t change user email	2014-05-16 17:45:48 +01:00
Henry Oswald	50df82697a	Merge branch 'master' of github.com:sharelatex/web-sharelatex	2014-05-16 11:27:09 +01:00
James Allen	2104c69cb9	Stream files into zip in series	2014-05-16 11:26:58 +01:00
Henry Oswald	9419d3a0e5	hooked up the frount end ui to show the email can not be found, ... added client side valdidation on password, removed server side min length check. Just check that it is not 0 len	2014-05-16 11:26:29 +01:00
James Allen	e9c164dc73	Fix test that could never fail	2014-05-16 11:01:36 +01:00
James Allen	240dc2e319	Use crypto.randomBytes	2014-05-16 10:52:31 +01:00
Henry Oswald	9c3c57f2a8	renamed TokenGenerator to PasswordResetTokenHandler and added Expire to function name	2014-05-16 10:43:55 +01:00
Henry Oswald	bf1bb22afd	added rate limiting to password reset endpoint	2014-05-16 10:31:33 +01:00
Henry Oswald	ca1539cac0	added timefreeze to recurly wrapper, don't think it really works but never know *double shurg*	2014-05-15 22:21:49 +01:00
Henry Oswald	133c4759f8	fix tests, whoops	2014-05-15 18:26:00 +01:00
Henry Oswald	24c50189b6	Merge branch 'master' of github.com:sharelatex/web-sharelatex	2014-05-15 18:01:49 +01:00
Henry Oswald	f7245f32d0	cleaned up old password reset cruft	2014-05-15 18:01:43 +01:00
Henry Oswald	96d98329f1	token based reset works	2014-05-15 17:58:25 +01:00
Henry Oswald	1ffd19099b	writen getUserIdFromToken	2014-05-15 17:20:42 +01:00
Henry Oswald	9f901fb1ba	added the token generator and its getNewToken function	2014-05-15 17:16:20 +01:00
Henry Oswald	64688e661d	written password reset controller	2014-05-15 16:50:38 +01:00
Henry Oswald	551e1d465a	written password reset handler	2014-05-15 16:20:23 +01:00
James Allen	93883c7a03	Fix calling of updateDoc	2014-05-15 15:43:04 +01:00
James Allen	f6e85c4140	Don't proxy version number to/from docstore	2014-05-15 12:44:08 +01:00
James Allen	0bddc5552e	Use docstore for updating documents	2014-05-08 15:47:50 +01:00
James Allen	8315de58c7	Proxy get doc requests to the docstore	2014-05-08 13:42:30 +01:00
James Allen	c73b7fae69	Use docstore when creating a new doc	2014-05-07 14:31:46 +01:00
James Allen	2fb8b0e807	Get project without doc lines in getAllFolders	2014-05-06 13:15:18 +01:00
James Allen	6a2370b5be	Use docstore for CLSI request building	2014-05-06 12:54:26 +01:00
James Allen	ca6be52fa0	Revert "Revert "Get doclines from docstore when cloning project"" ... This reverts commit ff79e4d2e659751ec88b3791566f3de24e6b67f4.	2014-05-06 12:36:00 +01:00
James Allen	8af372aff3	Revert "Revert "Get doc lines from docstore when performing batch operations"" ... This reverts commit a700665650b5984fdb3afe5565d62ba810100ebe.	2014-05-06 12:35:27 +01:00
James Allen	9be4feaae1	Revert "Get doc lines from docstore when performing batch operations" ... This reverts commit 9fab27158cb02b0268f8e6aec090f275f062d885.	2014-05-01 17:19:21 +01:00
James Allen	fee632cfc9	Revert "Get doclines from docstore when cloning project" ... This reverts commit 9ab3f5b3fba8a1324c576bbdb9614f70f4c719aa.	2014-05-01 17:19:09 +01:00
James Allen	82b56d0b4f	Get doclines from docstore when cloning project	2014-04-30 16:45:53 +01:00
James Allen	465b5ca9db	Get doc lines from docstore when performing batch operations	2014-04-30 15:49:07 +01:00
James Allen	d82ae02d23	Fix unit tests	2014-04-30 11:23:53 +01:00
James Allen	355a5a020e	Keep reference to deleted docs and delete via docstore	2014-04-30 11:15:29 +01:00
James Allen	f8dec76464	Add DocstoreManager	2014-04-29 17:22:37 +01:00
Henry Oswald	bf2c60f84d	added rename project to list page	2014-04-28 17:47:47 +01:00
Henry Oswald	3655e83ff9	Merge branch 'master' of github.com:sharelatex/web-sharelatex	2014-04-28 16:27:19 +01:00
Henry Oswald	a0fb170878	updated archive module to latest version	2014-04-28 16:27:15 +01:00
James Allen	d528ac21a3	Mark projects as archived, but don't actually delete them	2014-04-28 12:53:43 +01:00
Henry Oswald	39b9c99735	fix unit tests I broke by adding timeout to tags	2014-04-16 17:51:40 +01:00
Henry Oswald	aca2e5639e	added referal allocator to user controller	2014-04-15 13:59:00 +01:00
Henry Oswald	c23f9aa056	be able to get build templates from web as well as templates	2014-04-11 15:15:32 +01:00
Henry Oswald	dbe2dd3078	fix case problem with require of newsletter manager	2014-04-10 22:21:20 +01:00
Henry Oswald	5760e51d6e	moved password change to new user controller with tests	2014-04-10 17:15:18 +01:00
Henry Oswald	cc68fe443f	Moved register function into user registration handler and new user ... controller	2014-04-10 16:32:47 +01:00
Henry Oswald	2ca7c344a3	reformtted reg handler tests	2014-04-10 12:39:13 +01:00
Henry Oswald	e4223c9b5e	fixed test for logout	2014-04-09 17:07:19 +01:00
Henry Oswald	b6b30c3d37	moved logout to new user controller	2014-04-09 16:59:28 +01:00
Henry Oswald	bb7025ad6e	moved user update user settings to user controller	2014-04-09 16:33:54 +01:00
Henry Oswald	bcfc1bee0c	moved unsubscribe endpoint to new user controller	2014-04-09 15:41:19 +01:00
Henry Oswald	0d1421b7ee	fix user deleter test	2014-04-09 15:26:07 +01:00
Henry Oswald	12773c26c2	moved user settings page to the user pages controller	2014-04-09 15:04:47 +01:00
Henry Oswald	823f4a5eb9	created new UserController and put delete user in it	2014-04-09 14:50:12 +01:00
Henry Oswald	37fb959b00	renamed UserController to UserInfoController	2014-04-09 14:45:46 +01:00
Henry Oswald	c55c5032b0	moved delete user to the user controller	2014-04-09 14:43:08 +01:00
Henry Oswald	5f72f13528	moved password reset to user pages controller	2014-04-09 12:26:59 +01:00
Henry Oswald	434fca8874	moved login page to new user page controller	2014-04-09 12:22:57 +01:00
Henry Oswald	fa36891faf	moved register page to new UserPagesController	2014-04-09 12:17:50 +01:00
Henry Oswald	47fb623c4b	dont call enable versioning on join project	2014-04-09 11:45:57 +01:00
Henry Oswald	cba3644777	updated building proj from template, no longer suport other domains and work in different envs	2014-04-09 08:24:23 +01:00
Henry Oswald	88ba45b9dc	moved load project from old proj controller to new one	2014-04-08 17:44:31 +01:00
Henry Oswald	a6bd916fbf	refactored project list, and updated sig for findAllUsersProjects to include err	2014-04-08 16:56:34 +01:00
Henry Oswald	0c921d9188	moved project list to new project controller and added tests	2014-04-08 16:40:12 +01:00
Henry Oswald	15bddae931	moved new project from old proj controller to new one with test	2014-04-08 15:25:27 +01:00
Henry Oswald	6f84f4214f	moved clone project from old proj controller to new one with test	2014-04-08 14:53:33 +01:00
Henry Oswald	5b757ac7ab	moved delete project from old proj controller to new one with test	2014-04-08 14:34:03 +01:00
Henry Oswald	bc07525d71	broken dropbox endpoints for user into its own controller	2014-04-07 21:49:22 +01:00
Henry Oswald	430cf5cea8	created CollaboratorsHandler	2014-04-07 20:46:58 +01:00
Henry Oswald	ff88849444	added a change privlage level for user to new collab handler, won't work yet but is starting point	2014-04-07 16:54:51 +01:00
Henry Oswald	fa78db5c59	moved setPublicAccessLevel to project details handler	2014-04-07 16:07:44 +01:00
Henry Oswald	d229269a69	moved rename project to project details handler	2014-04-07 15:37:40 +01:00
Henry Oswald	9134fa7b4c	moved deleteProject to the project deleter	2014-04-07 13:47:10 +01:00
Henry Oswald	5378890e57	moved rename entity to proj entity handler	2014-04-07 12:18:24 +01:00
Henry Oswald	2288591bae	updated tpds background tests	2014-04-05 12:21:34 +01:00
Henry Oswald	90eac4d52c	moved setRootDoc from collab manager to editor controller	2014-04-04 16:59:45 +01:00
Henry Oswald	7c10b5cd24	moved setPublicAccessLevel from collab manager to editor controller	2014-04-04 16:53:59 +01:00
Henry Oswald	08d1eeba78	moved renameProject from collab manager to editor controller	2014-04-04 16:49:44 +01:00
Henry Oswald	d684f04d4f	moved moveEntity from collab manager to editor controller	2014-04-04 16:40:53 +01:00
Henry Oswald	88e47bbe12	moved renameEntity from collab manager to editor controller	2014-04-04 16:35:02 +01:00
Henry Oswald	3983e77b73	move deleteProject from collab manager to editor controller	2014-04-04 16:21:30 +01:00
Henry Oswald	615e05cb89	moved newsletter manager into its own feature	2014-04-04 15:47:27 +01:00
Henry Oswald	479b37a48c	null check user when getting user id from session	2014-04-02 15:56:54 +01:00
James Allen	9f966996be	Monkey patch request in smoke tests to work around secnding secure cookie over HTTP	2014-04-01 12:53:16 +01:00
Henry Oswald	d41807e667	changed smoke test message	2014-04-01 11:14:31 +01:00
Henry Oswald	eabd440bb6	fixed a couple of tests which broke after async upgrade	2014-03-31 18:05:33 +01:00
James Allen	6318d9ace1	Return features along with project details	2014-03-28 12:47:15 +00:00
James Allen	767b220fab	Allow CLSI cache to be cleared from within the editor	2014-03-27 17:00:41 +00:00
Henry Oswald	ba1371744b	deal with users who may have been deleted but are still inside a subscription group	2014-03-25 16:19:30 +00:00
James Allen	dc2dfaa66c	Flush project to track changes when leaving	2014-03-22 09:34:43 +00:00
Henry Oswald	04bdde4d0d	added logging around publishing templates and changed another templates-api -> templates	2014-03-20 12:53:23 +00:00
Henry Oswald	fc2b42400f	Merge pull request #54 from cwoac/nodemailer-passthrough ... Nodemailer passthrough	2014-03-18 13:09:14 +00:00
James Allen	498e0d4787	Fix unit tests	2014-03-14 11:56:15 +00:00
Henry Oswald	b7104a82e9	added null check when filtering elements	2014-03-12 22:44:15 +00:00
Henry Oswald	e7f8d11e45	added checks on error and response status code for smoke tests to make them easier to follow in logs	2014-03-12 22:29:44 +00:00
Oliver Matthews	efbb17a3b9	move all parameter handling to nodemailer.	2014-03-12 15:38:40 +00:00
James Allen	be64b510e8	Support the new update format from the track changes api	2014-03-11 18:01:14 +00:00
James Allen	afb8bb6a42	Add in restore button to track changes	2014-03-11 12:14:52 +00:00
Henry Oswald	e7602321e9	Merge branch 'master' of github.com:sharelatex/web-sharelatex	2014-03-08 19:01:21 +00:00
Henry Oswald	0e7d241fcf	fixed has subscription check causing bad redirects ... subscription != recurlySubscription	2014-03-08 19:01:00 +00:00
Henry Oswald	f2069c6208	converted all analytics to use new google analytics, removing mixpanel ... and heap. Not tracking subscriptions or cancelations yet.	2014-03-08 19:00:26 +00:00
Oliver Matthews	8989284e10	move from node-ses to nodemailer	2014-03-07 14:08:21 +00:00
James Allen	9851321429	Merge branch 'track_changes_integration'	2014-03-07 13:17:30 +00:00
Henry Oswald	38d3bbb556	changed underscore templating to be standard syntax thoughout fixing main.tex name inserting bug, added tests to catch it in future	2014-03-06 12:28:07 +00:00
James Allen	0468cbc300	Add in proxy to track changes api	2014-03-05 16:31:52 +00:00
Henry Oswald	ffe690afa3	hooked up lifetime emails	2014-03-05 14:56:52 +00:00
Henry Oswald	a9327cb7c5	replyTo is overridable when sending email	2014-03-05 13:33:41 +00:00
Henry Oswald	3c18cc5553	email sending options are configurable from settings	2014-03-05 11:31:40 +00:00
Henry Oswald	5bacb2d784	added settings check on sending lifcycle emails out	2014-03-05 11:22:52 +00:00
Henry Oswald	eb92e5832b	renamed email templator -> email builder	2014-03-05 11:22:34 +00:00
Henry Oswald	360fac9510	setup basic new email feature which is tested, not linked up to real ... events yet	2014-03-04 18:10:06 +00:00
Henry Oswald	67e9d0724d	increased auto compile limits	2014-03-04 15:29:45 +00:00
Henry Oswald	99dc141693	deleteing user account cancels any subscription	2014-03-03 16:22:55 +00:00
Henry Oswald	dd22f1f7a1	added redis connection settings into rate limiter	2014-03-03 11:46:40 +00:00
Henry Oswald	ff8320bce0	added new rate limit file based on redback. converetd auto compile to ... use it.	2014-02-28 17:59:54 +00:00
Henry Oswald	303a0e985b	improved the publish button process so it talks to the templates-api and lets the user know what is going on	2014-02-27 17:35:35 +00:00
Henry Oswald	029077fe6e	downloading a file now sets the filename in header correctly	2014-02-20 22:33:12 +00:00
Henry Oswald	65f849aad0	fixed bug where file uploader was calling cb on read stream not write stream, race condition created.	2014-02-14 18:13:22 +00:00
James Allen	8715690ce9	Intial open source comment	2014-02-12 10:23:40 +00:00