hugh-obrien
|
8792e600d2
|
authenticate publish menu zip downloads
|
2018-07-31 12:43:39 +01:00 |
|
hugh-obrien
|
3532a29d50
|
allow fetching of export zips
|
2018-07-30 19:14:59 +01:00 |
|
Henry Oswald
|
3cf060dbac
|
Merge branch 'master' of github.com:sharelatex/web-sharelatex-internal
|
2018-07-26 16:04:23 +01:00 |
|
Henry Oswald
|
d484c36c6d
|
improve clsi logging
|
2018-07-26 16:04:14 +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 |
|
Alasdair Smith
|
62f69a4bcd
|
Fix case sensitivity
|
2018-07-18 09:26:03 +01:00 |
|
Alasdair Smith
|
9cd3f32365
|
Use hasFeature function instead of new standalone function
|
2018-07-18 09:26:03 +01:00 |
|
Alasdair Smith
|
4202b9c717
|
Use hard-coded feature flag for rich text
|
2018-07-18 09:26:03 +01:00 |
|
Shane Kilkelly
|
299de369e5
|
Refactor the way logins are finished off and sessions established
|
2018-07-17 16:27:24 +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
|
f6def039bf
|
code review feedback
|
2018-07-16 16:06:17 +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 |
|
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 |
|
Shane Kilkelly
|
b4f8108277
|
Move the pre-login async code into a helper function
|
2018-07-13 11:51:11 +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
|
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 |
|
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
|
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 |
|
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 |
|