Shane Kilkelly
efb6018246
Add a rate-limit to the email-confirm endpoint
2018-09-19 09:28:59 +01:00
Shane Kilkelly
6cfe68db26
Roughly working account-merge-by-email callback endpoint
2018-09-19 09:28:59 +01:00
Shane Kilkelly
958c7a19b6
Add a skeleton of a callback endpoint for merging accounts via email
2018-09-19 09:28:59 +01:00
Shane Kilkelly
ba221a1135
WIP: add email-based account merge flow to ShareLaTeX
2018-09-19 09:28:59 +01:00
Alasdair Smith
bdcc25805e
Add route to handle /teams similar to v1
2018-09-18 17:14:37 +01:00
Brian Gough
02854274a7
2018-09-18 14:09:05 +01:00
hugh-obrien
277225d8de
use existing left sidebar controller for affiliation cta
2018-09-18 13:06:26 +01:00
Timothée Alby
b16cffe587
Merge pull request #932 from sharelatex/as-redirect-query-string
...
Support passing through query params in redirects
2018-09-18 12:35:21 +01:00
Timothée Alby
b6925647ef
Merge pull request #922 from sharelatex/ta-forbid-null-query
...
Prevent Calls to UserGetter.getUser with Null Query
2018-09-18 12:24:19 +01:00
Timothée Alby
7981d867e8
Merge pull request #924 from sharelatex/ta-sign-in-v1
...
Change Links to v1 to Sign User In
2018-09-18 12:24:08 +01:00
Alasdair Smith
7e358ab318
Support passing through query params
2018-09-18 11:34:04 +01:00
hugh-obrien
2d40c3d21a
Use existing notification styling
2018-09-18 11:01:10 +01:00
hugh-obrien
f76ff55b6f
email alert styling
2018-09-18 10:54:20 +01:00
hugh-obrien
e343c04423
add notification to confirm unconfirmed emails
2018-09-18 10:54:20 +01:00
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
6fc7468b02
Thousands of templates
2018-09-17 10:47:57 -05:00
Jessica Lawshe
4f5c12e9ac
More specific group contact controller name and email subject
...
This form is only used on the group contact modal.
2018-09-17 10:47:57 -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
Tim Alby
09c92c0b69
don't encode /
2018-09-14 16:09:24 +01:00
Tim Alby
2e4d3d7aab
change links to v1 to sign user in first
2018-09-14 14:26:16 +01:00
Tim Alby
41b92d4647
prevent calls to UserGetter.getUser with null query
2018-09-14 12:46:00 +01: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
hugh-obrien
26defd0833
reword CTA
2018-09-13 13:54:43 +01:00
hugh-obrien
8697edc149
replace profile completion CTA with affiliationa adding CTA
2018-09-13 12:34:18 +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
Chrystal Griffiths
6c7301fb09
Templates detail page
2018-09-06 15:20:03 +01:00
Chrystal Maria Griffiths
59ae0efad7
Templates index page
2018-09-06 15:20:03 +01:00
Jessica Lawshe
aa2f6ad0dd
Merge pull request #880 from sharelatex/jel-v2-launch-plans
...
Launch v2 Plans Page
2018-09-06 08:51:05 -05: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
hugh-obrien
8ef90a0dcb
move call for creating ip matched notifcation to project controller
2018-09-05 15:40:59 +01:00
Jessica Lawshe
c3c2e524f5
Add quotes
2018-09-05 08:14:32 -05:00
Jessica Lawshe
40a412b6b9
Remove plans message about v2 beta
2018-09-05 08:14:05 -05:00
Jessica Lawshe
65b2715e62
Remove unused layout for v2 plans
2018-09-05 08:14:05 -05:00
Jessica Lawshe
a4956294c1
Remove plans redirect
2018-09-05 08:14:05 -05:00
Shane Kilkelly
f0d17c1db7
Merge pull request #894 from sharelatex/as-fix-homepage-cta
...
Fix height issue on homepage for smaller screens
2018-09-05 11:47:02 +01:00
Tim Alby
9ec60a128a
add userHasSubscriptionOrIsGroupMember alias
2018-09-05 11:37:37 +01:00
hugh-obrien
5605e1c5c3
update copy for ip match notifications
2018-09-05 11:22:26 +01:00
hugh-obrien
23e6292fd7
updating tests for ip matcher logic
2018-09-05 11:22:26 +01:00
hugh-obrien
f20d27986b
create ip match notifications without forcing replacement
2018-09-05 11:22:26 +01:00
hugh-obrien
d950e14b3f
use new routes and params from v1 ip matcher endpoint
2018-09-05 11:22:26 +01:00
hugh-obrien
bf2ea4e7b3
test against ip matcher for notification on login if different from previous ip
2018-09-05 11:22:26 +01:00
hugh-obrien
de83df2703
adding tests for ip matching notifications
2018-09-05 11:22:25 +01:00
hugh-obrien
38faa5c25e
correctly create and display ip matched affiliations
2018-09-05 11:22:25 +01:00
hugh-obrien
fa23ea75b8
Call university ip matcher api when checking notifications
2018-09-05 11:22:25 +01:00
Alasdair Smith
455e682fac
Fix height issue on small screens
2018-09-05 11:00:30 +01:00
Shane Kilkelly
d432b6799f
Merge pull request #888 from sharelatex/ta-v1-subscription-check-fix
...
Don't Regard v1 Teams as Paid Subscriptions
2018-09-05 10:22:46 +01:00
Shane Kilkelly
81c845850e
Merge pull request #889 from sharelatex/sk-update-account-delete-wording-v1
...
Account-delete, clarify what happens to v1 account and projects
2018-09-05 10:22:32 +01:00
Christopher Hoskin
c3e64b12cf
Remove 'beta' from v2 welcome text
2018-09-04 15:11:27 +01:00
Shane Kilkelly
680654f7e7
Account-delete, clarify what happens to v1 account and projects
2018-09-04 13:31:22 +01:00
Douglas Lovell
15a54d8228
Style for label alignment on text area
2018-09-04 08:53:29 -03:00
Douglas Lovell
fa7f8ebfed
Styling tweaks to Gallery publish dialog
2018-09-04 07:22:58 -03:00
Ersun Warncke
e4e6a0fa1b
add new tag methods
2018-09-03 10:40:28 -04:00
Tim Alby
3324796086
don't regard v1 teams as paid subscriptions
...
- use `userHasV1Subscription` instead of `userHasV1SubscriptionOrTeam` in `LimitationsManager.userHasSubscriptionOrIsGroupMember `
- remove `userHasV1SubscriptionOrTeam`
- rename `LimitationsManager.userHasSubscriptionOrIsGroupMember` to `LimitationsManager.hasPaidSubscription`
- rename some variables for clarity
2018-09-03 15:09:57 +01:00
James Allen
5025b54c9c
Merge pull request #887 from sharelatex/as-logout-of-v1
...
Extract logout to function, so different redirect can be called
2018-09-03 14:04:22 +01:00
