Commit graph

2902 commits

Author SHA1 Message Date
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
Alasdair Smith
bc1f10a710 Merge pull request #868 from sharelatex/ho-mongo-health-checks
added a /health_check/mongo endpoint
2018-08-30 09:52:20 +01:00
Jessica Lawshe
ad55842c0a Merge pull request #847 from sharelatex/ns-bye-typeform
move typeform survey to google forms
2018-08-29 12:24:12 -05: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
Henry Oswald
360618a7d3 added a /health_check/mongo endpoint 2018-08-29 11:24:01 +01:00
James Allen
6a04800f70 Merge pull request #810 from sharelatex/ja-v2-templates
Split out feature flags into publish and view templates
2018-08-29 10:27:23 +01:00
Shane Kilkelly
1848befcb7 Merge branch 'sk-flush-when-refreshing-linked-file' 2018-08-29 09:27:05 +01:00
Shane Kilkelly
6ee2a83885 Merge pull request #856 from sharelatex/ns-use-regex-test
Use regex test instead of string match
2018-08-29 09:21:40 +01: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
f3a4c7f2ed Remove debug line. 2018-08-28 17:08:46 +01:00
Henry Oswald
425017930a catch newsletter email change error if user already exists on mailing list 2018-08-28 14:26:51 +01:00
Paulo Reis
90b353298d Switch themes at runtime. 2018-08-28 14:12:00 +01:00
Timothée Alby
107e8ce633 Merge pull request #859 from sharelatex/ho-mailchimp-change-email
always set status_if_new
2018-08-28 14:44:59 +02:00
Henry Oswald
60b3e6777f always set status_if_new 2018-08-28 13:34:53 +01:00
Timothée Alby
c2ef2326b9 Merge pull request #857 from sharelatex/ho-mailchimp-change-email
add error handling for changing email in newsletter of user who has not subscribed
2018-08-28 14:03:44 +02:00
Henry Oswald
32749267b8 improve logging on change email in newsletter 2018-08-28 12:46:49 +01:00
Henry Oswald
423bc9312d only set status and merge fields if required
Not strictly nessaserry but it is a bit safer

also improve error reporting for change email
2018-08-28 12:32:20 +01:00
Henry Oswald
75521a4c86 add error handling for changing email in newsletter of user who has not subscribed 2018-08-28 10:47:33 +01:00
Paulo Reis
307a98851d Nest the overall theme property under ace. 2018-08-28 10:10:16 +01:00
Nate Stemen
465b9aefc5 use match in one case and remove and operator 2018-08-27 16:48:44 -04:00
Nate Stemen
4d991aa176 Merge branch 'master' into ns-use-regex-test 2018-08-27 14:26:51 -04:00
Nate Stemen
ebea8a8633 use regex test instead of match when only bool needed 2018-08-27 14:25:01 -04: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
Nate Stemen
6d00f38a71 move typeform survey to google forms 2018-08-23 12:34:13 -04:00
Hugh O'Brien
29253c5a93 Merge branch 'master' into hb-fetch-licences-graph 2018-08-23 16:11:43 +01:00
hugh-obrien
bd721d52f4 review fixes and moving licences endpoint to module 2018-08-23 14:39:48 +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
Henry Oswald
473063cf3d set rclient.expire for server ttl even when there is no server id 2018-08-21 10:36:18 +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
Shane Kilkelly
034586b296 Flush source project to mongo before linked-file create/refresh 2018-08-20 12:19:59 +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
Alasdair Smith
b9e63421a8 Merge pull request #814 from sharelatex/as-fix-delete-modal-copy
Fix delete wording on archive modal
2018-08-16 16:33:30 +01:00
Alasdair Smith
38689dbb1d Merge pull request #802 from sharelatex/as-sl-redirect
Add feature flag for redirecting SL to v2
2018-08-16 16:32:55 +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
Henry Oswald
1e1f26b350 Merge pull request #818 from sharelatex/ho-backendgroup-config
configure backend group name via config files
2018-08-16 10:37:14 +01:00
Henry Oswald
af6e7758d3 configure backend group name via config files 2018-08-15 15:26:22 +01:00
Alasdair Smith
985344c0d7 Use redirect setting instead of re-using setting that coincidentally would be flipped on the same day 2018-08-15 15:22:06 +01:00
Alasdair Smith
fc0b9df14c Add feature flag for redirecting SL to v2 2018-08-15 15:22:05 +01:00
Timothée Alby
5e488dcab7 Merge pull request #813 from sharelatex/ta-enable-affiliations-ui
Enable Affiliations UI
2018-08-14 16:40:35 +02:00
Alasdair Smith
db16fad6c9 Fix 2018-08-13 14:25:38 +01:00
Alasdair Smith
085c2529d9 Inject isOverleaf setting globally 2018-08-13 14:25:38 +01:00
Tim Alby
bfb2f636cd enable affiliations UI 2018-08-13 14:59:39 +02:00
Brian Gough
19dfe5fc8b intial version of user setting for texlive imageName 2018-08-13 10:53:43 +01:00
Alasdair Smith
d7a341f59b Merge pull request #808 from sharelatex/ta-import-affiliations
Allow confirmed_at date to be specified
2018-08-13 09:47:10 +01:00
James Allen
ff506b2b03 Make publishing and viewing templates separate features 2018-08-10 17:16:49 +01:00
James Allen
0f8fe53bc9 Allow confirmed_at date to be specified 2018-08-10 17:48:43 +02:00
Tim Alby
197e7ce8ab refactor institutions getter 2018-08-10 13:40:25 +02:00
Hugh O'Brien
0af23718ba Merge pull request #749 from sharelatex/hb-activate-submit-modal
Activate publish modal
2018-08-09 09:44:41 +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
df161d3ece change newsletter log to info on process boot 2018-08-08 14:32:36 +01:00
Henry Oswald
c68366155e remove sanitize = require('sanitizer') not used anywhere 2018-08-08 14:14:56 +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
6208e9f2d0 add changeEmail function to newsletter manager
not actually called
2018-08-07 21:38:31 +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
Henry Oswald
fa37caef58 remove null check on mailchimp at top of file
I didn't like the if statment being after the require, mailchimp
could also be null and called elsewhere by acident
2018-08-06 12:37:18 +01:00
Brian Gough
7da8a926bb increase bodyparser limit to 64kb
16kb is not enough for bibtex files with more escaping.
2018-08-06 10:52:10 +01:00
Henry Oswald
17a63258c6 changed newsletter to use mailchimp 2018-08-04 17:52:12 +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
James Allen
b1228b7eb2 Merge pull request #789 from sharelatex/mm-exports-specify-clsi-image
Add compiler and imageName to export API request
2018-08-01 11:43:20 +01:00
Henry Oswald
89efa7e83e add null check on response 2018-07-31 13:07:57 +01:00
Henry Oswald
5bb3acc1eb fix metrics sending to clsi 2018-07-31 12:56:35 +01:00
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
b04c7d2ffe send clsi response codes to graphite 2018-07-30 18:16:52 +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
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
4130a934a3 Merge pull request #779 from sharelatex/ho-ClsiCookieManager-bug-fix
fix router issue where ClsiCookieManager isn't calling a function to set
2018-07-24 10:04:41 +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
Henry Oswald
e79501340c fix router issue where ClsiCookieManager isn't calling a function to set
the backend
2018-07-23 16:05:26 +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
Henry Oswald
413721ebf9 look at more chars for if the server is in dark mode
v2-dark.overleaf.com also needs to be marked as dark
2018-07-18 13:49:53 +01:00
Alasdair Smith
d36d3f2a0e Actually enable rich text 2018-07-18 09:26:03 +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
Jessica Lawshe
64a257dae2 Merge pull request #708 from sharelatex/jel-mathjax
MathJax - library path, directive, and use `Safe` extension
2018-07-17 09:32:06 -05: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
5821d2c981 Merge pull request #755 from sharelatex/afc-import-team-names
Import team names
2018-07-17 10:05:38 +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
Alberto Fernández Capel
79ada88b13 Add team name to subscription model 2018-07-13 11:15:58 +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
Paulo Reis
59008b4a51 Show university custom departments when changing affiliations; fix Features typo. 2018-07-12 16:37:09 +01:00
Paulo Reis
a759828ece Update feature flag for affiliations; use it in the router; minor style adjustments. 2018-07-12 16:37:09 +01:00
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
abcfa0b0d2 Store manager ids in an array 2018-07-12 16:35:27 +01:00
hugh-obrien
367b16a3ab removes checking params for submit modal 2018-07-11 16:36:03 +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
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
Jessica Lawshe
90986c1ade Express local for MathJax path 2018-06-27 17:26:39 -05: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
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
096d3f28a1 Move the handleError function into the LinkedFilesController 2018-06-22 13:09:18 +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
dfb4898be5 Move getFileById to the LinkedFilesHandler module 2018-06-22 13:09:18 +01:00
Shane Kilkelly
c8012f2968 Cleaner import of errors 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
d93eb448e3 Move Clsi logic to ClsiManager 2018-06-22 13:09:18 +01:00
Shane Kilkelly
708e809df6 Use errors from ProjectFileAgent 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
a313184c71 Handle linked-output-files from v1 imports 2018-06-22 13:09:18 +01:00
Shane Kilkelly
48a4f6c4c4 Fix error handling for failing to get output file 2018-06-22 13:08:13 +01:00
Shane Kilkelly
87474ce060 Remove commentary 2018-06-22 13:08:13 +01:00
Shane Kilkelly
d4beba24b6 Backend for project output file agent 2018-06-22 13:08:13 +01:00
Shane Kilkelly
e916d96792 WIP: basic backend for project-output-file agent 2018-06-22 13:08:13 +01:00
Shane Kilkelly
5abb745e05 Copy linkedFileData when cloning a project 2018-06-22 10:00:39 +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
Paulo Reis
b16ebc1843 Read user email from the URL in DELETE requests. 2018-06-21 17:16:42 +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
James Allen
74ca0c4220 Refactor email template system 2018-06-21 10:19:12 +01:00
Henry Oswald
4cb78a5797 move start time inside each clsi request as they are run in series now 2018-06-20 14:15:42 +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
Alasdair Smith
8de9e9fae4 Use error type instead of error message to check v1 connection error 2018-06-19 16:25:56 +01:00
Alasdair Smith
82a8e37071 Handle V1 connection refused when getting v1 subscription 2018-06-19 16:25:31 +01:00
Alasdair Smith
8492373a14 Add V1ConnectionError 2018-06-19 16:24:27 +01:00
Henry Oswald
b5581c4d40 Merge branch 'master' into ho-clsi-double-backend 2018-06-19 14:55:18 +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
hugh-obrien
fb9ca430de export status endpoint 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
Henry Oswald
b24b110037 Merge pull request #647 from sharelatex/ho-clsi-domain
PDF download takes optional domain paramater
2018-06-13 11:30:17 +01:00
Henry Oswald
02110064f7 Merge branch 'master' into ho-clsi-domain 2018-06-13 10:32:51 +01:00
Shane Kilkelly
3baf0836bc Support project-linked-files originating from imported v1 projects 2018-06-13 10:02:54 +01:00
James Allen
b00a79ff1c Redirect to v1 plans page from v2 2018-06-12 13:52:47 +01:00
James Allen
a417dc8ff4 v1Subscription -> v1Subscriptions 2018-06-12 13:52:47 +01:00
James Allen
034e50760e Add flag that can disable plans page 2018-06-12 13:52:47 +01:00
James Allen
ce60e6941c Check with v1 before allowing a new subscription 2018-06-12 13:52:47 +01:00
James Allen
9d84263463 Fetch subscription details from v1 and display to user 2018-06-12 13:52:46 +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
dbd6ea30e9 Improve robustness of email validation 2018-06-11 15:22:42 +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
James Allen
b716f59442 Remove deprecated removeEmailInviteFromGroup 2018-06-11 14:19:47 +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
Henry Oswald
75c9489c06 PDF Downloads work, not tested on large pdf's yet 2018-06-08 17:17:00 +01: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
e7e429a963 Merge pull request #605 from sharelatex/afc-update-user-references
Add method to update user references
2018-06-08 11:29:25 +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
10da4fc5f7 Merge pull request #585 from sharelatex/afc-team-overleaf-id
Add overleaf id to the Subscription (team) schema
2018-06-08 11:27:15 +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
Alberto Fernández Capel
85f4a31585 Proper coffee syntax 2018-06-07 16:49:17 +01: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
Alberto Fernández Capel
30b935befd Prevent double rendering error 2018-06-07 16:12:02 +01:00
Alberto Fernández Capel
d1b1e6c299 Do not include the Licence ending in domain invites
So the message reads like "University of Notre Dame has invited
you to join a team on Overleaf" instead of ""University of Notre
Dame licence..."
2018-06-07 16:12:02 +01:00
Alberto Fernández Capel
88d12b43ac Make CTA message match regular message 2018-06-07 16:12:02 +01:00
Alberto Fernández Capel
5e70825c94 Rename view variable to invite
Makes the meaning more explicit
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
hugh-obrien
c684fc3383 fix first/last name check bug 2018-06-07 12:57:01 +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
16cb5e0d35 Propagate the error further up the stack
Useful for error reporting and metrics.
2018-06-06 15:36:53 +01:00
Alberto Fernández Capel
8a317b5bfe Better wording 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
3cb499a3c2 add comment 2018-06-06 15:46:41 +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
Tim Alby
1f6fcafce6 remove default emails attribute on user model 2018-06-06 11:11:57 +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
Paulo Reis
8e5032fb34 Merge branch 'master' into pr-v2-history-ui 2018-06-05 10:55:42 +01:00
Jessica Lawshe
10cf5825a5 Add plans variant
Also, fix for multiple quotes. Without a closing quote subsequent quotes are considered nested, and
will use a ‘ instead of “

Also, move repeated elements to partials
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
4c5f186ca2 take custom first and last names from export UI 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
b0b2546e43 Remove dead code 2018-06-01 16:45:36 +01:00
Alberto Fernández Capel
a73a869d03 I can haz some grammar 2018-06-01 16:17:11 +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
Alberto Fernández Capel
89735f4b8e Keep method name for compatibility 2018-06-01 15:36:00 +01:00
James Allen
cfbb5c8f24 Remove some dead code 2018-06-01 14:55:07 +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
Alberto Fernández Capel
1c485c1884 Improve error handling 2018-05-31 16:42:09 +01:00
Alberto Fernández Capel
d262de14d6 Use team invites to join domain licensed teams 2018-05-31 16:15:47 +01:00
Brian Gough
fef667a738 Merge pull request #614 from sharelatex/ja-restrict-restore
Don't allow read-only users to restore
2018-05-31 15:52:40 +01:00
Brian Gough
c4f3a12ce5 add missing locking to copyFileFromExistingProject 2018-05-31 14:51:32 +01:00
Alberto Fernández Capel
39c8595c27 Split SubscriptionGroupInvites and rename to DomainSubscriptionJoin
To not cause confusion with team invites.
They are not really an invite because they are user initiated, but
more of a user choosing to join a team.
2018-05-31 14:25:47 +01:00
James Allen
f5367985c3 Don't allow read-only users to restore 2018-05-31 13:44:37 +01:00
hugh-obrien
d47e845367 add v1 template tests 2018-05-31 13:26:54 +01:00
Alberto Fernández Capel
11edfde153 Accept & revoke team invites 2018-05-31 11:54:50 +01:00
hugh-obrien
7f86ddc72c extract v1 templates code to web 2018-05-31 11:12:31 +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
Henry Oswald
a747480425 add references host into settings 2018-05-30 15:28:59 +01:00
Alberto Fernández Capel
9aa95cb0d5 Show team invites 2018-05-30 13:06:27 +01:00
James Allen
e0e88b25fe Make agrument checking more robust 2018-05-30 12:48:08 +01:00
Alberto Fernández Capel
7e09c0e0b1 First stab at email token invites (WIP) 2018-05-30 11:29:21 +01:00
Paulo Reis
637c492e6e Merge branch 'master' into pr-v2-history-ui 2018-05-30 11:24:33 +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
Timothée Alby
6db3bf59a6 Merge pull request #586 from sharelatex/ta-refactor-user-getter
Canonical Way to Get Users by Email
2018-05-29 17:56:59 +02:00
Timothée Alby
eeff32bf4f Merge pull request #584 from sharelatex/ta-remove-deprecated-method
Remove getUserOrCreateHoldingAccount Function
2018-05-29 17:56:42 +02:00
Alberto Fernández Capel
b52fbdbfa4 Unit test SubscriptionGroupHandler.replaceUserReferencesInGroups 2018-05-29 15:37:04 +01:00
Jessica Lawshe
85ee5a36c8 Merge pull request #587 from sharelatex/jel-contact
Move contact form to modules
2018-05-29 09:20:05 -05:00
Alberto Fernández Capel
259d690f7c Add method to update user references 2018-05-29 12:00:22 +01:00
Shane Kilkelly
dccac6302e Use a decorateLinkedFileData function on server to add project name 2018-05-29 10:07:31 +01:00
Shane Kilkelly
92fb83e665 Use the correct linkedFileData var 2018-05-29 10:05:50 +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
bc7d6a64ed Add a trailing comma 2018-05-25 16:01:37 +01:00
Shane Kilkelly
c8a8fe6af7 Use Agent.handleError in case checkAuth produces an error 2018-05-25 16:01:11 +01:00
Jessica Lawshe
868083676f Move contact form 2018-05-25 08:50:38 -05:00
Hayden Faulds
29f7ce0bbf Merge pull request #576 from sharelatex/mm-handle-export-error
Handle error in ExportsController
2018-05-25 13:22:18 +01:00
Shane Kilkelly
0cb5beb689 Merge branch 'master' into sk-linked-files-from-project 2018-05-24 13:47:28 +01:00
Shane Kilkelly
b2a68cb911 Merge pull request #582 from sharelatex/sk-add-test-controls-panel
Add a "Test Controls" section to the left-panel
2018-05-24 11:41:10 +01:00
Shane Kilkelly
8766b5d487 DRY up writing to dump-folder in FileWriter 2018-05-24 11:30:29 +01:00
Shane Kilkelly
b5e8ed81b9 Better sanitization and validation for project-linked-file 2018-05-24 11:30:03 +01:00
Shane Kilkelly
1cbc901492 Add a checkAuth function to linked-file agents 2018-05-24 11:29:37 +01:00
Shane Kilkelly
3181f624a7 Remove obsolete auth check 2018-05-24 10:22:17 +01:00
James Allen
7bcd285bb1 Add Dropbox test for Front widget too 2018-05-24 09:51:29 +01:00
Alberto Fernández Capel
8a55994f64 Ensure a team overleaf id is unique 2018-05-23 16:11:28 +01:00
Alberto Fernández Capel
c8977ab9d6 Add overleaf id to user schema 2018-05-23 15:23:46 +01:00
Shane Kilkelly
ba9143fc3c Show test-controls for admin users by default 2018-05-23 12:55:49 +01:00
Shane Kilkelly
561b62f7db Add a hidden 'Test Controls' section to the left-menu.
This is to be used for hidden features that are not yet ready to ship,
and would otherwise be hidden behind a console command.
Append `?tc=true` to the project url to reveal this panel.
2018-05-23 12:37:42 +01:00
Shane Kilkelly
295425e791 Check that user can read a project on entities-json route 2018-05-23 11:34:55 +01:00
Shane Kilkelly
6a5af88e12 Remove stray comment 2018-05-23 11:32:00 +01:00
Shane Kilkelly
4daf062be9 Add unit test for ProjectController.projectEntitiesJson 2018-05-22 16:40:39 +01:00
Shane Kilkelly
691eec48ba Merge branch 'master' into sk-linked-files-from-project 2018-05-22 15:39:09 +01:00
Shane Kilkelly
73184c063e Be more specific about the source-file-not-found error case 2018-05-22 11:36:35 +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
4deaf7865d Guard against no apis.v1 setting 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
Paulo Reis
2a52eab8d6 Proxy history filetree requests through web. 2018-05-21 15:10:46 +01:00
Shane Kilkelly
7d8c7bebe2 Remove commented-out code 2018-05-21 10:17:00 +01:00
Shane Kilkelly
ee1b32eee1 Check for case where the source file is not found 2018-05-21 10:12:41 +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
19e07485bc Handle error in ExportsController 2018-05-18 15:08:33 +01:00
Shane Kilkelly
94a599d530 Fix the reloading of file view after refreshing linked file 2018-05-18 10:35:02 +01:00
Hugh O'Brien
24b4f9c46f Merge pull request #436 from sharelatex/mm-project-export
Project exports spike
2018-05-18 10:31:15 +01:00
James Allen
e7a4aeaf79 Merge pull request #560 from sharelatex/ja-enable-v2-for-all
Enable the v2 banner for everyone if showV2Banner is set
2018-05-17 11:55:21 +01:00
Shane Kilkelly
2345b77ea7 Validate project-linked-file data before doing import 2018-05-17 10:51:58 +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
33b4a1768b Merge branch 'master' into sk-linked-files-from-project 2018-05-15 10:53:59 +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
Hayden Faulds
3fb3daaee7 Merge pull request #529 from sharelatex/sk-remove-templates-from-v2
Add `templates` to the `Features.hasFeature` function
2018-05-14 10:57:28 +01:00
James Allen
58b5d67bdd Enable the v2 banner for everyone if showV2Banner is set 2018-05-14 10:29:42 +01:00
Nate Stemen
d108b11bc0 Add latexmkrc in FileTypeManager 2018-05-10 16:59:58 -04:00
James Allen
dee96920b0 Allow font family and line height to be user configurable 2018-05-10 18:03:54 +01:00
Hayden Faulds
9ccdf073c4 accept attributes rather than projectHistoryId to ProjectCreationHandler 2018-05-10 11:39:23 +01:00
James Allen
78aefc2871 Merge pull request #542 from sharelatex/ja-match-front-to-v1
Update font and line spacing in Ace to match OL v1
2018-05-09 12:24:37 +01:00
Brian Gough
2bb2d9615f added comment about using a project entity iterator 2018-05-08 13:37:33 +01:00
Brian Gough
f34ce5b12b rename _updateProjectStructure to _updateProjectStructureWithDeletedEntity 2018-05-08 13:37:33 +01:00
Brian Gough
1278e2da45 fix project structure version when deleting folder 2018-05-08 13:37:33 +01:00
Brian Gough
24764f66ff Merge pull request #544 from sharelatex/bg-add-lockvalue-to-lockmanager
improve locking in web
2018-05-08 11:11:32 +01:00
Hugh O'Brien
57f07fb5fe Merge pull request #518 from sharelatex/hob-publish-modal-qs
Publish modal accessible from query string
2018-05-08 09:40:41 +01:00
Brian Gough
afd4a10a19 retry lock with exponential backoff 2018-05-04 15:02:36 +01:00
James Allen
1aadd7d369 Configure line height and font family separately for v2 2018-05-04 14:05:20 +01:00
Brian Gough
e414100c41 add support for unique lock values 2018-05-04 13:22:33 +01:00
Shane Kilkelly
30beb098ab Sort the project entities by path 2018-05-04 11:06:59 +01:00
Shane Kilkelly
08263180fa Add project_id to the entities payload 2018-05-04 11:03:54 +01:00
Shane Kilkelly
3c3ce2010a Add endpoint to list entities within a project 2018-05-04 10:45:13 +01:00
Shane Kilkelly
4925bfe536 Add an endpoint to get users projects as json 2018-05-04 09:44:13 +01:00
Shane Kilkelly
87fb226c3e Fix invocation of getFileStream 2018-05-03 15:30:44 +01:00
Shane Kilkelly
5cb85c0332 WIP: Add ProjectFileAgent 2018-05-03 14:29:03 +01:00
Hayden Faulds
ba0e06d0fe add V1HistoryNotSyncedError 2018-05-02 13:18:43 +01:00
Shane Kilkelly
af70ef0dc4 Add templates to the hasFeature function 2018-05-01 14:01:52 +01:00
James Allen
4c7364fd01 Merge pull request #503 from sharelatex/ja-reorder-compile-rate-limits
Re-order compile rate limits
2018-05-01 08:48:22 +01:00
James Allen
d454be8053 Bring down proportion to 10% 2018-04-30 17:19:21 +01:00
James Allen
6399621d1f Show front widget for paid and sampled free users 2018-04-30 17:13:57 +01:00
hugh-obrien
157efa6d96 make publish modal accessible from query string 2018-04-27 15:50:11 +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
d9a7b1248a Re-order compile rate limits to do project/user check before everyone check 2018-04-17 14:43:54 +01:00
James Allen
9e525702c1 Merge branch 'master' into ja-restore-files 2018-04-16 16:14:31 +01:00
Alasdair Smith
3af10733cc Replace hard coded rich text hashed file path with registration system 2018-04-16 14:14:49 +01:00
Hayden Faulds
7755a7cc1f add overleaf to projections for project structure updates 2018-04-13 13:45:07 +01:00
Hayden Faulds
9ef40902ca send projectHistoryId with resync requests 2018-04-13 13:45:03 +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
Hugh O'Brien
2d3f169c49 Merge pull request #473 from sharelatex/hob-publish-modal-setup
Publish modal web setup
2018-04-12 14:01:18 +01:00
Brian Gough
4115a35773 Merge pull request #445 from sharelatex/bg-separate-uploads-and-locking
replace files and separate uploads and locking (connects to overleaf/sharelatex#422)
2018-04-12 09:52:02 +01:00
Alasdair Smith
60a28f7173 Fix hashed file path for rich text 2018-04-11 12:00:36 +01:00
hugh-obrien
a250004036 initial publish modal setup 2018-04-10 15:59:24 +01:00
Alasdair Smith
35cc5bf19c Add defensive check for req.query, fixing tests 2018-04-10 10:38:40 +01:00
Brian Gough
882b555433 create new file on replace 2018-04-09 12:05:08 +01:00
Brian Gough
1a68f768d4 rename internal method uploadFile to _uploadFile 2018-04-09 12:05:08 +01:00
Brian Gough
38dab1c82c clean up whitespace 2018-04-09 12:05:08 +01:00
Brian Gough
e29c657c8a preserve original callback signature for addFile 2018-04-09 12:05:08 +01:00
Brian Gough
b551f3c7e9 fix indentation 2018-04-09 12:05:08 +01:00
Brian Gough
61b192fb2c fix indentation of comment 2018-04-09 12:05:07 +01:00
Brian Gough
fe8897d757 refactor addFile and addFileWithOutUpdatingHistory 2018-04-09 12:05:07 +01:00
Brian Gough
d949338ed4 separate out file uploads 2018-04-09 12:05:07 +01:00
Brian Gough
cdfa2de68d add comment about upsert and locking 2018-04-09 12:05:07 +01:00
Brian Gough
baec4eb195 move uploads outside the lock 2018-04-09 12:05:07 +01:00
Alasdair Smith
eb05be6eb3 Remove unused feature flag 2018-04-06 17:00:27 +01:00
Alasdair Smith
d433a88158 Pass rich text flag if query string is set 2018-04-06 16:58:12 +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
075db1e5b9 Remove stray console.log 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
James Allen
0a00dea610 Merge pull request #469 from sharelatex/ja-feature-flag-rename
Split references feature flag into mendeley and referencesSearch
2018-04-03 11:53:58 +01:00
Paulo Reis
bd3c12cf90 Make sure the layout lib knows about the resizer width in v2. 2018-03-29 10:35:17 +01:00