Commit graph

19936 commits

Author SHA1 Message Date
Antoine Clausse
aa7839876a [web] Promisify MetricsEmailController and InstitutionHubsController (attempt 2) (#18805)
* Reapply "[web] Promisify MetricsEmailController and InstitutionHubsController …"

This reverts commit ea14df1395f1dc2fa7d41fc7837849f9686425b5.

* Fix changes to node-fetch: `statusCode` -> `status` (!!)

* Update test

* Handle no-content without throwing (!)

Avoid error `Unexpected end of JSON input` when doing `response.json()` on an empty response when status is 204

Related: https://github.com/node-fetch/node-fetch/issues/165

* Also return `204` when no data in departments_data and roles_data

* Revert "Handle no-content without throwing (!)", and return null instead

This reverts commits 3baa779f7a9e64804e54a276faf865ab9252f336 and 51507a3d763d7006c8b01414a7c79bd3f3b6948b.

* Update tests: `assert_nil`

* Fixup: Update tests: assert null

* Use `fetchJSON` in Institution.fetchV1Data

* Proxy errors from server without throwing 500

GitOrigin-RevId: 9c13e293f3fed3abd2accddd1a9060ed02b96ba2
2024-06-19 08:04:02 +00:00
M Fahru
e549e44ca7 Merge pull request #18889 from overleaf/mf-plans-new-tab-active-green
[web] Change text and icon color to green when new plans page tab is active

GitOrigin-RevId: 745b15538aa89afdb35a642f6927ecce0f1b40ee
2024-06-18 08:05:25 +00:00
M Fahru
bdf8927cdf Fix new plans page table header does not occupy full height for all of its children on Chrome
GitOrigin-RevId: a69c20057ff1563e6f6e93c87e4ac3a0c010885d
2024-06-18 08:05:21 +00:00
M Fahru
9309df9a13 Merge pull request #18870 from overleaf/mf-new-plans-page-table-individual
[web] Create new plans page table for individual plans

GitOrigin-RevId: 82bfcf5a5e7886517bab9b67dfb4a712350f8c33
2024-06-18 08:05:16 +00:00
Jessica Lawshe
c117a64ebb Merge pull request #18902 from overleaf/ar-web-script-for-salesforce-data
[web] Add script for loading v2 salesforce data

GitOrigin-RevId: 15d3c30be166d011702d1a2d4a1d960cd4b2fa8c
2024-06-18 08:05:11 +00:00
Jessica Lawshe
a343ec1578 Merge pull request #18932 from overleaf/jel-rename-css-light-touch
[web] Rename CSS classes for light touch redesign

GitOrigin-RevId: 2e415dcffd04f8783f5b7145827031fdbfc83baf
2024-06-18 08:05:07 +00:00
Jessica Lawshe
1db5593c5a Merge pull request #18931 from overleaf/jel-new-files-for-light-touch
[web] New files for plans light touch redesign

GitOrigin-RevId: beb517543c8341bbd8124fab87b532f62c5a0c11
2024-06-18 08:05:02 +00:00
Jessica Lawshe
a7adfc12da Merge pull request #18907 from overleaf/jel-faq-css
[web] CSS updates to new plans FAQ

GitOrigin-RevId: b00d8b22f62d9a3774eb673501c0b2074dd15d81
2024-06-18 08:04:57 +00:00
Jessica Lawshe
092e49d6ec Merge pull request #18905 from overleaf/jel-plans-faq
[web] Add new plans FAQ to light touch redesign variant

GitOrigin-RevId: a4140a09c94e0374792acb789b4f36ad104841f2
2024-06-18 08:04:53 +00:00
Jessica Lawshe
6e084f389a Merge pull request #18885 from overleaf/jel-plans-page-quotes
[web] Handle hiding/showing quote rows on new plans page variants

GitOrigin-RevId: dd88cce9acdc2ca07d5df1afa7278028820e673d
2024-06-18 08:04:48 +00:00
Domagoj Kriskovic
4aa746a759 [web] show file restored change in history (#18792)
* add RestoreFileOrigin in overleaf-editor-core

* support source to be an object

* use sourceOrOrigin as param

* rename to originOrSource so the priority is more clear

* get timestamp from version

* fix test

* include version and min_count in getUpdatesFromHistory

* extractOriginOrSource util function

* fix RestoreManagerTests

* [web] show restore file change in history

* make sure two restore operations are not merged

* dont summarize updates for different paths

GitOrigin-RevId: d890484760a7379716e8bd65dd28e353d293492f
2024-06-18 08:04:43 +00:00
Alexandre Bourdin
f265797bb1 Sets lastUpdatedBy to null when it is empty on github sync update (#18788)
GitOrigin-RevId: bce67f7d3dbc59facc626cc63af94df46afd8f24
2024-06-18 08:04:39 +00:00
Domagoj Kriskovic
7e8e2b0585 Send origin metadata through docupdater and project-history when restoring files (#18721)
* add RestoreFileOrigin in overleaf-editor-core

* support source to be an object

* use sourceOrOrigin as param

* rename to originOrSource so the priority is more clear

* get timestamp from version

* fix test

* include version and min_count in getUpdatesFromHistory

* extractOriginOrSource util function

* fix RestoreManagerTests

GitOrigin-RevId: 0ace05a6ade2794c753a9d0bffb4f858ecc6899a
2024-06-18 08:04:34 +00:00
Alf Eaton
5a5defee69 Merge pull request #18943 from overleaf/ae-jquery-revert
Revert "Upgrade jQuery to v3 (#18796)"

GitOrigin-RevId: fa7815b7bfe28239c86900b62bdcd3c4dac3a65f
2024-06-18 08:04:29 +00:00
Alf Eaton
9cb313d687 Merge pull request #18847 from overleaf/ls-remove-crypto-js
remove npm package crypto-js

GitOrigin-RevId: c6f3bc2275a4757e6fb17e82f98ee5f8ca119e15
2024-06-18 08:04:19 +00:00
Alf Eaton
46f878c42f Upgrade jQuery to v3 (#18796)
GitOrigin-RevId: c5d1e280784480911de8ec11af618f5eadc6a846
2024-06-18 08:04:14 +00:00
Alf Eaton
b9a8a7f7ec Move AI provider usage to the backend (#18562)
GitOrigin-RevId: 4f66c6576571c4fbb7381d8d0e34f2e468d6f34f
2024-06-18 08:04:09 +00:00
Jakob Ackermann
e36de5a62d Merge pull request #18856 from overleaf/jpa-server-ce-shutdown
[server-ce] improve shutdown procedure

GitOrigin-RevId: 5a99868d17f597c366e42625cd39f05146dcb682
2024-06-18 08:04:04 +00:00
CloudBuild
6980a44f8b auto update translation
GitOrigin-RevId: bae1485e0792582f6a3bee3a791c193c8c7a5bee
2024-06-17 08:04:34 +00:00
David
dcb7944b05 Merge pull request #18895 from overleaf/dp-presentation-mode
Add pdf presentation mode

GitOrigin-RevId: e6ac1ae339e9690a733a110c6f0a33149e869dd6
2024-06-17 08:04:30 +00:00
Rebeka Dekany
805ec8c2e0 Merge pull request #18808 from overleaf/rd-ejs-upgrade
Upgrading ejs package version from 3.1.8 to 3.1.10

GitOrigin-RevId: 2e2ad7c3d74a2c6e929a030ddbc8735235346804
2024-06-17 08:04:26 +00:00
Miguel Serrano
da5846209f Merge pull request #18402 from overleaf/msm-git-bridge-pom
* [git-bridge] Extracted pom versions to properties

Managing versions as properties is a best practice
with pom files. An advantage in our case is ensuring
dependency groups (as simpleclient) are upgraded
together.

* [git-bridge] Remove '_' as keyword

* [git-bridge] Added formatting with 'fmt-maven-plugin'

* Remove java from .editorconfig

No longer needed as a formatter is now available

* Replace javadoc comments with multiline comments

Replaces "/**" with "/*", which then prevents the formatter
from adding HTML elements to comments

* [git-bridge] Formatted .java files

GitOrigin-RevId: 0997b838cee88c290d824a74444295e26392f26b
2024-06-17 08:04:21 +00:00
ilkin-overleaf
b34be6bea4 Merge pull request #18653 from overleaf/ii-invite-token-create-hmac
[web] Add HMAC tokens for project invitations

GitOrigin-RevId: 02fa01e24790c9a87f57ff9346f5346658d4dd46
2024-06-17 08:04:17 +00:00
ilkin-overleaf
bb2a3b091d Merge pull request #18911 from overleaf/ii-new-project-modal-fix
[web] Allow creating new project by submitting the form with keyboard

GitOrigin-RevId: e04e70a0713299d6d8459755359d16ea7755c67e
2024-06-17 08:04:13 +00:00
andrew rumble
81b0eb7eb5 Remove obsolete comment
GitOrigin-RevId: 73da65c200d19ed4b389423e3d9f983c90ea1885
2024-06-17 08:04:09 +00:00
andrew rumble
49b7ebe0d0 Remove instances where async is required but not used
GitOrigin-RevId: a202a2d90c4ce61391aabbde1f24437caef54ff0
2024-06-17 08:04:05 +00:00
andrew rumble
ee31d44f03 Explicitly specify latest version of async
GitOrigin-RevId: 9112007de0f5eb4e75604de9f01c2d77b3b8b980
2024-06-17 08:04:00 +00:00
Alf Eaton
e3fcbb4e79 Unpin async dependency
GitOrigin-RevId: 2fd885030ebda5cd4e1e8faad0ba5f57926e38a3
2024-06-17 08:03:51 +00:00
CloudBuild
658be2e7e1 auto update translation
GitOrigin-RevId: dfd486e1ad6b88c5b9d7b22492563b660c0e0b9a
2024-06-14 08:05:30 +00:00
Davinder Singh
df2898a911 Merge pull request #18868 from overleaf/ds-plans-page-new-design-mobile-plans-1
Website redesign - Plans page `new-design` mobile screen plans card (1)

GitOrigin-RevId: 5a3be0f0a5f0a41b934e0c3489883c65450a0076
2024-06-14 08:05:17 +00:00
M Fahru
a0f90bd971 Merge pull request #18860 from overleaf/mf-new-plans-page-student-desktop-header
[web] Create a table header for student plans with static data

GitOrigin-RevId: 29e787509521b6249a97f858b715b482214a9ab0
2024-06-14 08:05:12 +00:00
M Fahru
65592194ec Merge pull request #18862 from overleaf/mf-simplify-non-discounted-text-new-plans-page
[web] Improve the structure of the price elements on the new plans table by using grid display

GitOrigin-RevId: 08052aec5037432af7ad4d4c554e529582d4acfc
2024-06-14 08:05:07 +00:00
M Fahru
d80046c757 Delete unused code: planFeatures.js, this config should have been deleted on the first plans page redesign.
This config is superseded by `plansFeatures.js` that is imported by `plansConfig.js` which is directly used in the pug template.

GitOrigin-RevId: ae0a0e1ff7c8a64022ab378d17943fe4a7ed3b35
2024-06-14 08:05:03 +00:00
Davinder Singh
05c0cbfd6d Merge pull request #18883 from overleaf/jel-eyebrow-text
[web] Add mixin for eyebrow headline

GitOrigin-RevId: 992acd11e6c22c35499329bb53917a2b1ac79ac5
2024-06-14 08:04:55 +00:00
Davinder Singh
9ff03e9245 Merge pull request #18877 from overleaf/jel-sales-ad
[web] Remove 2 sales ad variants and increase probability of FOMO variant

GitOrigin-RevId: 6045dd4255313ae53f255afa528695583171d55b
2024-06-14 08:04:46 +00:00
Davinder Singh
6f39e41461 Website Redesign - Plans page main heading section (#18837)
* adding the main heading of the plans page

* removing some extra CSS and adding a max-width

GitOrigin-RevId: 78e8ab57826171505bb37e89e950dbd44ea1b3d1
2024-06-14 08:04:42 +00:00
Davinder Singh
8018bc7249 Website redesign - Plans page FQA's tabs Section (new-design) (#18696)
* running git reset head

* renaming the local-mixins file to _plans_faq

* removed js to rotate the icon

* format:fix

* adding aria-hidden for curly braces

* removing extra tab space

* removing .card.card-body extra class

* introducing accordions-container so that we can use the last-child property to remove the border of the last questions

* creating new website-redesign-ol-tabs class and adding new styles in this class

* adding content for managingYourSubscription and overleafIndividualPlans sections

* adding content in overleaf group plans section

* removing extra section

* running make cleanup_unused_locales

* cleaning after rebase

* deleting extra variable projectLimits

* fixing spaces around curly brackets and some additional changes after rebase

GitOrigin-RevId: 3c2267080825d853e680a0a207cb640226262be2
2024-06-14 08:04:37 +00:00
ilkin-overleaf
182e9859ec Merge pull request #18690 from overleaf/ii-bs5-projects-welcome
[web] Welcome page migration

GitOrigin-RevId: 2469786372df24d579d1987cf5bb1113450e9d78
2024-06-14 08:04:32 +00:00
CloudBuild
196cf2f190 auto update translation
GitOrigin-RevId: 9c86718bcd0a64cbe44852344a34e80be794e87a
2024-06-13 08:04:57 +00:00
Jessica Lawshe
87bc0b2aa9 Merge pull request #18857 from overleaf/jel-plans-page-css
[web] Add quotes to new plans page variants

GitOrigin-RevId: 794692730a7a6846bf4e43021c34798e9a2605da
2024-06-13 08:04:45 +00:00
Jessica Lawshe
0361299764 Merge pull request #18859 from overleaf/jel-greens
[web] Update greens across website for new site design

GitOrigin-RevId: ff7ca877f1bcdbd9b5e80a87b48f8d375fd8ea5a
2024-06-13 08:04:41 +00:00
Jessica Lawshe
cd9dc12059 Merge pull request #18683 from overleaf/jel-new-styles-quote
[web] New quote style for plans page and CMS pages using `Element | Quote`

GitOrigin-RevId: c4a089727f023d5d28a036c6babbdc773d7fc06a
2024-06-13 08:04:36 +00:00
Mathias Jakobsen
801a17af27 Merge pull request #18838 from overleaf/mj-history-detached-ranges
[project-history] Handle detached ranges

GitOrigin-RevId: cdbe9b46a03d55fd7b865fdd87092aaad1920c62
2024-06-13 08:04:32 +00:00
Brian Gough
49dc94192a Merge pull request #18848 from overleaf/bg-cookie-session-metrics-for-real-time
add cookie session metrics for real-time

GitOrigin-RevId: 6b482dafc19fca46a375ea00a9b2297e20d915ce
2024-06-13 08:04:24 +00:00
Brian Gough
38ac00ba13 Merge pull request #18775 from overleaf/bg-cookie-session-metrics-middleware
add middleware to record session cookie metrics in web

GitOrigin-RevId: f4404455e219d2071d6f0b39e657e9219b7d1c70
2024-06-13 08:04:16 +00:00
Brian Gough
97956856ca Merge pull request #18741 from overleaf/bg-cookie-session-test-rotation-support
test session key rotation in cookie-session module

GitOrigin-RevId: 57486b3df527a9998da3b93981c9d45f510802b8
2024-06-13 08:04:06 +00:00
M Fahru
c8e8c5213c Merge pull request #18845 from overleaf/mf-line-height-rem
[web] Create a new standardized font-size and line-height and use that in new plans page

GitOrigin-RevId: 7c9c92e58e55dd03d0459f5e7314a2832bc769ce
2024-06-12 08:05:54 +00:00
M Fahru
f8e899b026 Merge pull request #18843 from overleaf/mf-new-plans-page-header-padding-fix
[web] New plans page table spacing issues

GitOrigin-RevId: db36694a76acd1a4fa03c64af90ad6fb90c4705f
2024-06-12 08:05:49 +00:00
M Fahru
17ca5b22c5 Merge pull request #18840 from overleaf/mf-new-plans-page-max-height-th
Make new plans table head row (thead > tr) have a dynamic height depending on the maximum value of one of the `th`

GitOrigin-RevId: 1aad2f023a3e83f3037a41b061d63a9351eb1ae8
2024-06-12 08:05:45 +00:00
M Fahru
17110168e2 Merge pull request #18811 from overleaf/mf-new-plans-page-group-desktop-header
[web] Create table header for group table with static data

GitOrigin-RevId: 42a5bda96b3bb4434b6c39c5b35512550ea7157a
2024-06-12 08:05:41 +00:00