github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-11-21 20:47:08 -05:00
Code Issues Projects Releases Packages Wiki Activity
7410 commits 3 branches 7 tags 206 MiB
Commit graph

7112 commits

Author SHA1 Message Date
Timothée Alby
0f7c0de05d Merge pull request #738 from sharelatex/as-fix-memory-leak 
Fix memory leak setting up spell check
 2018-07-11 10:21:26 +02:00
Tim Alby
791dc0df5b check institution features on features update 2018-07-10 17:53:37 +02:00
James Allen
dc724eae92 Try with parallel tests 2018-07-10 16:42:52 +01:00
James Allen
ba17c1da14 Cache pug templates and modules, by using production environment 2018-07-10 16:15:50 +01:00
Alasdair Smith
5806101bd0 Trigger events instead of calling cursor manager 
This improves readability and prevents race conditions in compat
between Ace/CM
 2018-07-10 16:05:01 +01:00
Alasdair Smith
da77c06774 Refactor saving cursor position to not use Ace event 
This is will help with triggering CM correctly
 2018-07-10 16:05:01 +01:00
Alasdair Smith
ba9fa9a0be Store first visible line instead of scrollTop 
scrollTop is affected by changing viewport size and switching between
Ace and CM
 2018-07-10 16:05:01 +01:00
Alasdair Smith
6c7e942470 Unbind unload listener when destroying editor 2018-07-10 16:05:01 +01:00
Alasdair Smith
e5ad2a8724 Abstract Ace-specific code to adapter 2018-07-10 16:05:01 +01:00
Alasdair Smith
2dc509f43d Fix memory leak setting up spell check 
Switching docs would set up event listeners on Ace without tearing down
any old listeners, which could lead to a memory leak. This tears down
old listeners when detaching from the "old" doc
 2018-07-10 12:25:13 +01: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
Hayden Faulds
158cb58e29 Merge pull request #734 from sharelatex/sk-handle-403-linked-files 
When refreshing or creating linked files, exempt from 403-error-catcher
 2018-07-06 15:09:28 +01:00
Shane Kilkelly
b6880550d5 When refreshing or creating linked files, exempt from 403-error-catcher 2018-07-06 11:29:21 +01:00
James Allen
2ba78179f5 fix linting 2018-07-06 11:17:57 +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
2016be6be4 Merge pull request #691 from sharelatex/ja-resync-subscriptions-script 
Add script that refreshes all v1 users' features in v2
 2018-07-06 11:06:23 +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
James Allen
a54a69159a Revert "Add in option to sync all users" - too dangerous! 
This reverts commit 218e042aba6784f32777f496e1706300845c3f44.
 2018-07-06 09:07:55 +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
Hugh O'Brien
3a33fef42c Merge pull request #722 from sharelatex/hb-publish-layout-updates 
Add border-radius to overbox on submit modal
 2018-07-05 12:12:15 +01:00
Alasdair Smith
b2abcfc3f2 Extract debounced load to service, so can be injected 2018-07-04 15:14:29 +01:00
Alasdair Smith
1f9c1ca6c6 Extracts envs to separate file so they can be exported to rich text 2018-07-04 15:14:29 +01:00
Alasdair Smith
33742d447d Move top hundred snippets to snippets directory 
Allows for more snippets in future. Also makes file name consistent
 2018-07-04 15:14:29 +01:00
Alasdair Smith
88dd233624 Add stylesheet for CodeMirror autocomplete 2018-07-04 15:14:29 +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
e22d2c8da7 Merge pull request #721 from sharelatex/as-rt-search 
Add CodeMirror search styles
 2018-07-03 13:39:47 +01: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
Alberto Fernández-Capel
a1c49b0cf9 Merge pull request #694 from sharelatex/sk-linked-files-warning-when-no-projects 
Add a warning message when there are no other projects to choose.
 2018-07-03 13:38:33 +01:00
Alasdair Smith
1db937cd50 Merge pull request #714 from sharelatex/as-line-nos 
Add rich text line numbers
 2018-07-03 11:11:17 +01:00
Michael Mazour
235534d269 Also include user's v1 ID in export requests 2018-07-03 10:15:51 +01:00
hugh-obrien
a39bcdb0f0 add border-radius to overbox on submit modal 2018-07-02 17:30:17 +01:00
Douglas Lovell
260f927980 Merge pull request #719 from sharelatex/dcl-test-fix 
Small repair to SubscriptionController Test
 2018-07-02 13:16:10 -03:00
Paulo Reis
80b7641652 Update UserEmails acceptance tests to use the new POST-based email deletion endpoint. 2018-07-02 12:31:36 +01:00
Alasdair Smith
04a98c4d91 Merge pull request #697 from sharelatex/pr-user-affilitations 
User affiliations
 2018-07-02 11:36:04 +01:00
Alasdair Smith
cf2aa76fcb Merge pull request #712 from sharelatex/as-fix-shrinkwrap 
Fix missing packages in shrinkwrap
 2018-07-02 11:35:37 +01:00
Alasdair Smith
ec1dbc47bf Merge pull request #703 from sharelatex/as-cm-pos-assertion 
Add assertion method for CodeMirror Pos objects
 2018-07-02 11:35:26 +01:00
Michael Mazour
8436b67260 Include project's v1 ID in export requests 
If a project was imported from v1, include its v1 ID when making an export request back to v1.

Use case: v1 project exported via ScholarOne and then migrated to v2 needs to be linked up to its earlier v1 export records.
 2018-07-02 11:12:42 +01:00
Douglas Lovell
1df5b0b942 Fixup mixed indentation 2018-06-29 19:36:59 -03:00
Douglas Lovell
20835a79e2 Repair not logged in subscription controller test 2018-06-29 19:36:40 -03:00
Alasdair Smith
673e9155ba Add CodeMirror search styles 2018-06-29 15:33:50 +01:00
Alberto Fernández Capel
d76a6ae710 Ensure overleaf settings is defined before linking to the v1 subscription page 2018-06-29 15:33:03 +01:00
Alasdair Smith
ae26237c2b Fix styling for line numbers 
Need to use .CodeMirror to override specificity of CM styles. This
should mean that CM styles use serifed font not monospaced
 2018-06-28 17:04:26 +01:00
Paulo Reis
2e46111b4b Add explanation about using template cache directly. 2018-06-28 17:02:04 +01:00
Paulo Reis
d021cd8e3f Add role hints and deparment hints (when not provided by the uni). 2018-06-28 16:37:36 +01:00
Alberto Fernández Capel
18ded60619 Fix unit tests 2018-06-28 15:28:44 +01:00
Alasdair Smith
cb2c470325 Fix missing packages in shrinkwrap 2018-06-28 15:19:19 +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
Jessica Lawshe
49cf2a8dee Use the MathJax Safe.js extension to prevent XSS 2018-06-27 17:57:07 -05:00
Jessica Lawshe
a739348146 Move MathJax directive to a shared directory 
MathJax parsing now on learn pages, and soon to be on the blog, so move
out of the `ide/chat` directive.
 2018-06-27 17:46:35 -05:00
Jessica Lawshe
3e8168d32f Remove MathJax dependency injection 2018-06-27 17:31:11 -05:00
Jessica Lawshe
a34dcef8b7 Use express local for MathJax path 2018-06-27 17:27:27 -05:00
Jessica Lawshe
90986c1ade Express local for MathJax path 2018-06-27 17:26:39 -05:00
Paulo Reis
270c67df5f Move affiliations form and table into specific file. 2018-06-27 17:08:25 +01:00
Paulo Reis
d1467784bb Avoid showing a comma when the user only has department info. 2018-06-27 14:21:03 +01:00
Paulo Reis
82392978a7 Improve input suggestions template readability. 2018-06-27 13:47:49 +01: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
Paulo Reis
522084a504 Add Keys enum; use it when detecting keystrokes in the input suggestions component. 2018-06-27 12:21:26 +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
Alasdair Smith
3a90a2d004 Add custom assertion method to chai for comparing CM Pos objects 2018-06-27 11:28:29 +01:00
Tim Alby
bebbc433bf proxy static institutions URLs in dev env 2018-06-27 09:59:55 +02:00
Tim Alby
60009c6346 fix delete endpoint 2018-06-26 19:50:12 +02:00
Paulo Reis
3e0ad47873 Avoid suggesting blacklisted emails as university domains. 2018-06-26 16:50:55 +01:00
Paulo Reis
76d8ab11e5 Make sure we infer the university when the user finishes typing his email. 2018-06-26 16:18:53 +01:00
Jessica Lawshe
9f5e976539 Merge pull request #681 from sharelatex/jel-cms-meta-and-btn 
CMS: control of metadata
 2018-06-26 08:19:57 -05:00
Ersun Warncke
193d497d66 fix undefined last name 2018-06-26 07:50:31 -04:00
James Allen
6838904d65 Add in option to sync all users 2018-06-26 11:30:27 +01:00
James Allen
156c417df0 Don't consider current features when assignin bonus 2018-06-26 11:26:07 +01:00
James Allen
de519f545f Add in check to see if user was out of sync 2018-06-26 11:07:13 +01:00
Shane Kilkelly
c5defc9203 Update wording, tell user to create another project 2018-06-26 09:54:58 +01:00
James Allen
fbfb0d6472 Remove conflicting .modal class from upload alerts 2018-06-26 09:09:10 +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
8ac6f4d6f4 Use v1 proxy; even more style adjustments. 2018-06-25 16:13:43 +01:00
James Allen
3a8b5d23d8 Merge pull request #696 from sharelatex/ja-fix-right-click-new-file 
Fix right click new and upload file options
 2018-06-25 16:10:15 +01:00
James Allen
80d7c39044 Fix right click new and upload file options 2018-06-25 15:01:27 +01:00
Paulo Reis
b92dc98b99 Merge branch 'master' into pr-user-affilitations 2018-06-25 14:13:26 +01:00
Paulo Reis
00dfcf66c6 More styling adjustments. 2018-06-25 13:44:43 +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
c81f9c24ed mock affiliations API in acceptance tests 2018-06-25 13:45:46 +02:00
Tim Alby
e41391fb4a ignore affiliations if v1 is not configured 2018-06-25 13:45:46 +02:00
Tim Alby
d3b2a2650f add/remove affiliations when adding/removing emails 2018-06-25 13:45:46 +02:00
Shane Kilkelly
04be842b30 Fix validation of project-output-file, no build_id for imported v1 projects 2018-06-25 12:27:56 +01:00
Shane Kilkelly
b3d17fc753 Add a warning message when there are no other projects to choose. 2018-06-25 11:48:05 +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
Jessica Lawshe
f7a1ded6e1 More general class and visible preview 2018-06-22 13:42:08 -05:00
Jessica Lawshe
af2417bdc5 Move metadata to separate file and update metadata existence check 2018-06-22 13:42:01 -05:00
Paulo Reis
a1da24a86d Styling adjustments. 2018-06-22 16:07:54 +01:00
James Allen
76de9c05f2 Merge pull request #688 from sharelatex/ja-fix-upgrade-prompt-contrast 
Set font colour at entire side bar level
 2018-06-22 16:00:05 +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
be13ed7beb Merge pull request #689 from sharelatex/ja-use-app-name-in-upgrade 
Remove hardcoded ShareLaTeX reference in upgrade blurb
 2018-06-22 15:59:41 +01:00
James Allen
89d5605874 Add script that refreshes all v1 users' features in v2 2018-06-22 15:33:02 +01:00
Nate Stemen
ab159a5169 Merge remote-tracking branch 'origin' into ns-dropdown-on-completion 2018-06-22 10:25:18 -04:00
Nate Stemen
e9f8cceabb fix syntax error 2018-06-22 10:23:33 -04:00
James Allen
c004cdb200 Remove hardcoded ShareLaTeX reference in upgrade blurb 2018-06-22 14:24:41 +01:00
James Allen
9194e25742 Set font colour at entire side bar level 2018-06-22 14:23:43 +01:00
James Allen
0edd2b5fe7 Fix check for hasSubscription 2018-06-22 14:10:20 +01:00
Shane Kilkelly
d76c6c2c22 Merge pull request #682 from sharelatex/sk-copy-linked-file-data-on-clone 
Copy linkedFileData when cloning a project
 2018-06-22 13:22:45 +01:00
Shane Kilkelly
a8222f2e31 Fix tests after sync with master 2018-06-22 13:20:13 +01:00
Shane Kilkelly
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
54cdbd738c If selecting 'output.pdf', set the filename to project-name.pdf 2018-06-22 13:09:18 +01:00
Shane Kilkelly
67dcbff450 Remove linked-files items from the left-menu test controls 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
28257462ae Acceptance tests for project-output-file 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
2cfc2b4738 Only show output files which are images or pdfs 2018-06-22 13:08:13 +01:00
Shane Kilkelly
7fc99a38f8 Better styling on the output-files toggle 2018-06-22 13:08:13 +01:00
Shane Kilkelly
6672a20c2b Enable switching between source and output files 2018-06-22 13:08:13 +01:00
Shane Kilkelly
64ec90f34f Move the isOutputFilesMode flag onto the scope 2018-06-22 13:08:13 +01:00
James Allen
5717496685 Create unified new file modal with linked files 2018-06-22 13:08:13 +01:00
Shane Kilkelly
2da1d57948 Clean up logging 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
ead245721b Mostly working selection of output files from another project 2018-06-22 13:08:13 +01:00
Shane Kilkelly
60ca298db3 WIP 2018-06-22 13:08:13 +01:00
Paulo Reis
9bc70d479c Use university-provided list of departments when available. 2018-06-22 11:24:14 +01:00
Shane Kilkelly
fadbd72837 Add unit test for copying project with linked files 2018-06-22 10:52:49 +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
62ab9dbb98 Rearrange layout to have the new affiliation form within the affiliations table. 2018-06-21 17:18:01 +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
de45c08585 Restrict token look ups by id to not conflict with other tests 2018-06-21 11:00:25 +01:00
James Allen
c07ce3bd89 Merge pull request #675 from sharelatex/ja-fail-on-acceptance-tests 
Bail out with exit code on acceptance test failure
 2018-06-21 10:28:41 +01:00
James Allen
46fbf0c641 Merge pull request #672 from sharelatex/ja-refactor-email-templating 
Refactor email templating
 2018-06-21 10:28:26 +01:00
James Allen
4608a59e3d Store OneTimeTokens in mongo rather than redis 2018-06-21 10:22:08 +01:00
James Allen
0dcbc5facb Send out confirmation emails on register and record confirmedAt date 2018-06-21 10:21:15 +01:00
James Allen
74ca0c4220 Refactor email template system 2018-06-21 10:19:12 +01:00
Paulo Reis
147d74d92a Integrate e-mails table with backend. 2018-06-20 14:22:06 +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
5a7b8f4887 fix broken test for compile controller 2018-06-20 13:44:07 +01:00
Paulo Reis
917776aede Change the UI to gradually show needed fields for affiliations. 2018-06-20 11:37:55 +01:00
Paulo Reis
f3806faeb2 Make git ignore compiled Coffeescript Angular components. 2018-06-20 11:37:34 +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
Paulo Reis
c0241df15c Rewrite service and controller code to send the correct payload according to use case (no uni; known uni; new uni). 2018-06-19 17:10:55 +01:00
Paulo Reis
82f359e735 Support more input configuration attributes in the input suggestions component. 2018-06-19 17:10:02 +01: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
Jessica Lawshe
ad50db858e Merge pull request #664 from sharelatex/jel-pricing-plans-event 
Plans and Pricing Google Analytics events
 2018-06-19 08:48:12 -05: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
James Allen
99728d8f18 Bail out with exit code on acceptance test failure 2018-06-19 13:56: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
James Allen
0c86a7dc9b Revert "Simplify package metadata check" 2018-06-19 08:43:27 +01:00
James Allen
b5e976f8a7 Merge pull request #663 from sharelatex/as-simplify-metadata-check 
Simplify package metadata check
 2018-06-19 08:38:03 +01:00
James Allen
a3e92a8867 Merge pull request #658 from sharelatex/ja-enable-subscriptions 
Add message explaining Collaborator subscription to v1 users
 2018-06-19 08:37:50 +01:00
Nate Stemen
e7038f0a57 remove trailing } for all commands rather than relying on Helpers module 2018-06-18 15:08:25 -04:00
Tim Alby
3d272ca297 replace OldAssetProxy 2018-06-18 18:37:58 +02:00
Nate Stemen
9f309e22a7 refactor AutoCompleteManager 2018-06-18 12:26:45 -04:00
Alberto Fernández Capel
81c102b501 Add method to import invites 2018-06-18 14:48:27 +01:00
Alasdair Smith
f9c074a31e Simplify check for when we are editing lines with metadata commands 2018-06-18 10:52:27 +01:00
Jessica Lawshe
fe225fbbd3 Include event label when features table viewed 2018-06-15 16:29:42 -05:00
Jessica Lawshe
3de1721aa2 Send event to Google Analytics when variant selected 2018-06-15 16:11:45 -05:00
Nate Stemen
b1c0552214 add ref command to snippets 2018-06-15 16:59:35 -04:00
Nate Stemen
4b1bc291cb misspelled variable completionAfterCursor 2018-06-15 10:31:51 -04:00
Nate Stemen
b8787e6e68 modify dropdown to trigger on command completion if possible 2018-06-15 08:56:03 -04:00
Paulo Reis
3ddb8d0bef Add affiliations UI. 2018-06-15 11:33:47 +01:00
Paulo Reis
5ada231d15 Add basic affiliations styles, data services and controller. 2018-06-15 11:33:47 +01:00
Paulo Reis
a8cb126c4b Add UI Select (enhanced select boxes) components. 2018-06-15 11:33:47 +01:00
Paulo Reis
1df8c044ee Add component for auto-completing inputs. 2018-06-15 11:33:47 +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
Timothée Alby
3374aa6c9d Merge pull request #660 from sharelatex/ja-no-legacy-nodemon 
Don't use the legacy watch option in nodemon
 2018-06-14 13:58:38 +02:00
James Allen
dc3fea74f9 Don't use the legacy watch option in nodemon 2018-06-14 10:41:18 +01:00
James Allen
32e14527c6 Make links readable in v2 alerts 2018-06-14 10:31:06 +01:00
James Allen
eda031023c Update subscription thank you page to remove ShareLaTeX references 2018-06-14 10:15:20 +01: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
45fbcfecb3 Merge pull request #659 from sharelatex/ja-fix-subscription-dash 
Add null check to subscription dash
 2018-06-14 09:11:45 +01:00
James Allen
c60b74a2b1 Merge pull request #652 from sharelatex/ja-fix-front-end-test 
Fix frontend HistoryV2ManagerTests
 2018-06-14 09:11:32 +01:00
James Allen
e162ff6256 Merge pull request #654 from sharelatex/ja-explain-error-on-crash 
Explain error if web crashes in acceptance tests
 2018-06-14 09:09:26 +01:00
James Allen
1e7601d647 Add null check to subscription dash 2018-06-14 09:03:14 +01:00
James Allen
e5bd7ce551 Add message explaining Collaborator subscription to v1 users 2018-06-13 17:22:34 +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
406bf1f5fc Don't set pdfDownloadDomain by default 2018-06-13 11:23:33 +01:00
James Allen
76d10e6402 Improve error message readability 2018-06-13 10:40:36 +01:00
Henry Oswald
02110064f7 Merge branch 'master' into ho-clsi-domain 2018-06-13 10:32:51 +01:00
James Allen
f57290382d Explain error if web crashes in acceptance tests 2018-06-13 10:11:38 +01:00
Shane Kilkelly
3baf0836bc Support project-linked-files originating from imported v1 projects 2018-06-13 10:02:54 +01:00
Jessica Lawshe
baa321fa1a Merge pull request #628 from sharelatex/ns-only-one-doc-env 
only suggest one document environment per project
 2018-06-12 08:44:14 -05: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
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
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
1d7accabdd Update group notification for new group invite URL 2018-06-12 09:54:54 +01:00
James Allen
f7532e5854 Merge pull request #619 from sharelatex/afc-email-tokens 
Use emails with tokens for team invites
 2018-06-12 08:30:23 +01:00
James Allen
d4efdb3ede Fix frontend HistoryV2ManagerTests 2018-06-11 15:47:23 +01:00
James Allen
dbd6ea30e9 Improve robustness of email validation 2018-06-11 15:22:42 +01:00
James Allen
ed5bc70350 Tweak front-end layout 2018-06-11 14:20:46 +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
07aedaa92b Merge pull request #645 from sharelatex/jel-add-cms 
Existence check for data from CMS
 2018-06-08 10:14:23 -05:00
Jessica Lawshe
43da34098e Existence check 2018-06-08 10:07:44 -05:00
Jessica Lawshe
ba5b3bb06a Merge pull request #581 from sharelatex/jel-add-cms 
Add CMS
 2018-06-08 07:18:03 -05: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
Alasdair Smith
c53ff0fa84 Merge pull request #618 from sharelatex/as-toolbar-btns 
Rich text toolbar styles
 2018-06-08 10:09:27 +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
Alberto Fernández Capel
c4250e601e Minor copy change Registered -> Accepted invite 2018-06-07 16:53:19 +01:00
Alberto Fernández Capel
85f4a31585 Proper coffee syntax 2018-06-07 16:49:17 +01:00
Jessica Lawshe
6c92238f37 Fix analytics event label for when shouldABTestPlans: false 2018-06-07 10:30:21 -05: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
0516a7ed79 Merge pull request #630 from sharelatex/ta-multi-emails-script 
Script to Backfill Secondary Emails
 2018-06-07 15:40:55 +02: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
Alasdair Smith
c4c9441995 Adjust caret down 2018-06-07 14:13:19 +01:00
Alasdair Smith
ad13eccfa7 Flatten rules for readability 2018-06-07 14:13:19 +01:00
Alasdair Smith
9ae92dbeef Small icon & math icon styling 2018-06-07 14:13:19 +01:00
Alasdair Smith
ea18d606c4 Nicer v2 styles 2018-06-07 14:13:19 +01:00
Alasdair Smith
12d7eb8a46 Adjust styling to work with wrapper 2018-06-07 14:13:19 +01:00
Alasdair Smith
611a6f9c0b Reduce width of overflowed button menu 2018-06-07 14:13:19 +01:00
Alasdair Smith
c5f62d3aa3 Style dropdown & clean up naming 2018-06-07 14:13:19 +01:00
Alasdair Smith
aaf5da877e Style different buttons 2018-06-07 14:10:33 +01:00
Alasdair Smith
7384cfba1a Style wrapped buttons so the toolbar can be resized 2018-06-07 14:09:02 +01:00
Alasdair Smith
bfaa6d8dcc Improve styling of buttons 2018-06-07 14:05:21 +01:00
Alberto Fernández Capel
6639f61a43 Remove extra space between rows 2018-06-07 14:05:10 +01: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
Alasdair Smith
3fa6f4743d Merge pull request #637 from sharelatex/as-fix-clone-owner 
Set the owner object to the current user when cloning a project
 2018-06-07 11:54:09 +01:00
Hayden Faulds
87f6c65b99 Merge pull request #625 from sharelatex/hof-container-teardown-timeout 
reduce acceptance test container teardown timeout to 0
 2018-06-07 11:50:16 +01:00
Alasdair Smith
f3c871a972 Merge pull request #640 from sharelatex/as-fix-leave-quick-action 
Show leave quick action instead of archive for unowned projects
 2018-06-07 11:44:36 +01:00
Alasdair Smith
89ecb9f01b Merge pull request #641 from sharelatex/as-fix-autocomplete-blur 
Fix blurry autocomplete highlight on Chrome
 2018-06-07 11:44:25 +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
Alasdair Smith
4a1c2cf0e0 Set cloned project's owner to current user 
Fixes a bug where cloning a project then selecting to delete it, the wrong
button for deletion is shown (leave instead of archive/delete). This is
because we are using the owner object (which was undefined after cloning) to
determine which button to show
 2018-06-07 11:19:11 +01:00
Tim Alby
458650d456 create script to backfill secondary emails 2018-06-07 11:26:56 +02:00
Alasdair Smith
0900559579 Fix blurrly autocomplete highlight on Chrome 
The blurrly text shadow is back on Chrome. I suspect it maybe intended, not a
bug, so I've fixed it for all versions of Chrome.

I've replaced with font-weight: bold, which visually has the same appearance
 2018-06-06 17:19:12 +01:00
Alberto Fernández Capel
1fc047d08e Fix invitation resend 2018-06-06 17:11:25 +01:00
Alasdair Smith
8f71b104c5 Fix bug where unowned project would show archive quick action instead of leave 
If the user does not own the project, the project can only be left, not
archived. Previously the quick action button was only showing the archive icon
but clicking the button would correctly leave the project. This is confusing,
so this commit corrects to show the leave icon for projects not owned by the
current user
 2018-06-06 16:59:13 +01:00
Alberto Fernández Capel
4885b70016 Better translation key 2018-06-06 16:33:01 +01:00
Alberto Fernández Capel
06efe1910b Replace hardcoded string 2018-06-06 15:36:53 +01:00
Alberto Fernández Capel
b308dcef63 Clean up markup 
- Avoid nested rows without cols in them
- Use .row-spaced instead of empty rows to space content
 2018-06-06 15:36:53 +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
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
Tim Alby
1f6fcafce6 remove default emails attribute on user model 2018-06-06 11:11:57 +02:00
Jessica Lawshe
679d91c4d2 Update default plans view conditional 
Fixes a flash of unwanted content on Firefox
 2018-06-05 12:58:18 -05:00
Nate Stemen
26385718e6 only suggest thebibliography once 2018-06-05 11:02:03 -04: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
Nate Stemen
863128a030 only suggest one document environment in project 2018-06-05 10:08:27 -04:00
Paulo Jorge Reis
1f19e0e7da Merge pull request #627 from sharelatex/hof-fix-tk-in-tests 
move tk call to before sandboxed module call
 2018-06-05 14:15:34 +01:00
Paulo Reis
bfad95ae61 File restore button needs to be smaller to fit the new toolbar height. 2018-06-05 13:59:27 +01:00
Hayden Faulds
0bb37d4991 move tk call to before sandboxed module call 2018-06-05 13:42:26 +01:00
Hayden Faulds
be0fd9a446 reduce container teardown timeout to 0 2018-06-05 11:30:48 +01:00
Paulo Reis
4088c164c9 Update translations; use underscores for keys. 2018-06-05 11:15:39 +01:00
Paulo Reis
8e5032fb34 Merge branch 'master' into pr-v2-history-ui 2018-06-05 10:55:42 +01:00
Paulo Reis
1624639bc8 Merge branch 'pr-v2-history-ui' of github.com:sharelatex/web-sharelatex-internal into pr-v2-history-ui 2018-06-05 10:32:06 +01:00
Paulo Reis
f858786f2d Add i18n. 2018-06-05 10:14:16 +01:00
Jessica Lawshe
8b672dea0d Add unit tests 2018-06-04 14:42:26 -05:00
Jessica Lawshe
b1c988e4c1 Add hover and scroll events 2018-06-04 14:42:26 -05: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
Jessica Lawshe
b4a989f0b7 Add contentful 2018-06-04 09:51:40 -05:00
Jessica Lawshe
64ead238e4 Add meta tags 2018-06-04 09:51:35 -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
hugh-obrien
4c5f186ca2 take custom first and last names from export UI 2018-06-04 13:16:21 +01:00
Hugh O'Brien
63482e0ea0 Merge pull request #617 from sharelatex/hb-check-for-folders-clientside 
Add function to check for existence of folders
 2018-06-04 12:07:25 +01:00
Alasdair Smith
7898a1deca Fix missed snake_case to camelCase, causing bug where projects couldn't be restored 2018-06-04 10:45:23 +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
hugh-obrien
063187b5fc add function to check for existance of folders 2018-05-31 17:03:41 +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
Alasdair Smith
57c56a0853 Merge pull request #565 from sharelatex/as-dash-action-btns 
Add action buttons to v2 dash
 2018-05-31 10:11:20 +01:00
Alasdair Smith
cc9d18d991 Merge pull request #600 from sharelatex/as-refactor-rt-load 
Refactor loading rich text
 2018-05-31 10:11:01 +01:00
Alasdair Smith
00808dfc9a Merge pull request #599 from sharelatex/sk-less-border-radius-on-selects-v2 
On v2, use smaller (default) border radius on select inputs
 2018-05-31 10:10:49 +01:00
Alasdair Smith
5ec238cae8 Switch archive button with restore button for archived projects 2018-05-31 10:05:39 +01:00
Alasdair Smith
7dffc56804 Clone project action button 2018-05-31 10:05:04 +01:00
Alasdair Smith
2354f4156b Download project action button 2018-05-31 10:04:59 +01:00