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
7975 commits 3 branches 7 tags 201 MiB
Commit graph

4569 commits

Author SHA1 Message Date
hugh-obrien
e343c04423 add notification to confirm unconfirmed emails 2018-09-18 10:54:20 +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
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
Douglas Lovell
7d10e64840 Alter endpoint for account settings, change password form submission. 2018-09-14 16:19:02 -03: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
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
Douglas Lovell
0ecda4e093 Display password change from in Account Settings 2018-09-10 14:53:33 -03: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
James Allen
24f60bf791 Don't include the license name twice in invite emails 2018-09-05 11:05:38 +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
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
Alasdair Smith
53bd2cfd33 Add error handling on logout 2018-09-03 11:46:36 +01:00
Alasdair Smith
6569e34873 Extract logout to function, so different redirect can be called 2018-09-03 11:01:14 +01:00
Shane Kilkelly
7be716e889 Merge pull request #879 from sharelatex/sk-handle-user-account-delete 
Sk handle user account delete
 2018-09-03 10:41:49 +01:00
Shane Kilkelly
bafcf24cc9 Add missing column class to the change-password panel 2018-09-03 10:21:45 +01:00
Shane Kilkelly
1776482159 Update wording of the change-password instruction 2018-09-03 10:21:45 +01:00
Shane Kilkelly
0300ffbdc6 Bonus, add a link to the v1 settings page to change password 2018-09-03 10:21:45 +01:00
Shane Kilkelly
27a2e06d7b Revert "Move the new logic to the externalAuthenticationSystemUsed function" 
This reverts commit 34009fbf59cc6597b08e9262ea274ce266baa8fe.
 2018-09-03 10:21:45 +01:00
Shane Kilkelly
40a500648c Move the new logic to the externalAuthenticationSystemUsed function 2018-09-03 10:21:45 +01:00
Shane Kilkelly
be6720d805 Add a janky warning that this action will delete the account on v1 also. 2018-09-03 10:21:45 +01:00
Shane Kilkelly
9141f678b1 Show the account delete option on v2 2018-09-03 10:21:45 +01:00
Paulo Reis
60cbc989e2 Add delete as an inline table action (only when viewing archived projects). 2018-09-02 15:14:45 +01:00
Paulo Reis
af4094a88c Use CSS hashed paths when hot-swapping themes. 2018-09-02 14:44:15 +01:00
Paulo Reis
fbf98d89f2 Improve the collapsing behaviour of 'change' entries in track-changes. 2018-09-01 15:36:02 +01:00
Paulo Reis
4ff7410391 Disable the review button when history is open. 2018-08-31 17:10:15 +01:00
Paulo Reis
f88a3815c6 Add loading spinner when cloning a project. 2018-08-31 16:14:20 +01:00
Paulo Reis
7e5094f53d Avoid z-index issues with the new project dropdown. 2018-08-31 15:37:22 +01:00
Paulo Reis
fc7b5bdd63 * Share button shown to all users, with a tooltip for non-admin; remove its id. 2018-08-31 15:33:56 +01:00
Timothée Alby
855840d89a Merge pull request #883 from sharelatex/ta-domain-licence-join-fix 
Fix id Accessor in Domain Licence Join Page
 2018-08-31 13:15:23 +02:00
Timothée Alby
012d341df6 Merge pull request #881 from sharelatex/ho-change-email-fire-forget 
change email: catch invalid emails and don't pass the error back on invalid requests
 2018-08-31 13:15:16 +02:00
Timothée Alby
59b137e303 Merge pull request #877 from sharelatex/pr-fill-university-model-as-you-type 
Update university, role and department value as the user types.
 2018-08-31 13:15:01 +02:00
Henry Oswald
245ad2a2a8 call changeEmail before the callback in setDefaultEmailAddress 2018-08-31 11:49:45 +01:00
Tim Alby
195ae49052 fix id accessor in domain licence join page 2018-08-31 11:41:28 +01:00
Henry Oswald
bab334aa44 fire and forget changeEmail in setDefaultEmailAddress 
prevents blocking/erroring the change email workflow
 2018-08-31 11:16:28 +01:00
Henry Oswald
038b18a209 change email: catch invalid emails and don't pass the error back on invalid requests 2018-08-31 11:06:55 +01:00
Jessica Lawshe
dff29637b7 Move quotes to partial 2018-08-30 09:52:55 -05:00
Jessica Lawshe
bac90c0976 Move v2 plans redirect to router 2018-08-30 09:52:55 -05:00
Jessica Lawshe
eb8e279ac7 Add border styling 2018-08-30 09:52:55 -05:00
Jessica Lawshe
7d249f513b Remove Positive SSL badge for v2 2018-08-30 09:52:55 -05:00
Jessica Lawshe
c1d37a712c Update translations to use appName 2018-08-30 09:52:55 -05:00
Jessica Lawshe
c920dc37d2 Update button classes for v2 
Use `.btn-default` instead of `.btn-info`
 2018-08-30 09:52:55 -05:00
Jessica Lawshe
26f2ff3d6f Unlink instapages for v2 FAQ and add group contact modal 
group contact link: v2 opens contact portal and SL opens instapage
 2018-08-30 09:52:50 -05:00
James Allen
52381c8fb7 Merge pull request #851 from sharelatex/jel-remove-a-b-test 
Remove Plans and Pricing A/B Test
 2018-08-30 15:19:56 +01:00
Paulo Jorge Reis
cf075b0c42 Merge pull request #878 from sharelatex/ja-hide-bonus-in-v2 
Don't suggest bonus page to v2 users
 2018-08-30 11:29:41 +01:00
Paulo Jorge Reis
8b64f46807 Merge pull request #861 from sharelatex/ho-mailchimp-change-email 
catch newsletter email change error if user already exists on mailing list
 2018-08-30 11:29:01 +01:00
Paulo Jorge Reis
4be364cd93 Merge pull request #864 from sharelatex/pr-history-restore-placeholder 
Add a placeholder "restore" button, showing a tooltip.
 2018-08-30 11:25:25 +01:00
Paulo Jorge Reis
cb4d4145a1 Merge pull request #855 from sharelatex/pr-v2-light-theme 
v2 light theme
 2018-08-30 11:24:52 +01:00
Paulo Jorge Reis
8b9397f80c Merge pull request #863 from sharelatex/as-update-v1-import-modal 
Update project import modal to be more friendly near the launch
 2018-08-30 11:24:44 +01:00
James Allen
b86ac31c63 Don't suggest bonus page to v2 users 2018-08-30 10:56:31 +01:00
Alasdair Smith
bc1f10a710 Merge pull request #868 from sharelatex/ho-mongo-health-checks 
added a /health_check/mongo endpoint
 2018-08-30 09:52:20 +01:00
Jessica Lawshe
3a2400b212 Merge pull request #841 from sharelatex/ns-remove-wufoo-log-links 
remove wufoo latex error response logging
 2018-08-29 12:24:22 -05:00
Jessica Lawshe
ad55842c0a Merge pull request #847 from sharelatex/ns-bye-typeform 
move typeform survey to google forms
 2018-08-29 12:24:12 -05:00
Jessica Lawshe
a5d84ecc0a Merge pull request #842 from sharelatex/jel-portals-user-affiliation 
Add dashboard link mixin
 2018-08-29 12:23:50 -05:00
Paulo Reis
79f1e7b0ee Update ui-select value as the user types. 2018-08-29 17:31:47 +01:00
Ersun Warncke
afc22dc5c2 Revert "Merge pull request #790 from sharelatex/ew-add-cookie-and-form-to-proxy" 
This reverts commit ebefc2f28c6e88bbfa632f2b22cb8b99b75e95ec, reversing
changes made to 223beab491d2f8dcf4c7285267fda355cfce3f05.
 2018-08-29 12:00:20 -04:00
Ersun Warncke
e7eefc0474 Merge pull request #790 from sharelatex/ew-add-cookie-and-form-to-proxy 
set options and method for request, pass cookies and form body
 2018-08-29 10:17:21 -04:00
Henry Oswald
360618a7d3 added a /health_check/mongo endpoint 2018-08-29 11:24:01 +01:00
Alasdair Smith
4174b8edee Update image and adjust size 2018-08-29 10:50:07 +01:00
Alasdair Smith
3dc437d932 More copy updates 2018-08-29 10:50:07 +01:00
Alasdair Smith
ff275e3425 Replace image and improve copy 2018-08-29 10:50:07 +01:00
Alasdair Smith
2e0d6ab305 Remove 2 step modal and make copy more friendly 2018-08-29 10:50:07 +01:00
James Allen
6a04800f70 Merge pull request #810 from sharelatex/ja-v2-templates 
Split out feature flags into publish and view templates
 2018-08-29 10:27:23 +01:00
Shane Kilkelly
1848befcb7 Merge branch 'sk-flush-when-refreshing-linked-file' 2018-08-29 09:27:05 +01:00
Shane Kilkelly
6ee2a83885 Merge pull request #856 from sharelatex/ns-use-regex-test 
Use regex test instead of string match
 2018-08-29 09:21:40 +01:00
Shane Kilkelly
b8ff6ae9a2 Merge pull request #862 from sharelatex/ta-increase-space 
Increase Spacing Between Buttons
 2018-08-29 09:21:31 +01:00
Shane Kilkelly
2c782fee67 Merge pull request #858 from sharelatex/sk-update-v2-migration-banner 
Update the color and wording of the warning message shown on SL
 2018-08-29 09:21:19 +01:00
Shane Kilkelly
6157db1964 Merge pull request #835 from sharelatex/sk-sanitize-system-messages 
Sanitize display of system messages.
 2018-08-29 09:21:07 +01:00
Shane Kilkelly
33a4882bd3 Update the color and wording of the warning message shown on SL 2018-08-29 09:08:44 +01:00
Paulo Reis
0df5c61c44 Add a placeholder restore button, showing a tooltip. 2018-08-28 21:35:35 +01:00
Jessica Lawshe
e1fbef6910 Move style from winning test variant to main class 
`.more-details` contained style for the winning variant. Move these CSS declarations to main class of page, `.plans`.

Also alphabetize CSS classes.

Remove .more-details and extra .container from layout

CSS statements for .more-details were moved to .plans
 2018-08-28 12:42:09 -05:00
Jessica Lawshe
ae85bfafef Move FAQ to partial 2018-08-28 12:42:09 -05:00
Jessica Lawshe
e5c3d72e1a Move winning variant layout to main layout 2018-08-28 12:42:09 -05:00
Jessica Lawshe
8889f2aed2 Remove Plans and Pricing A/B Test 
Remove all layouts, analytics events, and scope related to the A/B test.

The group modal from the default layout of the A/B test should be maintained though for v2.
 2018-08-28 12:42:09 -05:00
Paulo Reis
f3a4c7f2ed Remove debug line. 2018-08-28 17:08:46 +01:00
Tim Alby
204423696d increase spacing between buttons 2018-08-28 17:34:49 +02:00
Paulo Reis
32ff66b0dd Add two more font-size options to the editor. 2018-08-28 14:52:25 +01:00
Henry Oswald
425017930a catch newsletter email change error if user already exists on mailing list 2018-08-28 14:26:51 +01:00
Paulo Reis
90b353298d Switch themes at runtime. 2018-08-28 14:12:00 +01:00
Timothée Alby
107e8ce633 Merge pull request #859 from sharelatex/ho-mailchimp-change-email 
always set status_if_new
 2018-08-28 14:44:59 +02:00
Henry Oswald
60b3e6777f always set status_if_new 2018-08-28 13:34:53 +01:00
Timothée Alby
c2ef2326b9 Merge pull request #857 from sharelatex/ho-mailchimp-change-email 
add error handling for changing email in newsletter of user who has not subscribed
 2018-08-28 14:03:44 +02:00
Timothée Alby
8057f4e74d Merge pull request #849 from sharelatex/pr-fix-add-new-university 
Correctly invoke the function to add unknown universities.
 2018-08-28 14:03:35 +02:00
Timothée Alby
946726c898 Merge pull request #853 from sharelatex/ta-institution-features-fix 
Check Institution Confirmation Status
 2018-08-28 14:03:22 +02:00
Henry Oswald
32749267b8 improve logging on change email in newsletter 2018-08-28 12:46:49 +01:00
Henry Oswald
423bc9312d only set status and merge fields if required 
Not strictly nessaserry but it is a bit safer

also improve error reporting for change email
 2018-08-28 12:32:20 +01:00
Henry Oswald
75521a4c86 add error handling for changing email in newsletter of user who has not subscribed 2018-08-28 10:47:33 +01:00
Paulo Reis
307a98851d Nest the overall theme property under ace. 2018-08-28 10:10:16 +01:00
Nate Stemen
465b9aefc5 use match in one case and remove and operator 2018-08-27 16:48:44 -04:00
Nate Stemen
4d991aa176 Merge branch 'master' into ns-use-regex-test 2018-08-27 14:26:51 -04:00
Nate Stemen
ebea8a8633 use regex test instead of match when only bool needed 2018-08-27 14:25:01 -04:00
Paulo Reis
64c29787c0 Add i18n; update the review icon image. 2018-08-27 15:57:51 +01:00
Paulo Reis
efc926ffc5 Load theme as a user setting; allow the user to change it; update tests. 2018-08-27 15:25:00 +01:00
Tim Alby
ef37902dfc check institution confirmation status 2018-08-27 15:45:31 +02:00
Tim Alby
e19882455a improve affiliation endorsement button 
- design as button instead of link
- disable unless role and department are set
 2018-08-27 11:32:48 +02:00
Tim Alby
7863561bff display university licence in affiliations UI 2018-08-27 11:26:13 +02:00
Paulo Reis
4f6f459bfe Remove debug code. 2018-08-24 15:35:52 +01:00
Paulo Reis
920c24cacb Correctly invoke the function to add unknown universities. 2018-08-24 15:29:48 +01:00
Nate Stemen
c034b0654b Merge branch 'master' into ns-remove-wufoo-log-links 2018-08-24 09:18:48 -04:00
Paulo Reis
2491bee38e Merge branch 'master' into pr-v2-light-theme 2018-08-24 12:11:16 +01:00
Paulo Reis
7c95de29cd Avoid breaking the page if isnt set. 2018-08-24 12:06:26 +01:00
Nate Stemen
6d00f38a71 move typeform survey to google forms 2018-08-23 12:34:13 -04:00
Nate Stemen
80c74ce07b add back learn more link 2018-08-23 11:42:00 -04:00
Hugh O'Brien
29253c5a93 Merge branch 'master' into hb-fetch-licences-graph 2018-08-23 16:11:43 +01:00
hugh-obrien
bd721d52f4 review fixes and moving licences endpoint to module 2018-08-23 14:39:48 +01:00
Tim Alby
753fb02c05 always return an array when getting affiliations 2018-08-23 15:15:53 +02:00
Paulo Jorge Reis
d838f8778a Merge pull request #832 from sharelatex/pr-change-free-history-limits 
Change history limits for free users
 2018-08-23 14:02:08 +01:00
Jessica Lawshe
787f0fe239 Add dashboard link mixin 2018-08-22 16:35:06 -05:00
Nate Stemen
6d3b7cbe7b remove wufoo latex log responses 2018-08-22 15:45:08 -04:00
hugh-obrien
8d72fc78fc send licences graph request to v1 for data instead of analytics 2018-08-22 18:31:29 +01:00
Henry Oswald
ab1848d0ae Add a trusted filter for iframe downloads (#836) 
* add trusted helper to iframe downloads
 2018-08-22 14:47:15 +01:00
Paulo Reis
a15706ce24 Merge branch 'master' into pr-v2-light-theme 2018-08-22 11:19:01 +01:00
Shane Kilkelly
7f7b10aa09 Sanitize display of system messages. 
When showing system-messages, use default Angular sanitizer, also,
on the admin panel itself, show the verbatim text of the message.

This solves a mild Stored-XSS vulnerability whereby a user could
put `<script>` tags in a message. We don't want that, but we do want
to be able to use basic html tags.
 2018-08-22 10:15:50 +01:00
Hugh O'Brien
eeadd1e9bb Merge pull request #797 from sharelatex/hb-inform-v1-affiliation-confirms 
Tell v1 confirmation status of affiliation emails
 2018-08-22 08:34:33 +01:00
Jessica Lawshe
484d7acbc8 Merge pull request #817 from sharelatex/jel-mixins 
Add a mixin for FAQ search and move links mixin file
 2018-08-21 11:44:30 -05:00
Jessica Lawshe
b145ca5d5c Merge pull request #791 from sharelatex/jel-pagination 
Add pagination mixin and color variables
 2018-08-21 11:44:15 -05:00
Paulo Reis
54e0a7cfd2 Merge branch 'master' into pr-change-free-history-limits 2018-08-21 11:23:28 +01:00
Henry Oswald
473063cf3d set rclient.expire for server ttl even when there is no server id 2018-08-21 10:36:18 +01:00
Alasdair Smith
d99a42e678 Merge pull request #824 from sharelatex/as-redirect-sl-login-to-v2-login 
Allow for redirection of unlinked SL account to /user/login_to_ol_v2
 2018-08-21 10:13:52 +01:00
Jessica Lawshe
09efced352 Add pagination mixin and color variables 2018-08-20 09:25:33 -05:00
Paulo Jorge Reis
53a9a174a2 Merge pull request #821 from sharelatex/as-account-deletion-note 
Add message about deleting SL account affecting v2 account
 2018-08-20 13:58:50 +01:00
Shane Kilkelly
034586b296 Flush source project to mongo before linked-file create/refresh 2018-08-20 12:19:59 +01:00
Jessica Lawshe
45cc278acb Add FAQ search mixin 2018-08-17 16:31:06 -05:00
Jessica Lawshe
f8b85cb848 Move link mixins to mixins folder 2018-08-17 16:12:24 -05:00
Timothée Alby
9d3e649710 Merge pull request #825 from sharelatex/ta-skip-affiliation-on-create 
Skip Affiliation on Create
 2018-08-17 17:50:17 +02:00
Tim Alby
8d6505b518 log institutions API errors 2018-08-17 17:48:00 +02:00
Tim Alby
f5513f36ca add param to skip affiliation creation on user create 2018-08-17 17:48:00 +02:00
Jessica Lawshe
5b5ece37a5 Handle sixpack timeouts and include variant in metabase segmentation 
Render default when sixpack timesout

Only convert when variant exists

Use Angular cookies module to add variant cookie, which is used on the new subscription page.
 2018-08-17 10:29:45 -05:00
Paulo Reis
96aa418b94 Show upgrade prompts when the free history limit is hit. 2018-08-17 16:04:31 +01:00
Paulo Reis
fc424aee9e Adapt styles to avoid layout breaking/showing options that do not make sense when no history entries are loaded. 2018-08-17 15:31:59 +01:00
Alasdair Smith
9bc3fa2df0 Pass req to preDoPassportLogin module hook 2018-08-17 12:04:05 +01:00
Alasdair Smith
b9e63421a8 Merge pull request #814 from sharelatex/as-fix-delete-modal-copy 
Fix delete wording on archive modal
 2018-08-16 16:33:30 +01:00
Alasdair Smith
38689dbb1d Merge pull request #802 from sharelatex/as-sl-redirect 
Add feature flag for redirecting SL to v2
 2018-08-16 16:32:55 +01:00
Alasdair Smith
3b31125a62 Add message about deleting account affecting v2 
Only show on SL and if the user has linked accounts
 2018-08-16 14:11:43 +01:00
hugh-obrien
96ffeef73d send fixed confirmed date to v1 for affiliations 2018-08-16 13:50:34 +01:00
hugh-obrien
55597b9279 inform v1 when confirming affiliation emails 2018-08-16 13:50:34 +01:00
Paulo Reis
02701a996d Merge branch 'master' into pr-history-labels-part-2 2018-08-16 11:56:36 +01:00
Paulo Reis
652be9efe6 Slightly adapt the markup for the generic history error. 2018-08-16 11:41:19 +01:00
Henry Oswald
5ed95694da Merge pull request #801 from sharelatex/ho-mailchimp 
Add non checked checkbox for newsletter subscription on signup and use mailchimp as newsletter provider.
 2018-08-16 11:40:39 +01:00
Paulo Reis
23bb866988 Show an error message when history fails to load updates. 2018-08-16 11:26:34 +01:00
Henry Oswald
1e1f26b350 Merge pull request #818 from sharelatex/ho-backendgroup-config 
configure backend group name via config files
 2018-08-16 10:37:14 +01:00
Henry Oswald
af6e7758d3 configure backend group name via config files 2018-08-15 15:26:22 +01:00
Alasdair Smith
985344c0d7 Use redirect setting instead of re-using setting that coincidentally would be flipped on the same day 2018-08-15 15:22:06 +01:00
Alasdair Smith
fc0b9df14c Add feature flag for redirecting SL to v2 2018-08-15 15:22:05 +01:00
Jessica Lawshe
2c9977d26e Add analytics to link mixins 2018-08-14 12:06:28 -05:00
Jessica Lawshe
cf532b93d8 Merge pull request #784 from sharelatex/jel-portals 
Add styling and mixins for portals
 2018-08-14 12:00:36 -05:00
Timothée Alby
5e488dcab7 Merge pull request #813 from sharelatex/ta-enable-affiliations-ui 
Enable Affiliations UI
 2018-08-14 16:40:35 +02:00
Paulo Reis
663ca275cb Add i18n. 2018-08-13 17:09:18 +01:00
Alasdair Smith
bd94e55ce9 Handle archive and leave action 2018-08-13 14:25:38 +01:00
Alasdair Smith
009c5c363b Also fix modal body for archiving projects 2018-08-13 14:25:38 +01:00
Alasdair Smith
5836c029c8 Show archive heading if archiving and on OL 2018-08-13 14:25:38 +01:00
Alasdair Smith
274ac8b1ba Another fix 2018-08-13 14:25:38 +01:00
Alasdair Smith
db16fad6c9 Fix 2018-08-13 14:25:38 +01:00
Alasdair Smith
085c2529d9 Inject isOverleaf setting globally 2018-08-13 14:25:38 +01:00
Tim Alby
bfb2f636cd enable affiliations UI 2018-08-13 14:59:39 +02:00
Paulo Reis
2ee42af1de Change strategy to store selected label; improve the history toolbar layout to accomodate larger labels; fix issues with layout not being updated when changing history view modes. 2018-08-13 13:39:25 +01:00
Brian Gough
19dfe5fc8b intial version of user setting for texlive imageName 2018-08-13 10:53:43 +01:00
Alasdair Smith
d7a341f59b Merge pull request #808 from sharelatex/ta-import-affiliations 
Allow confirmed_at date to be specified
 2018-08-13 09:47:10 +01:00
Alasdair Smith
4e484912bb Merge pull request #804 from sharelatex/as-update-project-import-modal 
Update copy in v1 import modal now that more features are supported
 2018-08-13 09:46:18 +01:00
James Allen
a9a6dcf82a Move template modal to template module 2018-08-10 17:17:00 +01:00
James Allen
ff506b2b03 Make publishing and viewing templates separate features 2018-08-10 17:16:49 +01:00
James Allen
0f8fe53bc9 Allow confirmed_at date to be specified 2018-08-10 17:48:43 +02:00
Paulo Reis
a5c6f81573 Merge branch 'master' into pr-history-labels-part-2 2018-08-10 15:57:32 +01:00
Tim Alby
197e7ce8ab refactor institutions getter 2018-08-10 13:40:25 +02:00
Paulo Reis
7e86218b21 Allow multiple events to trigger layout external resizes. 2018-08-10 11:28:17 +01:00
Alasdair Smith
7830a5f69d Update copy in v1 import modal now that more features are supported 2018-08-09 13:21:11 +01:00
Paulo Reis
4f4ab57958 Use controller binding in the label tooltip. 2018-08-09 12:05:00 +01:00
Paulo Reis
d6ab993519 Dont hide history entries while loading. 2018-08-09 12:00:53 +01:00
Paulo Reis
d59fe61a83 Handle sorting of labels; keep selection between view changes. 2018-08-09 11:03:00 +01:00
James Allen
69e8eddff0 Merge pull request #796 from sharelatex/pr-history-labels-ui 
History labels UI
 2018-08-09 10:50:28 +01:00
Hugh O'Brien
0af23718ba Merge pull request #749 from sharelatex/hb-activate-submit-modal 
Activate publish modal
 2018-08-09 09:44:41 +01:00
James Allen
9cbb51bbbc Merge pull request #793 from sharelatex/sk-sl-login-v2 
If we're creating v1 accounts, don't allow login for users already linked up
 2018-08-08 15:51:25 +01:00
Henry Oswald
df161d3ece change newsletter log to info on process boot 2018-08-08 14:32:36 +01:00
Henry Oswald
c68366155e remove sanitize = require('sanitizer') not used anywhere 2018-08-08 14:14:56 +01:00
Henry Oswald
687637eec7 change email address in newsletter when changing default email 
put mongo_id into mailchimp merge fields
 2018-08-08 13:50:03 +01:00
Paulo Reis
f2b957e5b3 Add history labels view. 2018-08-08 13:46:43 +01:00
Paulo Reis
cd853abb3c Load labels list from the backend. 2018-08-08 11:02:14 +01:00
Paulo Reis
7e8e2a89ae Create history labels list component. 2018-08-08 11:01:51 +01:00
Paulo Reis
9a27a39f55 Make tooltip optional in the label component. 2018-08-08 11:01:20 +01:00
Henry Oswald
6208e9f2d0 add changeEmail function to newsletter manager 
not actually called
 2018-08-07 21:38:31 +01:00
Henry Oswald
6cf1f71604 add newsletter checkbox to user register forms 2018-08-06 17:43:03 +01:00
Brian Gough
efcd3577ce avoid clobbering imported image names 2018-08-06 16:56:44 +01:00
Henry Oswald
fa37caef58 remove null check on mailchimp at top of file 
I didn't like the if statment being after the require, mailchimp
could also be null and called elsewhere by acident
 2018-08-06 12:37:18 +01:00
Paulo Reis
b0261970fc Make label removal also work in compare mode. 2018-08-06 11:26:22 +01:00
Paulo Reis
e0707253a7 Remove debug lines and unneeded HTML. 2018-08-06 11:03:15 +01:00
Paulo Reis
bd6dcc007b Remove prototype code. 2018-08-06 11:00:45 +01:00
Brian Gough
7da8a926bb increase bodyparser limit to 64kb 
16kb is not enough for bibtex files with more escaping.
 2018-08-06 10:52:10 +01:00
Henry Oswald
17a63258c6 changed newsletter to use mailchimp 2018-08-04 17:52:12 +01:00
Shane Kilkelly
d8c9a96619 If we're creating v1 accounts, don't allow login for users already linked up 2018-08-03 14:58:29 +01:00
Paulo Reis
f418929dcf Adjust i18n. 2018-08-02 16:28:13 +01:00
Paulo Reis
2c2bb4c130 Add i18n; avoid injecting unneeded dependencies. 2018-08-02 16:28:13 +01:00
Paulo Reis
dc235b91d9 Fix some issues with the label tooltip in compare mode. 2018-08-02 16:28:13 +01:00
Paulo Reis
a8ee879746 Use history label component; restrict label deletion to label owners. 2018-08-02 16:28:13 +01:00
Paulo Reis
d21f6ef624 Label handling in compare mode. 2018-08-02 16:28:13 +01:00
Paulo Reis
5a64313e24 Add label delete functionality; styles. 2018-08-02 16:28:13 +01:00
Paulo Reis
3a80c34078 Basic label support (showing labels in the entries list; creating labels via a modal). 2018-08-02 16:28:13 +01:00
Hugh O'Brien
22b664da1a Merge pull request #792 from sharelatex/hb-fetch-export-zips 
Fetch export zips
 2018-08-02 13:50:11 +01:00