Commit Graph

7288 Commits

Author SHA1 Message Date
hugh-obrien 39f580d6ba fixing broken exports test 2018-09-18 10:13:33 +01:00
hugh-obrien 6f00d1f45a send required export fields for s1 submission 2018-09-18 10:05:35 +01:00
Jessica Lawshe 203c005f26 Merge pull request #928 from sharelatex/jel-content-updates
Link mixin paths and universities list styling
2018-09-17 13:16:52 -05:00
Jessica Lawshe 08a9534f8c Vertically align universities list items 2018-09-17 10:45:59 -05:00
Jessica Lawshe 66bfbce45f Correct link mixin paths 2018-09-17 09:46:34 -05:00
James Allen 15103ac894 Support the same URL with multiple methods in redirects 2018-09-17 15:38:58 +01:00
James Allen 83a1039b7e Add acceptance tests for RedirectManager 2018-09-17 15:38:58 +01:00
James Allen 40f08d1592 Add additional functionality to RedirectManager 2018-09-17 15:38:45 +01:00
Chrystal Maria Griffiths 784984dd78 Merge pull request #923 from sharelatex/cmg-share-modal
Show share button for collaborators
2018-09-17 15:19:44 +01:00
Alasdair Smith 42cef8e393 Merge pull request #920 from sharelatex/mm-gallery-exports
Add gallery fields to export controller and handler
2018-09-17 09:42:26 +01:00
Alasdair Smith e1e7091f30 Merge pull request #905 from sharelatex/as-project-intelligent-redirect
Intelligently redirect to v1 if no v2 project found
2018-09-17 09:40:52 +01:00
Jessica Lawshe c8b803681e Set max-width for <video> on CMS pages 2018-09-14 10:48:56 -05:00
Jessica Lawshe bcd465a35d Allow <video> and <source> in sanitized HTML 2018-09-14 10:36:46 -05:00
Chrystal Griffiths 6334066d2d Merge branch 'master' into cmg-share-modal 2018-09-14 12:09:10 +01:00
Chrystal Griffiths 915bd18058 Read-only collaborators table 2018-09-14 11:47:18 +01:00
Michael Mazour 79dc415064 Slightly refactor exports controller body handling
1. Move all body parsing together
2. Remove `firstName && lastName` condition, which duplicates one present in the Handler.
2018-09-14 11:02:51 +01:00
Michael Mazour 10fcdd6daf Add optional gallery fields to export request
Support the optional (well, gallery-only) fields `title`, `description`, `author`, `license`, and `show_source` in export requests.
2018-09-14 11:02:51 +01:00
Chrystal Griffiths 3b43cf9075 Slight copy change 2018-09-13 17:57:11 +01:00
Tim Alby 0051e59309 remove unused call to UserGetter.getUser 2018-09-13 17:39:30 +01:00
Chrystal Griffiths b51fc01bde Remove temporary solution 2018-09-13 17:17:18 +01:00
James Allen ef11161ddb Revert "Record and show last modified by user for projects" 2018-09-13 14:00:30 +01:00
Michael Mazour 1f976a0e04 Improve ExportsController unit tests
Test the params the handler's called with.
2018-09-13 12:24:03 +01:00
Chrystal Griffiths 57ac858004 Style the notice 2018-09-13 12:19:44 +01:00
Alasdair Smith f37040e4a4 Only redirect if has overleaf setting 2018-09-13 12:09:19 +01:00
Alasdair Smith 8a969d1c25 Redirect directly from controller instead of via handler 2018-09-13 12:09:19 +01:00
Alasdair Smith 0c658127ef Add tests for ProjectNotTokenAccessError 2018-09-13 12:09:19 +01:00
Alasdair Smith 893e2dd235 Add test for location of redirect to v1 2018-09-13 12:09:19 +01:00
Alasdair Smith 9d600afdf8 Fix failing tests for token access
If project was changed from token access to private, then we want to
404 on v2 (not redirect to v1). So the logic was changed to check if the
project exists and if it does then a 404 is returned. If it does not
then it redirects to v1.
2018-09-13 12:09:19 +01:00
Alasdair Smith cf8ae7c28c Add test for redirecting to v1 if project unimported 2018-09-13 12:09:19 +01:00
Alasdair Smith 24495f3340 Also redirect not found read tokens to v1 2018-09-13 12:09:19 +01:00
Alasdair Smith e0ce988d32 Intelligently redirect to v1 if no v2 project found for token 2018-09-13 12:09:19 +01:00
James Allen 5dbebc0693 Translate 'by' 2018-09-13 10:38:52 +01:00
James Allen ab871b9ba7 Fix tabs vs spaces 2018-09-13 10:38:52 +01:00
James Allen dd4b85b809 Combine v1 and v2 projects into item.pug 2018-09-13 10:38:52 +01:00
James Allen 225d30ffd2 Add missed lines from rebase 2018-09-13 10:38:52 +01:00
James Allen c072961183 Update project-list list to a table and show last updated user 2018-09-13 10:38:52 +01:00
James Allen ab10336110 Record last update time and user from project-history 2018-09-13 10:38:52 +01:00
Hugh O'Brien 24c479e984 Merge pull request #885 from sharelatex/hb-ip-matcher-notifications
IP matcher affiliation CTA notifications
2018-09-13 08:59:25 +01:00
Jessica Lawshe 75a6b8f32b Move custom tab styling to file
Custom tab styling was nested within a portal class. This styling is also needed on the CMS pages.
2018-09-12 16:34:38 -05:00
Brian Gough 6d54e843e8 fix typo in Errors, only two underscores in __proto__ 2018-09-12 10:45:50 +01:00
Jessica Lawshe f7e4750df6 Merge pull request #903 from sharelatex/as-cursor-position-change-editor
Store cursor & line position when switching editor
2018-09-11 10:44:24 -05:00
Jessica Lawshe 66e288864b Wiki and CMS images height and width 2018-09-11 07:46:38 -05:00
Ersun Warncke 7d3e17651f set options and method for request, pass cookies and form body 2018-09-10 06:10:36 -04:00
Ersun Warncke dd056e36ae add overleaf method 2018-09-10 06:10:36 -04:00
Alasdair Smith b6a4bb74f8 Store cursor & line position when switching editor
When tearing down the source editor, we need to store the updated cursor
position, so that the position can be moved to when opening the rich
text editor.
2018-09-10 11:02:08 +01:00
hugh-obrien 1e04a09ec6 remove unnecessary error returns and ip fetching 2018-09-07 18:15:32 +01:00
Chrystal Griffiths 46eadfada4 Conditionally show sharing bits 2018-09-07 17:23:03 +01:00
Shane Kilkelly eba14ee7d6 Merge pull request #874 from sharelatex/dcl-olsl760b
Stylesheet for publish modal
2018-09-07 10:27:11 +01:00
Chrystal Griffiths 0d283f103a Move remaining new styles to v2-templates 2018-09-06 15:21:19 +01:00
Chrystal Griffiths f3c47320cf Tidy up 2018-09-06 15:21:19 +01:00