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

2372 commits

Author SHA1 Message Date
Tim Alby
6f63cd7ca0 add notification to confirm unconfirmed emails 2018-10-15 14:47:16 +02:00
Tim Alby
e646c5c42a refactor to use config file 2018-10-15 14:46:38 +02:00
Timothée Alby
89590d5199 Merge pull request #1003 from sharelatex/cmg-split-screen-button 
Switch between pdf and editor with full-screen button
 2018-10-11 10:54:53 +01:00
Simon Detheridge
e7506489d1 Fix missing string in modals.pug 
Add escape to execute translate() server-side when handling error message for invalid filenames in project on copy.

Signed-off-by: Simon Detheridge <s@sd.ai>
 2018-10-10 15:06:37 +01:00
Paulo Reis
29787c42c5 Read brand variation id from v1-crafted links; set brand variation id for projects created from v1 templates. 2018-10-10 14:09:47 +01:00
Simon Detheridge
ea2782ff22 Merge pull request #1005 from sharelatex/spd-no-more-asterisks 
Sanitize paths in all relevant ProjectEntityHandler methods
 2018-10-10 10:44:13 +01:00
Simon Detheridge
32149e652f Handle 'invalid element name' error in project list ui 
When invalid filenames are found during project-copy, the somewhat obscure (and non-localised) 'invalid element name' error is returned. Add a special case to handle this particular error and display something more descriptive to the user.

Added a modal error handler for when this error is generated by clicking the 'copy' icon in the project list, instead of using the 'more' dropdown which opens a modal copy dialog

bug: overleaf/sharelatex#908
Signed-off-by: Simon Detheridge <s@sd.ai>
 2018-10-09 17:23:43 +01:00
Ersun Warncke
8719eff1d7 update error message 2018-10-09 11:44:59 -04:00
Ersun Warncke
7652e80800 add account merge error 2018-10-09 09:47:03 -04:00
Tim Alby
48e5c6b523 add UserMembership logic 2018-10-09 12:09:11 +01:00
Chrystal Griffiths
7ae39a0f84 Revert to ng-show 2018-10-09 10:30:24 +01:00
Chrystal Griffiths
849c5253c7 Avoid duplicating code 2018-10-08 17:50:10 +01:00
Jessica Lawshe
8f8765a412 Merge pull request #1008 from sharelatex/ta-fix-help-link 
fix link to link sharing help page
 2018-10-08 16:09:31 +01:00
Tim Alby
cf47fc0b1c fix link to link sharing help page 2018-10-08 16:07:11 +01:00
Jessica Lawshe
d9c98aa45e Add default Twitter and OG images 2018-10-08 15:18:18 +01:00
Simon Detheridge
50993f59c0 Merge pull request #926 from sharelatex/dcl-i850 
Display password change form in Account Settings
 2018-10-08 13:59:04 +01:00
Chrystal Griffiths
d51549c4f0 Use ng-if to switch between pdf and editor 2018-10-05 11:19:20 +01:00
Jessica Lawshe
6692d06e5f Handle image_src in metadata layout 
The CMS is already using `image`, which is an object based on data from the API.
 2018-10-05 11:06:21 +01:00
Shane Kilkelly
254d74899b WIP: enable sudo-mode for v2 2018-10-04 15:05:40 +01:00
Jessica Lawshe
bbe847c16d Update default meta images 
Favicons are not picked up by social sites.
 2018-10-03 17:34:40 +01:00
Douglas Lovell
4a846e4d87 Merge branch 'master' into dcl-i850 2018-10-02 16:04:39 +01:00
Jessica Lawshe
96b4f7edb3 Use viewport metatag on SL pw reset 2018-09-28 15:22:24 -05:00
Jessica Lawshe
40bc5564b6 Use viewport metatag on SL login 2018-09-28 15:14:05 -05:00
Jessica Lawshe
297f61da04 Add viewport metatag 2018-09-28 14:16:32 -05:00
Paulo Reis
b8baf1a6f4 Hide front chat widget via code. 2018-09-25 10:30:13 +01:00
Brian Gough
2692090f3f support a mainFile parameter for templates 2018-09-24 15:27:16 +01:00
Douglas Lovell
bfb369fab0 Merge branch 'master' into dcl-i850 
Conflicts repaired:
app/views/user/settings.pug

modified:   app/coffee/Features/Authentication/AuthenticationController.coffee
modified:   app/coffee/Features/Editor/EditorHttpController.coffee
modified:   app/coffee/Features/Email/EmailBuilder.coffee
modified:   app/coffee/Features/Errors/Errors.coffee
modified:   app/coffee/Features/Exports/ExportsController.coffee
modified:   app/coffee/Features/Exports/ExportsHandler.coffee
modified:   app/coffee/Features/Notifications/NotificationsBuilder.coffee
modified:   app/coffee/Features/Notifications/NotificationsHandler.coffee
modified:   app/coffee/Features/Project/ProjectController.coffee
modified:   app/coffee/Features/StaticPages/HomeController.coffee
modified:   app/coffee/Features/Subscription/planFeatures.coffee
modified:   app/coffee/Features/TokenAccess/TokenAccessController.coffee
modified:   app/coffee/Features/TokenAccess/TokenAccessHandler.coffee
modified:   app/coffee/Features/User/UserGetter.coffee
modified:   app/coffee/infrastructure/RedirectManager.coffee
modified:   app/coffee/infrastructure/Server.coffee
modified:   app/coffee/models/User.coffee
modified:   app/coffee/router.coffee
modified:   app/views/_mixins/links.pug
modified:   app/views/general/500.pug
modified:   app/views/layout/navbar.pug
modified:   app/views/project/editor/header.pug
modified:   app/views/project/editor/share.pug
modified:   app/views/project/list.pug
modified:   app/views/project/list/modals.pug
modified:   app/views/project/list/notifications.pug
modified:   app/views/project/list/side-bar.pug
modified:   app/views/project/list/v1-item.pug
modified:   app/views/subscriptions/_modal_group_inquiry.pug
modified:   app/views/subscriptions/dashboard.pug
modified:   app/views/user/settings.pug
modified:   config/settings.defaults.coffee
modified:   npm-shrinkwrap.json
modified:   package.json
new file:   public/apple-touch-icon.png
new file:   public/atlassian-domain-verification.html
modified:   public/coffee/ide/editor/directives/aceEditor.coffee
modified:   public/coffee/ide/editor/directives/aceEditor/cursor-position/CursorPositionManager.coffee
modified:   public/coffee/ide/share/controllers/ShareController.coffee
modified:   public/coffee/main.coffee
deleted:    public/coffee/main/account-merge-checker.coffee
modified:   public/coffee/main/contact-us.coffee
modified:   public/coffee/main/project-list/left-hand-menu-promo-controller.coffee
new file:   public/google4f15e48c48709a75.html
new file:   public/googleef256f97939bd9b7.html
new file:   public/img/advocates/friend.jpeg
new file:   public/img/grid.png
new file:   public/img/homepage.png
new file:   public/img/homepage@2x.png
new file:   public/img/other-brands/logo_google.svg
new file:   public/img/other-brands/logo_google_alt.svg
new file:   public/img/other-brands/logo_ieee.svg
new file:   public/img/other-brands/logo_orcid.svg
new file:   public/img/other-brands/logo_orcid_alt.svg
new file:   public/img/other-brands/logo_sharelatex.svg
new file:   public/img/other-brands/logo_twitter.svg
new file:   public/img/overleaf-partner/overleaf-greygreen-410.png
new file:   public/img/overleaf-partner/overleaf-white-410.png
new file:   public/static/brochures/Overleaf-Information-v8.pdf
new file:   public/static/brochures/Overleaf-Institutional-Solutions-v1.pdf
new file:   public/static/brochures/Overleaf-Tri-Fold-leaflet.pdf
new file:   public/static/brochures/Overleaf-request-for-service.pdf
new file:   public/static/brochures/Overleaf_Institutional.pdf
new file:   public/static/campus-challenge/campus-challenge-2016-flyer.pdf
new file:   public/static/campus-challenge/campus-challenge-2016-poster.pdf
new file:   public/static/campus-challenge/campus-challenge-2017-flyer.pdf
new file:   public/static/campus-challenge/campus-challenge-2017-poster.pdf
new file:   public/static/latex/learn/free-online-introduction-to-latex-part-1.pdf
new file:   public/static/latex/learn/free-online-introduction-to-latex-part-2.pdf
new file:   public/static/latex/learn/free-online-introduction-to-latex-part-3.pdf
new file:   public/static/partners/caltech-library.gif
new file:   public/static/partners/stanford-building.jpg
modified:   public/stylesheets/_ol_style_includes.less
modified:   public/stylesheets/app/blog-posts.less
modified:   public/stylesheets/app/cms-page.less
new file:   public/stylesheets/app/content_page.less
modified:   public/stylesheets/app/editor/share.less
modified:   public/stylesheets/app/editor/toolbar.less
modified:   public/stylesheets/app/features.less
modified:   public/stylesheets/app/homepage.less
new file:   public/stylesheets/app/login-register.less
modified:   public/stylesheets/app/plans.less
modified:   public/stylesheets/app/portals.less
modified:   public/stylesheets/app/templates-v2.less
modified:   public/stylesheets/app/wiki.less
modified:   public/stylesheets/components/alerts.less
modified:   public/stylesheets/components/buttons.less
modified:   public/stylesheets/components/icons.less
new file:   public/stylesheets/components/images.less
new file:   public/stylesheets/components/tabs.less
modified:   public/stylesheets/core/_common-variables.less
modified:   public/stylesheets/core/ol-variables.less
modified:   public/stylesheets/ol-style.less
modified:   test/acceptance/coffee/ExportsTests.coffee
new file:   test/acceptance/coffee/RedirectUrlsTests.coffee
modified:   test/acceptance/coffee/TokenAccessTests.coffee
modified:   test/acceptance/coffee/helpers/User.coffee
modified:   test/acceptance/config/settings.test.coffee
modified:   test/unit/coffee/Authentication/AuthenticationControllerTests.coffee
modified:   test/unit/coffee/Editor/EditorHttpControllerTests.coffee
modified:   test/unit/coffee/Exports/ExportsControllerTests.coffee
modified:   test/unit/coffee/Exports/ExportsHandlerTests.coffee
new file:   test/unit/coffee/Notifications/NotificationsBuilderTests.coffee
modified:   test/unit/coffee/Project/ProjectControllerTests.coffee
modified:   test/unit/coffee/TokenAccess/TokenAccessControllerTests.coffee
modified:   test/unit/coffee/User/UserGetterTests.coffee
deleted:    test/unit/coffee/infrastructure/RedirectManagerTests.coffee
 2018-09-24 09:11:48 -03:00
Alasdair Smith
b6c794f627 Ensure brand prefixed favicon is used 2018-09-21 15:44:36 +01:00
Alasdair Smith
945894e89e Reset showNavItem bool if fails check 2018-09-21 12:53:57 +01:00
Jessica Lawshe
bfcb91e60f Hide content page links in nav when on dash 2018-09-20 11:16:18 -05:00
Jessica Lawshe
d2af2fb630 Merge pull request #927 from sharelatex/jel-plans-updates 
Plans page updates
 2018-09-20 09:00:58 -05:00
Hugh O'Brien
8805447bb9 Revert "Add notification to confirm unconfirmed emails" 2018-09-19 12:28:39 +01:00
Douglas Lovell
98be2c2bf5 Update wording and endpoint for change password form 2018-09-19 07:58:04 -03:00
Hugh O'Brien
78ad6e7e5c Merge pull request #915 from sharelatex/hb-affiliation-cta 
Replace profile completion CTA with affiliations CTA
 2018-09-19 11:32:55 +01:00
Hugh O'Brien
18e706c4b2 Merge pull request #917 from sharelatex/hb-confirm-email-notification 
Add notification to confirm unconfirmed emails
 2018-09-19 11:32:44 +01:00
Douglas Lovell
4abbc5d569 Password change form conditioned on installation 2018-09-18 09:10:33 -03:00
hugh-obrien
277225d8de use existing left sidebar controller for affiliation cta 2018-09-18 13:06:26 +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
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
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
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
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
Chrystal Griffiths
3b43cf9075 Slight copy change 2018-09-13 17:57:11 +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
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
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
Douglas Lovell
0ecda4e093 Display password change from in Account Settings 2018-09-10 14:53:33 -03: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
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
hugh-obrien
5605e1c5c3 update copy for ip match notifications 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
38faa5c25e correctly create and display ip matched affiliations 2018-09-05 11:22:25 +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
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
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
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
Jessica Lawshe
dff29637b7 Move quotes to partial 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
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
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
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
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
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
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
Paulo Reis
90b353298d Switch themes at runtime. 2018-08-28 14:12:00 +01: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
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
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
80c74ce07b add back learn more link 2018-08-23 11:42:00 -04: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
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
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
Paulo Reis
54e0a7cfd2 Merge branch 'master' into pr-change-free-history-limits 2018-08-21 11:23:28 +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
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
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
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
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
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
Paulo Reis
23bb866988 Show an error message when history fails to load updates. 2018-08-16 11:26:34 +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
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
James Allen
a9a6dcf82a Move template modal to template module 2018-08-10 17:17:00 +01:00
Paulo Reis
a5c6f81573 Merge branch 'master' into pr-history-labels-part-2 2018-08-10 15:57:32 +01: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
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
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
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
Jessica Lawshe
c7941ac00e Links mixins 2018-07-26 10:35:48 -05:00
James Allen
7dc82597e1 Merge pull request #765 from sharelatex/ja-update-email-in-v1 
Update email in v1 when setting as default in v2
 2018-07-26 10:58:57 +01:00
Alasdair Smith
ffe3bc2977 Switch review panel to use richTextEnabled variable 2018-07-18 09:26:03 +01:00
Alasdair Smith
4202b9c717 Use hard-coded feature flag for rich text 2018-07-18 09:26:03 +01:00
Alasdair Smith
fba0cd04f5 Fix TC underlines being offset because review panel above editor toolbar 2018-07-17 17:34:09 +01:00
Jessica Lawshe
64a257dae2 Merge pull request #708 from sharelatex/jel-mathjax 
MathJax - library path, directive, and use `Safe` extension
 2018-07-17 09:32:06 -05:00
James Allen
4435eab423 Update affiliations UI to show specific errors for conflicting emails 2018-07-17 11:12:47 +01:00
James Allen
b150a7b4ae Merge pull request #735 from sharelatex/pr-affiliations-ui-adjustments 
Affiliations UI, second round
 2018-07-16 10:08:47 +01:00
James Allen
a238c74440 Remove inline style 2018-07-13 11:19:49 +01:00
Alasdair Smith
b00cad19ff Merge pull request #751 from sharelatex/as-fix-loading-toolbar 
Fix bug where loading panel was showing over toolbar
 2018-07-13 11:17:46 +01:00
James Allen
452d698a47 ng-show -> ng-if 2018-07-13 11:17:05 +01:00
James Allen
d7e0b8c369 Show unconfirmed email status in UI and add link to resend confirmation 2018-07-12 17:13:26 +01:00
Paulo Reis
a759828ece Update feature flag for affiliations; use it in the router; minor style adjustments. 2018-07-12 16:37:09 +01:00
Paulo Reis
85cf518457 Avoid showing the email input when viewing the full affiliations UI; disable affiliations when using SAML and LDAP authentication strategies. 2018-07-12 16:37:09 +01:00
Paulo Reis
c817094a2d Add i18n keys; minor style adjustments. 2018-07-12 16:37:09 +01:00
Paulo Reis
4d1b6c6ba8 Add error handling. 2018-07-12 16:37:09 +01:00
Paulo Reis
c630c5d952 Preemptively remove front-end data when removing user emails. 2018-07-12 16:37:09 +01:00
Paulo Reis
19b57571bf Basic affiliation change implementation. 2018-07-12 16:37:08 +01:00
Paulo Reis
1514e5e071 Isolate affiliations form in a component. 2018-07-12 16:37:08 +01:00
Alasdair Smith
ba6560ce04 Fix bug where loading panel was showing over toolbar 2018-07-12 11:18:09 +01:00
Alasdair Smith
dc56ffb8a6 Improve copy 2018-07-11 15:22:20 +01:00
Alasdair Smith
b1a47ddae4 Improve copy 2018-07-11 15:15:22 +01:00
Alasdair Smith
538aba323a Add first pass at unsupported message and style 2018-07-11 15:15:22 +01:00
Alasdair Smith
00c089448e Add review panel unsupported message 2018-07-11 15:15:22 +01:00
Alasdair Smith
9d81cf20f9 Add new unsupported class to control visibility while rich text is open 2018-07-11 15:15:22 +01:00
Paulo Reis
2ef1b4904d Bootstrap the light theme. 2018-07-09 15:45:09 +01:00
Shane Kilkelly
0777e44abf Merge branch 'sk-linked-files-mendeley' 2018-07-04 12:16:39 +01:00
Shane Kilkelly
b32c9be8ca Linked files from Mendeley. 2018-07-04 10:05:03 +01:00
Alberto Fernández-Capel
a1c49b0cf9 Merge pull request #694 from sharelatex/sk-linked-files-warning-when-no-projects 
Add a warning message when there are no other projects to choose.
 2018-07-03 13:38:33 +01:00
Alasdair Smith
04a98c4d91 Merge pull request #697 from sharelatex/pr-user-affilitations 
User affiliations
 2018-07-02 11:36:04 +01:00
Alberto Fernández Capel
d76a6ae710 Ensure overleaf settings is defined before linking to the v1 subscription page 2018-06-29 15:33:03 +01:00
Paulo Reis
d021cd8e3f Add role hints and deparment hints (when not provided by the uni). 2018-06-28 16:37:36 +01:00
Jessica Lawshe
a34dcef8b7 Use express local for MathJax path 2018-06-27 17:27:27 -05:00
Paulo Reis
270c67df5f Move affiliations form and table into specific file. 2018-06-27 17:08:25 +01:00
Paulo Reis
d1467784bb Avoid showing a comma when the user only has department info. 2018-06-27 14:21:03 +01:00
Jessica Lawshe
9f5e976539 Merge pull request #681 from sharelatex/jel-cms-meta-and-btn 
CMS: control of metadata
 2018-06-26 08:19:57 -05:00
Shane Kilkelly
c5defc9203 Update wording, tell user to create another project 2018-06-26 09:54:58 +01:00
James Allen
fbfb0d6472 Remove conflicting .modal class from upload alerts 2018-06-26 09:09:10 +01:00
Paulo Reis
e7f819fbdd Hide affiliations UI behind feature flag. 2018-06-25 17:06:23 +01:00
Paulo Reis
8ac6f4d6f4 Use v1 proxy; even more style adjustments. 2018-06-25 16:13:43 +01:00
Paulo Reis
b92dc98b99 Merge branch 'master' into pr-user-affilitations 2018-06-25 14:13:26 +01:00
Paulo Reis
00dfcf66c6 More styling adjustments. 2018-06-25 13:44:43 +01:00
Shane Kilkelly
b3d17fc753 Add a warning message when there are no other projects to choose. 2018-06-25 11:48:05 +01:00
Shane Kilkelly
f6424ada40 Merge pull request #655 from sharelatex/sk-linked-files-output-redux 
Linked files from project output
 2018-06-25 10:28:29 +01:00
Jessica Lawshe
af2417bdc5 Move metadata to separate file and update metadata existence check 2018-06-22 13:42:01 -05:00
Paulo Reis
a1da24a86d Styling adjustments. 2018-06-22 16:07:54 +01:00
James Allen
c004cdb200 Remove hardcoded ShareLaTeX reference in upgrade blurb 2018-06-22 14:24:41 +01:00
Shane Kilkelly
ebe828aa62 Refactor, and remove the source_project_display_name prop from linkedFileData 2018-06-22 13:09:18 +01:00
Shane Kilkelly
67dcbff450 Remove linked-files items from the left-menu test controls 2018-06-22 13:09:18 +01:00
Shane Kilkelly
7fc99a38f8 Better styling on the output-files toggle 2018-06-22 13:08:13 +01:00
Shane Kilkelly
6672a20c2b Enable switching between source and output files 2018-06-22 13:08:13 +01:00
Shane Kilkelly
64ec90f34f Move the isOutputFilesMode flag onto the scope 2018-06-22 13:08:13 +01:00
James Allen
5717496685 Create unified new file modal with linked files 2018-06-22 13:08:13 +01:00
Shane Kilkelly
d4beba24b6 Backend for project output file agent 2018-06-22 13:08:13 +01:00
Shane Kilkelly
e916d96792 WIP: basic backend for project-output-file agent 2018-06-22 13:08:13 +01:00
Shane Kilkelly
ead245721b Mostly working selection of output files from another project 2018-06-22 13:08:13 +01:00
Shane Kilkelly
60ca298db3 WIP 2018-06-22 13:08:13 +01:00
Paulo Reis
9bc70d479c Use university-provided list of departments when available. 2018-06-22 11:24:14 +01:00
Paulo Reis
62ab9dbb98 Rearrange layout to have the new affiliation form within the affiliations table. 2018-06-21 17:18:01 +01:00
James Allen
46fbf0c641 Merge pull request #672 from sharelatex/ja-refactor-email-templating 
Refactor email templating
 2018-06-21 10:28:26 +01:00
James Allen
0dcbc5facb Send out confirmation emails on register and record confirmedAt date 2018-06-21 10:21:15 +01:00
Paulo Reis
147d74d92a Integrate e-mails table with backend. 2018-06-20 14:22:06 +01:00
Paulo Reis
917776aede Change the UI to gradually show needed fields for affiliations. 2018-06-20 11:37:55 +01:00
Paulo Reis
c0241df15c Rewrite service and controller code to send the correct payload according to use case (no uni; known uni; new uni). 2018-06-19 17:10:55 +01:00
Jessica Lawshe
ad50db858e Merge pull request #664 from sharelatex/jel-pricing-plans-event 
Plans and Pricing Google Analytics events
 2018-06-19 08:48:12 -05:00
James Allen
a3e92a8867 Merge pull request #658 from sharelatex/ja-enable-subscriptions 
Add message explaining Collaborator subscription to v1 users
 2018-06-19 08:37:50 +01:00
Jessica Lawshe
fe225fbbd3 Include event label when features table viewed 2018-06-15 16:29:42 -05:00