Commit graph

6969 commits

Author SHA1 Message Date
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
Timothée Alby
f2da3155ff Merge pull request #670 from sharelatex/ta-manage-affiliations
Add & Remove Affiliations
2018-06-25 14:07:26 +02: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
Timothée Alby
4c6c4a2b23 Merge pull request #680 from sharelatex/ta-smart-proxy-take2
Replace OldAssetProxy take 2
2018-06-25 13:25:50 +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
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
962d39f056 Merge pull request #667 from sharelatex/ns-dropdown-on-completion
dropdown autocomplete when command is completed
2018-06-22 15:59:21 +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