Paulo Reis
85cf518457
Avoid showing the email input when viewing the full affiliations UI; disable affiliations when using SAML and LDAP authentication strategies.
2018-07-12 16:37:09 +01:00
Alberto Fernández Capel
40c1f67561
Check that the subscription is a group before exporting it to csv
...
I removed this check by mistake, just taking it back.
2018-07-11 12:10:43 +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
cb449f4b75
Delete a subscription on expiry, rather than set personal plan code
2018-07-10 10:31:25 +01:00
James Allen
f5ea7f2d77
Merge pull request #730 from sharelatex/sk-handle-orphaned-mendeley-linked-files
...
Add a new error type to LinkedFiles: FileCannotRefreshError
2018-07-06 11:06:51 +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
James Allen
dad4bad9eb
Merge pull request #700 from sharelatex/ew-fix-undefined-last-name
...
fix undefined last name
2018-07-06 11:06:12 +01:00
Tim Alby
b78212290a
handle dynamic Proxy URLs
2018-07-06 12:03:47 +02:00
James Allen
b902821c07
Return blank features, not default features if no bonuses
2018-07-06 09:09:41 +01: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
08aab38470
Merge pull request #725 from sharelatex/ta-disable-emails-endpoint
...
Disable Emails Endpoint when externalAuthenticationSystemUsed is True
2018-07-05 15:57:31 +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
Shane Kilkelly
f125a755bf
Add a new error type to LinkedFiles: FileCannotRefreshError
2018-07-05 12:13:07 +01: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
3581aa3ccb
disable emails endpoint when externalAuthenticationSystemUsed is true
2018-07-04 15:19:15 +02: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
Alasdair Smith
04a98c4d91
Merge pull request #697 from sharelatex/pr-user-affilitations
...
User affiliations
2018-07-02 11:36:04 +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
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
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
7e5ababe66
Ensure we can import both user and user stubs to teams
2018-06-27 12:09:58 +01:00
Tim Alby
60009c6346
fix delete endpoint
2018-06-26 19:50:12 +02:00
Ersun Warncke
193d497d66
fix undefined last name
2018-06-26 07:50:31 -04:00
James Allen
156c417df0
Don't consider current features when assignin bonus
2018-06-26 11:26:07 +01:00
Paulo Reis
70b3df5a0e
Remove logs.
2018-06-25 17:32:39 +01:00
Paulo Reis
e7f819fbdd
Hide affiliations UI behind feature flag.
2018-06-25 17:06:23 +01:00
Paulo Reis
b92dc98b99
Merge branch 'master' into pr-user-affilitations
2018-06-25 14:13:26 +01:00
Henry Oswald
c1a8d8b31a
Merge branch 'master' into ho-clsi-double-backend
2018-06-25 13:43:40 +01:00
Tim Alby
7a3fcf6d2c
change error message on email update failure
2018-06-25 13:47:22 +02: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
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
