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
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
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
hugh-obrien
39f580d6ba
fixing broken exports test
2018-09-18 10:13:33 +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
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
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
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
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
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
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
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
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
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
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
5b989f0a8e
Merge pull request #759 from sharelatex/sk-login-with-v1-credentials
...
Login with v1 credentials
2018-07-24 10:04:02 +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
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
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
Alberto Fernández Capel
46a1cdc510
Use the admin_ids array to query for subscriptions
2018-07-13 09:38:58 +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
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
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
Michael Mazour
235534d269
Also include user's v1 ID in export requests
2018-07-03 10:15:51 +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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
cae09028ff
Fix tests
2018-03-05 10:37:53 +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
Brian Gough
af494dedf2
check project structure version in unit 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
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
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
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
Hayden Faulds
adc90b68e7
use gauge not inc
2018-02-21 13:25:25 +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
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
ea9976994a
update unit tests for duplicate checks
2018-01-25 17:09: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
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
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
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
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
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
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
James Allen
62de9d8946
Move test/UnitTests -> unit/test
2017-11-27 17:10:22 +00:00