github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-11-07 20:31:06 -05:00
Code Issues Projects Releases Packages Wiki Activity
7606 commits 3 branches 7 tags 201 MiB
Commit graph

4360 commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
Brian Gough
6d54e843e8 fix typo in Errors, only two underscores in __proto__ 2018-09-12 10:45:50 +01:00
Ersun Warncke
7d3e17651f set options and method for request, pass cookies and form body 2018-09-10 06:10:36 -04: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
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
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
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
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