6822 commits

Author	SHA1	Message	Date
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
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