6709 commits

Author	SHA1	Message	Date
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
Alberto Fernández Capel	4366a0ea2c	Remove trailing whitespace	2018-06-28 11:08:20 +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
Alberto Fernández Capel	7e5ababe66	Ensure we can import both user and user stubs to teams	2018-06-27 12:09:58 +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
James Allen	fbfb0d6472	Remove conflicting .modal class from upload alerts	2018-06-26 09:09:10 +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
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
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
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
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