Commit Graph
7589 Commits
Author SHA1 Message Date
Alasdair SmithandGitHub 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 SmithandGitHub 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 LawsheandGitHub 3b729c7b9c Merge pull request #925 from sharelatex/jel-sanitize-videos
Allow HTML5 videos in sanitized HTML
2018-09-14 11:11:37 -05: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
Timothée AlbyandGitHub b14fe82c1c Merge pull request #921 from sharelatex/ta-remove-unused-call
Remove Unused Call to UserGetter.getUser
2018-09-14 12:43:44 +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
Tim Alby 0051e59309 remove unused call to UserGetter.getUser 2018-09-13 17:39:30 +01:00
James AllenandGitHub 14b77a2060 Merge pull request #916 from sharelatex/revert-900-ja-show-last-modified
Revert "Record and show last modified by user for projects"
2018-09-13 14:01:36 +01:00
James AllenandGitHub ef11161ddb Revert "Record and show last modified by user for projects" 2018-09-13 14:00:30 +01:00
James AllenandGitHub 078575b236 Merge pull request #900 from sharelatex/ja-show-last-modified
Record and show last modified by user for projects
2018-09-13 13:19:25 +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
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'BrienandGitHub 24c479e984 Merge pull request #885 from sharelatex/hb-ip-matcher-notifications
IP matcher affiliation CTA notifications
2018-09-13 08:59:25 +01:00
Hugh O'BrienandGitHub c799502145 Merge pull request #911 from sharelatex/jel-tab-style
Custom tab styling
2018-09-13 08:59:14 +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 GoughandGitHub 47a7d2eaa9 Merge pull request #909 from sharelatex/bg-fix-typo-in-error-definitions
fix typo in Errors, only two underscores in __proto__
2018-09-12 10:56:20 +01:00
Brian Gough 6d54e843e8 fix typo in Errors, only two underscores in __proto__ 2018-09-12 10:45:50 +01:00
Jessica LawsheandGitHub 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 LawsheandGitHub 820e2de699 Merge pull request #906 from sharelatex/jel-cms-pages
Images on Wiki and CMS pages
2018-09-11 10:44:11 -05:00
Jessica Lawshe 66e288864b Wiki and CMS images height and width 2018-09-11 07:46:38 -05:00
Ersun WarnckeandGitHub ffcbda1efe Merge pull request #876 from sharelatex/ew-collabratec2
Redo Reverted Deploy
2018-09-10 09:00:56 -04: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
Shane KilkellyandGitHub eba14ee7d6 Merge pull request #874 from sharelatex/dcl-olsl760b
Stylesheet for publish modal
2018-09-07 10:27:11 +01:00
Jessica LawsheandGitHub 55f9cd4851 Merge pull request #837 from sharelatex/cmg-gallery-improvements
Improve styling of the v2 gallery pages
2018-09-06 11:49:51 -05: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
Chrystal Griffiths 6c7301fb09 Templates detail page 2018-09-06 15:20:03 +01:00
Chrystal Maria GriffithsandChrystal Griffiths 59ae0efad7 Templates index page 2018-09-06 15:20:03 +01:00
Jessica LawsheandGitHub aa2f6ad0dd Merge pull request #880 from sharelatex/jel-v2-launch-plans
Launch v2 Plans Page
2018-09-06 08:51:05 -05:00
Jessica LawsheandGitHub 0739bdd8de Merge pull request #891 from sharelatex/jel-v2-plans-quotes
Add quotes to plans page
2018-09-06 08:50:37 -05:00
James AllenandGitHub 29e9d5a1e6 Merge pull request #899 from sharelatex/sk-account-delete-confirm-delete-sharelatex
Add another confirmation checkbox to account-delete.
2018-09-06 11:57:34 +01:00
Shane Kilkelly 3d369b725c Add another confirmation checkbox to account-delete.
This confirms the user understands they will lose both their OL v2 and SL
accounts, and their projects.
2018-09-06 11:35:28 +01:00