diff --git a/.cirrus.yml b/.cirrus.yml.disabled similarity index 100% rename from .cirrus.yml rename to .cirrus.yml.disabled diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index 6cd2fef2663cd..453f41e7d180b 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -8,43 +8,34 @@ assignees: '' --- ### Describe the Bug - A clear and concise description of what the bug is. ### Steps to Reproduce - 1. Go to '...' 2. Click on '....' 3. Scroll down to '....' 4. See error ### Expected Behavior - A clear and concise description of what you expected to happen. ### Actual Behavior - A clear and concise description of what actually happens. ### Screenshots - If applicable, add screenshots to help explain your problem. ### Desktop - (Please complete the following information) - - **OS:** [e.g. Windows 11] - - **Browser:** [e.g. Chrome] - - **Version:** [e.g. 114.0] + - **Collabora version:** [e.g. 23.05.5.3] + - **OS and version:** [e.g. Windows 11] + - **Browser and version:** [e.g. Chrome 114.0] ### Smartphone - (Please complete the following information) - - **Device:** [e.g. iPhone14] - - **OS:** [e.g. iOS16.5] - - **Browser:** [e.g. Safari] - - **Version:** [e.g. 16.4] + - **Device:** [e.g. iPhone 14] + - **OS:** [e.g. iOS 16.5] + - **Browser and version:** [e.g. Safari 16.4] ### Additional Context - Add any other context about the problem here. diff --git a/.github/workflows/code-duplication.yml b/.github/workflows/code-duplication.yml deleted file mode 100644 index 278394133a3fc..0000000000000 --- a/.github/workflows/code-duplication.yml +++ /dev/null @@ -1,16 +0,0 @@ -on: [pull_request] - -jobs: - dry-code-action: - runs-on: ubuntu-latest - name: Dry Code Action - steps: - - name: Checkout Repository - uses: actions/checkout@v2 - - name: Dry Code Action - uses: Pposong-Hantaihe/dry-code@v1.0.2 - with: - token: "${{ secrets.GITHUB_TOKEN }}" - arguments: "./browser/src" - options: "--min-lines=26" - diff --git a/.github/workflows/helm-release.yml b/.github/workflows/helm-release.yml index b28f5eb786138..b9018ee9fd401 100644 --- a/.github/workflows/helm-release.yml +++ b/.github/workflows/helm-release.yml @@ -13,6 +13,7 @@ jobs: # see: https://docs.github.com/en/actions/security-guides/automatic-token-authentication#modifying-the-permissions-for-the-github_token permissions: contents: write + packages: write runs-on: ubuntu-latest steps: - name: Checkout @@ -30,10 +31,76 @@ jobs: with: version: v3.12.1 + - name: Import GPG key + run: | + echo "${{ secrets.GPG_PRIVATE_KEY }}" | gpg --dearmor --output keyring.gpg + echo "${{ secrets.GPG_PASSPHRASE }}" > passphrase-file.txt + - name: Run chart-releaser - uses: helm/chart-releaser-action@v1.5.0 + # for use with make-release-latest + uses: helm/chart-releaser-action@v1.6.0 env: CR_TOKEN: "${{ secrets.GITHUB_TOKEN }}" + CR_SKIP_EXISTING: true + CR_KEY: Collabora Productivity + CR_KEYRING: keyring.gpg + CR_PASSPHRASE_FILE: passphrase-file.txt + CR_SIGN: true with: charts_dir: "kubernetes/helm" - config: kubernetes/helm/cr.yaml \ No newline at end of file + config: kubernetes/helm/cr.yaml + + # see https://github.com/helm/chart-releaser/issues/183 + - name: Login to GitHub Container Registry + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: ${{ github.actor }} + password: ${{ secrets.GITHUB_TOKEN }} + + - name: Push charts to GHCR + run: | + shopt -s nullglob + for pkg in .cr-release-packages/*; do + if [ -z "${pkg:-}" ]; then + break + fi + + # Check if the package has a ".prov" extension and skip if true + # prov doesn't need to be pushed they are already pushed as layer in manifest + if [[ "${pkg}" == *.prov ]]; then + echo "Skipping package - ${pkg} with '.prov' extension" + continue + fi + + # convert uppercase->lowercase to make sure it follows oci rules + lowercase=$(echo "${GITHUB_REPOSITORY_OWNER}" | tr '[:upper:]' '[:lower:]') + + echo "Pushing package - ${pkg} to ghcr.io repository - ${lowercase}" + helm push "${pkg}" "oci://ghcr.io/${lowercase}/charts" + done + + - name: Login to Docker Hub + uses: docker/login-action@v3 + with: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_TOKEN }} + + - name: Push charts to Docker Hub + run: | + shopt -s nullglob + for pkg in .cr-release-packages/*; do + if [ -z "${pkg:-}" ]; then + break + fi + + # Check if the package has a ".prov" extension and skip if true + # prov doesn't need to be pushed they are already pushed as layer in manifest + if [[ "${pkg}" == *.prov ]]; then + echo "Skipping package - ${pkg} with '.prov' extension" + continue + fi + + echo "Pushing package - ${pkg} to docker.io repository - collabora" + helm push "${pkg}" "oci://registry-1.docker.io/collabora" + done diff --git a/.gitignore b/.gitignore index 14c2392fc933d..1f3486d2d6027 100644 --- a/.gitignore +++ b/.gitignore @@ -14,7 +14,6 @@ **/.cache Makefile Makefile.in -coolkitconfig.xcu coolwsd.spec coolwsd.xml aclocal.m4 @@ -99,6 +98,8 @@ coolforkit-nocaps loadtest unittest clientnb +libsimd.a +coolwsd-inproc # Fuzzer *_fuzzer @@ -121,6 +122,7 @@ ios/Mobile/Info.plist ios/Mobile/Fonts ios/Mobile/Branding ios/Mobile/Resources/Settings.bundle/Root.plist +ios/Mobile/coolkitconfig.xcu # symlinks created by configure for the iOS app Xcode project lobuilddir-symlink diff --git a/.gitpod-files/coolwsd-gitpod.xml b/.gitpod-files/coolwsd-gitpod.xml index 709c304759300..d8b45d54f1dfa 100644 --- a/.gitpod-files/coolwsd-gitpod.xml +++ b/.gitpod-files/coolwsd-gitpod.xml @@ -1,5 +1,8 @@ + + @@ -44,6 +47,7 @@ + true 120 900 @@ -134,7 +138,8 @@ - classic + default + true @@ -168,8 +173,6 @@ - true - true false @@ -180,4 +183,16 @@ + + both + + + + true + + + + true + + diff --git a/Makefile.am b/Makefile.am index 4a2e1dd4c1505..fef50272647c5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -27,6 +27,9 @@ bin_PROGRAMS = \ if ENABLE_LIBFUZZER else bin_PROGRAMS += coolwsd +if ENABLE_DEBUG +bin_PROGRAMS += coolwsd-inproc +endif endif dist_bin_SCRIPTS = coolwsd-systemplate-setup @@ -44,7 +47,8 @@ dist_doc_DATA = wsd/README \ wsd/README.vars \ wsd/protocol.txt \ wsd/reference.md \ - wsd/metrics.txt + wsd/metrics.txt \ + THIRDPARTYLICENSES coolwsddatadir = @COOLWSD_DATADIR@ @@ -115,6 +119,7 @@ shared_sources = common/FileUtil.cpp \ common/ConfigUtil.cpp \ common/Authorization.cpp \ common/CommandControl.cpp \ + common/Simd.cpp \ net/DelaySocket.cpp \ net/HttpRequest.cpp \ net/HttpHelper.cpp \ @@ -132,19 +137,24 @@ coolwsd_sources = common/Crypto.cpp \ wsd/DocumentBroker.cpp \ wsd/ProxyProtocol.cpp \ wsd/COOLWSD.cpp \ + wsd/ClientRequestDispatcher.cpp \ wsd/ClientSession.cpp \ wsd/FileServer.cpp \ wsd/ProxyRequestHandler.cpp \ wsd/FileServerUtil.cpp \ wsd/RequestDetails.cpp \ + wsd/RequestVettingStation.cpp \ wsd/Storage.cpp \ + wsd/StorageConnectionManager.cpp \ wsd/HostUtil.cpp \ wsd/TileCache.cpp \ wsd/ProofKey.cpp \ - wsd/QuarantineUtil.cpp + wsd/QuarantineUtil.cpp \ + wsd/WopiProxy.cpp coolwsd_SOURCES = $(coolwsd_sources) \ - $(shared_sources) + $(shared_sources) \ + wsd/coolwsd-fork.cpp EXTRA_coolwsd_DEPENDENCIES = browser/node_modules @@ -177,12 +187,29 @@ lokitclient_SOURCES = common/Log.cpp \ common/TraceEvent.cpp \ common/Util.cpp +noinst_LIBRARIES = libsimd.a +libsimd_a_SOURCES = kit/DeltaSimd.c +libsimd_a_CFLAGS = @SIMD_CFLAGS@ + coolforkit_sources = kit/ChildSession.cpp \ kit/ForKit.cpp \ kit/Kit.cpp coolforkit_SOURCES = $(coolforkit_sources) \ - $(shared_sources) + $(shared_sources) \ + kit/forkit-main.cpp + +coolforkit_LDADD = libsimd.a + +if ENABLE_DEBUG +coolwsd_inproc_SOURCES = $(coolwsd_sources) \ + $(shared_sources) \ + $(coolforkit_sources) \ + wsd/coolwsd-inproc.cpp + +coolwsd_inproc_LDADD = ${coolwsd_LDADD} \ + ${coolforkit_LDADD} +endif if ENABLE_LIBFUZZER coolforkit_SOURCES += \ @@ -191,41 +218,42 @@ coolforkit_SOURCES += \ common_fuzzer_sources = \ common/DummyTraceEventEmitter.cpp \ $(coolwsd_sources) \ + wsd/coolwsd-inproc.cpp \ $(coolforkit_sources) \ $(shared_sources) admin_fuzzer_CPPFLAGS = \ - -DKIT_IN_PROCESS=1 \ $(AM_CPPFLAGS) admin_fuzzer_SOURCES = \ $(common_fuzzer_sources) \ fuzzer/Admin.cpp admin_fuzzer_LDFLAGS = -fsanitize=fuzzer $(AM_LDFLAGS) +admin_fuzzer_LDADD = libsimd.a clientsession_fuzzer_CPPFLAGS = \ - -DKIT_IN_PROCESS=1 \ $(AM_CPPFLAGS) clientsession_fuzzer_SOURCES = \ $(common_fuzzer_sources) \ fuzzer/ClientSession.cpp clientsession_fuzzer_LDFLAGS = -fsanitize=fuzzer $(AM_LDFLAGS) +clientsession_fuzzer_LDADD = libsimd.a httpresponse_fuzzer_CPPFLAGS = \ - -DKIT_IN_PROCESS=1 \ $(AM_CPPFLAGS) httpresponse_fuzzer_SOURCES = \ $(common_fuzzer_sources) \ fuzzer/HttpResponse.cpp httpresponse_fuzzer_LDFLAGS = -fsanitize=fuzzer $(AM_LDFLAGS) +httpresponse_fuzzer_LDADD = libsimd.a httpecho_fuzzer_CPPFLAGS = \ - -DKIT_IN_PROCESS=1 \ $(AM_CPPFLAGS) \ -I${top_srcdir}/test httpecho_fuzzer_SOURCES = \ $(common_fuzzer_sources) \ fuzzer/HttpEcho.cpp httpecho_fuzzer_LDFLAGS = -fsanitize=fuzzer $(AM_LDFLAGS) +httpecho_fuzzer_LDADD = libsimd.a endif # ENABLE_LIBFUZZER @@ -269,17 +297,21 @@ wsd_headers = wsd/Admin.hpp \ wsd/FileServer.hpp \ wsd/ProxyRequestHandler.hpp \ wsd/COOLWSD.hpp \ + wsd/ClientRequestDispatcher.hpp \ wsd/ProofKey.hpp \ wsd/RequestDetails.hpp \ + wsd/RequestVettingStation.hpp \ wsd/SenderQueue.hpp \ wsd/ServerURL.hpp \ wsd/Storage.hpp \ + wsd/StorageConnectionManager.hpp \ wsd/TileCache.hpp \ wsd/TileDesc.hpp \ wsd/TraceFile.hpp \ wsd/UserMessages.hpp \ wsd/QuarantineUtil.hpp \ - wsd/HostUtil.hpp + wsd/HostUtil.hpp \ + wsd/WopiProxy.hpp shared_headers = common/Common.hpp \ common/Clipboard.hpp \ @@ -309,6 +341,7 @@ shared_headers = common/Common.hpp \ common/security.h \ common/SpookyV2.h \ common/CommandControl.hpp \ + common/Simd.hpp \ net/Buffer.hpp \ net/DelaySocket.hpp \ net/FakeSocket.hpp \ @@ -327,6 +360,7 @@ endif kit_headers = kit/ChildSession.hpp \ kit/Delta.hpp \ + kit/DeltaSimd.h \ kit/DummyLibreOfficeKit.hpp \ kit/Kit.hpp \ kit/KitHelper.hpp \ @@ -363,7 +397,6 @@ dist-hook: EXTRA_DIST = discovery.xml \ favicon.ico \ coolkitconfig.xcu \ - coolwsd.init.rhel6 \ coolwsd.spec \ coolwsd.xml.in \ coolwsd.service \ @@ -385,6 +418,7 @@ EXTRA_DIST = discovery.xml \ scripts/unocommands.py \ scripts/refresh-git-hooks \ README.md \ + THIRDPARTYLICENSES \ $(man_MANS) if ENABLE_LIBFUZZER @@ -480,6 +514,17 @@ run-one: setup-wsd --o:security.capabilities="$(CAPABILITIES)" \ --o:logging.file[@enable]=true --o:logging.level=trace \ --singlekit + +run-inproc: setup-wsd + @echo "Launching coolwsd-inproc" + ./coolwsd-inproc $(COMMON_PARAMS) \ + --o:logging.file[@enable]=true --o:logging.level=trace + +run-massif-inproc: setup-wsd + @echo "Launching coolwsd under valgrind for single process" + valgrind --tool=massif --num-callers=64 --trace-children=no -v \ + ./coolwsd-inproc $(COMMON_PARAMS) \ + --o:logging.file[@enable]=false --o:logging.level=trace endif sync-writer: @@ -590,6 +635,14 @@ compile_commands: $(abs_srcdir)/compile_commands.json browser/node_modules: browser/package.json browser/archived-packages @cd browser && npm install +eslint: browser/node_modules + browser/node_modules/.bin/eslint browser/src browser/js browser/admin/src \ + --max-warnings 0 \ + --resolve-plugins-relative-to browser \ + --ignore-path browser/.eslintignore \ + --no-eslintrc \ + --config browser/.eslintrc + install-exec-hook: cd $(DESTDIR)$(bindir) && \ $(LN_S) coolconfig loolconfig && \ @@ -631,7 +684,9 @@ check-for-system-nss: fi \ fi -check: check-for-system-nss check-recursive +check-recursive: eslint + +check: check-for-system-nss eslint check-recursive $(GEN_COVERAGE_COMMAND) coverage-report: diff --git a/README.CONTRIBUTING.md b/README.CONTRIBUTING.md index d38bca1da7207..761451ca4660d 100644 --- a/README.CONTRIBUTING.md +++ b/README.CONTRIBUTING.md @@ -34,3 +34,33 @@ Signed-off-by: Random J Developer using your real name and the email address (sorry, no pseudonyms or anonymous contributions.) + +## Other information to put into your commit message + +When reviewing a patch, we look for the following information in the commit message: + +- Title: a single line, short and to the point summary of what the patch does. + + - The reason is to be able to do `git log --pretty=oneline` and have a usable result. + +- Intro: observation of the current state + + - Rationale: the problem to be solved is obvious to you, but not to the reviewer. It's good to + have a list of steps to reproduce the problem. + +- Problem description: pros and cons of the current state + + - Rationale: when some feature doesn't work the way expected, frequently there is some other + use-case that motivated the current behavior. It's easier to not break the old use-case with + your change if you're aware of the old use-case. + + - If there was an old use-case and you found it by research, please document it, so the person + reading the commit message finds it easily. + +- Solution: give orders to the codebase + + - A short description of how you introduce new behavior while not breaking old behavior is useful, + because it may not be too obvious just by looking at what you changed. + +An alternative is to have much of this information in a (public) issue, refer to that issue and have +a short commit message. That works better e.g. when using images to demonstrate the problem. diff --git a/README.FILENOTICES.md b/README.FILENOTICES.md index 241800985e49d..b26b8b2ba88e7 100644 --- a/README.FILENOTICES.md +++ b/README.FILENOTICES.md @@ -10,6 +10,10 @@ Notices (ie. header in the file describing the Copyright and License): * Copyright the Collabora Online contributors. * * SPDX-License-Identifier: MPL-2.0 + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ ``` @@ -21,4 +25,8 @@ Notices (ie. header in the file describing the Copyright and License): # # SPDX-License-Identifier: MPL-2.0 # +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# ``` diff --git a/README.md b/README.md index 9ec69cdbf690d..c2b2219aec588 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ [![Master: Pull request policy](https://img.shields.io/badge/Master-protected%2C%20PRs%20need%20approval-red?logoColor=lightred&logo=git "Collabora Team is preparing for the next release, therefore 'master' branch is protected now, PRs need 1 review before merging. Thanks for your support and contributions! :)")](https://github.com/CollaboraOnline/online/blob/master/CONTRIBUTING.md#contributing-to-source-code) -[![irc](https://img.shields.io/badge/IRC-%23cool--dev%20on%20libera-orange.svg)](https://web.libera.chat/?channels=cool-dev) +[![Matrix](https://img.shields.io/badge/Matrix-%23cool--dev-turquoise.svg)](https://matrix.to/#/#cool-dev:clicks.codes) [![Telegram](https://img.shields.io/badge/Telegram-Collabora%20Online-green.svg)](https://t.me/CollaboraOnline) [![Forum](https://img.shields.io/badge/Forum-Discourse-blue.svg)](https://forum.collaboraonline.com/) [![Website](https://img.shields.io/badge/Website-collaboraonline.github.io-blueviolet.svg)](https://collaboraonline.github.io/) @@ -22,9 +22,9 @@ ## Get in touch 💬 -* [📋 Forum](forum.collaboraonline.com/) +* [📋 Forum](https://forum.collaboraonline.com/) * [👥 Facebook](https://www.facebook.com/collaboraoffice/) -* [🐣 Twitter](https://twitter.com/CollaboraOffice) +* [🐣 𝕏(Twitter)](https://twitter.com/CollaboraOffice) * [🐘 Mastodon](https://mastodon.social/@CollaboraOffice) ## Key features @@ -38,9 +38,8 @@ For many more details, build instructions, downloads and more please visit https://collaboraonline.github.io/ ## Developer assistance -Please ask your questions on any of the bridged IRC/Matrix/Telegram rooms -* IRC: `#cool-dev` on `irc.libera.chat` -* Matrix: [#cool-dev:libera.chat](https://app.element.io/#/room/#cool-dev:libera.chat) +Please ask your questions on any of the bridged Matrix/Telegram rooms +* Matrix: [#cool-dev:clicks.codes](https://matrix.to/#/#cool-dev:clicks.codes) * Telegram: [CollaboraOnline](https://t.me/CollaboraOnline) Join the conversation on our Discourse server at https://forum.collaboraonline.com/ @@ -78,15 +77,6 @@ See the corresponding READMEs: ## GitPod -Head over to https://collaboraonline.github.io/post/build-code/ select gitpod from the dropdown and follow the steps. - -Interesting things to keep in mind: -- Make sure your browser is not blocking windows/tabs from opening from the gitpod workspace URL (maybe add `*.gitpod.io` to your browser's whitelist) - - The GitPod tasks will run automatically and further instructions will be printed out right in the terminal - - VNC tab will open automatically if not just click in the left icon `Remote explorer` and click `6080`. You will see a tab completly black, that's normal. - - As mentioned in those instructions if you are not using the VS Code desktop and if you are only relying on your browser please: - - Do not try to click the URL from the make run out put instead copy that URL and execute `firefox [paste URL here]` - - Head over to the tab where the VNC is opened (black page), you will see Firefox opening there, maximize and have fun. - - You can also run cypress tests via GitPod but you will need to use Firefox, for that just prepend `CYPRESS_BROWSER="firefox"` to the desired command. Example: `CYPRESS_BROWSER="firefox" make check` for every test or `CYPRESS_BROWSER="firefox" make check-desktop spec=impress/scrolling_spec.js` for one specific test on desktop +Head over to https://collaboraonline.github.io/post/build-code/#build-code-on-gitpod and follow the steps. ## Enjoy! diff --git a/THIRDPARTYLICENSES b/THIRDPARTYLICENSES new file mode 100644 index 0000000000000..6c3fa7a0109d1 --- /dev/null +++ b/THIRDPARTYLICENSES @@ -0,0 +1,459 @@ +Collabora Online binaries may be statically linked against POCO C++ Libraries. + +The POCO C++ Libraries are licensed under the Boost Software License. A very liberal license that encourages both commercial and non-commercial use. + +THE BOOST SOFTWARE LICENSE 1.0 +Permission is hereby granted, free of charge, to any person or organization obtaining a copy of the software and accompanying documentation covered by this license (the "Software") to use, reproduce, display, distribute, execute, and transmit the Software, and to prepare derivative works of the Software, and to permit third-parties to whom the Software is furnished to do so, all subject to the following: + +The copyright notices in the Software and this entire statement, including the above license grant, this restriction and the following disclaimer, must be included in all copies of the Software, in whole or in part, and all derivative works of the Software, unless such copies or derivative works are solely in the form of machine-executable object code generated by a source language processor. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +Collabora Online binaries may be statically linked against OpenSSL 3.0 Libraries. + +For the OpenSSL 3.0 release, and later releases derived from that, the Apache License v2 applies. + + + Apache License + Version 2.0, January 2004 + https://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + +Collabora Online binaries may be statically linked against libpng, the free reference library for reading and writing PNGs. + +COPYRIGHT NOTICE, DISCLAIMER, and LICENSE +========================================= + +PNG Reference Library License version 2 +--------------------------------------- + + * Copyright (c) 1995-2024 The PNG Reference Library Authors. + * Copyright (c) 2018-2024 Cosmin Truta. + * Copyright (c) 2000-2002, 2004, 2006-2018 Glenn Randers-Pehrson. + * Copyright (c) 1996-1997 Andreas Dilger. + * Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc. + +The software is supplied "as is", without warranty of any kind, +express or implied, including, without limitation, the warranties +of merchantability, fitness for a particular purpose, title, and +non-infringement. In no event shall the Copyright owners, or +anyone distributing the software, be liable for any damages or +other liability, whether in contract, tort or otherwise, arising +from, out of, or in connection with the software, or the use or +other dealings in the software, even if advised of the possibility +of such damage. + +Permission is hereby granted to use, copy, modify, and distribute +this software, or portions hereof, for any purpose, without fee, +subject to the following restrictions: + + 1. The origin of this software must not be misrepresented; you + must not claim that you wrote the original software. If you + use this software in a product, an acknowledgment in the product + documentation would be appreciated, but is not required. + + 2. Altered source versions must be plainly marked as such, and must + not be misrepresented as being the original software. + + 3. This Copyright notice may not be removed or altered from any + source or altered source distribution. + +Collabora Online binaries may be statically linked against Zstandard library. + +BSD License + +For Zstandard software + +Copyright (c) Meta Platforms, Inc. and affiliates. All rights reserved. + +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: + + * Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. + + * Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + + * Neither the name Facebook, nor Meta, nor the names of its contributors may + be used to endorse or promote products derived from this software without + specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON +ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +Collabora Online client side JavaScript code uses the following 3rd party modules. + +Autolinker.js +Copyright(c) 2020 Gregory Jacobs +MIT License + +braintee/sanitize-url +Copyright (c) 2017 Braintree +MIT License + +Bulma: the modern CSS framework that just works +Copyright (c) 2023 Jeremy Thomas +MIT License + +fzstd – High performance Zstandard decompression in a pure JavaScript +Copyright (c) 2020 Arjun Barrett +MIT License + +hammer.js – A javascript library for multi-touch gestures +Copyright (C) 2011-2017 by Jorik Tangelder (Eight Media) +MIT License + +jQuery JavaScript Library +Includes Sizzle.js https://sizzlejs.com/ +Copyright JS Foundation and other contributors +MIT License + +jQuery contextMenu - Plugin for simple contextMenu handling +Copyright (c) 2011-2020 SWIS BV and contributors +MIT License + +jQuery Mousewheel +Copyright jQuery Foundation and other contributors +MIT License + +jQuery UI +Copyright jQuery Foundation and other contributors +MIT License + +Leaflet – an open-source JavaScript library for mobile-friendly interactive maps +Copyright (c) 2010-2015, Vladimir Agafonkin +Copyright (c) 2010-2011, CloudMade +All rights reserved. + +Redistribution and use in source and binary forms, with or without modification, are +permitted provided that the following conditions are met: + + 1. Redistributions of source code must retain the above copyright notice, this list of + conditions and the following disclaimer. + + 2. Redistributions in binary form must reproduce the above copyright notice, this list + of conditions and the following disclaimer in the documentation and/or other materials + provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY +EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE +COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, +EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR +TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +ResizeObserverPolyfill.js – A polyfill for the Resize Observer API +Copyright (c) 2016 Denis Rul +MIT License + +Select2 – The jQuery replacement for select boxes +Copyright (c) 2012-2017 Kevin Brown, Igor Vaynberg, and Select2 contributors +MIT License + +SmartMenus jQuery Plugin +Copyright Vasil Dinkov, Vadikom Web Ltd. +MIT License + +w2ui – JavaScript UI Library for the Modern Web +Copyright (C) 2014 (vitmalina@gmail.com) +MIT License + +The MIT License + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. + +Montserraft Regular Font +Copyright 2011 The Montserrat Project Authors +This Font Software is licensed under the SIL Open Font License, Version 1.1. +This license is copied below, and is also available with a FAQ at: +https://openfontlicense.org + +----------------------------------------------------------- +SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 +----------------------------------------------------------- + +PREAMBLE +The goals of the Open Font License (OFL) are to stimulate worldwide +development of collaborative font projects, to support the font creation +efforts of academic and linguistic communities, and to provide a free and +open framework in which fonts may be shared and improved in partnership +with others. + +The OFL allows the licensed fonts to be used, studied, modified and +redistributed freely as long as they are not sold by themselves. The +fonts, including any derivative works, can be bundled, embedded, +redistributed and/or sold with any software provided that any reserved +names are not used by derivative works. The fonts and derivatives, +however, cannot be released under any other type of license. The +requirement for fonts to remain under this license does not apply +to any document created using the fonts or their derivatives. + +DEFINITIONS +"Font Software" refers to the set of files released by the Copyright +Holder(s) under this license and clearly marked as such. This may +include source files, build scripts and documentation. + +"Reserved Font Name" refers to any names specified as such after the +copyright statement(s). + +"Original Version" refers to the collection of Font Software components as +distributed by the Copyright Holder(s). + +"Modified Version" refers to any derivative made by adding to, deleting, +or substituting -- in part or in whole -- any of the components of the +Original Version, by changing formats or by porting the Font Software to a +new environment. + +"Author" refers to any designer, engineer, programmer, technical +writer or other person who contributed to the Font Software. + +PERMISSION & CONDITIONS +Permission is hereby granted, free of charge, to any person obtaining +a copy of the Font Software, to use, study, copy, merge, embed, modify, +redistribute, and sell modified and unmodified copies of the Font +Software, subject to the following conditions: + +1) Neither the Font Software nor any of its individual components, +in Original or Modified Versions, may be sold by itself. + +2) Original or Modified Versions of the Font Software may be bundled, +redistributed and/or sold with any software, provided that each copy +contains the above copyright notice and this license. These can be +included either as stand-alone text files, human-readable headers or +in the appropriate machine-readable metadata fields within text or +binary files as long as those fields can be easily viewed by the user. + +3) No Modified Version of the Font Software may use the Reserved Font +Name(s) unless explicit written permission is granted by the corresponding +Copyright Holder. This restriction only applies to the primary font name as +presented to the users. + +4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font +Software shall not be used to promote, endorse or advertise any +Modified Version, except to acknowledge the contribution(s) of the +Copyright Holder(s) and the Author(s) or with their explicit written +permission. + +5) The Font Software, modified or unmodified, in part or in whole, +must be distributed entirely under this license, and must not be +distributed under any other license. The requirement for fonts to +remain under this license does not apply to any document created +using the Font Software. + +TERMINATION +This license becomes null and void if any of the above conditions are +not met. + +DISCLAIMER +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE +COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL +DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM +OTHER DEALINGS IN THE FONT SOFTWARE. + + diff --git a/android/app/build.gradle.in b/android/app/build.gradle.in index a9cf2fd4305b1..0dd0cee32066c 100644 --- a/android/app/build.gradle.in +++ b/android/app/build.gradle.in @@ -6,6 +6,7 @@ apply from: 'appSettings.gradle' android { compileSdkVersion 33 buildDir = "${rootProject.getBuildDir()}/app" + ndkVersion "20.1.5948944" defaultConfig { // applicationId, versionCode and versionName are defined in appSettings.gradle @@ -61,21 +62,30 @@ android { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation 'androidx.appcompat:appcompat:1.1.0' - implementation 'androidx.core:core:1.0.2' - implementation 'androidx.constraintlayout:constraintlayout:1.1.3' - implementation 'androidx.recyclerview:recyclerview:1.0.0' - implementation 'com.google.android.material:material:1.1.0-alpha04' - implementation 'com.google.android.play:core:1.8.0' + implementation 'androidx.appcompat:appcompat:1.6.1' + implementation 'androidx.core:core:1.9.0' + implementation 'androidx.constraintlayout:constraintlayout:2.1.4' + implementation 'androidx.recyclerview:recyclerview:1.3.1' + implementation 'com.google.android.material:material:1.6.1' + implementation 'com.google.android.play:core:1.10.3' - //before changing the version please see https://issuetracker.google.com/issues/111662669 - implementation 'androidx.preference:preference:1.1.0-alpha01' + implementation 'androidx.preference:preference:1.2.1' implementation project(path: ':lib') + + // https://stackoverflow.com/questions/75263047/duplicate-class-in-kotlin-android + constraints { + implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.0") { + because("kotlin-stdlib-jdk7 is now a part of kotlin-stdlib") + } + implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.0") { + because("kotlin-stdlib-jdk8 is now a part of kotlin-stdlib") + } + } } -task copyBrandFiles(type: Copy) { - from "${liboBrandingDir}/android" - into "src/main/res" +tasks.register('copyBrandFiles', Copy) { + from "${liboBrandingDir}/android" + into "src/main/res" } afterEvaluate { diff --git a/android/app/src/main/java/org/libreoffice/androidapp/SettingsActivity.java b/android/app/src/main/java/org/libreoffice/androidapp/SettingsActivity.java index e42017f33543c..56e03e4fd3249 100644 --- a/android/app/src/main/java/org/libreoffice/androidapp/SettingsActivity.java +++ b/android/app/src/main/java/org/libreoffice/androidapp/SettingsActivity.java @@ -17,6 +17,7 @@ import androidx.preference.Preference; import androidx.preference.PreferenceFragmentCompat; import org.libreoffice.androidapp.ui.LibreOfficeUIActivity; +import org.libreoffice.androidlib.LOActivity; public class SettingsActivity extends AppCompatActivity { @@ -86,6 +87,7 @@ public void onCheckedChanged(RadioGroup radioGroup, int i) { } AppCompatDelegate.setDefaultNightMode(dayNightMode); prefs.edit().putInt(LibreOfficeUIActivity.NIGHT_MODE_KEY, dayNightMode).commit(); + prefs.edit().putInt(LOActivity.NIGHT_MODE_KEY, dayNightMode).commit(); getActivity().recreate(); } diff --git a/android/app/src/main/java/org/libreoffice/androidapp/ui/RecentFilesAdapter.java b/android/app/src/main/java/org/libreoffice/androidapp/ui/RecentFilesAdapter.java index 74a0f12b9d6e9..1879e87d223e2 100644 --- a/android/app/src/main/java/org/libreoffice/androidapp/ui/RecentFilesAdapter.java +++ b/android/app/src/main/java/org/libreoffice/androidapp/ui/RecentFilesAdapter.java @@ -73,7 +73,7 @@ public static String getUriFilename(Activity activity, Uri uri) { try { cursor = activity.getContentResolver().query(uri, null, null, null, null); if (cursor != null && cursor.moveToFirst()) - filename = cursor.getString(cursor.getColumnIndex(OpenableColumns.DISPLAY_NAME)); + filename = cursor.getString(cursor.getColumnIndexOrThrow(OpenableColumns.DISPLAY_NAME)); } catch (Exception e) { return null; } finally { @@ -94,7 +94,7 @@ public static long getUriFileLength(Activity activity, Uri uri) { try { cursor = activity.getContentResolver().query(uri, null, null, null, null); if (cursor != null && cursor.moveToFirst()) - length = cursor.getLong(cursor.getColumnIndex(OpenableColumns.SIZE)); + length = cursor.getLong(cursor.getColumnIndexOrThrow(OpenableColumns.SIZE)); } catch (Exception e) { return 0; } finally { diff --git a/android/app/src/main/res/layout/file_explorer_grid_item.xml b/android/app/src/main/res/layout/file_explorer_grid_item.xml index a84161e496de8..b741a90916cbd 100644 --- a/android/app/src/main/res/layout/file_explorer_grid_item.xml +++ b/android/app/src/main/res/layout/file_explorer_grid_item.xml @@ -37,7 +37,7 @@ android:layout_gravity="center" android:layout_weight="1" android:ellipsize="end" - android:gravity="center_vertical" + android:gravity="center" android:maxLines="2" android:textAlignment="center" android:textColor="?android:attr/textColorPrimary" @@ -52,8 +52,8 @@ android:layout_gravity="center" android:contentDescription="@string/file_actions_icon_desc" android:scaleType="fitStart" - android:tint="?android:attr/textColorPrimary" - app:srcCompat="@drawable/ic_more_vert_black_24dp" /> + app:srcCompat="@drawable/ic_more_vert_black_24dp" + app:tint="?android:attr/textColorPrimary" /> diff --git a/android/app/src/main/res/values-ar/strings.xml b/android/app/src/main/res/values-ar/strings.xml index e6e2f9f2121c6..1e0b990c84b9e 100644 --- a/android/app/src/main/res/values-ar/strings.xml +++ b/android/app/src/main/res/values-ar/strings.xml @@ -59,4 +59,11 @@ مواقع المستندات نظام الملفات المحلي بطاقة SD خارجية + إنشاء + عنْ + الخادم عن بُعد + السِّمة + اختر حُلّة + جداول البيانات + مُشارَكة المستنَد \ No newline at end of file diff --git a/android/app/src/main/res/values-cy/strings.xml b/android/app/src/main/res/values-cy/strings.xml index 52426dd64ceb2..f1878479fce17 100644 --- a/android/app/src/main/res/values-cy/strings.xml +++ b/android/app/src/main/res/values-cy/strings.xml @@ -1,7 +1,7 @@ Methu cysylltu a\'r gweinydd cwmwl. Gwiriwch eich ffurfweddiad. - USB wedi\'i gysylltu, ffurfweddwch eich dyfais + USB wedi\'i gysylltu, ffurfweddwch eich dyfais. Gweinydd pell Dyfais OTG (arbrofol) SD allanol @@ -38,19 +38,19 @@ Dangos y Drwydded Galluogi i ddangos manylion dadfygio mewn darllenydd dogfennau Dangos Manylion Dadfygio - Gosod pa hidl ffeiliau ddylai gael eu defnyddio drwy ragosodiad + Gosod pa hidl ffeiliau ddylai gael eu defnyddio drwy ragosodiad. Hidl Ffeiliau Rhagosodedig Trefn Ffeiliau Cynllun rheolwr ffeiliau - Gweld ffeiliau fel grid neu mewn rhestr - Dewiswch sut i drefnu ffeiliau: A-Z, yn ôl maint neu ddyddiad + Gweld ffeiliau fel grid neu mewn rhestr. + Dewiswch sut i drefnu ffeiliau: A-Z, yn ôl maint neu ddyddiad. Galluogwch i ddangos ffeiliau/ffolderi cudd Ffeiliau/Ffolderi Cudd Gosodiadau Rheolwr Ffeiliau Grid Rhestr Methwyd penderfynu pa ffeil i\'w chadw - Mae angen caniatâd cadw. + Mae angen caniatâd cadw Methodd creu\'r ffeil Mae ffeil o\'r enw yna\'n bodoli eisoes, a bydd yn cael ei thros ysgrifennu. Darllen yn unig yw\'r ffeil hon, mae cadw wedi ei analluogi. @@ -62,8 +62,8 @@ Gosodiadau Methu mewngofnodi i\'r gweinydd cwmwl. Gwiriwch eich ffurfweddiad. Ynghylch - Heb gadw\'r cyfeiriadur - Mae bmp yn nwll + Heb gadw\'r cyfeiriadur. + Mae bmp yn nwl! Methu mynd ymhellach. Rhannu Dogfen Llwytho... @@ -77,7 +77,7 @@ Iawn Mae angen caniatâd ar gyfer darllen eich dogfennau. Mae Angen Caniatâd - "Cyfeiriadur Cyfredol: %1$s" + Cyfeiriadur Cyfredol: %1$s Llwybr cyfeiriadur annilys Dewis Gyfeiriadur Mynd @@ -86,9 +86,9 @@ Llinynnau porwr cyfeiriadur Cyfrinair Enw defnyddiwr - URL a phorth y gweinydd cwmwl + URL a phorth y gweinydd cwmwl. URL y gweinydd - Nodwedd arbrofol: Defnyddiwch yn unig os yw\'r ddyfais OTG yn ysgrifenadwy + Nodwedd Arbrofol: Defnyddiwch yn unig os yw\'r ddyfais OTG yn ysgrifenadwy. Llwybr dyfais OTG Llwybr SD allanol Gosodiadau offer storio @@ -110,4 +110,7 @@ Rhagosodiad y system Dewis thema Thema + Enw Defnyddiwr + Yn cael ei ddefnyddio wrth ychwanegu sylw + Defnyddiwr Gwadd \ No newline at end of file diff --git a/android/app/src/main/res/values-en-rGB/strings.xml b/android/app/src/main/res/values-en-rGB/strings.xml index 08021e81822fb..3c94320702da4 100644 --- a/android/app/src/main/res/values-en-rGB/strings.xml +++ b/android/app/src/main/res/values-en-rGB/strings.xml @@ -98,7 +98,7 @@ Largest first Smallest first Sort by - Filter by + Filter byy Editor Settings Remove from the list File actions diff --git a/android/app/src/main/res/values-hr/strings.xml b/android/app/src/main/res/values-hr/strings.xml index d9a8162832ee3..fabe3ab804d81 100644 --- a/android/app/src/main/res/values-hr/strings.xml +++ b/android/app/src/main/res/values-hr/strings.xml @@ -32,18 +32,18 @@ Potrebna je dozvola za spremište Neuspjelo određivanje datoteke za učitavanje Popis - Ikone + Mreža Postavke upravljača datoteka Skrivene datoteke i mape Aktiviraj prikaz skrivenih datoteka i mapa Odaberi redoslijed datoteka: A-Z, po veličini ili po datumu. - Prikaži pločasti prikaz ili popis. + Prikaži datoteke kao mrežu ili kao popis. Raspored upravljača datoteka Redoslijed datoteka Standardno filtriranje datoteka Postavi standardno filtriranje datoteka. Prikaži podatke otklanjanje grešaka - Aktiviraj za prikaz podataka otklanjanje grešaka u dokumentu + Aktiviraj za prikaz informacija o otklanjanju grešaka u prikazivaču dokumenata Redoslijed Postavke Otvori @@ -52,7 +52,7 @@ Zatvori lokacije dokumenata Mapa dokumenata Lokalni datotečni sustav - Vanjska SD kartica + Eksterna SD kartica OTG uređaj (eksperimentalno) Udaljeni poslužitelju USB povezan, konfiguriraj uređaj. @@ -63,7 +63,7 @@ Nevažeća root datoteka. Provjeri OTG uređaj i/ili konfiguraciju. Postavke poslužitelja oblaka Postavke fizičkog spremišta - Staza vanjske SD kartice + Staza eksterne SD kartice Staza OTG uređaja Eksperimentalna funkcija: koristi samo, ako je na OTG uređaju dozvoljeno pisanje. URL poslužitelja diff --git a/android/app/src/main/res/values-ia/strings.xml b/android/app/src/main/res/values-ia/strings.xml new file mode 100644 index 0000000000000..a6b3daec9354f --- /dev/null +++ b/android/app/src/main/res/values-ia/strings.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/android/app/src/main/res/values-or/strings.xml b/android/app/src/main/res/values-or/strings.xml index 76cd3305aa5be..591dcc3e5c083 100644 --- a/android/app/src/main/res/values-or/strings.xml +++ b/android/app/src/main/res/values-or/strings.xml @@ -2,12 +2,12 @@ ସେଟିଂ ଏହା ଅନୁଯାୟୀ ସଜାନ୍ତୁ - ଵିଷୟରେ + ସମ୍ବନ୍ଧରେ ସେଟିଂ ଯାଅ ଠିକ୍ ଅଛି ପାସ୍‍ୱର୍ଡ଼ - ଵିଷୟରେ + ସମ୍ବନ୍ଧରେ ଥିମ୍ ଗାଢ଼ ହାଲୁକା diff --git a/android/app/src/main/res/values-sq/strings.xml b/android/app/src/main/res/values-sq/strings.xml index 80fc0110c58b3..4f0e397d75284 100644 --- a/android/app/src/main/res/values-sq/strings.xml +++ b/android/app/src/main/res/values-sq/strings.xml @@ -11,14 +11,14 @@ S’bëhet dot hyrje në llogari te shërbyesi re. Gabim i papërcaktuar në lidhjen te shërbyesi re. Kontrolloni formësimin tuaj dhe/ose riprovoni më vonë. Rregullime - $APP_NAME është një suitë moderne, e lehtë për t’u përdorur, me burim të hapët zyrash, për përpunim tekstesh, fletëllogaritje, paraqitje, etj. + $APP_NAME është një suitë moderne zyrash, e lehtë për t’u përdorur, me burim të hapët, për përpunim tekstesh, fletëllogaritje, paraqitje, etj. Kjo hedhje në qarkullim qe sjellë nga $VENDOR. Ju lutemi, hapni një kartelë duke përdorur ikonën dosje te paneli. S’ka objekte Ka tashmë një kartelë me këtë emër dhe do të mbishkruhet. Krijimi i kartelës dështoi Listë - Rrjetë + Mozaik Rregullime Përgjegjësi Kartelash Rregullime Përpunuesi Kartela/Dosje të Fshehura @@ -30,7 +30,7 @@ Filtër Parazgjedhje Kartelash Caktoni cili filtër kartelash duhet përdorur si parazgjedhje. Shfaq Hollësi Diagnostikimi - Shfaq Licence + Shfaq Licencë Shfaq Njoftim Më Tepër Hollësi Dokument i Ri Tekst @@ -67,10 +67,10 @@ Kartelë rrënjë e pavlefshme. Kontrolloni pajisje tuaj OTG dhe/ose formësimin. Rregullime depozitimi nga shërbimi Rregullime shërbyesi re - Rregullime depozite faktike + Rregullime depozite materiale Shteg SD të jashtme Shteg pajisjeje OTG - Veçori Eksperimentale: Përdoreni vetëm nëse pajisje OTG është e shkrueshme. + Veçori Eksperimentale: Përdoreni vetëm nëse pajisja OTG është e shkrueshme. URL Shërbyesi URL dhe portë te shërbyesi re. Emër përdoruesi @@ -109,4 +109,7 @@ Paraqitje Vendndodhje dokumentesh Fjalëkalim + Version: %1$s +\nonline git-hash: %2$s +\ncore git-hash: %3$s \ No newline at end of file diff --git a/android/build.gradle.in b/android/build.gradle.in index 4552f6897d80f..6674d7a371883 100644 --- a/android/build.gradle.in +++ b/android/build.gradle.in @@ -4,10 +4,11 @@ buildDir = "@abs_top_builddir@/android/build" buildscript { repositories { google() - jcenter() + mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:3.4.1' + // before updating make sure https://issuetracker.google.com/issues/293294923 is fixed + classpath 'com.android.tools.build:gradle:3.6.4' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files @@ -17,11 +18,11 @@ buildscript { allprojects { repositories { google() - jcenter() + mavenCentral() } } -task clean(type: Delete) { +tasks.register('clean', Delete) { delete rootProject.buildDir } diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties index 5bb4a233eb20c..efc143b99acdb 100644 --- a/android/gradle/wrapper/gradle-wrapper.properties +++ b/android/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip diff --git a/android/lib/build.gradle.in b/android/lib/build.gradle.in index 78ebe83ee316f..6dfcfaf49e3a5 100644 --- a/android/lib/build.gradle.in +++ b/android/lib/build.gradle.in @@ -6,6 +6,7 @@ apply from: 'libSettings.gradle' android { compileSdkVersion 33 buildDir = "${rootProject.getBuildDir()}/lib" + ndkVersion "20.1.5948944" defaultConfig { minSdkVersion 21 @@ -67,13 +68,22 @@ android { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation 'androidx.appcompat:appcompat:1.0.2' - implementation 'com.google.android.material:material:1.1.0-alpha04' - implementation 'androidx.constraintlayout:constraintlayout:1.1.2' + implementation 'androidx.appcompat:appcompat:1.6.1' + implementation 'com.google.android.material:material:1.6.1' + implementation 'androidx.constraintlayout:constraintlayout:2.1.4' + // https://stackoverflow.com/questions/75263047/duplicate-class-in-kotlin-android + constraints { + implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.0") { + because("kotlin-stdlib-jdk7 is now a part of kotlin-stdlib") + } + implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.0") { + because("kotlin-stdlib-jdk8 is now a part of kotlin-stdlib") + } + } } -task copyUnpackAssets(type: Copy) { +tasks.register('copyUnpackAssets', Copy) { description "copies assets that need to be extracted on the device" into 'src/main/assets/unpack' into('program') { @@ -95,7 +105,7 @@ task copyUnpackAssets(type: Copy) { } into('etc/coolwsd') { from('/android/coolkitconfig.xcu') - includes = [ 'coolkitconfig.xcu' ] + includes = ['coolkitconfig.xcu'] } into('user/fonts') { from "${liboInstdir}/share/fonts/truetype" @@ -122,7 +132,7 @@ task copyUnpackAssets(type: Copy) { filter { String line -> line.replaceAll( - '@@APPLICATION_ID@@', new String("${liboApplicationId}") + '@@APPLICATION_ID@@', new String("${liboApplicationId}") ) } } @@ -138,15 +148,15 @@ task copyUnpackAssets(type: Copy) { includes = ['extensions/dict-de/**', 'extensions/dict-en/**', 'extensions/dict-es/**', 'extensions/dict-fr/**', 'extensions/dict-pt-BR/**'] exclude { FileTreeElement details -> !(details.file.isDirectory() || - details.file.name.endsWith('.xcu') || - details.file.name.endsWith('.dic') || - details.file.name.endsWith('.aff') || - details.file.name.endsWith('.xml')) + details.file.name.endsWith('.xcu') || + details.file.name.endsWith('.dic') || + details.file.name.endsWith('.aff') || + details.file.name.endsWith('.xml')) } } } -task copyAssets(type: Copy) { +tasks.register('copyAssets', Copy) { description "copies assets that can be accessed within the installed apk" into 'src/main/assets' from("${liboSrcRoot}/instdir/") { @@ -168,7 +178,7 @@ task copyAssets(type: Copy) { } } -task createFullConfig(type: Copy) { +tasks.register('createFullConfig', Copy) { description "copies various configuration bits into the apk" into('src/main/assets/share/config') from("${liboInstdir}/share/config") { @@ -176,25 +186,25 @@ task createFullConfig(type: Copy) { } } -task copyBrandTheme(type: Copy) { - from "${liboBrandingDir}/online-theme" - into "src/main/assets/share/theme_definitions/online" +tasks.register('copyBrandTheme', Copy) { + from "${liboBrandingDir}/online-theme" + into "src/main/assets/share/theme_definitions/online" } -task copyDocTemplates(type: Copy) { - from "${rootProject.getRootDir()}/templates/untitled.odp", - "${rootProject.getRootDir()}/templates/untitled.ods", - "${rootProject.getRootDir()}/templates/untitled.odt" - into "src/main/assets/templates" +tasks.register('copyDocTemplates', Copy) { + from "${rootProject.getRootDir()}/templates/untitled.odp", + "${rootProject.getRootDir()}/templates/untitled.ods", + "${rootProject.getRootDir()}/templates/untitled.odt" + into "src/main/assets/templates" } -task copyKitConfig(type: Copy) { - from "${file(rootProject.getRootDir()).getParent()}/coolkitconfig-mobile.xcu" - into "src/main/assets/etc/coolwsd" - rename { "coolkitconfig.xcu" } +tasks.register('copyKitConfig', Copy) { + from "${file(rootProject.getRootDir()).getParent()}/coolkitconfig-mobile.xcu" + into "src/main/assets/etc/coolwsd" + rename { "coolkitconfig.xcu" } } -task createStrippedConfig { +tasks.register('createStrippedConfig') { def preserveDir = file("src/main/assets/share/config/soffice.cfg/empty") outputs.dir "src/main/assets/share/registry/res" outputs.file preserveDir @@ -207,7 +217,7 @@ task createStrippedConfig { } } -task createRCfiles { +tasks.register('createRCfiles') { inputs.file "libSettings.gradle" dependsOn copyUnpackAssets, copyAssets def sofficerc = file('src/main/assets/unpack/program/sofficerc') @@ -295,7 +305,7 @@ preBuild.dependsOn 'createRCfiles', 'createFullConfig', 'copyBrandTheme' -task generateCoolDebugAssets { +tasks.register('generateCoolDebugAssets') { doLast { exec { commandLine 'make', '-C', "${rootProject.getBuildDir()}/../../browser", 'clean' @@ -306,7 +316,7 @@ task generateCoolDebugAssets { } } -task generateCoolReleaseAssets { +tasks.register('generateCoolReleaseAssets') { doLast { exec { commandLine 'make', '-C', "${rootProject.getBuildDir()}/../../browser", 'clean' diff --git a/android/lib/src/main/cpp/CMakeLists.txt.in b/android/lib/src/main/cpp/CMakeLists.txt.in index 74101d0d4a304..12529d4109fab 100644 --- a/android/lib/src/main/cpp/CMakeLists.txt.in +++ b/android/lib/src/main/cpp/CMakeLists.txt.in @@ -11,6 +11,7 @@ add_library(androidapp SHARED ../../../../../common/MessageQueue.cpp ../../../../../common/TraceEvent.cpp ../../../../../common/Protocol.cpp + ../../../../../common/Simd.cpp ../../../../../common/StringVector.cpp ../../../../../common/Session.cpp ../../../../../common/SigUtil.cpp @@ -18,15 +19,19 @@ add_library(androidapp SHARED ../../../../../common/Unit.cpp ../../../../../common/Util.cpp ../../../../../kit/ChildSession.cpp + ../../../../../kit/DeltaSimd.c ../../../../../kit/Kit.cpp ../../../../../net/FakeSocket.cpp ../../../../../net/Socket.cpp ../../../../../wsd/ClientSession.cpp ../../../../../wsd/DocumentBroker.cpp ../../../../../wsd/COOLWSD.cpp + ../../../../../wsd/ClientRequestDispatcher.cpp ../../../../../wsd/RequestDetails.cpp + ../../../../../wsd/RequestVettingStation.cpp ../../../../../wsd/Storage.cpp - ../../../../../wsd/TileCache.cpp) + ../../../../../wsd/TileCache.cpp + ../../../../../wsd/coolwsd-fork.cpp) target_compile_definitions(androidapp PRIVATE COOLWSD_CONFIGDIR="/assets/etc/coolwsd") diff --git a/android/lib/src/main/cpp/androidapp.cpp b/android/lib/src/main/cpp/androidapp.cpp index 8606bb00b401d..a8748982ee903 100644 --- a/android/lib/src/main/cpp/androidapp.cpp +++ b/android/lib/src/main/cpp/androidapp.cpp @@ -35,6 +35,7 @@ static int fakeClientFd; static int closeNotificationPipeForForwardingThread[2] = {-1, -1}; static JavaVM* javaVM = nullptr; static bool lokInitialized = false; +static std::mutex coolwsdRunningMutex; // Remember the reference to the LOActivity jclass g_loActivityClz = nullptr; @@ -182,9 +183,11 @@ void closeDocument() { // Close one end of the socket pair, that will wake up the forwarding thread that was constructed in HULLO fakeSocketClose(closeNotificationPipeForForwardingThread[0]); - + LOG_DBG("Waiting for Lokit to finish..."); + std::unique_lock lokitLock(COOLWSD::lokit_main_mutex); + LOG_DBG("Lokit has finished."); LOG_DBG("Waiting for COOLWSD to finish..."); - std::unique_lock lock(COOLWSD::lokit_main_mutex); + std::unique_lock coolwsdLock(coolwsdRunningMutex); LOG_DBG("COOLWSD has finished."); } @@ -345,6 +348,7 @@ Java_org_libreoffice_androidlib_LOActivity_createCOOLWSD(JNIEnv *env, jobject in { LOG_DBG("Creating COOLWSD"); { + std::unique_lock lock(coolwsdRunningMutex); fakeClientFd = fakeSocketSocket(); LOG_DBG("createCOOLWSD created fakeClientFd: " << fakeClientFd); std::unique_ptr coolwsd = std::make_unique(); diff --git a/android/lib/src/main/java/org/libreoffice/androidlib/LOActivity.java b/android/lib/src/main/java/org/libreoffice/androidlib/LOActivity.java index e741d6bb2248f..fcdd0f95f4f9a 100644 --- a/android/lib/src/main/java/org/libreoffice/androidlib/LOActivity.java +++ b/android/lib/src/main/java/org/libreoffice/androidlib/LOActivity.java @@ -23,6 +23,7 @@ import android.content.pm.PackageManager; import android.content.res.AssetFileDescriptor; import android.content.res.AssetManager; +import android.content.res.Configuration; import android.database.Cursor; import android.net.Uri; import android.os.AsyncTask; @@ -74,6 +75,7 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.appcompat.app.AppCompatActivity; +import androidx.appcompat.app.AppCompatDelegate; import androidx.core.app.ActivityCompat; import androidx.core.content.ContextCompat; import androidx.localbroadcastmanager.content.LocalBroadcastManager; @@ -96,6 +98,7 @@ public class LOActivity extends AppCompatActivity { private static final String CLIPBOARD_COOL_SIGNATURE = "cool-clip-magic-4a22437e49a8-"; public static final String RECENT_DOCUMENTS_KEY = "RECENT_DOCUMENTS_LIST"; private static String USER_NAME_KEY = "USER_NAME"; + public static final String NIGHT_MODE_KEY = "NIGHT_MODE"; private File mTempFile = null; @@ -349,6 +352,8 @@ private void initUI() { webSettings.setJavaScriptEnabled(true); mWebView.addJavascriptInterface(this, "COOLMessageHandler"); + webSettings.setDomStorageEnabled(true); + // allow debugging (when building the debug version); see details in // https://developers.google.com/web/tools/chrome-devtools/remote-debugging/webviews boolean isChromeDebugEnabled = sPrefs.getBoolean("ENABLE_CHROME_DEBUGGING", false); @@ -637,6 +642,7 @@ protected void onDestroy() { @Override public void onActivityResult(int requestCode, int resultCode, Intent intent) { + super.onActivityResult(requestCode, resultCode, intent); if (resultCode != RESULT_OK) { if (requestCode == REQUEST_SELECT_IMAGE_FILE) { valueCallback.onReceiveValue(null); @@ -655,18 +661,15 @@ Meaning that we will switch to the copied (saved-as) document in the bg requestCopy = true; if (getMimeType().equals("text/plain")) { requestCode = REQUEST_SAVEAS_ODT; - } - else if (getMimeType().equals("text/comma-separated-values")) { + } else if (getMimeType().equals("text/comma-separated-values")) { requestCode = REQUEST_SAVEAS_ODS; - } - else if (getMimeType().equals("application/vnd.ms-excel.sheet.binary.macroenabled.12")) { + } else if (getMimeType().equals("application/vnd.ms-excel.sheet.binary.macroenabled.12")) { requestCode = REQUEST_SAVEAS_ODS; - } - else { + } else { String filename = getFileName(true); String extension = filename.substring(filename.lastIndexOf('.') + 1); requestCode = getRequestIDForFormat(extension); - assert(requestCode != 0); + assert (requestCode != 0); } } switch (requestCode) { @@ -703,8 +706,7 @@ else if (getMimeType().equals("application/vnd.ms-excel.sheet.binary.macroenable inputStream = new FileInputStream(tempFile); try { outputStream = getContentResolver().openOutputStream(intent.getData(), "wt"); - } - catch (FileNotFoundException e) { + } catch (FileNotFoundException e) { Log.i(TAG, "failed with the 'wt' mode, trying without: " + e.getMessage()); outputStream = getContentResolver().openOutputStream(intent.getData()); } @@ -729,7 +731,7 @@ else if (getMimeType().equals("application/vnd.ms-excel.sheet.binary.macroenable } } if (requestCopy == true) { - assert(_tempFile != null); + assert (_tempFile != null); mTempFile = _tempFile; getIntent().setData(intent.getData()); /** add the document to recents */ @@ -858,6 +860,11 @@ private void loadDocument() { if (isLargeScreen() && !isChromeOS()) finalUrlToLoad += "&userinterfacemode=notebookbar"; + + if(isDarkMode()) { + finalUrlToLoad += "&darkTheme=true"; + } + // load the page mWebView.loadUrl(finalUrlToLoad); @@ -866,6 +873,21 @@ private void loadDocument() { loadDocumentMillis = android.os.SystemClock.uptimeMillis(); } + private boolean isDarkMode() { + SharedPreferences recentPrefs = getSharedPreferences(EXPLORER_PREFS_KEY, MODE_PRIVATE); + int mode = recentPrefs.getInt(NIGHT_MODE_KEY, AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM); + switch (mode) { + case -1: + int darkModeFlag = getBaseContext().getResources().getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_MASK; + return darkModeFlag == Configuration.UI_MODE_NIGHT_YES; + case 1: + return false; + case 2: + return true; + } + return false; + } + static { System.loadLibrary("androidapp"); } @@ -1124,7 +1146,7 @@ private String getFileName(boolean withExtension) { try { cursor = getContentResolver().query(getIntent().getData(), null, null, null, null); if (cursor != null && cursor.moveToFirst()) - filename = cursor.getString(cursor.getColumnIndex(OpenableColumns.DISPLAY_NAME)); + filename = cursor.getString(cursor.getColumnIndexOrThrow(OpenableColumns.DISPLAY_NAME)); } catch (Exception e) { return null; } diff --git a/android/lib/src/main/res/values-cy/strings.xml b/android/lib/src/main/res/values-cy/strings.xml index 4b3260cc15a1f..759b404635653 100644 --- a/android/lib/src/main/res/values-cy/strings.xml +++ b/android/lib/src/main/res/values-cy/strings.xml @@ -4,7 +4,7 @@ Methu agor dewisydd ffeiliau Methwyd mewnosod delwedd Methwyd penderfynu pa ffeil i\'w chadw - Mae angen caniatâd cadw. + Mae angen caniatâd cadw Darllen yn unig yw\'r ffeil hon, mae cadw wedi ei analluogi. Yn cadw... Paratoi am y cychwyn cyntaf ar ôl diweddariad. @@ -14,4 +14,13 @@ Gorffen... Os ydych yn ei hoffi, rhowch 5 seren i ni ar Google Play. Mae eich adolygiadau da yn ein hysbrydoli. Nid oes modd cadw\'r ffeil yn y lleoliad yma. Bydd angen ei symud i\'r fan Chwarae ffeiliau ar gyfer mynediad darllen/ysgrifennu llawn. + Yn ailgychwyn... + Methu agor y ddogfen + Gweld yn unig + Golygu copi + Mae\'r ddogfen hon yn ddarllen-yn-unig. Ydych chi eisiau gwneud copi i\'w olygu? + Defnyddio Fformat Testun + Defnyddio Fformat ODF + Cadarnhau Fformat Ffeil + Gall y ddogfen hon gynnwys fformatio neu gynnwys nad oes modd ei chadw yn y fformat ffeil \"Testun\" a ddewiswyd ar hyn o bryd . \ No newline at end of file diff --git a/android/lib/src/main/res/values-hr/strings.xml b/android/lib/src/main/res/values-hr/strings.xml index 0a09aa47c832e..9ee63920148e9 100644 --- a/android/lib/src/main/res/values-hr/strings.xml +++ b/android/lib/src/main/res/values-hr/strings.xml @@ -10,7 +10,7 @@ Datoteka je zaštićena, spremanje je deaktivirano. Ovaj dokument je samo-za-čitanje. Želiš li izraditi kopiju za uređivanje\? Uredi kopiju - Samo prikaz + Samo za prikaz Ponovo pokretanje … Zatvaranje … Ako ti se sviđa, daj nam 5 zvjezdica na Google Play stranici. Tvoje dobre kritike su nam najbolja motivacija. diff --git a/android/lib/src/main/res/values-ia/strings.xml b/android/lib/src/main/res/values-ia/strings.xml new file mode 100644 index 0000000000000..a6b3daec9354f --- /dev/null +++ b/android/lib/src/main/res/values-ia/strings.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/android/lib/src/main/res/values-jv/strings.xml b/android/lib/src/main/res/values-jv/strings.xml new file mode 100644 index 0000000000000..a6b3daec9354f --- /dev/null +++ b/android/lib/src/main/res/values-jv/strings.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/android/lib/src/main/res/values-nb-rNO/strings.xml b/android/lib/src/main/res/values-nb-rNO/strings.xml index 2fb9390ce9efa..4d5ac52df106c 100644 --- a/android/lib/src/main/res/values-nb-rNO/strings.xml +++ b/android/lib/src/main/res/values-nb-rNO/strings.xml @@ -19,4 +19,8 @@ Kun visning Starter på ny… Kunne ikke åpne dokumentet + Dette dokumentet kan inneholde formatering eller innhold som ikke kan lagres i det for øyeblikket valgte filformatet \"Tekst\". + Bruk ODF format + Bekreft filformat + Bruk tekstformat \ No newline at end of file diff --git a/android/lib/src/main/res/values-nl/strings.xml b/android/lib/src/main/res/values-nl/strings.xml index 802550ea5c21e..5e8b430b3f610 100644 --- a/android/lib/src/main/res/values-nl/strings.xml +++ b/android/lib/src/main/res/values-nl/strings.xml @@ -15,7 +15,7 @@ Afsluiten... Dit document is alleen-lezen. Wil je een kopie maken om te bewerken\? Bewerk een kopie - Alleen-lezen + Alleen bekijken Opnieuw starten... Het bestand kan op deze locatie niet worden bewaard; het wordt alleen-lezen geopend. Verplaats het naar Play-bestanden voor volledige lees- en schrijftoegang. Gebruik Tekst-opmaak diff --git a/android/templates/untitled.odt b/android/templates/untitled.odt index d2a8dc274c6c4..1555daad7bb1e 100644 Binary files a/android/templates/untitled.odt and b/android/templates/untitled.odt differ diff --git a/autogen.sh b/autogen.sh index d256534c861df..c7303b23386ba 100755 --- a/autogen.sh +++ b/autogen.sh @@ -31,8 +31,22 @@ autoreconf || failed "autoreconf" scripts/refresh-git-hooks || failed "refresh-git-hooks" +if [ $# -gt 0 ]; then + # If we got parameters, we can execute configure directly. + echo -n "Result: All went OK, running $srcdir/configure " + for arg in "$@" + do + echo -n "'${arg}' " + done + echo "now." + $srcdir/configure "$@" || failed "configure" + exit 0 +fi + cat << EOF Result: All went OK, please run $srcdir/configure (with the appropriate parameters) now. EOF + +# vim:set shiftwidth=4 softtabstop=4 expandtab: diff --git a/browser/.eslintrc b/browser/.eslintrc index fcaf8bb0f14c1..62939a361e5f4 100644 --- a/browser/.eslintrc +++ b/browser/.eslintrc @@ -20,7 +20,11 @@ "no-control-regex": 0, "no-useless-escape": 0, "semi": 2, - "no-redeclare": 0 + "no-redeclare": 0, + /// Rules that are set to warn will fail in CI but not when building for development: + "no-debugger": 1, + "no-unreachable": 1, + "no-unused-vars": 1, }, "globals": { "L": true, @@ -30,6 +34,9 @@ "env": { "browser": true }, + "parserOptions": { + "ecmaVersion": 2017 + }, "overrides": [ { "files": ["**/*.ts"], diff --git a/browser/.gitignore b/browser/.gitignore index a4e3f88e76229..8b0c25aab9298 100644 --- a/browser/.gitignore +++ b/browser/.gitignore @@ -8,8 +8,10 @@ index.html bower.json component.json +mocha.log mocha_tests/*.js tscompile.done +duplication.log _site dist/*.js diff --git a/browser/Makefile.am b/browser/Makefile.am index 34b08373dd3fb..9ba8ca26fd4e0 100644 --- a/browser/Makefile.am +++ b/browser/Makefile.am @@ -31,8 +31,10 @@ endif MOCHA_DIR = $(srcdir)/mocha_tests MOCHA_TS_FILES = $(wildcard $(MOCHA_DIR)/*.ts) MOCHA_TS_JS_FILES := $(MOCHA_TS_FILES:.ts=.js) +# tsc can report a failure, but still create a .js and a second make attempt will succeed, +# so if this returns an error then delete the target $(MOCHA_TS_JS_FILES): %.js: %.ts - $(builddir)/node_modules/typescript/bin/tsc $< --outfile $@ --module none --lib dom,es2016 --target ES5 + $(builddir)/node_modules/typescript/bin/tsc $< --outfile $@ --module none --lib dom,es2016 --target ES5 || (rm -f $@ && false) JQUERY_LIGHTNESS_IMAGE_PATH = $(srcdir)/images/jquery-ui-lightness JQUERY_LIGHTNESS_IMAGES = $(wildcard $(JQUERY_LIGHTNESS_IMAGE_PATH)/*.png) @@ -106,7 +108,8 @@ COOL_ADMIN_JS =\ admin/src/AdminSocketSettings.js \ admin/src/AdminSocketHistory.js \ admin/src/AdminSocketLog.js \ - admin/src/AdminClusterOverview.js + admin/src/AdminClusterOverview.js \ + admin/src/AdminClusterOverviewAbout.js NODE_MODULES_SRC =\ autolinker@3.14.1 \ @@ -163,7 +166,6 @@ NODE_MODULES_JS =\ node_modules/jquery-ui/dist/jquery-ui.js \ $(shell find node_modules/jquery-ui/ui/i18n -name '*.js') \ node_modules/smartmenus/dist/jquery.smartmenus.js \ - node_modules/pako/dist/pako_inflate.es5.js \ node_modules/fzstd/umd/index.js COOL_LIBS_JS =\ @@ -204,6 +206,7 @@ COOL_JS_LST =\ src/core/Events.js \ src/core/Socket.js \ src/core/Matrix.js \ + src/core/Debug.js \ src/geometry/Point.ts \ src/geometry/Bounds.ts \ src/geometry/Transformation.ts \ @@ -211,7 +214,6 @@ COOL_JS_LST =\ src/geo/LatLngBounds.js \ src/geo/projection/Projection.LonLat.js \ src/geo/crs/CRS.js \ - src/geo/crs/CRS.Simple.js \ src/control/IFrameDialog.js \ src/map/Map.js \ src/control/Control.IdleHandler.ts \ @@ -247,7 +249,6 @@ COOL_JS_LST =\ src/layer/tile/CalcTileLayer.js \ src/layer/tile/ContentControlSection.ts \ src/layer/BackgroundColor.js \ - src/layer/ImageOverlay.js \ src/layer/marker/ProgressOverlay.js \ src/layer/marker/TextInput.js \ src/layer/marker/A11yTextInput.js \ @@ -295,6 +296,7 @@ COOL_JS_LST =\ src/dom/DomEvent.Pointer.js \ src/map/handler/Map.TouchGesture.js \ src/map/handler/Map.Keyboard.js \ + src/map/handler/Map.KeyboardShortcuts.ts \ src/map/handler/Map.Welcome.js \ src/map/handler/Map.Feedback.js \ src/map/handler/Map.VersionBar.js \ @@ -328,31 +330,38 @@ COOL_JS_LST =\ src/control/Control.LokDialog.js \ src/control/Control.AlertDialog.js \ src/control/ColorPicker.js \ + src/control/jsdialog/Util.Dropdown.js \ src/control/jsdialog/Util.FocusCycle.js \ + src/control/jsdialog/Util.ModalHelper.js \ + src/control/jsdialog/Util.StateChange.ts \ src/control/jsdialog/Widget.Calendar.js \ + src/control/jsdialog/Widget.Combobox.js \ src/control/jsdialog/Widget.DrawingArea.js \ src/control/jsdialog/Widget.FormulabarEdit.js \ + src/control/jsdialog/Widget.Frame.js \ + src/control/jsdialog/Widget.IconView.js \ src/control/jsdialog/Widget.LanguageSelector.js \ src/control/jsdialog/Widget.MenuButton.js \ + src/control/jsdialog/Widget.MobileBorderSelector.js \ src/control/jsdialog/Widget.MobileTabControl.js \ src/control/jsdialog/Widget.MultilineEdit.js \ + src/control/jsdialog/Widget.Progressbar.js \ src/control/jsdialog/Widget.ScrolledWindow.js \ + src/control/jsdialog/Widget.Timefield.js \ src/control/jsdialog/Widget.TreeView.js \ src/control/Control.JSDialog.js \ src/control/Control.JSDialogBuilder.js \ src/control/Control.MobileWizardBuilder.js \ src/control/Control.MobileWizardWindow.js \ src/control/Control.MobileWizard.js \ - src/control/Control.MobileWizardPopup.js \ src/control/Control.LanguageDialog.js \ src/control/Control.Attribution.js \ src/control/Control.MobileSlide.js \ - src/control/Control.Scale.js \ src/control/Control.StatusBar.js \ src/control/Control.SearchBar.js \ src/control/Control.MobileTopBar.js \ src/control/Control.MobileBottomBar.js \ - src/control/Control.UserList.js \ + src/control/Control.UserList.ts \ src/control/Control.FormulaBar.js \ src/control/Control.FormulaBarJSDialog.js \ src/control/Control.SheetsBar.js \ @@ -478,13 +487,17 @@ $(DIST_FOLDER)/soffice%: $(abs_top_builddir)/wasm/soffice% @cp $< $@ WASM_FILES= \ - $(DIST_FOLDER)/online.data \ $(DIST_FOLDER)/online.js \ $(DIST_FOLDER)/online.wasm \ - $(DIST_FOLDER)/online.wasm.debug.wasm \ $(DIST_FOLDER)/online.worker.js \ $(DIST_FOLDER)/soffice.data \ $(DIST_FOLDER)/soffice.data.js.metadata + +if ENABLE_DEBUG +WASM_FILES += \ + $(DIST_FOLDER)/online.wasm.debug.wasm +endif + endif $(TYPESCRIPT_JS_DIR)/%.js: $(srcdir)/%.ts @@ -531,7 +544,7 @@ $(INTERMEDIATE_DIR)/admin-src.js: $(COOL_ADMIN_TS_JS) $(COOL_ADMIN_JS) @$(NODE) node_modules/eslint/bin/eslint.js --resolve-plugins-relative-to $(abs_builddir) --ignore-path $(srcdir)/.eslintignore --config $(srcdir)/.eslintrc --no-eslintrc $(srcdir)/admin/src @awk 'FNR == 1 {print ""} 1' $(COOL_ADMIN_TS_JS) $(patsubst %.js,$(srcdir)/%.js,$(COOL_ADMIN_JS)) > $@ -$(INTERMEDIATE_DIR)/cool-src.js: tscompile.done $(call prereq_cool) $(COOL_JS_DST) +$(INTERMEDIATE_DIR)/cool-src.js: tscompile.done $(call prereq_cool) $(COOL_JS_DST) $(abs_top_srcdir)/scripts/unocommands.py @mkdir -p $(dir $@) $(abs_top_srcdir)/scripts/unocommands.py --check $(abs_top_srcdir) @printf "Checking for obsolete JS build intermediates in this makefile... " @@ -683,9 +696,25 @@ $(DIST_FOLDER)/admin/%: $(srcdir)/admin/% @mkdir -p $(dir $@) @cp $< $@ +if ENABLE_DEBUG install-data-hook: mkdir -p $(DESTDIR)$(pkgdatadir)/browser; \ cp -a dist/ $(DESTDIR)$(pkgdatadir)/browser/; +else +install-data-hook: + mkdir -p $(DESTDIR)$(pkgdatadir)/browser; \ + rsync -a --exclude='src' \ + --exclude='debug.html' \ + --exclude='framed.doc.html' \ + --exclude='framed.html' \ + --exclude='load.doc.html' \ + --exclude='multidocs.html' \ + --exclude='tsconfig.tsbuildinfo' \ + dist $(DESTDIR)$(pkgdatadir)/browser/; +if ENABLE_WASM + find $(DESTDIR)$(pkgdatadir)/browser/dist -type f ! -iname "*.png" -exec brotli --force {} \; +endif +endif libs: @mkdir -p $(abs_srcdir)/libs @@ -700,6 +729,7 @@ pot: admin/src/AdminSocketOverview.js \ admin/src/AdminSocketSettings.js \ admin/src/Util.js \ + js/global.js \ js/w2ui-1.5.rc1.js \ src/control/ColorPicker.js \ src/control/Control.AlertDialog.js \ @@ -710,6 +740,7 @@ pot: src/control/Control.DownloadProgress.js \ src/control/Control.FormulaBar.js \ src/control/Control.FormulaBarJSDialog.js \ + src/control/Control.IdleHandler.ts \ src/control/Control.JSDialogBuilder.js \ src/control/Control.LanguageDialog.js \ src/control/Control.Menubar.js \ @@ -718,7 +749,6 @@ pot: src/control/Control.MobileWizardBuilder.js \ src/control/Control.MobileWizardWindow.js \ src/control/Control.MobileWizard.js \ - src/control/Control.MobileWizardPopup.js \ src/control/Control.Notebookbar.js \ src/control/Control.NotebookbarBuilder.js \ src/control/Control.NotebookbarCalc.js \ @@ -734,15 +764,19 @@ pot: src/control/Control.Tabs.js \ src/control/Control.Toolbar.js \ src/control/Control.TopToolbar.js \ - src/control/Control.UserList.js \ + src/control/Control.UIManager.js \ + src/control/Control.UserList.ts \ src/control/Control.Zotero.js \ src/control/Parts.js \ src/control/Permission.js \ src/control/Ruler.js \ src/control/Signing.js \ src/control/Toolbar.js \ + src/control/jsdialog/Widget.MobileBorderSelector.js \ src/control/jsdialog/Widget.TreeView.js \ src/core/Socket.js \ + src/core/Debug.js \ + src/docstate.js \ src/errormessages.js \ src/layer/tile/CanvasTileLayer.js \ src/layer/tile/CommentListSection.ts \ @@ -753,6 +787,7 @@ pot: src/map/handler/Map.Feedback.js \ src/map/handler/Map.FileInserter.js \ src/map/handler/Map.Keyboard.js \ + src/map/handler/Map.SlideShow.js \ src/map/handler/Map.WOPI.js html2po --pot --input=html/cool-help.html --output=po/templates/cool-help.pot --duplicates=merge @@ -795,6 +830,7 @@ build-tests: $(MOCHA_TS_JS_FILES) @echo "Build of mocha test finished." MOCHA_TEST_LOG = "`pwd`/mocha.log" +DUPLICATION_TEST_LOG = "`pwd`/duplication.log" check-local: $(MOCHA_TS_JS_FILES) @echo "Running mocha tests..." @echo > ${MOCHA_TEST_LOG} @@ -805,6 +841,15 @@ check-local: $(MOCHA_TS_JS_FILES) exit 1; \ fi + @echo "Checking code duplication..." + @echo > ${DUPLICATION_TEST_LOG} + @if npm run duplication 2> ${DUPLICATION_TEST_LOG} 1>&2; then \ + echo "Code duplication tests finished successfully."; \ + else \ + cat ${DUPLICATION_TEST_LOG}; \ + exit 1; \ + fi + # the delay (in milliseconds) between each emulated key stroke for each view typing_speed=100 # The duration of the typing (in milliseconds) diff --git a/browser/admin/admin.strings.js b/browser/admin/admin.strings.js index 1d5fb8ce5dd10..4493067956958 100644 --- a/browser/admin/admin.strings.js +++ b/browser/admin/admin.strings.js @@ -1,4 +1,13 @@ /* -*- js-indent-level: 8 -*- */ +/* + * Copyright the Collabora Online contributors. + * + * SPDX-License-Identifier: MPL-2.0 + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ /* Stringtable for Admin Console User Interface */ var l10nstrings = {}; @@ -55,7 +64,8 @@ l10nstrings.strLogLevels = _('Log Levels'); l10nstrings.strCloseModal = _('Close'); l10nstrings.strUpdateLogLevels = _('Update Log Levels'); l10nstrings.strVersionInfo = _('Version Information'); - +l10nstrings.strLicense = _('License'); +l10nstrings.strAbout = _('About'); if (module) { module.exports = l10nstrings; } diff --git a/browser/admin/adminClusterBody.html b/browser/admin/adminClusterBody.html new file mode 100644 index 0000000000000..91cc600d70fcc --- /dev/null +++ b/browser/admin/adminClusterBody.html @@ -0,0 +1,47 @@ + + + + +
+ + + + + + +
+ + diff --git a/browser/admin/adminClusterOverview.html b/browser/admin/adminClusterOverview.html index 52c75713e3989..cd4f546fb181b 100644 --- a/browser/admin/adminClusterOverview.html +++ b/browser/admin/adminClusterOverview.html @@ -1,27 +1,21 @@ - - -
- -
- -
- - + diff --git a/browser/admin/adminClusterOverviewAbout.html b/browser/admin/adminClusterOverviewAbout.html new file mode 100644 index 0000000000000..b15d238f43182 --- /dev/null +++ b/browser/admin/adminClusterOverviewAbout.html @@ -0,0 +1,43 @@ +
+
+
+ +
+
+

+ +

+
+
+
+ +
+
+

+

+

+
+
+
+
+ + diff --git a/browser/admin/admintemplate.html b/browser/admin/admintemplate.html index dc5135e952ffb..5790a1e0e5293 100644 --- a/browser/admin/admintemplate.html +++ b/browser/admin/admintemplate.html @@ -63,17 +63,23 @@ diff --git a/browser/admin/main-admin.js b/browser/admin/main-admin.js index 583d3d54b23a5..ac4991155ce04 100644 --- a/browser/admin/main-admin.js +++ b/browser/admin/main-admin.js @@ -1,4 +1,13 @@ /* -*- js-indent-level: 8 -*- */ +/* + * Copyright the Collabora Online contributors. + * + * SPDX-License-Identifier: MPL-2.0 + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ // CSS requires var $ = require('jquery'); diff --git a/browser/admin/src/AdminClusterOverview.js b/browser/admin/src/AdminClusterOverview.js index 0a5a5e3968280..b6562b31be418 100644 --- a/browser/admin/src/AdminClusterOverview.js +++ b/browser/admin/src/AdminClusterOverview.js @@ -1,16 +1,28 @@ /* -*- js-indent-level: 8 -*- */ /* - Socket to be intialized on opening the cluster overview page in Admin console -*/ -/* global DlgLoading _ AdminSocketBase Admin d3 Map */ + * Copyright the Collabora Online contributors. + * + * SPDX-License-Identifier: MPL-2.0 + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ +/* + * Socket to be intialized on opening the cluster overview page in Admin console + */ + +/* global DlgLoading _ AdminSocketBase Admin d3 Map Util DlgYesNo */ var AdminClusterOverview = AdminSocketBase.extend({ - constructor: function (host) { + constructor: function (host, routeToken) { this.base(host); + this.routeToken = routeToken; }, _statsData: new Map(), _size: 20, + _statIntervalId: 0, _graphDimensions: { x: 756, @@ -18,10 +30,10 @@ var AdminClusterOverview = AdminSocketBase.extend({ }, _graphMargins: { - top: 5, + top: 10, right: 0, - bottom: 5, - left: 25 + bottom: 10, + left: 80 }, _interval: 5000, @@ -66,21 +78,24 @@ var AdminClusterOverview = AdminSocketBase.extend({ createCard: function (server) { var card = document.createElement('div'); - card.className = 'tile is-child card'; + card.className = 'tile is-child card is-rounded'; card.id = 'card-' + server.serverId; - var cardContent = document.createElement('div'); - cardContent.className = 'card-content'; - + var cardHeader = document.createElement('header'); + cardHeader.className = 'card-header is-top-rounded'; var cardTitle = document.createElement('p'); - cardTitle.className = 'title has-text-centered'; + cardTitle.className = 'card-header-title'; if (server.podname) { cardTitle.textContent = server.podname; } else { console.warn('podname doesnot exist, using serverId instead of podname on card title'); cardTitle.textContent = server.serverId; } - cardContent.appendChild(cardTitle); + cardHeader.appendChild(cardTitle); + card.appendChild(cardHeader); + + var cardContent = document.createElement('div'); + cardContent.className = 'card-content'; var mainTile = document.createElement('div'); mainTile.className = 'tile is-fullwidth is-vertical'; @@ -103,7 +118,7 @@ var AdminClusterOverview = AdminSocketBase.extend({ mainTile.appendChild(memorySubTitle); - var memGraph = this.createGraph('mem', data.mem, server.memory); + var memGraph = this.createGraph('mem', data.mem, Util.humanizeMem(server.memory)); mainTile.appendChild(memGraph); var horizontalTile = document.createElement('div'); @@ -128,7 +143,7 @@ var AdminClusterOverview = AdminSocketBase.extend({ updateCardContent: function (cardId, server) { var card = document.getElementById(cardId); card.querySelector('#cpu-usage').textContent = server.cpu + '%'; - card.querySelector('#mem-con').textContent = server.memory + ' MB'; + card.querySelector('#mem-con').textContent = Util.humanizeMem(server.memory); card.querySelector('#route').textContent = server.routeToken; var data = this._statsData.get(server.serverId); @@ -143,8 +158,11 @@ var AdminClusterOverview = AdminSocketBase.extend({ var innerWidth = this._graphDimensions.x - this._graphMargins.left - this._graphMargins.right; - var yAxisMemGenerator = d3.axisLeft(memObj.yScale); - yAxisMemGenerator.ticks(3); + var yAxisMemGenerator = d3.axisLeft(memObj.yScale) + .tickFormat(function (d) { + return Util.humanizeMem(d); + }); + yAxisMemGenerator.ticks(2); yAxisMemGenerator.tickSize(-innerWidth); var yAxisMem = d3.select(memSvg).select('.y-axis') @@ -160,8 +178,11 @@ var AdminClusterOverview = AdminSocketBase.extend({ .datum(data.cpu) .attr('d', cpuObj.line); - var yAxisCpuGenerator = d3.axisLeft(cpuObj.yScale); - yAxisCpuGenerator.ticks(3); + var yAxisCpuGenerator = d3.axisLeft(cpuObj.yScale) + .tickFormat(function (d) { + return d + '%'; + }); + yAxisCpuGenerator.ticks(2); yAxisCpuGenerator.tickSize(-innerWidth); var yAxisCpu = d3.select(cpuSvg).select('.y-axis') @@ -199,7 +220,7 @@ var AdminClusterOverview = AdminSocketBase.extend({ spanforBullet.style = 'color:green'; var spanforText = document.createElement('span'); spanforText.id = 'mem-con'; - spanforText.textContent = currData + ' MB'; + spanforText.textContent = currData; memStat.appendChild(spanforBullet); memStat.appendChild(spanforText); @@ -210,22 +231,33 @@ var AdminClusterOverview = AdminSocketBase.extend({ figure.id = graphName + '-graph'; var svg = d3.select(figure).append('svg') - .attr('width', '100%') - .attr('height', this._graphDimensions.y) .attr('viewBox', '0 0 ' + this._graphDimensions.x + ' ' + this._graphDimensions.y) .append('g') .attr('transform', 'translate(' + this._graphMargins.left + ',' + this._graphMargins.top + ')'); var obj = this.getScaleAndLine(data); - var yAxisGenerator = d3.axisLeft(obj.yScale); - yAxisGenerator.ticks(3); + var yAxisGenerator; + if (graphName == 'cpu') { + yAxisGenerator = d3.axisLeft(obj.yScale) + .tickFormat(function (d) { + return d + '%'; + }); + yAxisGenerator.ticks(3); + } else if (graphName == 'mem') { + yAxisGenerator = d3.axisLeft(obj.yScale) + .tickFormat(function (d) { + return Util.humanizeMem(d); + }); + yAxisGenerator.ticks(3); + } var innerWidth = this._graphDimensions.x - this._graphMargins.left - this._graphMargins.right; yAxisGenerator.tickSize(-innerWidth); var yAxis = svg.append('g') .attr('class', 'y-axis axis') + .style('font-size', '1em') .call(yAxisGenerator); yAxis.select('.domain').attr('stroke-width', 0); @@ -331,7 +363,7 @@ var AdminClusterOverview = AdminSocketBase.extend({ var tableBody = document.createElement('tbody'); var that = this; documents.forEach(function (doc) { - var row = that.createRow(doc.documentName, doc.memoryConsumed, doc.pid); + var row = that.createRow(doc.documentName, Util.humanizeMem(doc.memoryConsumed), doc.pid); tableBody.appendChild(row); }); @@ -446,7 +478,7 @@ var AdminClusterOverview = AdminSocketBase.extend({ table = this.createDocumentTable([{ documentName: decodeURI(filename), memoryConsumed: mem, pid: pid }]); card.querySelector('.card-content').appendChild(table); } else { - var row = this.createRow(decodeURI(filename), mem, pid); + var row = this.createRow(decodeURI(filename), Util.humanizeMem(Number.parseInt(mem)), pid); card.querySelector('tbody').appendChild(row); } } @@ -481,7 +513,7 @@ var AdminClusterOverview = AdminSocketBase.extend({ if (card) { var row = card.querySelector('#doc-' + pid); if (row) { - row.querySelector('.docmem').textContent = newMem; + row.querySelector('.docmem').textContent = Util.humanizeMem(Number.parseInt(newMem)); } } } else if (textMsg.startsWith('rmsrv')) { @@ -510,21 +542,44 @@ var AdminClusterOverview = AdminSocketBase.extend({ this.socket.send('stats'); DlgLoading.close(); } + } else if (textMsg == 'InvalidAuthToken' || textMsg == 'NotAuthenticated') { + var msg; + if (window.location.protocol === 'http:') { + // Browsers refuse to overwrite the jwt cookie in this case. + msg = _('Failed to set jwt authentication cookie over insecure connection'); + } + else { + msg = _('Failed to authenticate this session over protocol %0'); + msg = msg.replace('%0', window.location.protocol); + } + + var dialog = (new DlgYesNo()) + .title(_('Warning')) + .text(_(msg)) + .yesButtonText(_('OK')) + .noButtonText(_('Cancel')) + .type('warning'); + this.pageWillBeRefreshed = true; + dialog.open(); } }, onSocketOpen: function () { - this.base.call(this); - + this.socket.send('auth jwt=' + window.jwtToken + ' routeToken=' + this.routeToken); this.socket.send('stats'); this.socket.send('documents'); var that = this; - setInterval(function () { + this._statIntervalId = setInterval(function () { that.socket.send('stats'); }, this._interval); + }, + + onSocketClose: function () { + clearInterval(this._statIntervalId); + this.base.call(this); } }); -Admin.ClusterOverview = function (host) { - return new AdminClusterOverview(host); -}; \ No newline at end of file +Admin.ClusterOverview = function (host, routeToken) { + return new AdminClusterOverview(host, routeToken); +}; diff --git a/browser/admin/src/AdminClusterOverviewAbout.js b/browser/admin/src/AdminClusterOverviewAbout.js new file mode 100644 index 0000000000000..192a851d6f88e --- /dev/null +++ b/browser/admin/src/AdminClusterOverviewAbout.js @@ -0,0 +1,35 @@ +/* -*- js-indent-level: 8 -*- */ +/* global AdminSocketBase Admin $ */ + +var AdminClusterOverviewAbout = AdminSocketBase.extend({ + constructor: function(host, routeToken) { + this.base(host); + this.routeToken = routeToken; + }, + + onSocketMessage: function(e) { + var textMsg; + if (typeof e.data === 'string') { + textMsg = e.data; + } + else { + textMsg = ''; + } + if (textMsg.startsWith('license')) { + $('#license-content').html(textMsg.substring('license: '.length)); + } + }, + + onSocketOpen: function() { + this.socket.send('auth jwt=' + window.jwtToken + ' routeToken=' + this.routeToken); + this.socket.send('license'); + }, + + onSocketClose: function() { + this.base.call(this); + } +}); + +Admin.ClusterOverviewAbout = function(host, routeToken) { + return new AdminClusterOverviewAbout(host, routeToken); +}; diff --git a/browser/admin/src/AdminSocketAnalytics.js b/browser/admin/src/AdminSocketAnalytics.js index 3b4c01b61b297..6806f38e4bc7a 100644 --- a/browser/admin/src/AdminSocketAnalytics.js +++ b/browser/admin/src/AdminSocketAnalytics.js @@ -1,8 +1,17 @@ /* -*- js-indent-level: 8 -*- */ /* - Socket to be intialized on opening the analytics page in Admin console - containing various graphs to show to the user on specified interval -*/ + * Copyright the Collabora Online contributors. + * + * SPDX-License-Identifier: MPL-2.0 + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ +/* + * Socket to be intialized on opening the analytics page in Admin console + * containing various graphs to show to the user on specified interval + */ /* global _ d3 Util AdminSocketBase $ Admin */ var AdminSocketAnalytics = AdminSocketBase.extend({ diff --git a/browser/admin/src/AdminSocketBase.js b/browser/admin/src/AdminSocketBase.js index 37539853aeb38..37da2b5c85eb9 100644 --- a/browser/admin/src/AdminSocketBase.js +++ b/browser/admin/src/AdminSocketBase.js @@ -1,7 +1,16 @@ /* -*- js-indent-level: 8 -*- */ /* - Abstract class -*/ + * Copyright the Collabora Online contributors. + * + * SPDX-License-Identifier: MPL-2.0 + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ +/* + * Abstract class for Admin Sockets + */ /* global _ DlgYesNo Base */ @@ -34,8 +43,7 @@ var AdminSocketBase = Base.extend({ onSocketOpen: function () { // Authenticate - var accessToken = window.accessToken; - this.socket.send('auth jwt=' + accessToken); + this.socket.send('auth jwt=' + window.jwtToken); }, onSocketMessage: function () { diff --git a/browser/admin/src/AdminSocketHistory.js b/browser/admin/src/AdminSocketHistory.js index 3a49d0c8c28bd..af97483970e1e 100644 --- a/browser/admin/src/AdminSocketHistory.js +++ b/browser/admin/src/AdminSocketHistory.js @@ -1,8 +1,19 @@ /* -*- js-indent-level: 8 -*- */ /* - Socket to be intialized on opening the history page in Admin console -*/ + * Copyright the Collabora Online contributors. + * + * SPDX-License-Identifier: MPL-2.0 + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ +/* + * Socket to be intialized on opening the history page in Admin console + */ + /* global Admin $ AdminSocketBase */ + var AdminSocketHistory = AdminSocketBase.extend({ constructor: function(host) { this.base(host); diff --git a/browser/admin/src/AdminSocketLog.js b/browser/admin/src/AdminSocketLog.js index 0c21fd6ca84b8..3a43ebfc70076 100644 --- a/browser/admin/src/AdminSocketLog.js +++ b/browser/admin/src/AdminSocketLog.js @@ -1,8 +1,19 @@ /* -*- js-indent-level: 8 -*- */ /* - Socket to be intialized on opening the log page in Admin console -*/ + * Copyright the Collabora Online contributors. + * + * SPDX-License-Identifier: MPL-2.0 + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ +/* + * Socket to be intialized on opening the log page in Admin console + */ + /* global Admin $ AdminSocketBase */ + var AdminSocketLog = AdminSocketBase.extend({ _logLines: '', diff --git a/browser/admin/src/AdminSocketOverview.js b/browser/admin/src/AdminSocketOverview.js index d6bdc23fafa37..2f113475fcc7b 100644 --- a/browser/admin/src/AdminSocketOverview.js +++ b/browser/admin/src/AdminSocketOverview.js @@ -1,9 +1,18 @@ /* -*- js-indent-level: 8 -*- */ /* - Socket to be intialized on opening the overview page in Admin console -*/ -/* global DlgYesNo _ $ Util AdminSocketBase Admin */ + * Copyright the Collabora Online contributors. + * + * SPDX-License-Identifier: MPL-2.0 + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ +/* + * Socket to be intialized on opening the overview page in Admin console + */ +/* global DlgYesNo _ $ Util AdminSocketBase Admin */ function getCollapsibleClass(id) { var container = document.getElementById(id); diff --git a/browser/admin/src/AdminSocketSettings.js b/browser/admin/src/AdminSocketSettings.js index 0b572dcea3340..d48bd64ca8614 100644 --- a/browser/admin/src/AdminSocketSettings.js +++ b/browser/admin/src/AdminSocketSettings.js @@ -1,8 +1,19 @@ /* -*- js-indent-level: 8 -*- */ /* - Socket to be intialized on opening the settings page in Admin console -*/ + * Copyright the Collabora Online contributors. + * + * SPDX-License-Identifier: MPL-2.0 + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ +/* + * Socket to be intialized on opening the settings page in Admin console + */ + /* global DlgYesNo $ AdminSocketBase Admin _ */ + var AdminSocketSettings = AdminSocketBase.extend({ constructor: function(host) { this.base(host); diff --git a/browser/admin/src/Base.js b/browser/admin/src/Base.js index c798f5c410608..c404f344e93b1 100644 --- a/browser/admin/src/Base.js +++ b/browser/admin/src/Base.js @@ -1,9 +1,12 @@ /* -*- js-indent-level: 8 -*- */ /* - Base.js, version 1.1a - Copyright 2006-2010, Dean Edwards - License: http://www.opensource.org/licenses/mit-license.php -*/ + * SPDX-License-Identifier: MIT License + */ +/* + * Base.js, version 1.1a + * Copyright 2006-2010, Dean Edwards + * License: http://www.opensource.org/licenses/mit-license.php + */ var Base = function() { // dummy diff --git a/browser/admin/src/ModalDialogCreator.ts b/browser/admin/src/ModalDialogCreator.ts index 6d19ad4f6f0cc..43927130f6707 100644 --- a/browser/admin/src/ModalDialogCreator.ts +++ b/browser/admin/src/ModalDialogCreator.ts @@ -1,4 +1,13 @@ /* eslint-disable */ +/* + * Copyright the Collabora Online contributors. + * + * SPDX-License-Identifier: MPL-2.0 + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ /// Available types: info, warning, danger, link, success, primary. Works with bulma.css. @@ -201,4 +210,4 @@ class DlgYesNo { let modal = document.getElementById('modal-' + String(this._modalID)); modal?.classList.add('is-active'); } -} \ No newline at end of file +} diff --git a/browser/admin/src/Util.js b/browser/admin/src/Util.js index a0288d3921013..a5e450952af76 100644 --- a/browser/admin/src/Util.js +++ b/browser/admin/src/Util.js @@ -1,9 +1,21 @@ /* -*- js-indent-level: 8 -*- */ /* - Utility class -*/ + * Copyright the Collabora Online contributors. + * + * SPDX-License-Identifier: MPL-2.0 + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ +/* + * Utility class + */ + /* global Base _ */ + /* eslint no-unused-vars:0 */ + var Util = Base.extend({ constructor: null diff --git a/browser/archived-packages/word-wrap-1.2.3-1f3fe6acd.tar b/browser/archived-packages/@aashutoshrathi/word-wrap-1.2.6-d588ecd92.tar similarity index 80% rename from browser/archived-packages/word-wrap-1.2.3-1f3fe6acd.tar rename to browser/archived-packages/@aashutoshrathi/word-wrap-1.2.6-d588ecd92.tar index ba3750a0dbaa0..770fd33747f66 100644 Binary files a/browser/archived-packages/word-wrap-1.2.3-1f3fe6acd.tar and b/browser/archived-packages/@aashutoshrathi/word-wrap-1.2.6-d588ecd92.tar differ diff --git a/browser/archived-packages/@ampproject/remapping-2.2.0-a919a38fc.tar b/browser/archived-packages/@ampproject/remapping-2.2.1-945323253.tar similarity index 55% rename from browser/archived-packages/@ampproject/remapping-2.2.0-a919a38fc.tar rename to browser/archived-packages/@ampproject/remapping-2.2.1-945323253.tar index e87b74f4e89e4..e0d44969d2689 100644 Binary files a/browser/archived-packages/@ampproject/remapping-2.2.0-a919a38fc.tar and b/browser/archived-packages/@ampproject/remapping-2.2.1-945323253.tar differ diff --git a/browser/archived-packages/@babel/code-frame-7.21.4-2d8be134a.tar b/browser/archived-packages/@babel/code-frame-7.21.4-2d8be134a.tar deleted file mode 100644 index c71dfaec9ba43..0000000000000 Binary files a/browser/archived-packages/@babel/code-frame-7.21.4-2d8be134a.tar and /dev/null differ diff --git a/browser/archived-packages/@babel/code-frame-7.22.13-5e4b6e856.tar b/browser/archived-packages/@babel/code-frame-7.22.13-5e4b6e856.tar new file mode 100644 index 0000000000000..4d2bcdb4944bc Binary files /dev/null and b/browser/archived-packages/@babel/code-frame-7.22.13-5e4b6e856.tar differ diff --git a/browser/archived-packages/@babel/compat-data-7.21.4-fc36320e9.tar b/browser/archived-packages/@babel/compat-data-7.22.20-05062329b.tar similarity index 87% rename from browser/archived-packages/@babel/compat-data-7.21.4-fc36320e9.tar rename to browser/archived-packages/@babel/compat-data-7.22.20-05062329b.tar index 08f9225d72cef..4ed22f96baa23 100644 Binary files a/browser/archived-packages/@babel/compat-data-7.21.4-fc36320e9.tar and b/browser/archived-packages/@babel/compat-data-7.22.20-05062329b.tar differ diff --git a/browser/archived-packages/@babel/core-7.21.4-aadfd8575.tar b/browser/archived-packages/@babel/core-7.21.4-aadfd8575.tar deleted file mode 100644 index bc0b741e405ec..0000000000000 Binary files a/browser/archived-packages/@babel/core-7.21.4-aadfd8575.tar and /dev/null differ diff --git a/browser/archived-packages/@babel/core-7.22.20-63a8ddd5a.tar b/browser/archived-packages/@babel/core-7.22.20-63a8ddd5a.tar new file mode 100644 index 0000000000000..29b08c27308a0 Binary files /dev/null and b/browser/archived-packages/@babel/core-7.22.20-63a8ddd5a.tar differ diff --git a/browser/archived-packages/@babel/generator-7.21.4-36278cde9.tar b/browser/archived-packages/@babel/generator-7.21.4-36278cde9.tar deleted file mode 100644 index 0435b46d3dfbf..0000000000000 Binary files a/browser/archived-packages/@babel/generator-7.21.4-36278cde9.tar and /dev/null differ diff --git a/browser/archived-packages/@babel/generator-7.22.15-66ef68580.tar b/browser/archived-packages/@babel/generator-7.22.15-66ef68580.tar new file mode 100644 index 0000000000000..a335174e986f8 Binary files /dev/null and b/browser/archived-packages/@babel/generator-7.22.15-66ef68580.tar differ diff --git a/browser/archived-packages/@babel/helper-compilation-targets-7.21.4-15ad2d4ee.tar b/browser/archived-packages/@babel/helper-compilation-targets-7.21.4-15ad2d4ee.tar deleted file mode 100644 index 38dd95f9e43c0..0000000000000 Binary files a/browser/archived-packages/@babel/helper-compilation-targets-7.21.4-15ad2d4ee.tar and /dev/null differ diff --git a/browser/archived-packages/@babel/helper-compilation-targets-7.22.15-cba104cd4.tar b/browser/archived-packages/@babel/helper-compilation-targets-7.22.15-cba104cd4.tar new file mode 100644 index 0000000000000..c1ef0782df348 Binary files /dev/null and b/browser/archived-packages/@babel/helper-compilation-targets-7.22.15-cba104cd4.tar differ diff --git a/browser/archived-packages/@babel/helper-environment-visitor-7.18.9-debfda002.tar b/browser/archived-packages/@babel/helper-environment-visitor-7.22.20-cdf79d488.tar similarity index 54% rename from browser/archived-packages/@babel/helper-environment-visitor-7.18.9-debfda002.tar rename to browser/archived-packages/@babel/helper-environment-visitor-7.22.20-cdf79d488.tar index 75e179684b6cc..cc93eb06cff0d 100644 Binary files a/browser/archived-packages/@babel/helper-environment-visitor-7.18.9-debfda002.tar and b/browser/archived-packages/@babel/helper-environment-visitor-7.22.20-cdf79d488.tar differ diff --git a/browser/archived-packages/@babel/helper-function-name-7.21.0-1df2b568c.tar b/browser/archived-packages/@babel/helper-function-name-7.21.0-1df2b568c.tar deleted file mode 100644 index aa2b64778eda4..0000000000000 Binary files a/browser/archived-packages/@babel/helper-function-name-7.21.0-1df2b568c.tar and /dev/null differ diff --git a/browser/archived-packages/@babel/helper-function-name-7.22.5-c2d1d2aba.tar b/browser/archived-packages/@babel/helper-function-name-7.22.5-c2d1d2aba.tar new file mode 100644 index 0000000000000..08830b50b778e Binary files /dev/null and b/browser/archived-packages/@babel/helper-function-name-7.22.5-c2d1d2aba.tar differ diff --git a/browser/archived-packages/@babel/helper-hoist-variables-7.18.6-5252503e4.tar b/browser/archived-packages/@babel/helper-hoist-variables-7.22.5-c068e4f50.tar similarity index 60% rename from browser/archived-packages/@babel/helper-hoist-variables-7.18.6-5252503e4.tar rename to browser/archived-packages/@babel/helper-hoist-variables-7.22.5-c068e4f50.tar index 7eb785b8dd9db..0be2cebcdda8c 100644 Binary files a/browser/archived-packages/@babel/helper-hoist-variables-7.18.6-5252503e4.tar and b/browser/archived-packages/@babel/helper-hoist-variables-7.22.5-c068e4f50.tar differ diff --git a/browser/archived-packages/@babel/helper-module-imports-7.21.4-a2b6a3739.tar b/browser/archived-packages/@babel/helper-module-imports-7.22.15-d29615067.tar similarity index 79% rename from browser/archived-packages/@babel/helper-module-imports-7.21.4-a2b6a3739.tar rename to browser/archived-packages/@babel/helper-module-imports-7.22.15-d29615067.tar index 11aebce448491..19c3ec03fdd16 100644 Binary files a/browser/archived-packages/@babel/helper-module-imports-7.21.4-a2b6a3739.tar and b/browser/archived-packages/@babel/helper-module-imports-7.22.15-d29615067.tar differ diff --git a/browser/archived-packages/@babel/helper-module-transforms-7.21.2-efdca3d80.tar b/browser/archived-packages/@babel/helper-module-transforms-7.21.2-efdca3d80.tar deleted file mode 100644 index 71a855d53a64e..0000000000000 Binary files a/browser/archived-packages/@babel/helper-module-transforms-7.21.2-efdca3d80.tar and /dev/null differ diff --git a/browser/archived-packages/@babel/helper-module-transforms-7.22.20-74b4fb255.tar b/browser/archived-packages/@babel/helper-module-transforms-7.22.20-74b4fb255.tar new file mode 100644 index 0000000000000..a7a51eca77367 Binary files /dev/null and b/browser/archived-packages/@babel/helper-module-transforms-7.22.20-74b4fb255.tar differ diff --git a/browser/archived-packages/@babel/helper-simple-access-7.20.2-fb4c2823f.tar b/browser/archived-packages/@babel/helper-simple-access-7.20.2-fb4c2823f.tar deleted file mode 100644 index 2b8da9885c529..0000000000000 Binary files a/browser/archived-packages/@babel/helper-simple-access-7.20.2-fb4c2823f.tar and /dev/null differ diff --git a/browser/archived-packages/@babel/helper-simple-access-7.22.5-9f41fdf44.tar b/browser/archived-packages/@babel/helper-simple-access-7.22.5-9f41fdf44.tar new file mode 100644 index 0000000000000..3dda87d42f66d Binary files /dev/null and b/browser/archived-packages/@babel/helper-simple-access-7.22.5-9f41fdf44.tar differ diff --git a/browser/archived-packages/@babel/helper-split-export-declaration-7.18.6-6dd7b57ad.tar b/browser/archived-packages/@babel/helper-split-export-declaration-7.18.6-6dd7b57ad.tar deleted file mode 100644 index 77e1f59c9f938..0000000000000 Binary files a/browser/archived-packages/@babel/helper-split-export-declaration-7.18.6-6dd7b57ad.tar and /dev/null differ diff --git a/browser/archived-packages/@babel/helper-split-export-declaration-7.22.6-02c527c6e.tar b/browser/archived-packages/@babel/helper-split-export-declaration-7.22.6-02c527c6e.tar new file mode 100644 index 0000000000000..da1c95229f66d Binary files /dev/null and b/browser/archived-packages/@babel/helper-split-export-declaration-7.22.6-02c527c6e.tar differ diff --git a/browser/archived-packages/@babel/helper-string-parser-7.19.4-9c7b43a10.tar b/browser/archived-packages/@babel/helper-string-parser-7.19.4-9c7b43a10.tar deleted file mode 100644 index 887c8c2238c46..0000000000000 Binary files a/browser/archived-packages/@babel/helper-string-parser-7.19.4-9c7b43a10.tar and /dev/null differ diff --git a/browser/archived-packages/@babel/helper-string-parser-7.22.5-98ce023a3.tar b/browser/archived-packages/@babel/helper-string-parser-7.22.5-98ce023a3.tar new file mode 100644 index 0000000000000..e792144540b98 Binary files /dev/null and b/browser/archived-packages/@babel/helper-string-parser-7.22.5-98ce023a3.tar differ diff --git a/browser/archived-packages/@babel/helper-validator-identifier-7.19.1-6b0acd7da.tar b/browser/archived-packages/@babel/helper-validator-identifier-7.19.1-6b0acd7da.tar deleted file mode 100644 index 0dbea2d6b4b29..0000000000000 Binary files a/browser/archived-packages/@babel/helper-validator-identifier-7.19.1-6b0acd7da.tar and /dev/null differ diff --git a/browser/archived-packages/@babel/helper-validator-identifier-7.22.20-638399fb2.tar b/browser/archived-packages/@babel/helper-validator-identifier-7.22.20-638399fb2.tar new file mode 100644 index 0000000000000..a45bae6c4976a Binary files /dev/null and b/browser/archived-packages/@babel/helper-validator-identifier-7.22.20-638399fb2.tar differ diff --git a/browser/archived-packages/@babel/helper-validator-option-7.21.0-ae62ff07c.tar b/browser/archived-packages/@babel/helper-validator-option-7.22.15-6cc9fb466.tar similarity index 58% rename from browser/archived-packages/@babel/helper-validator-option-7.21.0-ae62ff07c.tar rename to browser/archived-packages/@babel/helper-validator-option-7.22.15-6cc9fb466.tar index 94ca35fe1537f..9b22429168534 100644 Binary files a/browser/archived-packages/@babel/helper-validator-option-7.21.0-ae62ff07c.tar and b/browser/archived-packages/@babel/helper-validator-option-7.22.15-6cc9fb466.tar differ diff --git a/browser/archived-packages/@babel/helpers-7.21.0-5d7bded02.tar b/browser/archived-packages/@babel/helpers-7.21.0-5d7bded02.tar deleted file mode 100644 index 50a5395a65bb4..0000000000000 Binary files a/browser/archived-packages/@babel/helpers-7.21.0-5d7bded02.tar and /dev/null differ diff --git a/browser/archived-packages/@babel/helpers-7.22.15-ee90232b4.tar b/browser/archived-packages/@babel/helpers-7.22.15-ee90232b4.tar new file mode 100644 index 0000000000000..8f91495def5f1 Binary files /dev/null and b/browser/archived-packages/@babel/helpers-7.22.15-ee90232b4.tar differ diff --git a/browser/archived-packages/@babel/highlight-7.18.6-bbbb2d6ce.tar b/browser/archived-packages/@babel/highlight-7.18.6-bbbb2d6ce.tar deleted file mode 100644 index e674dfd25acc2..0000000000000 Binary files a/browser/archived-packages/@babel/highlight-7.18.6-bbbb2d6ce.tar and /dev/null differ diff --git a/browser/archived-packages/@babel/highlight-7.22.20-76474c08d.tar b/browser/archived-packages/@babel/highlight-7.22.20-76474c08d.tar new file mode 100644 index 0000000000000..f3408118b3b63 Binary files /dev/null and b/browser/archived-packages/@babel/highlight-7.22.20-76474c08d.tar differ diff --git a/browser/archived-packages/@babel/parser-7.21.4-6a55498fb.tar b/browser/archived-packages/@babel/parser-7.21.4-6a55498fb.tar deleted file mode 100644 index 18394a4f60fed..0000000000000 Binary files a/browser/archived-packages/@babel/parser-7.21.4-6a55498fb.tar and /dev/null differ diff --git a/browser/archived-packages/@babel/parser-7.22.16-fa03df2af.tar b/browser/archived-packages/@babel/parser-7.22.16-fa03df2af.tar new file mode 100644 index 0000000000000..08f31ccef45f1 Binary files /dev/null and b/browser/archived-packages/@babel/parser-7.22.16-fa03df2af.tar differ diff --git a/browser/archived-packages/@babel/template-7.20.7-f127a05c0.tar b/browser/archived-packages/@babel/template-7.20.7-f127a05c0.tar deleted file mode 100644 index 6539300935c51..0000000000000 Binary files a/browser/archived-packages/@babel/template-7.20.7-f127a05c0.tar and /dev/null differ diff --git a/browser/archived-packages/@babel/template-7.22.15-40f12b515.tar b/browser/archived-packages/@babel/template-7.22.15-40f12b515.tar new file mode 100644 index 0000000000000..db48b9fc5463c Binary files /dev/null and b/browser/archived-packages/@babel/template-7.22.15-40f12b515.tar differ diff --git a/browser/archived-packages/@babel/traverse-7.21.4-7b22ab447.tar b/browser/archived-packages/@babel/traverse-7.21.4-7b22ab447.tar deleted file mode 100644 index 1bc3b4b05a559..0000000000000 Binary files a/browser/archived-packages/@babel/traverse-7.21.4-7b22ab447.tar and /dev/null differ diff --git a/browser/archived-packages/@babel/traverse-7.22.20-794dbad26.tar b/browser/archived-packages/@babel/traverse-7.22.20-794dbad26.tar new file mode 100644 index 0000000000000..a4865ac666eff Binary files /dev/null and b/browser/archived-packages/@babel/traverse-7.22.20-794dbad26.tar differ diff --git a/browser/archived-packages/@babel/types-7.21.4-ad4da8639.tar b/browser/archived-packages/@babel/types-7.22.19-3fb2c0c3f.tar similarity index 60% rename from browser/archived-packages/@babel/types-7.21.4-ad4da8639.tar rename to browser/archived-packages/@babel/types-7.22.19-3fb2c0c3f.tar index bb35298148af6..cd0a9a9981f15 100644 Binary files a/browser/archived-packages/@babel/types-7.21.4-ad4da8639.tar and b/browser/archived-packages/@babel/types-7.22.19-3fb2c0c3f.tar differ diff --git a/browser/archived-packages/@jridgewell/gen-mapping-0.1.1-b105c26ac.tar b/browser/archived-packages/@jridgewell/gen-mapping-0.1.1-b105c26ac.tar deleted file mode 100644 index b09a68f50db4d..0000000000000 Binary files a/browser/archived-packages/@jridgewell/gen-mapping-0.1.1-b105c26ac.tar and /dev/null differ diff --git a/browser/archived-packages/@jridgewell/gen-mapping-0.3.2-9a1eb9c4a.tar b/browser/archived-packages/@jridgewell/gen-mapping-0.3.2-9a1eb9c4a.tar deleted file mode 100644 index 39b5c276ecdd3..0000000000000 Binary files a/browser/archived-packages/@jridgewell/gen-mapping-0.3.2-9a1eb9c4a.tar and /dev/null differ diff --git a/browser/archived-packages/@jridgewell/gen-mapping-0.3.3-1cb85258e.tar b/browser/archived-packages/@jridgewell/gen-mapping-0.3.3-1cb85258e.tar new file mode 100644 index 0000000000000..ec463aef57e5a Binary files /dev/null and b/browser/archived-packages/@jridgewell/gen-mapping-0.3.3-1cb85258e.tar differ diff --git a/browser/archived-packages/@jridgewell/resolve-uri-3.1.0-1769ac95a.tar b/browser/archived-packages/@jridgewell/resolve-uri-3.1.1-75261987b.tar similarity index 50% rename from browser/archived-packages/@jridgewell/resolve-uri-3.1.0-1769ac95a.tar rename to browser/archived-packages/@jridgewell/resolve-uri-3.1.1-75261987b.tar index 5b486ec3aeefa..d66b34b363b25 100644 Binary files a/browser/archived-packages/@jridgewell/resolve-uri-3.1.0-1769ac95a.tar and b/browser/archived-packages/@jridgewell/resolve-uri-3.1.1-75261987b.tar differ diff --git a/browser/archived-packages/@jridgewell/sourcemap-codec-1.4.14-5cf4891d6.tar b/browser/archived-packages/@jridgewell/sourcemap-codec-1.4.15-785dabc42.tar similarity index 52% rename from browser/archived-packages/@jridgewell/sourcemap-codec-1.4.14-5cf4891d6.tar rename to browser/archived-packages/@jridgewell/sourcemap-codec-1.4.15-785dabc42.tar index 9df855e4e6ca7..6a669fb68e91c 100644 Binary files a/browser/archived-packages/@jridgewell/sourcemap-codec-1.4.14-5cf4891d6.tar and b/browser/archived-packages/@jridgewell/sourcemap-codec-1.4.15-785dabc42.tar differ diff --git a/browser/archived-packages/@jridgewell/trace-mapping-0.3.17-302373029.tar b/browser/archived-packages/@jridgewell/trace-mapping-0.3.19-91fdfb42d.tar similarity index 99% rename from browser/archived-packages/@jridgewell/trace-mapping-0.3.17-302373029.tar rename to browser/archived-packages/@jridgewell/trace-mapping-0.3.19-91fdfb42d.tar index a850e7f33948f..fd9dfcac5af68 100644 Binary files a/browser/archived-packages/@jridgewell/trace-mapping-0.3.17-302373029.tar and b/browser/archived-packages/@jridgewell/trace-mapping-0.3.19-91fdfb42d.tar differ diff --git a/browser/archived-packages/@mapbox/node-pre-gyp-1.0.10-e324a8e02.tar b/browser/archived-packages/@mapbox/node-pre-gyp-1.0.11-62195aafa.tar similarity index 97% rename from browser/archived-packages/@mapbox/node-pre-gyp-1.0.10-e324a8e02.tar rename to browser/archived-packages/@mapbox/node-pre-gyp-1.0.11-62195aafa.tar index 37e5d50fdcd97..c1cf595e627da 100644 Binary files a/browser/archived-packages/@mapbox/node-pre-gyp-1.0.10-e324a8e02.tar and b/browser/archived-packages/@mapbox/node-pre-gyp-1.0.11-62195aafa.tar differ diff --git a/browser/archived-packages/@types/json-schema-7.0.11-c0ebaf1b5.tar b/browser/archived-packages/@types/json-schema-7.0.13-45b492a07.tar similarity index 92% rename from browser/archived-packages/@types/json-schema-7.0.11-c0ebaf1b5.tar rename to browser/archived-packages/@types/json-schema-7.0.13-45b492a07.tar index 6ab9f4b46ec42..0aac50fc4e7c2 100644 Binary files a/browser/archived-packages/@types/json-schema-7.0.11-c0ebaf1b5.tar and b/browser/archived-packages/@types/json-schema-7.0.13-45b492a07.tar differ diff --git a/browser/archived-packages/@types/mdast-3.0.11-63fb889a2.tar b/browser/archived-packages/@types/mdast-3.0.12-0d3fa2348.tar similarity index 90% rename from browser/archived-packages/@types/mdast-3.0.11-63fb889a2.tar rename to browser/archived-packages/@types/mdast-3.0.12-0d3fa2348.tar index 0f0bdc3db08fb..d5ec26505684f 100644 Binary files a/browser/archived-packages/@types/mdast-3.0.11-63fb889a2.tar and b/browser/archived-packages/@types/mdast-3.0.12-0d3fa2348.tar differ diff --git a/browser/archived-packages/@types/unist-2.0.6-3c18c8531.tar b/browser/archived-packages/@types/unist-2.0.8-7745f12b7.tar similarity index 85% rename from browser/archived-packages/@types/unist-2.0.6-3c18c8531.tar rename to browser/archived-packages/@types/unist-2.0.8-7745f12b7.tar index a5bd242a8a495..404c9a096e10e 100644 Binary files a/browser/archived-packages/@types/unist-2.0.6-3c18c8531.tar and b/browser/archived-packages/@types/unist-2.0.8-7745f12b7.tar differ diff --git a/browser/archived-packages/acorn-8.8.2-c63218804.tar b/browser/archived-packages/acorn-8.10.0-174480999.tar similarity index 92% rename from browser/archived-packages/acorn-8.8.2-c63218804.tar rename to browser/archived-packages/acorn-8.10.0-174480999.tar index ba43d9506ff5b..1e080e425777a 100644 Binary files a/browser/archived-packages/acorn-8.8.2-c63218804.tar and b/browser/archived-packages/acorn-8.10.0-174480999.tar differ diff --git a/browser/archived-packages/assert-1.5.0-103b206b0.tar b/browser/archived-packages/assert-1.5.1-cf3c35b82.tar similarity index 90% rename from browser/archived-packages/assert-1.5.0-103b206b0.tar rename to browser/archived-packages/assert-1.5.1-cf3c35b82.tar index 8198d2f7cc76b..0d075605aa3d3 100644 Binary files a/browser/archived-packages/assert-1.5.0-103b206b0.tar and b/browser/archived-packages/assert-1.5.1-cf3c35b82.tar differ diff --git a/browser/archived-packages/browserslist-4.21.5-b5492282e.tar b/browser/archived-packages/browserslist-4.21.10-6e2a4405d.tar similarity index 93% rename from browser/archived-packages/browserslist-4.21.5-b5492282e.tar rename to browser/archived-packages/browserslist-4.21.10-6e2a4405d.tar index 4f61571e804f7..49a3d09086d06 100644 Binary files a/browser/archived-packages/browserslist-4.21.5-b5492282e.tar and b/browser/archived-packages/browserslist-4.21.10-6e2a4405d.tar differ diff --git a/browser/archived-packages/call-bind-1.0.2-ecef856c2.tar b/browser/archived-packages/call-bind-1.0.2-ecef856c2.tar new file mode 100644 index 0000000000000..5d1c68ee19029 Binary files /dev/null and b/browser/archived-packages/call-bind-1.0.2-ecef856c2.tar differ diff --git a/browser/archived-packages/caniuse-lite-1.0.30001473-7b00da77b.tar b/browser/archived-packages/caniuse-lite-1.0.30001473-7b00da77b.tar deleted file mode 100644 index 96baa8a7a3b76..0000000000000 Binary files a/browser/archived-packages/caniuse-lite-1.0.30001473-7b00da77b.tar and /dev/null differ diff --git a/browser/archived-packages/caniuse-lite-1.0.30001538-1d6267867.tar b/browser/archived-packages/caniuse-lite-1.0.30001538-1d6267867.tar new file mode 100644 index 0000000000000..1de9d1cbea257 Binary files /dev/null and b/browser/archived-packages/caniuse-lite-1.0.30001538-1d6267867.tar differ diff --git a/browser/archived-packages/canvas-2.11.0-6dd4e315e.tar b/browser/archived-packages/canvas-2.11.2-22d6a7181.tar similarity index 71% rename from browser/archived-packages/canvas-2.11.0-6dd4e315e.tar rename to browser/archived-packages/canvas-2.11.2-22d6a7181.tar index 94839c6370ae1..7d89961fa3cf6 100644 Binary files a/browser/archived-packages/canvas-2.11.0-6dd4e315e.tar and b/browser/archived-packages/canvas-2.11.2-22d6a7181.tar differ diff --git a/browser/archived-packages/cyclist-1.0.1-34919528f.tar b/browser/archived-packages/cyclist-1.0.2-d2c557228.tar similarity index 72% rename from browser/archived-packages/cyclist-1.0.1-34919528f.tar rename to browser/archived-packages/cyclist-1.0.2-d2c557228.tar index 94c04b6423d58..4fe5df6399508 100644 Binary files a/browser/archived-packages/cyclist-1.0.1-34919528f.tar and b/browser/archived-packages/cyclist-1.0.2-d2c557228.tar differ diff --git a/browser/archived-packages/d3-5.16.0-e0f2f9847.tar b/browser/archived-packages/d3-6.7.0-84d1d185e.tar similarity index 56% rename from browser/archived-packages/d3-5.16.0-e0f2f9847.tar rename to browser/archived-packages/d3-6.7.0-84d1d185e.tar index 8205cff146f6b..3921859260e61 100644 Binary files a/browser/archived-packages/d3-5.16.0-e0f2f9847.tar and b/browser/archived-packages/d3-6.7.0-84d1d185e.tar differ diff --git a/browser/archived-packages/d3-array-1.2.4-2875ba33c.tar b/browser/archived-packages/d3-array-1.2.4-2875ba33c.tar deleted file mode 100644 index 4724691bb11e1..0000000000000 Binary files a/browser/archived-packages/d3-array-1.2.4-2875ba33c.tar and /dev/null differ diff --git a/browser/archived-packages/d3-array-2.12.1-07412b64a.tar b/browser/archived-packages/d3-array-2.12.1-07412b64a.tar new file mode 100644 index 0000000000000..a0b5ed0eb5a6c Binary files /dev/null and b/browser/archived-packages/d3-array-2.12.1-07412b64a.tar differ diff --git a/browser/archived-packages/d3-axis-1.0.12-7a320d3df.tar b/browser/archived-packages/d3-axis-1.0.12-7a320d3df.tar deleted file mode 100644 index 97ea006b09932..0000000000000 Binary files a/browser/archived-packages/d3-axis-1.0.12-7a320d3df.tar and /dev/null differ diff --git a/browser/archived-packages/d3-axis-2.1.0-cff1b64d0.tar b/browser/archived-packages/d3-axis-2.1.0-cff1b64d0.tar new file mode 100644 index 0000000000000..d7758e9b1bb98 Binary files /dev/null and b/browser/archived-packages/d3-axis-2.1.0-cff1b64d0.tar differ diff --git a/browser/archived-packages/d3-brush-1.1.6-ed15bec3b.tar b/browser/archived-packages/d3-brush-2.1.0-7072cb005.tar similarity index 65% rename from browser/archived-packages/d3-brush-1.1.6-ed15bec3b.tar rename to browser/archived-packages/d3-brush-2.1.0-7072cb005.tar index 7d77e7232135a..2f9f64fc2d26f 100644 Binary files a/browser/archived-packages/d3-brush-1.1.6-ed15bec3b.tar and b/browser/archived-packages/d3-brush-2.1.0-7072cb005.tar differ diff --git a/browser/archived-packages/d3-chord-1.0.6-2570360eb.tar b/browser/archived-packages/d3-chord-1.0.6-2570360eb.tar deleted file mode 100644 index 4a319588e14d3..0000000000000 Binary files a/browser/archived-packages/d3-chord-1.0.6-2570360eb.tar and /dev/null differ diff --git a/browser/archived-packages/d3-chord-2.0.0-0f93d96fb.tar b/browser/archived-packages/d3-chord-2.0.0-0f93d96fb.tar new file mode 100644 index 0000000000000..3ee7bf7b5ca53 Binary files /dev/null and b/browser/archived-packages/d3-chord-2.0.0-0f93d96fb.tar differ diff --git a/browser/archived-packages/d3-collection-1.0.7-8a2d3faf9.tar b/browser/archived-packages/d3-collection-1.0.7-8a2d3faf9.tar deleted file mode 100644 index d9f4090a7249f..0000000000000 Binary files a/browser/archived-packages/d3-collection-1.0.7-8a2d3faf9.tar and /dev/null differ diff --git a/browser/archived-packages/d3-color-1.4.1-a76b131d2.tar b/browser/archived-packages/d3-color-2.0.0-48f5e2d13.tar similarity index 87% rename from browser/archived-packages/d3-color-1.4.1-a76b131d2.tar rename to browser/archived-packages/d3-color-2.0.0-48f5e2d13.tar index cdc61b8bb1a60..61162fdf224a7 100644 Binary files a/browser/archived-packages/d3-color-1.4.1-a76b131d2.tar and b/browser/archived-packages/d3-color-2.0.0-48f5e2d13.tar differ diff --git a/browser/archived-packages/d3-contour-1.3.2-8683e9e0a.tar b/browser/archived-packages/d3-contour-2.0.0-f6e9c0b6f.tar similarity index 52% rename from browser/archived-packages/d3-contour-1.3.2-8683e9e0a.tar rename to browser/archived-packages/d3-contour-2.0.0-f6e9c0b6f.tar index b757004334634..301a0d60eab08 100644 Binary files a/browser/archived-packages/d3-contour-1.3.2-8683e9e0a.tar and b/browser/archived-packages/d3-contour-2.0.0-f6e9c0b6f.tar differ diff --git a/browser/archived-packages/d3-delaunay-5.3.0-6a600b4ab.tar b/browser/archived-packages/d3-delaunay-5.3.0-6a600b4ab.tar new file mode 100644 index 0000000000000..21af37516ee25 Binary files /dev/null and b/browser/archived-packages/d3-delaunay-5.3.0-6a600b4ab.tar differ diff --git a/browser/archived-packages/d3-dispatch-1.0.6-7d58e8125.tar b/browser/archived-packages/d3-dispatch-2.0.0-4bf9b656c.tar similarity index 75% rename from browser/archived-packages/d3-dispatch-1.0.6-7d58e8125.tar rename to browser/archived-packages/d3-dispatch-2.0.0-4bf9b656c.tar index f7f6ae4513465..854f3d5ccd3b9 100644 Binary files a/browser/archived-packages/d3-dispatch-1.0.6-7d58e8125.tar and b/browser/archived-packages/d3-dispatch-2.0.0-4bf9b656c.tar differ diff --git a/browser/archived-packages/d3-drag-1.2.5-ac3d68865.tar b/browser/archived-packages/d3-drag-2.0.0-83dcbd59b.tar similarity index 61% rename from browser/archived-packages/d3-drag-1.2.5-ac3d68865.tar rename to browser/archived-packages/d3-drag-2.0.0-83dcbd59b.tar index 473994df9a3fd..aca228867d6a2 100644 Binary files a/browser/archived-packages/d3-drag-1.2.5-ac3d68865.tar and b/browser/archived-packages/d3-drag-2.0.0-83dcbd59b.tar differ diff --git a/browser/archived-packages/d3-dsv-1.2.0-f72565aaf.tar b/browser/archived-packages/d3-dsv-2.0.0-13e3e7f14.tar similarity index 85% rename from browser/archived-packages/d3-dsv-1.2.0-f72565aaf.tar rename to browser/archived-packages/d3-dsv-2.0.0-13e3e7f14.tar index b65d0056199e4..ac8ca6fc979ce 100644 Binary files a/browser/archived-packages/d3-dsv-1.2.0-f72565aaf.tar and b/browser/archived-packages/d3-dsv-2.0.0-13e3e7f14.tar differ diff --git a/browser/archived-packages/d3-ease-1.0.7-971d7864f.tar b/browser/archived-packages/d3-ease-2.0.0-ebcfe7f49.tar similarity index 89% rename from browser/archived-packages/d3-ease-1.0.7-971d7864f.tar rename to browser/archived-packages/d3-ease-2.0.0-ebcfe7f49.tar index b4a9a6c808b07..9aeb64828ee03 100644 Binary files a/browser/archived-packages/d3-ease-1.0.7-971d7864f.tar and b/browser/archived-packages/d3-ease-2.0.0-ebcfe7f49.tar differ diff --git a/browser/archived-packages/d3-fetch-1.2.0-c82efc341.tar b/browser/archived-packages/d3-fetch-2.0.0-4e462ffe1.tar similarity index 81% rename from browser/archived-packages/d3-fetch-1.2.0-c82efc341.tar rename to browser/archived-packages/d3-fetch-2.0.0-4e462ffe1.tar index 6c37fdcb5bfed..64be9e8c8d01f 100644 Binary files a/browser/archived-packages/d3-fetch-1.2.0-c82efc341.tar and b/browser/archived-packages/d3-fetch-2.0.0-4e462ffe1.tar differ diff --git a/browser/archived-packages/d3-force-1.2.1-1c7bde872.tar b/browser/archived-packages/d3-force-2.1.1-9c0b87133.tar similarity index 61% rename from browser/archived-packages/d3-force-1.2.1-1c7bde872.tar rename to browser/archived-packages/d3-force-2.1.1-9c0b87133.tar index 01542defab16b..9f2fe378a3422 100644 Binary files a/browser/archived-packages/d3-force-1.2.1-1c7bde872.tar and b/browser/archived-packages/d3-force-2.1.1-9c0b87133.tar differ diff --git a/browser/archived-packages/d3-format-1.4.5-274a6279d.tar b/browser/archived-packages/d3-format-2.0.0-01bdd2e97.tar similarity index 93% rename from browser/archived-packages/d3-format-1.4.5-274a6279d.tar rename to browser/archived-packages/d3-format-2.0.0-01bdd2e97.tar index daeaa05fa13ae..11356769d48c7 100644 Binary files a/browser/archived-packages/d3-format-1.4.5-274a6279d.tar and b/browser/archived-packages/d3-format-2.0.0-01bdd2e97.tar differ diff --git a/browser/archived-packages/d3-geo-1.12.1-5c6e1dd5c.tar b/browser/archived-packages/d3-geo-2.0.2-f29335586.tar similarity index 82% rename from browser/archived-packages/d3-geo-1.12.1-5c6e1dd5c.tar rename to browser/archived-packages/d3-geo-2.0.2-f29335586.tar index 7faf9fe8589ca..0bdb63a397bf8 100644 Binary files a/browser/archived-packages/d3-geo-1.12.1-5c6e1dd5c.tar and b/browser/archived-packages/d3-geo-2.0.2-f29335586.tar differ diff --git a/browser/archived-packages/d3-hierarchy-1.1.9-8fcb4fc65.tar b/browser/archived-packages/d3-hierarchy-2.0.0-4b021da8c.tar similarity index 77% rename from browser/archived-packages/d3-hierarchy-1.1.9-8fcb4fc65.tar rename to browser/archived-packages/d3-hierarchy-2.0.0-4b021da8c.tar index dfe643efeb3ad..b1cbac5fb2960 100644 Binary files a/browser/archived-packages/d3-hierarchy-1.1.9-8fcb4fc65.tar and b/browser/archived-packages/d3-hierarchy-2.0.0-4b021da8c.tar differ diff --git a/browser/archived-packages/d3-interpolate-1.4.0-57dce72b4.tar b/browser/archived-packages/d3-interpolate-2.0.1-739521c30.tar similarity index 78% rename from browser/archived-packages/d3-interpolate-1.4.0-57dce72b4.tar rename to browser/archived-packages/d3-interpolate-2.0.1-739521c30.tar index 38b2b92cfd094..e46392c3f5348 100644 Binary files a/browser/archived-packages/d3-interpolate-1.4.0-57dce72b4.tar and b/browser/archived-packages/d3-interpolate-2.0.1-739521c30.tar differ diff --git a/browser/archived-packages/d3-path-1.0.9-54b698727.tar b/browser/archived-packages/d3-path-2.0.0-670650c4a.tar similarity index 80% rename from browser/archived-packages/d3-path-1.0.9-54b698727.tar rename to browser/archived-packages/d3-path-2.0.0-670650c4a.tar index f1b130247be3d..25c1ef40acbee 100644 Binary files a/browser/archived-packages/d3-path-1.0.9-54b698727.tar and b/browser/archived-packages/d3-path-2.0.0-670650c4a.tar differ diff --git a/browser/archived-packages/d3-polygon-1.0.6-93e445ed6.tar b/browser/archived-packages/d3-polygon-2.0.0-32c7b1ac2.tar similarity index 78% rename from browser/archived-packages/d3-polygon-1.0.6-93e445ed6.tar rename to browser/archived-packages/d3-polygon-2.0.0-32c7b1ac2.tar index 7898fa5afbe3b..ab25d33f0dbb9 100644 Binary files a/browser/archived-packages/d3-polygon-1.0.6-93e445ed6.tar and b/browser/archived-packages/d3-polygon-2.0.0-32c7b1ac2.tar differ diff --git a/browser/archived-packages/d3-quadtree-1.0.7-44a3c0797.tar b/browser/archived-packages/d3-quadtree-2.0.0-6f411ddad.tar similarity index 83% rename from browser/archived-packages/d3-quadtree-1.0.7-44a3c0797.tar rename to browser/archived-packages/d3-quadtree-2.0.0-6f411ddad.tar index de6c99a219d4b..beb4da9a8d6b0 100644 Binary files a/browser/archived-packages/d3-quadtree-1.0.7-44a3c0797.tar and b/browser/archived-packages/d3-quadtree-2.0.0-6f411ddad.tar differ diff --git a/browser/archived-packages/d3-random-1.1.2-e802b904d.tar b/browser/archived-packages/d3-random-1.1.2-e802b904d.tar deleted file mode 100644 index 2625fd8fca1ea..0000000000000 Binary files a/browser/archived-packages/d3-random-1.1.2-e802b904d.tar and /dev/null differ diff --git a/browser/archived-packages/d3-random-2.2.2-d03f4ff13.tar b/browser/archived-packages/d3-random-2.2.2-d03f4ff13.tar new file mode 100644 index 0000000000000..40b132a6036d1 Binary files /dev/null and b/browser/archived-packages/d3-random-2.2.2-d03f4ff13.tar differ diff --git a/browser/archived-packages/d3-scale-2.2.2-2db784bc6.tar b/browser/archived-packages/d3-scale-3.3.0-d491a9e38.tar similarity index 53% rename from browser/archived-packages/d3-scale-2.2.2-2db784bc6.tar rename to browser/archived-packages/d3-scale-3.3.0-d491a9e38.tar index a268ef40399bd..ec01295e091e8 100644 Binary files a/browser/archived-packages/d3-scale-2.2.2-2db784bc6.tar and b/browser/archived-packages/d3-scale-3.3.0-d491a9e38.tar differ diff --git a/browser/archived-packages/d3-scale-chromatic-1.5.0-00270be3a.tar b/browser/archived-packages/d3-scale-chromatic-2.0.0-2cbab2edd.tar similarity index 78% rename from browser/archived-packages/d3-scale-chromatic-1.5.0-00270be3a.tar rename to browser/archived-packages/d3-scale-chromatic-2.0.0-2cbab2edd.tar index ffd721606282c..c1ca5b203d6c3 100644 Binary files a/browser/archived-packages/d3-scale-chromatic-1.5.0-00270be3a.tar and b/browser/archived-packages/d3-scale-chromatic-2.0.0-2cbab2edd.tar differ diff --git a/browser/archived-packages/d3-selection-1.4.2-489d01a98.tar b/browser/archived-packages/d3-selection-2.0.0-5e8186aa1.tar similarity index 71% rename from browser/archived-packages/d3-selection-1.4.2-489d01a98.tar rename to browser/archived-packages/d3-selection-2.0.0-5e8186aa1.tar index 3461088e09896..dd7a82ee0675f 100644 Binary files a/browser/archived-packages/d3-selection-1.4.2-489d01a98.tar and b/browser/archived-packages/d3-selection-2.0.0-5e8186aa1.tar differ diff --git a/browser/archived-packages/d3-shape-1.3.7-11492f2a3.tar b/browser/archived-packages/d3-shape-2.1.0-3e78d4a9f.tar similarity index 81% rename from browser/archived-packages/d3-shape-1.3.7-11492f2a3.tar rename to browser/archived-packages/d3-shape-2.1.0-3e78d4a9f.tar index c573fe9e47c59..8fab14827ad06 100644 Binary files a/browser/archived-packages/d3-shape-1.3.7-11492f2a3.tar and b/browser/archived-packages/d3-shape-2.1.0-3e78d4a9f.tar differ diff --git a/browser/archived-packages/d3-time-1.1.0-5e1d22b2b.tar b/browser/archived-packages/d3-time-2.1.1-fde2107bf.tar similarity index 67% rename from browser/archived-packages/d3-time-1.1.0-5e1d22b2b.tar rename to browser/archived-packages/d3-time-2.1.1-fde2107bf.tar index 068ed51477a96..d91cbcd4b0f5d 100644 Binary files a/browser/archived-packages/d3-time-1.1.0-5e1d22b2b.tar and b/browser/archived-packages/d3-time-2.1.1-fde2107bf.tar differ diff --git a/browser/archived-packages/d3-time-format-2.3.0-82ebfa6f6.tar b/browser/archived-packages/d3-time-format-3.0.0-517261e84.tar similarity index 88% rename from browser/archived-packages/d3-time-format-2.3.0-82ebfa6f6.tar rename to browser/archived-packages/d3-time-format-3.0.0-517261e84.tar index 8a73aef7f1c65..28b398eabe78f 100644 Binary files a/browser/archived-packages/d3-time-format-2.3.0-82ebfa6f6.tar and b/browser/archived-packages/d3-time-format-3.0.0-517261e84.tar differ diff --git a/browser/archived-packages/d3-timer-1.0.10-0752439b4.tar b/browser/archived-packages/d3-timer-2.0.0-4cee152e1.tar similarity index 76% rename from browser/archived-packages/d3-timer-1.0.10-0752439b4.tar rename to browser/archived-packages/d3-timer-2.0.0-4cee152e1.tar index c585c7785aecc..1f668f2dfdd4f 100644 Binary files a/browser/archived-packages/d3-timer-1.0.10-0752439b4.tar and b/browser/archived-packages/d3-timer-2.0.0-4cee152e1.tar differ diff --git a/browser/archived-packages/d3-transition-1.3.2-b1cd20454.tar b/browser/archived-packages/d3-transition-2.0.0-e3696d006.tar similarity index 83% rename from browser/archived-packages/d3-transition-1.3.2-b1cd20454.tar rename to browser/archived-packages/d3-transition-2.0.0-e3696d006.tar index 1872708e1c54a..bd808df719297 100644 Binary files a/browser/archived-packages/d3-transition-1.3.2-b1cd20454.tar and b/browser/archived-packages/d3-transition-2.0.0-e3696d006.tar differ diff --git a/browser/archived-packages/d3-voronoi-1.1.4-740ac9df6.tar b/browser/archived-packages/d3-voronoi-1.1.4-740ac9df6.tar deleted file mode 100644 index 5c15906726b8a..0000000000000 Binary files a/browser/archived-packages/d3-voronoi-1.1.4-740ac9df6.tar and /dev/null differ diff --git a/browser/archived-packages/d3-zoom-1.8.3-5682d74ca.tar b/browser/archived-packages/d3-zoom-2.0.0-7c583b6a8.tar similarity index 69% rename from browser/archived-packages/d3-zoom-1.8.3-5682d74ca.tar rename to browser/archived-packages/d3-zoom-2.0.0-7c583b6a8.tar index 665c13290d312..d0540c3e74a05 100644 Binary files a/browser/archived-packages/d3-zoom-1.8.3-5682d74ca.tar and b/browser/archived-packages/d3-zoom-2.0.0-7c583b6a8.tar differ diff --git a/browser/archived-packages/define-data-property-1.1.0-5331b0cdc.tar b/browser/archived-packages/define-data-property-1.1.0-5331b0cdc.tar new file mode 100644 index 0000000000000..9d441492b2b68 Binary files /dev/null and b/browser/archived-packages/define-data-property-1.1.0-5331b0cdc.tar differ diff --git a/browser/archived-packages/define-properties-1.2.1-f109902aa.tar b/browser/archived-packages/define-properties-1.2.1-f109902aa.tar new file mode 100644 index 0000000000000..161bec17f5d0d Binary files /dev/null and b/browser/archived-packages/define-properties-1.2.1-f109902aa.tar differ diff --git a/browser/archived-packages/delaunator-4.0.1-58d3d68b5.tar b/browser/archived-packages/delaunator-4.0.1-58d3d68b5.tar new file mode 100644 index 0000000000000..6168141574a92 Binary files /dev/null and b/browser/archived-packages/delaunator-4.0.1-58d3d68b5.tar differ diff --git a/browser/archived-packages/des.js-1.0.1-434238a5f.tar b/browser/archived-packages/des.js-1.1.0-af5ec6c63.tar similarity index 89% rename from browser/archived-packages/des.js-1.0.1-434238a5f.tar rename to browser/archived-packages/des.js-1.1.0-af5ec6c63.tar index db38789c6280e..bc1b7ebb2b4be 100644 Binary files a/browser/archived-packages/des.js-1.0.1-434238a5f.tar and b/browser/archived-packages/des.js-1.1.0-af5ec6c63.tar differ diff --git a/browser/archived-packages/detect-libc-2.0.1-e3adefdd9.tar b/browser/archived-packages/detect-libc-2.0.2-517eac1ae.tar similarity index 77% rename from browser/archived-packages/detect-libc-2.0.1-e3adefdd9.tar rename to browser/archived-packages/detect-libc-2.0.2-517eac1ae.tar index bdc486049cf32..1ffba37e5da1a 100644 Binary files a/browser/archived-packages/detect-libc-2.0.1-e3adefdd9.tar and b/browser/archived-packages/detect-libc-2.0.2-517eac1ae.tar differ diff --git a/browser/archived-packages/electron-to-chromium-1.4.348-80ced3770.tar b/browser/archived-packages/electron-to-chromium-1.4.525-18867adb4.tar similarity index 50% rename from browser/archived-packages/electron-to-chromium-1.4.348-80ced3770.tar rename to browser/archived-packages/electron-to-chromium-1.4.525-18867adb4.tar index 71198b0fa5f13..720f348484187 100644 Binary files a/browser/archived-packages/electron-to-chromium-1.4.348-80ced3770.tar and b/browser/archived-packages/electron-to-chromium-1.4.525-18867adb4.tar differ diff --git a/browser/archived-packages/escodegen-2.0.0-9a61cacac.tar b/browser/archived-packages/escodegen-2.1.0-d8d9480d3.tar similarity index 97% rename from browser/archived-packages/escodegen-2.0.0-9a61cacac.tar rename to browser/archived-packages/escodegen-2.1.0-d8d9480d3.tar index 3891f30596255..ce37ea05337c0 100644 Binary files a/browser/archived-packages/escodegen-2.0.0-9a61cacac.tar and b/browser/archived-packages/escodegen-2.1.0-d8d9480d3.tar differ diff --git a/browser/archived-packages/fast-glob-3.2.12-0d58f8090.tar b/browser/archived-packages/fast-glob-3.2.12-0d58f8090.tar deleted file mode 100644 index 31f9e3c0606cf..0000000000000 Binary files a/browser/archived-packages/fast-glob-3.2.12-0d58f8090.tar and /dev/null differ diff --git a/browser/archived-packages/fast-glob-3.3.1-90d14fca3.tar b/browser/archived-packages/fast-glob-3.3.1-90d14fca3.tar new file mode 100644 index 0000000000000..2bfa01b4ad0c2 Binary files /dev/null and b/browser/archived-packages/fast-glob-3.3.1-90d14fca3.tar differ diff --git a/browser/archived-packages/fzstd-0.0.4-18d644ca8.tar b/browser/archived-packages/fzstd-0.1.0-4d3bf39e7.tar similarity index 84% rename from browser/archived-packages/fzstd-0.0.4-18d644ca8.tar rename to browser/archived-packages/fzstd-0.1.0-4d3bf39e7.tar index a107b2a701484..28af7864388ac 100644 Binary files a/browser/archived-packages/fzstd-0.0.4-18d644ca8.tar and b/browser/archived-packages/fzstd-0.1.0-4d3bf39e7.tar differ diff --git a/browser/archived-packages/get-intrinsic-1.2.1-d8372cc9f.tar b/browser/archived-packages/get-intrinsic-1.2.1-d8372cc9f.tar new file mode 100644 index 0000000000000..3c0a973e8d3e6 Binary files /dev/null and b/browser/archived-packages/get-intrinsic-1.2.1-d8372cc9f.tar differ diff --git a/browser/archived-packages/gopd-1.0.1-77ae5b365.tar b/browser/archived-packages/gopd-1.0.1-77ae5b365.tar new file mode 100644 index 0000000000000..cd95f8ebf6a45 Binary files /dev/null and b/browser/archived-packages/gopd-1.0.1-77ae5b365.tar differ diff --git a/browser/archived-packages/has-property-descriptors-1.0.0-eb60d52d9.tar b/browser/archived-packages/has-property-descriptors-1.0.0-eb60d52d9.tar new file mode 100644 index 0000000000000..9ffce14e35c97 Binary files /dev/null and b/browser/archived-packages/has-property-descriptors-1.0.0-eb60d52d9.tar differ diff --git a/browser/archived-packages/has-proto-1.0.1-eea13e88f.tar b/browser/archived-packages/has-proto-1.0.1-eea13e88f.tar new file mode 100644 index 0000000000000..15c347b0b545e Binary files /dev/null and b/browser/archived-packages/has-proto-1.0.1-eea13e88f.tar differ diff --git a/browser/archived-packages/has-symbols-1.0.3-9772c2b85.tar b/browser/archived-packages/has-symbols-1.0.3-9772c2b85.tar new file mode 100644 index 0000000000000..ac4bb80c52c6e Binary files /dev/null and b/browser/archived-packages/has-symbols-1.0.3-9772c2b85.tar differ diff --git a/browser/archived-packages/html-tags-3.2.0-bf2ec2967.tar b/browser/archived-packages/html-tags-3.3.1-cedab20b7.tar similarity index 85% rename from browser/archived-packages/html-tags-3.2.0-bf2ec2967.tar rename to browser/archived-packages/html-tags-3.3.1-cedab20b7.tar index 50d9326575e50..a0d94cb34e738 100644 Binary files a/browser/archived-packages/html-tags-3.2.0-bf2ec2967.tar and b/browser/archived-packages/html-tags-3.3.1-cedab20b7.tar differ diff --git a/browser/archived-packages/inherits-2.0.1-f275aada7.tar b/browser/archived-packages/inherits-2.0.1-f275aada7.tar deleted file mode 100644 index 41644395ca236..0000000000000 Binary files a/browser/archived-packages/inherits-2.0.1-f275aada7.tar and /dev/null differ diff --git a/browser/archived-packages/internmap-1.0.1-94307961c.tar b/browser/archived-packages/internmap-1.0.1-94307961c.tar new file mode 100644 index 0000000000000..aae3c0bbe8cc5 Binary files /dev/null and b/browser/archived-packages/internmap-1.0.1-94307961c.tar differ diff --git a/browser/archived-packages/is-core-module-2.11.0-4518f196f.tar b/browser/archived-packages/is-core-module-2.13.0-67b764e90.tar similarity index 91% rename from browser/archived-packages/is-core-module-2.11.0-4518f196f.tar rename to browser/archived-packages/is-core-module-2.13.0-67b764e90.tar index 1cdb8c8ccd6ca..687583426b4c0 100644 Binary files a/browser/archived-packages/is-core-module-2.11.0-4518f196f.tar and b/browser/archived-packages/is-core-module-2.13.0-67b764e90.tar differ diff --git a/browser/archived-packages/levn-0.3.0-d0e3b8cb6.tar b/browser/archived-packages/levn-0.3.0-d0e3b8cb6.tar deleted file mode 100644 index 5a642e2011f6e..0000000000000 Binary files a/browser/archived-packages/levn-0.3.0-d0e3b8cb6.tar and /dev/null differ diff --git a/browser/archived-packages/minipass-4.2.5-fb2425ed2.tar b/browser/archived-packages/minipass-5.0.0-dc59e362e.tar similarity index 96% rename from browser/archived-packages/minipass-4.2.5-fb2425ed2.tar rename to browser/archived-packages/minipass-5.0.0-dc59e362e.tar index be3439d9f9e07..7f63b75405cc2 100644 Binary files a/browser/archived-packages/minipass-4.2.5-fb2425ed2.tar and b/browser/archived-packages/minipass-5.0.0-dc59e362e.tar differ diff --git a/browser/archived-packages/nan-2.17.0-d994e0b65.tar b/browser/archived-packages/nan-2.18.0-5bbb5f1bb.tar similarity index 96% rename from browser/archived-packages/nan-2.17.0-d994e0b65.tar rename to browser/archived-packages/nan-2.18.0-5bbb5f1bb.tar index 4f8c6145a79bc..1f632c1d234a9 100644 Binary files a/browser/archived-packages/nan-2.17.0-d994e0b65.tar and b/browser/archived-packages/nan-2.18.0-5bbb5f1bb.tar differ diff --git a/browser/archived-packages/node-fetch-2.6.9-0c99bf089.tar b/browser/archived-packages/node-fetch-2.7.0-7381517d4.tar similarity index 98% rename from browser/archived-packages/node-fetch-2.6.9-0c99bf089.tar rename to browser/archived-packages/node-fetch-2.7.0-7381517d4.tar index 60cf07ef44f34..a13f61fdc349a 100644 Binary files a/browser/archived-packages/node-fetch-2.6.9-0c99bf089.tar and b/browser/archived-packages/node-fetch-2.7.0-7381517d4.tar differ diff --git a/browser/archived-packages/node-releases-2.0.10-e46165747.tar b/browser/archived-packages/node-releases-2.0.10-e46165747.tar deleted file mode 100644 index 1799278b9623b..0000000000000 Binary files a/browser/archived-packages/node-releases-2.0.10-e46165747.tar and /dev/null differ diff --git a/browser/archived-packages/node-releases-2.0.13-b98afb277.tar b/browser/archived-packages/node-releases-2.0.13-b98afb277.tar new file mode 100644 index 0000000000000..3fbee7dbba0f4 Binary files /dev/null and b/browser/archived-packages/node-releases-2.0.13-b98afb277.tar differ diff --git a/browser/archived-packages/nwsapi-2.2.2-f74caffba.tar b/browser/archived-packages/nwsapi-2.2.2-f74caffba.tar deleted file mode 100644 index 883d3f53f8ccd..0000000000000 Binary files a/browser/archived-packages/nwsapi-2.2.2-f74caffba.tar and /dev/null differ diff --git a/browser/archived-packages/nwsapi-2.2.7-b9be44e3e.tar b/browser/archived-packages/nwsapi-2.2.7-b9be44e3e.tar new file mode 100644 index 0000000000000..f14b84c64b53c Binary files /dev/null and b/browser/archived-packages/nwsapi-2.2.7-b9be44e3e.tar differ diff --git a/browser/archived-packages/object-inspect-1.12.3-81e52f764.tar b/browser/archived-packages/object-inspect-1.12.3-81e52f764.tar new file mode 100644 index 0000000000000..3a4be6b22162b Binary files /dev/null and b/browser/archived-packages/object-inspect-1.12.3-81e52f764.tar differ diff --git a/browser/archived-packages/object-keys-1.1.1-36e004494.tar b/browser/archived-packages/object-keys-1.1.1-36e004494.tar new file mode 100644 index 0000000000000..75603977169c2 Binary files /dev/null and b/browser/archived-packages/object-keys-1.1.1-36e004494.tar differ diff --git a/browser/archived-packages/object.assign-4.1.4-d66c4a7f4.tar b/browser/archived-packages/object.assign-4.1.4-d66c4a7f4.tar new file mode 100644 index 0000000000000..e1c19f2b2f5e8 Binary files /dev/null and b/browser/archived-packages/object.assign-4.1.4-d66c4a7f4.tar differ diff --git a/browser/archived-packages/optionator-0.8.3-f885bda40.tar b/browser/archived-packages/optionator-0.8.3-f885bda40.tar deleted file mode 100644 index 9daaa98570efd..0000000000000 Binary files a/browser/archived-packages/optionator-0.8.3-f885bda40.tar and /dev/null differ diff --git a/browser/archived-packages/optionator-0.9.1-ef8465639.tar b/browser/archived-packages/optionator-0.9.3-2630a8ca9.tar similarity index 98% rename from browser/archived-packages/optionator-0.9.1-ef8465639.tar rename to browser/archived-packages/optionator-0.9.3-2630a8ca9.tar index be317eb914741..ac38c825fa6fd 100644 Binary files a/browser/archived-packages/optionator-0.9.1-ef8465639.tar and b/browser/archived-packages/optionator-0.9.3-2630a8ca9.tar differ diff --git a/browser/archived-packages/postcss-selector-parser-6.0.11-cdb011b9b.tar b/browser/archived-packages/postcss-selector-parser-6.0.13-11a5751a5.tar similarity index 89% rename from browser/archived-packages/postcss-selector-parser-6.0.11-cdb011b9b.tar rename to browser/archived-packages/postcss-selector-parser-6.0.13-11a5751a5.tar index 79e3939f6938f..3a7a561541773 100644 Binary files a/browser/archived-packages/postcss-selector-parser-6.0.11-cdb011b9b.tar and b/browser/archived-packages/postcss-selector-parser-6.0.13-11a5751a5.tar differ diff --git a/browser/archived-packages/prelude-ls-1.1.2-112176dd5.tar b/browser/archived-packages/prelude-ls-1.1.2-112176dd5.tar deleted file mode 100644 index e7ae50b99af40..0000000000000 Binary files a/browser/archived-packages/prelude-ls-1.1.2-112176dd5.tar and /dev/null differ diff --git a/browser/archived-packages/punycode-1.3.2-4687d682d.tar b/browser/archived-packages/punycode-1.3.2-4687d682d.tar deleted file mode 100644 index dc41000a4e1a6..0000000000000 Binary files a/browser/archived-packages/punycode-1.3.2-4687d682d.tar and /dev/null differ diff --git a/browser/archived-packages/qs-6.11.2-b43348cf6.tar b/browser/archived-packages/qs-6.11.2-b43348cf6.tar new file mode 100644 index 0000000000000..1aff77f6b7eee Binary files /dev/null and b/browser/archived-packages/qs-6.11.2-b43348cf6.tar differ diff --git a/browser/archived-packages/querystring-0.2.0-5ffc58f36.tar b/browser/archived-packages/querystring-0.2.0-5ffc58f36.tar deleted file mode 100644 index 6865fb34cbcee..0000000000000 Binary files a/browser/archived-packages/querystring-0.2.0-5ffc58f36.tar and /dev/null differ diff --git a/browser/archived-packages/resolve-1.22.1-9c1a6eb98.tar b/browser/archived-packages/resolve-1.22.6-9e387133b.tar similarity index 98% rename from browser/archived-packages/resolve-1.22.1-9c1a6eb98.tar rename to browser/archived-packages/resolve-1.22.6-9e387133b.tar index 53fd3c6c56305..ff22983cb639a 100644 Binary files a/browser/archived-packages/resolve-1.22.1-9c1a6eb98.tar and b/browser/archived-packages/resolve-1.22.6-9e387133b.tar differ diff --git a/browser/archived-packages/semver-5.7.1-b1ab9a0df.tar b/browser/archived-packages/semver-5.7.2-701ce79d0.tar similarity index 93% rename from browser/archived-packages/semver-5.7.1-b1ab9a0df.tar rename to browser/archived-packages/semver-5.7.2-701ce79d0.tar index cf872edd4ca77..788c047c9b6e2 100644 Binary files a/browser/archived-packages/semver-5.7.1-b1ab9a0df.tar and b/browser/archived-packages/semver-5.7.2-701ce79d0.tar differ diff --git a/browser/archived-packages/semver-6.3.0-6f7f5305a.tar b/browser/archived-packages/semver-6.3.1-051ed5bc3.tar similarity index 93% rename from browser/archived-packages/semver-6.3.0-6f7f5305a.tar rename to browser/archived-packages/semver-6.3.1-051ed5bc3.tar index 142b322cbbc33..2e03e8b1e8a50 100644 Binary files a/browser/archived-packages/semver-6.3.0-6f7f5305a.tar and b/browser/archived-packages/semver-6.3.1-051ed5bc3.tar differ diff --git a/browser/archived-packages/semver-7.3.8-341d5cb46.tar b/browser/archived-packages/semver-7.5.4-d5b092112.tar similarity index 87% rename from browser/archived-packages/semver-7.3.8-341d5cb46.tar rename to browser/archived-packages/semver-7.5.4-d5b092112.tar index c0717b7c5c95c..be264f7d66bfe 100644 Binary files a/browser/archived-packages/semver-7.3.8-341d5cb46.tar and b/browser/archived-packages/semver-7.5.4-d5b092112.tar differ diff --git a/browser/archived-packages/shell-quote-1.8.0-407b33f06.tar b/browser/archived-packages/shell-quote-1.8.1-ea3d56f65.tar similarity index 89% rename from browser/archived-packages/shell-quote-1.8.0-407b33f06.tar rename to browser/archived-packages/shell-quote-1.8.1-ea3d56f65.tar index a07cfa529ba46..ccd956ecc7c29 100644 Binary files a/browser/archived-packages/shell-quote-1.8.0-407b33f06.tar and b/browser/archived-packages/shell-quote-1.8.1-ea3d56f65.tar differ diff --git a/browser/archived-packages/side-channel-1.0.4-ab95cfcad.tar b/browser/archived-packages/side-channel-1.0.4-ab95cfcad.tar new file mode 100644 index 0000000000000..76e21c8b2fbd4 Binary files /dev/null and b/browser/archived-packages/side-channel-1.0.4-ab95cfcad.tar differ diff --git a/browser/archived-packages/spdx-license-ids-3.0.13-5e40fecf0.tar b/browser/archived-packages/spdx-license-ids-3.0.15-9694fc852.tar similarity index 91% rename from browser/archived-packages/spdx-license-ids-3.0.13-5e40fecf0.tar rename to browser/archived-packages/spdx-license-ids-3.0.15-9694fc852.tar index 37ef7599e835e..833299308cb96 100644 Binary files a/browser/archived-packages/spdx-license-ids-3.0.13-5e40fecf0.tar and b/browser/archived-packages/spdx-license-ids-3.0.15-9694fc852.tar differ diff --git a/browser/archived-packages/tar-6.1.13-8dd20120d.tar b/browser/archived-packages/tar-6.2.0-fd6a3b0dc.tar similarity index 96% rename from browser/archived-packages/tar-6.1.13-8dd20120d.tar rename to browser/archived-packages/tar-6.2.0-fd6a3b0dc.tar index 422a03566423a..902d3ba5818ad 100644 Binary files a/browser/archived-packages/tar-6.1.13-8dd20120d.tar and b/browser/archived-packages/tar-6.2.0-fd6a3b0dc.tar differ diff --git a/browser/archived-packages/tough-cookie-4.1.2-1bd7ea5d6.tar b/browser/archived-packages/tough-cookie-4.1.3-697ff2e69.tar similarity index 99% rename from browser/archived-packages/tough-cookie-4.1.2-1bd7ea5d6.tar rename to browser/archived-packages/tough-cookie-4.1.3-697ff2e69.tar index 03f4aaa5b1c3c..189e253d48320 100644 Binary files a/browser/archived-packages/tough-cookie-4.1.2-1bd7ea5d6.tar and b/browser/archived-packages/tough-cookie-4.1.3-697ff2e69.tar differ diff --git a/browser/archived-packages/type-check-0.3.2-64298e25d.tar b/browser/archived-packages/type-check-0.3.2-64298e25d.tar deleted file mode 100644 index c183293ec9874..0000000000000 Binary files a/browser/archived-packages/type-check-0.3.2-64298e25d.tar and /dev/null differ diff --git a/browser/archived-packages/update-browserslist-db-1.0.10-3b3b6a0de.tar b/browser/archived-packages/update-browserslist-db-1.0.11-742c0415f.tar similarity index 85% rename from browser/archived-packages/update-browserslist-db-1.0.10-3b3b6a0de.tar rename to browser/archived-packages/update-browserslist-db-1.0.11-742c0415f.tar index c71963dad6ef7..2e07581b465af 100644 Binary files a/browser/archived-packages/update-browserslist-db-1.0.10-3b3b6a0de.tar and b/browser/archived-packages/update-browserslist-db-1.0.11-742c0415f.tar differ diff --git a/browser/archived-packages/url-0.11.0-91b6a2949.tar b/browser/archived-packages/url-0.11.0-91b6a2949.tar deleted file mode 100644 index f385ca768fc4a..0000000000000 Binary files a/browser/archived-packages/url-0.11.0-91b6a2949.tar and /dev/null differ diff --git a/browser/archived-packages/url-0.11.3-ea1c4e2c6.tar b/browser/archived-packages/url-0.11.3-ea1c4e2c6.tar new file mode 100644 index 0000000000000..28cd99590e8e7 Binary files /dev/null and b/browser/archived-packages/url-0.11.3-ea1c4e2c6.tar differ diff --git a/browser/archived-packages/util-0.10.3-e4a8877ec.tar b/browser/archived-packages/util-0.10.3-e4a8877ec.tar deleted file mode 100644 index a945a618e0214..0000000000000 Binary files a/browser/archived-packages/util-0.10.3-e4a8877ec.tar and /dev/null differ diff --git a/browser/archived-packages/v8-compile-cache-2.3.0-97c942126.tar b/browser/archived-packages/v8-compile-cache-2.4.0-a1cc96737.tar similarity index 85% rename from browser/archived-packages/v8-compile-cache-2.3.0-97c942126.tar rename to browser/archived-packages/v8-compile-cache-2.4.0-a1cc96737.tar index 807e3d42032db..d44b642593567 100644 Binary files a/browser/archived-packages/v8-compile-cache-2.3.0-97c942126.tar and b/browser/archived-packages/v8-compile-cache-2.4.0-a1cc96737.tar differ diff --git a/browser/archived-packages/which-module-2.0.0-07e7a75a1.tar b/browser/archived-packages/which-module-2.0.1-881759e7b.tar similarity index 75% rename from browser/archived-packages/which-module-2.0.0-07e7a75a1.tar rename to browser/archived-packages/which-module-2.0.1-881759e7b.tar index 694eb5769e351..a1cb4eca07d99 100644 Binary files a/browser/archived-packages/which-module-2.0.0-07e7a75a1.tar and b/browser/archived-packages/which-module-2.0.1-881759e7b.tar differ diff --git a/browser/archived-packages/wide-align-1.1.5-78330e458.tar b/browser/archived-packages/wide-align-1.1.5-78330e458.tar new file mode 100644 index 0000000000000..b5eef81af3015 Binary files /dev/null and b/browser/archived-packages/wide-align-1.1.5-78330e458.tar differ diff --git a/browser/css/btns.css b/browser/css/btns.css index c262b92afbe58..756fed85b4a34 100644 --- a/browser/css/btns.css +++ b/browser/css/btns.css @@ -1,11 +1,14 @@ /* For btns hover status see device-desktop.css */ .jsdialog *[disabled] { - color: var(--color-text-lighter); - border: 1px solid var(--color-border-lighter); + color: var(--color-text-lighter) !important; background: var(--color-background-lighter); } +.jsdialog *[disabled]:not(label):not(.ui-frame-container):not(.checkbutton):not(.spinfieldcontainer):not(.ui-grid):not(.ui-content):not(.ui-listbox-container) { + border: 1px solid var(--color-border-lighter); +} + /*limit icon to button height*/ button.jsdialog img { max-height: 100%; @@ -18,8 +21,8 @@ button.jsdialog img { flex-wrap: wrap; } -.button-secondary, -button:not(.ui-tab):not(.ui-corner-all):not(.button-primary):not(.unobutton):not(.form-field-button) { +:not(.main-nav) .button-secondary, +:not(.main-nav) > div > button:not(.ui-tab):not(.ui-corner-all):not(.button-primary):not(.unobutton):not(.form-field-button) { box-sizing: border-box; height: 32px; line-height: 0em; @@ -97,3 +100,12 @@ button:not(.ui-tab):not(.ui-corner-all):not(.button-primary):not(.unobutton):not button.has-img { min-width: auto !important; } + +/* Calc Auto-Filter buttons coming from core */ +[data-theme='dark'] button#select_current.has-img > img { + filter: invert(.9) +} + +[data-theme='dark'] button#unselect_current.has-img > img { + filter: invert(.9) +} diff --git a/browser/css/cool.css b/browser/css/cool.css index 9ae6951a2cd73..f30ee683609d2 100644 --- a/browser/css/cool.css +++ b/browser/css/cool.css @@ -20,6 +20,16 @@ --default-font-size: 12px; --header-font-size: 16px; + /* tab min font-size */ + --tb-min-fs: 11px; + /* tab min font-size without units*/ + --tb-min-fs-u: 11; + /* tab max font-size */ + --tb-max-fs: 16px; + /* tab max font-size wihtout units*/ + --tb-max-fs-u: 16; + /* tab font-size preferred value or scaler */ + --tb-fs-s: 1vw; --default-height: 24px; --header-height: 38px; @@ -122,14 +132,21 @@ } .auto-color-button { - width: 100% !important; + width: calc(100% - 10px) !important; padding: 0; - margin: auto !important; + margin: 5px !important; } .color-palette-selector { + margin: 0 5px !important; +} + +.color-palette-selector > select { width: 100% !important; - margin-top: 8px !important; + padding: 0 14px 0 4px; + height: 28px; + font-size: var(--default-font-size); + font-family: var(--jquery-ui-font); } #toolbar-wrapper.readonly { @@ -158,7 +175,7 @@ } .bucket-cursor { - cursor: url('images/cursors/fill.png') 4 9, auto !important;/*setting coordinates to align the tip of the bucket icon */ + cursor: url('images/cursors/fill.png') 4 18, auto !important;/*setting coordinates to align the tip of the brush icon */ } .cool-scrollbar-show { opacity: 1 !important; @@ -489,26 +506,16 @@ nav.spreadsheet-color-indicator ~ #sidebar-dock-wrapper { max-width: 250px; } -.cool-annotation > .modalpopup { - max-height: initial !important; +.cool-annotation.tracked-deleted-comment-show { + opacity: 0.5; } -.cool-annotation:not(annotation-active) .cool-annotation-collapsed{ - position: absolute; - left: 24px; -} -.cool-annotation.annotation-active:not(.rtl) .cool-annotation-collapsed{ - position: absolute; - left: 0 !important; -} -.cool-annotation.annotation-active.rtl .cool-annotation-collapsed{ - position: absolute; - left: 48px !important; +.cool-annotation.tracked-deleted-comment-hide { + display: none; } -#document-container > .cool-annotation:hover .cool-annotation-collapsed{ - box-shadow: 0 0 3px 0 rgb(0 0 0 / 50%), 0 0 10px 4px rgb(0 0 0 / 10%); - cursor: pointer; +.cool-annotation > .modalpopup { + max-height: initial !important; } .cool-annotation-content-wrapper, .cool-annotation-redline-content-wrapper { @@ -531,8 +538,7 @@ nav.spreadsheet-color-indicator ~ #sidebar-dock-wrapper { } .annotation-active.modify-annotation-container .cool-annotation-content-wrapper, -.annotation-active.reply-annotation-container .cool-annotation-content-wrapper, -.cool-annotation-collapsed.modalpopup { +.annotation-active.reply-annotation-container .cool-annotation-content-wrapper { width: auto; } @@ -566,56 +572,10 @@ nav.spreadsheet-color-indicator ~ #sidebar-dock-wrapper { z-index: 0; } -.cool-annotation-collapsed { - background: var(--color-background-lighter); - border-radius: 50%; - width: 36px; - height: 36px; - box-shadow: 0 0 3px 5px var(--color-background-lighter), 0 0 1px 5px var(--color-box-shadow); -} - -.annotation-active .cool-annotation-collapsed { - box-shadow: 0 0 3px 5px var(--color-background-lighter), 0 0 1px 5px var(--color-box-shadow); -} - -.jsdialog-container.cool-annotation-collapsed.modalpopup { - border-radius: 8px !important; - border: 1px solid var(--color-border) !important; - background: var(--color-background-lighter) !important; -} - #mobile-wizard-popup { background-color: var(--color-background-lighter) !important; } -.jsdialog-container.cool-annotation-collapsed.modalpopup .lokdialog.ui-dialog-content { - background-color: transparent !important; -} - -.jsdialog-container.cool-annotation-collapsed.modalpopup .cool-annotation { - margin-bottom: 16px; -} - -.jsdialog-container.cool-annotation-collapsed.modalpopup .cool-annotation:last-of-type { - margin-bottom: 8px; -} - -.jsdialog-container.cool-annotation-collapsed.modalpopup .cool-annotation:first-of-type { - margin-top: 8px; -} - -.jsdialog-container.cool-annotation-collapsed.modalpopup .cool-annotation-content-wrapper { - box-shadow: none; - border-width: 0px 0px 1px !important; - border-bottom: 1px solid var(--color-border) !important; - border-radius: 0 !important; - background: var(--color-background-lighter); -} - -.jsdialog-container.cool-annotation-collapsed.modalpopup [id^='comment-container-']:last-child > .cool-annotation-content-wrapper{ - border-width: 0 !important; -} - .cool-dont-break { /* These are technically the same, but use both */ @@ -654,7 +614,7 @@ nav.spreadsheet-color-indicator ~ #sidebar-dock-wrapper { background-color: var(--color-background-dark); color: var(--color-main-text); overflow-x: hidden; - height: 50px; + height: 54px; width: 100%; box-sizing: border-box; } @@ -756,6 +716,11 @@ nav.spreadsheet-color-indicator ~ #sidebar-dock-wrapper { font-size: var(--default-font-size); } +.cool-annotation-autosavelabel { + font-size: var(--default-font-size); + opacity: 75%; +} + .cool-annotation-menubar { margin: 0; padding: 0; @@ -771,12 +736,6 @@ nav.spreadsheet-color-indicator ~ #sidebar-dock-wrapper { transition: all 0.1s ease 0.5s; visibility: visible; } -.cool-annotation-collapsed [data-title]:hover:after { - position: static; - float: right; - margin-top: 22px; - margin-right: 8px; -} [data-title]:after { content: attr(data-title); font-size: 1em !important; @@ -999,6 +958,11 @@ nav.spreadsheet-color-indicator ~ #sidebar-dock-wrapper { box-sizing: border-box; } +.functiontooltip { + white-space: nowrap; + max-width: fit-content !important; +} + .leaflet-canvas-container .cell-cursor-data { border-style: solid; /* required for ie11 */ display: none; /* prevent cypress failure */ @@ -1020,9 +984,9 @@ nav.spreadsheet-color-indicator ~ #sidebar-dock-wrapper { border-style: solid; /* required for ie11 */ display: none; /* prevent cypress failure */ - color: var(--color-background-dark); /* color */ + color: var(--color-border); /* color */ opacity: 1; /* opacity */ - border-top-width: 3px; /* weight */ + border-top-width: 1px; /* weight */ } #product-name { @@ -1140,4 +1104,9 @@ nav.spreadsheet-color-indicator ~ #sidebar-dock-wrapper { -webkit-user-select: none; -ms-user-select: none; user-select: none; -} \ No newline at end of file +} + +[contenteditable] { /* in old Safari, omitting this prevents editing */ + -webkit-user-select: text; + user-select: text; +} diff --git a/browser/css/device-mobile.css b/browser/css/device-mobile.css index aaecf42e04790..0006bd5178768 100644 --- a/browser/css/device-mobile.css +++ b/browser/css/device-mobile.css @@ -578,14 +578,6 @@ td[id^='tb_spreadsheet-toolbar_item']:focus table.w2ui-button div.w2ui-icon, td[ right: 0; } -/* Related to mobilewizard.cxx */ -#mobile-wizard-header.landscape { - display: none; -} -#mobile-wizard-header.portrait { - display: block; -} - /* Related to mobile-wizard based menubar */ #mobile-wizard.menuwizard.landscape #mobile-wizard-content.landscape { overflow-y: auto !important; @@ -687,16 +679,28 @@ td[id^='tb_spreadsheet-toolbar_item']:focus table.w2ui-button div.w2ui-icon, td[ } /* busy popup */ - -#mobile-wizard.popup:not(.snackbar) { +#mobile-wizard.popup:not(.snackbar):not(.busypopup) { + position: fixed; + top: 0; + left: 0; + height: 100vh !important; +} +#mobile-wizard.busypopup { border-radius: 16px 16px 0 0; } -#mobile-wizard.popup #mobile-wizard-content { +#mobile-wizard.popup #mobile-wizard-content, +#mobile-wizard.snackbar .mobile-wizard-content, +#mobile-wizard.busypopup #mobile-wizard-content, +#mobile-wizard.busypopup .mobile-wizard-content { display: flex; - align-items: center; + align-items: start; justify-content: center; flex-wrap: wrap; } +#mobile-wizard.snackbar #mobile-wizard-content, +#mobile-wizard.snackbar .mobile-wizard-content { + align-items: center; +} #mobile-wizard.popup.potrait #mobile-wizard-content { flex-direction: column; } @@ -727,6 +731,13 @@ td[id^='tb_spreadsheet-toolbar_item']:focus table.w2ui-button div.w2ui-icon, td[ #mobile-wizard.popup.snackbar #button { font-size: 14px !important; } +/* Separators */ +.mobile-wizard.ui-separator { + /* Hide separators coming from core when on mobile + since we are already adding border top on every + #mobile-wizard .mobile-wizard.ui-text */ + display: none; +} /* - Import text */ #mobile-wizard-content #separatoroptions { margin-top: 54px; @@ -834,3 +845,24 @@ div#fontstyletoolbox + div#style.mobile-wizard { flex-direction: row; justify-content: space-between; } +/* feature_lock */ +#mobile-wizard #unlock-features-popup .container { + flex-direction: column; +} +#mobile-wizard #unlock-features-popup #unlock-image { + max-width: 92%; + margin: 4%; + align-self: center; + flex: 2 1 auto; + height: 238px; + background-position: center; +} +#mobile-wizard #unlock-features-popup h1 { + font-size: 1.4em !important; +} +#unlock-features-popup .item ul { + text-shadow: none; + font-size: 1em !important; + margin-left: 5px; + margin-right: 5px; +} diff --git a/browser/css/iframedialog.css b/browser/css/iframedialog.css index d7e6584249c00..de8254cdf15d0 100644 --- a/browser/css/iframedialog.css +++ b/browser/css/iframedialog.css @@ -5,6 +5,10 @@ top: 50%; } +.iframe-dialog-wrap:focus { + outline: none; +} + .iframe-dialog-content { margin-left: -50%; margin-top: -50%; diff --git a/browser/css/jquery-ui-lightness.css b/browser/css/jquery-ui-lightness.css index e85811c0ee6ac..16ae57ee4924e 100644 --- a/browser/css/jquery-ui-lightness.css +++ b/browser/css/jquery-ui-lightness.css @@ -938,6 +938,9 @@ body .ui-tooltip, color: var(--color-main-text); background: var(--color-background-lighter); } +.ui-tooltip.ui-widget-shadow { + box-shadow: 0px 0px 4px 0 var(--color-box-shadow); +} /* Interaction states ----------------------------------*/ diff --git a/browser/css/jsdialogs.css b/browser/css/jsdialogs.css index 542b399df8bab..38c252de8307c 100644 --- a/browser/css/jsdialogs.css +++ b/browser/css/jsdialogs.css @@ -12,11 +12,7 @@ max-height: 100%; z-index: 2000; display: flex; -} - -.jsdialog #writerchanges .ui-treeview-body { - min-height: 300px; - max-height: none; + overflow: hidden; } .jsdialog-overlay.cancellable { @@ -78,11 +74,30 @@ } .jsdialog-container .ui-dialog-content { + max-height: calc( 90vh - 34px); + overflow-y: auto !important; background-color: var(--color-background-lighter) !important; font-family: var(--jquery-ui-font); line-height: 1.5; } +#SortKeyWindow { + /* As used in .jsdialog-container .ui-dialog-content 90 % of the viewport + minus 352px: + - 34px the dialog's header + - 112px the next sibling + - 50px the dialog's buttons + - 80px status bar and calc sheet bar + - 38px formulabar + - 38px document-header + */ + max-height: calc( 90vh - 352px); +} + +.jsdialog-container .ui-dialog-content > div:not(.ui-scrollwindow) { + overflow: hidden; /* don't inherit scrollbar from parent */ +} + .jsdialog-container .lokdialog.ui-dialog-content.ui-widget-content { overflow: hidden; } @@ -118,21 +133,6 @@ background: var(--color-background-darker); } -.jsdialog.ui-separator.vertical { - height: 100%; - padding-right: 6px; - /* border-right: 1px dashed #888; */ - background-image: linear-gradient(#888 22%, rgba(255,255,255,0) 0%); - background-position: right center; - background-size: 1px 14px; - background-repeat: repeat-y; - box-shadow: inset 0 34px 0 0 white; -} - -.jsdialog.ui-separator.horizontal { - padding-bottom: 6px; -} - .jsdialog.row { display: table-row; } @@ -205,6 +205,10 @@ td.jsdialog > [id^='table-box']:not(.sidebar) { overflow: auto; max-height: 500px; max-width: 700px; +} +/* - Also used in SpellingDialog where suggestion come in form + of an image*/ +.jsdialog.ui-scrollwindow.has-ui-drawing-area { width: max-content; } @@ -213,6 +217,30 @@ td.jsdialog > [id^='table-box']:not(.sidebar) { vertical-align: unset !important; } +/* Separator */ + +.jsdialog:focus-visible + .jsdialog.ui-separator.vertical { + background-color: transparent; +} +.jsdialog.ui-separator.vertical { + height: 100%; + padding-right: 6px; + /* border-right: 1px dashed #888; */ + background-image: linear-gradient(#888 22%, rgba(255,255,255,0) 0%); + background-position: right center; + background-size: 1px 14px; + background-repeat: repeat-y; + box-shadow: inset 0 34px 0 0 white; +} + +.jsdialog.ui-separator.horizontal { + width: 100%; + margin: 0px; + background-color: var(--color-border-lighter); + border: none; + height: 1px; +} + /* Tabs */ .ui-tabs-content.jsdialog { @@ -286,7 +314,8 @@ td.jsdialog > [id^='table-box']:not(.sidebar) { } .ui-expander-label::before, -.ui-treeview-expandable.collapsed > .ui-treeview-expander::before { +.ui-treeview-expandable.collapsed > .ui-treeview-expander::before, +.ui-treeview tr[aria-expanded='false'] > td > .ui-treeview-expander::before { display: inline-block; content: 'V'; color: transparent; @@ -296,7 +325,8 @@ td.jsdialog > [id^='table-box']:not(.sidebar) { } .ui-expander-label.expanded::before, -.ui-treeview-expandable:not(.collapsed) > .ui-treeview-expander::before { +.ui-treeview-expandable:not(.collapsed) > .ui-treeview-expander::before, +.ui-treeview tr[aria-expanded='true'] > td > .ui-treeview-expander::before { content: 'V'; color: transparent; margin-inline-end: 7px; @@ -306,14 +336,17 @@ td.jsdialog > [id^='table-box']:not(.sidebar) { } [data-theme='dark'] .ui-expander-label::before, -[data-theme='dark'] .ui-treeview-expandable > .ui-treeview-expander::before { +[data-theme='dark'] .ui-treeview-expandable > .ui-treeview-expander::before, +[data-theme='dark'] .ui-treeview tr[aria-expanded] > td > .ui-treeview-expander::before { filter: brightness(1); } -.ui-treeview-expandable > .ui-treeview-expander::before { +.ui-treeview-expandable > .ui-treeview-expander::before, +.ui-treeview tr[aria-expanded] > td > .ui-treeview-expander::before { margin-inline-end: 7px !important; display: inline-block; position: relative !important; + cursor: pointer; } .ui-treeview-header-sort-icon::after { @@ -335,6 +368,7 @@ td.jsdialog > [id^='table-box']:not(.sidebar) { height: var(--btn-size); width: var(--btn-size); margin-inline-end: 8px; + vertical-align: middle; } .ui-expander-label.expanded { @@ -366,6 +400,7 @@ td.jsdialog > [id^='table-box']:not(.sidebar) { overflow-y: auto; overflow-x: hidden; max-width: 1000px; + min-width: 150px; padding: 1px; padding-inline-end: 3px; } @@ -384,7 +419,7 @@ td.jsdialog > [id^='table-box']:not(.sidebar) { min-height: 100px; min-width: 100px; max-height: 150px; - width: 100%; + width: inherit; } .ui-treeview.empty .ui-treeview-body { @@ -434,7 +469,7 @@ input[type='checkbox'].autofilter, .jsdialog input[type='checkbox'] { margin: 1px 8px; } -[data-theme='dark'] input[type='checkbox'].autofilter, .jsdialog input[type='checkbox'] { +[data-theme='dark'] input[type='checkbox'].autofilter, [data-theme='dark'] .jsdialog input[type='checkbox'] { background: url('images/dark/lc_checkboxoff.svg') no-repeat center; } @@ -443,7 +478,7 @@ input[type='checkbox']:checked.autofilter, .jsdialog input[type='checkbox']:chec background-image: url('images/lc_checkbox.svg'); } -[data-theme='dark'] input[type='checkbox']:checked.autofilter, .jsdialog input[type='checkbox']:checked { +[data-theme='dark'] input[type='checkbox']:checked.autofilter, [data-theme='dark'] .jsdialog input[type='checkbox']:checked { background-image: url('images/dark/lc_checkbox.svg'); } @@ -457,6 +492,10 @@ input[type='checkbox']:checked.autofilter, .jsdialog input[type='checkbox']:chec padding-right: 10px; } +.ui-treeview .ui-listview-entry td { + vertical-align: middle; +} + .ui-treeview-entry.selected, .ui-listview-entry.selected { background-color: var(--color-background-dark); @@ -487,6 +526,38 @@ input[type='checkbox']:checked.autofilter, .jsdialog input[type='checkbox']:chec box-shadow: 0 0 2px 0 #777; } +/* tree grid */ + +.ui-treeview tr[aria-level='2'] > td:first-child { + padding-left: 2.5ch; +} + +.ui-treeview tr[aria-level='3'] > td:first-child { + padding-left: 5ch; +} + +.ui-treeview tr[aria-level='4'] > td:first-child { + padding-left: 7.5ch; +} + +.ui-treeview tr[aria-level='5'] > td:first-child { + padding-left: 10ch; +} + +.ui-treeview tr > td:first-child .ui-treeview-expander { + display: inline-block; + vertical-align: top; +} + +.ui-treeview tr[aria-level]:not([aria-expanded]) > td:first-child::before { + font-family: monospace; + content: 'V'; + color: transparent; + display: inline-block; + margin-inline-end: 7px; + vertical-align: top; +} + /* context menu */ .context-menu-list { background: var(--color-background-lighter); @@ -521,6 +592,7 @@ input[type='checkbox']:checked.autofilter, .jsdialog input[type='checkbox']:chec border-radius: var(--border-radius); overflow: hidden; align-self: center; + padding-inline: 4px; } #search_edit.ui-edit.autofilter { @@ -576,11 +648,22 @@ input[type='checkbox']:checked.autofilter, .jsdialog input[type='checkbox']:chec /* text label */ .ui-dialog-content .jsdialog.ui-text { + padding-inline-start: 0; + margin: auto 5px; +} + +.jsdialog.ui-text { padding-inline-start: 8px; } /* spinfield */ +.spinfieldcontainer { + margin-inline-end: 5px; + min-width: 70px; + width: 100%; +} + .spinfieldcontainer input { border: 1px solid var(--color-border-dark); border-radius: var(--border-radius); @@ -588,12 +671,16 @@ input[type='checkbox']:checked.autofilter, .jsdialog input[type='checkbox']:chec color: var(--color-text-dark); } -.spinfieldcontainer input:hover { +.spinfieldcontainer input:not([disabled]):hover { border: 1px solid var(--color-border-darker); color: var(--color-text-darker); background-color: var(--color-background-lighter); } +.jsdialog.spinfieldcontainer[disabled] input { + border: 1px solid var(--color-border-lighter); +} + .spinfield { padding: 4px 0 4px 4px; height: 28px; @@ -607,7 +694,7 @@ input[type='checkbox']:checked.autofilter, .jsdialog input[type='checkbox']:chec font-size: var(--default-font-size); color: var(--color-text-dark); margin: 5px; - margin-inline-start: calc(-40px); + margin-inline-start: calc(-50px); } /* spinfield (number) */ input[type='number'] { @@ -628,12 +715,20 @@ input[type='number']:hover::-webkit-outer-spin-button { cursor: pointer; } /* listbox */ -.jsdialog.ui-listbox-container { +.ui-listbox-container, +.ui-combobox { display: flex; margin: auto 0; } -.jsdialog.ui-listbox { +.ui-listbox { + padding: 0 14px 0 4px; + border: 1px solid var(--color-border-dark); +} + +.ui-listbox, +.ui-combobox, +.ui-timefield { box-sizing: border-box; -webkit-appearance: none; -moz-appearance: none; @@ -644,9 +739,7 @@ input[type='number']:hover::-webkit-outer-spin-button { line-height: normal; font-size: var(--default-font-size); font-family: var(--jquery-ui-font); - border: 1px solid var(--color-border-dark); border-radius: var(--border-radius); - padding: 0 14px 0 4px; background-color: var(--color-background-dark); color: var(--color-text-dark); } @@ -682,11 +775,131 @@ input[type='number']:hover::-webkit-outer-spin-button { background: url('images/jquery-ui-lightness/ui-icons_ffffff_256x240.png') no-repeat transparent; } -.ui-listbox[disabled='disabled'] ~ .ui-listbox-arrow { +.ui-listbox[disabled='disabled'] ~ .ui-listbox-arrow, +.ui-combobox[disabled='disabled'] ~ .ui-listbox-arrow { opacity: 0.5; cursor: auto; } +/* ui-combobox */ +.ui-combobox, +.ui-timefield { + border: 1px solid var(--color-border); +} + +.ui-combobox-content { + width: 100%; + border: none; + border-start-start-radius: var(--border-radius); + border-end-start-radius: var(--border-radius); + color: var(--color-text-dark); + background-color: var(--color-background-lighter); +} + +.ui-combobox-button { + padding-left: 20px; + border-left: 1px solid var(--color-border); +} + +.ui-combobox-dropdown { + position: absolute; + z-index: 2001; + padding: 0px; + overflow-y: auto; + max-height: 500px; + background-color: var(--color-background-dark); + border: 1px solid var(--color-border-dark); + border-radius: var(--border-radius); +} + +.modalpopup[id$='-dropdown'] { + /* submenu is inserted into the same overlay, dont make it relative to parent */ + position: absolute !important; +} + +.modalpopup[id$='-dropdown'] .ui-dialog-content { + padding: 0px; +} + +.modalpopup[id$='-dropdown'] .ui-grid { + grid-gap: 0px; +} + +.ui-combobox-entry { + width: calc(100% + 15px); /* + padding for scrollbar */ +} + +.ui-combobox-entry span:hover { + background-color: var(--color-background-dark); +} + +.ui-combobox-entry.selected span:not(:hover) { + border: 1px solid var(--color-primary); + background-color: var(--color-primary); + color: var(--color-primary-text); +} + +.ui-combobox-entry span { + border: 1px solid transparent; + padding: 5px; + display: block; + width: 100%; + font-size: var(--default-font-size); + font-family: var(--jquery-ui-font); + color: var(--color-text-dark); +} + +.ui-combobox-entry img { + border: 1px solid transparent; + max-height: 24px; /* required for hidpi*/ +} + +.ui-combobox-entry img:hover { + border: 1px solid var(--color-border-darker); + filter: contrast(0.5); +} + +.ui-combobox-entry.selected img:not(:hover) { + border: 1px solid var(--color-primary); +} + +[data-theme='dark'] .ui-combobox-entry img { + filter: invert(1); +} + +/* Combobox entry with menu and thus arrow/chevron */ +.ui-combobox-entry.ui-has-menu { + display: grid; + grid-template-columns: 1fr 25px; + align-items: center; +} +/* Arrow/chevron */ +.ui-combobox-entry.ui-has-menu::after { + content: ''; + display: inline-block; + width: 9px; + background: url('images/lc_menu_chevron.svg') no-repeat; + height: 9px; + margin-inline-start: -9px; +} + +.ui-combobox-entry.ui-has-menu > span { + /* menu entries have 5px all around padding, + add extra 9px at the horizontal end = 14px + so we can re-position the arrow/chevron */ + padding-inline-end: 14px; +} + +/* Apply style always show real colors */ +#applystyle-dropdown .ui-dialog-content { + background-color: white !important; +} + +#applystyle-dropdown .ui-combobox-entry img { + filter: none !important; + max-height: 30px; /* hidpi, avoid blurry text */ +} + /* ui-textarea */ .jsdialog.ui-textarea { color: var(--color-text-dark); @@ -844,6 +1057,7 @@ input[type='number']:hover::-webkit-outer-spin-button { #ZoteroDialog .ui-treeview-body { max-height: 500px; + max-width: 100%; } .autofilter-container-submenu > .autofilter-container { @@ -983,7 +1197,7 @@ input[type='number']:hover::-webkit-outer-spin-button { margin-left: 3px; } -.unoarrow:hover, .menubutton .arrow:hover { +.unoarrow:not([disabled]):hover, .menubutton .arrow:not([disabled]):hover { border-top: 5px solid var(--color-text-darker); } @@ -1000,7 +1214,7 @@ input[type='number']:hover::-webkit-outer-spin-button { background-color: transparent; } -.unoarrow:hover, .arrowbackground:hover .unoarrow { +.unoarrow:not([disabled]):hover, .arrowbackground:not([disabled]):hover .unoarrow { border-top-color: var(--color-text-darker); } @@ -1267,6 +1481,21 @@ input[type='number']:hover::-webkit-outer-spin-button { stop-opacity: 0.2; } +/* progressbar */ +.ui-progressbar { + display: flex; + align-items: center; +} + +.ui-progressbar progress { + width: 100%; +} + +.snackbar .ui-progressbar progress { + min-width: 120px; + margin-right: 10px; +} + /* snackbar */ .snackbar { border: none !important; @@ -1274,6 +1503,11 @@ input[type='number']:hover::-webkit-outer-spin-button { .snackbar.jsdialog-window { overflow: visible; } +.snackbar #snackbar-container, +.snackbar #snackbar-container-progress { + align-items: center; + max-width: calc(80vw); +} #mobile-wizard.popup.snackbar, .snackbar.jsdialog-container .ui-dialog-content { min-width: 200px; @@ -1309,26 +1543,36 @@ input[type='number']:hover::-webkit-outer-spin-button { padding: 2px 8px; } -#mobile-wizard.popup.snackbar #button, -.snackbar.jsdialog-container #button.ui-pushbutton.jsdialog { +#mobile-wizard.popup.snackbar [id$='button'], +.snackbar.jsdialog-container [id$='button'].ui-pushbutton.jsdialog { padding-right: 12px; background-color: transparent !important; border: none !important; margin: 0 !important; } -.snackbar.jsdialog-container #button.ui-pushbutton.jsdialog { - padding-right: 0; +.snackbar.jsdialog-container [id$='button'].ui-pushbutton.jsdialog { + padding: 8px; +} + +#snackbar-container-progress .ui-progressbar { + display: grid; + grid-column: 1 / 3; +} + +#snackbar-container-progress { + grid-template-rows: repeat(2, auto); + grid-template-columns: repeat(2, auto); } -#mobile-wizard.popup.snackbar #button, -.snackbar.jsdialog-container #button { +#mobile-wizard.popup.snackbar [id$='button'], +.snackbar.jsdialog-container [id$='button'] { color: #469cff !important; font-weight: 600; font-size: var(--header-font-size) !important; padding: 8px; } -.snackbar.jsdialog-container #button:hover { +.snackbar.jsdialog-container [id$='button']:hover { background-color: #ffffff15 !important; } @@ -1385,6 +1629,18 @@ input[type='number']:hover::-webkit-outer-spin-button { margin: auto; } +/* Writer - Insert - Page Number - page preview image */ +[data-theme='dark'] #PageNumberDialog #previewImage { + filter: invert(.95) +} + +/* Writer - Table of Contents, Index or Bibliography dialog, Columns tab */ +[data-theme='dark'] #ColumnPage #pageexample-img, +[data-theme='dark'] #ColumnPage #valueset-img { + filter: invert(.9) +} + + /* formulabar */ #sc_input_window.formulabar { height: 28px; @@ -1506,10 +1762,10 @@ input[type='number']:hover::-webkit-outer-spin-button { } /* hover effect */ -.jsdialog.menubutton:hover, -.jsdialog.ui-listbox:hover, -.jsdialog.ui-edit:hover, -.jsdialog.ui-textarea:hover { +.jsdialog.menubutton:not([disabled]):hover, +.ui-listbox:not([disabled]):hover, +.jsdialog.ui-edit:not([disabled]):hover, +.jsdialog.ui-textarea:not([disabled]):hover { color: var(--color-text-darker); background-color: var(--color-background-lighter); border: 1px solid var(--color-border-darker); @@ -1531,6 +1787,11 @@ input[type='number']:hover::-webkit-outer-spin-button { } #FormulaDialog #box3 { display: grid; + min-width: 400px; +} +#FormulaDialog .ui-tabs-content.jsdialog { + grid-auto-columns: 250px; + margin-right: 0.2em; } div [id^='TemplateDialog'] { @@ -1565,3 +1826,137 @@ kbd, .warn-copy-paste { width: 100%; } + +/* manage changes dialog */ + +.jsdialog #writerchanges .ui-treeview-body { + min-height: 300px; +} + +/* Insert hyperlink dialog */ + +#HyperlinkInternetPage #grid2, +#HyperlinkInternetPage #label2, +#HyperlinkInternetPage #lbProtocol, +#HyperlinkInternetPage #linktyp_ftp, +#HyperlinkInternetPage #linktyp_internet { + display: none; +} + +/* feature_lock */ +#modal-dialog-unlock-features-popup { + width: 652px; + min-width: auto; + max-width: none; +} +#unlock-features-popup .container { + display: flex; + flex-direction: row; +} +#unlock-features-popup #unlock-image { + flex: 1.3; + background: transparent no-repeat left 4px /contain; + background-image: none; + height: 288px; + margin-inline-end: 0.5em; +} +#unlock-features-popup .item { + flex: 1; +} +#unlock-features-popup .item *:not(ul, li) { + margin-inline-start: 1.1em; +} +#unlock-features-popup .item ul { + list-style: none; + padding: 0; + font-size: 0.84em; + text-shadow: 1px 1px 12px #ffbf0038, 0 0 0.5px #00000026; +} +#unlock-features-popup h1 { + margin-bottom: .5em; + font-size: 1.1em; + color: #fda208; +} +#unlock-features-popup ul { + list-style: none; + padding: 0; + font-size: 0.84em; + text-shadow: 1px 1px 12px #ffbf0038, 0 0 0.5px #00000026; +} + +#unlock-features-popup ul li { + display: flex; + justify-content: flex-start; + align-items: flex-start; +} + +#unlock-features-popup ul li::before { + content: '\2022'; + color: #fda208; + font-weight: bold; + display: inline-block; + width: 1em; + min-width: 1em; + margin-inline-start: 0.5em; +} + +/* clipboard warning dialog */ +#modal-dialog-copy_paste_download_progress .ui-dialog-content { + width: 450px; +} + +/* help */ +#modal-dialog-online-help-content-box { + min-width: 75%; +} + +/* Keyboard shortcuts */ +#modal-dialog-keyboard-shortcuts-content-box { + width: 468px; + max-width: 95%; /* Safe guard for when window is too small */ +} + +/* Calc -> Insert -> Pivot Table */ +#PivotTableLayout #box2 { + grid-gap: 12px; /* make space for vertical separator */ +} + +/* Modal info with 2 line message*/ +.jsdialog-container [id^='info-modal-label'] { + display: flex; +} + +/* DocumentPropertiesDialog Custom props */ +#DocumentPropertiesDialog #customprops .jsdialog .ui-grid .menubutton { + line-height: 16px; +} + +#DocumentPropertiesDialog #customprops div.jsdialog.ui-grid-cell, +#DocumentPropertiesDialog #customprops .spinfieldcontainer, +#DocumentPropertiesDialog #customprops input.ui-timefield { + margin-top: auto; + margin-bottom: auto; +} + +#DocumentPropertiesDialog #customprops #properties > .ui-grid { + display: flex; +} + +#DocumentPropertiesDialog #customprops #properties > .ui-grid > div:nth-child(1) { + width: 150px; +} + +#DocumentPropertiesDialog #customprops #properties > .ui-grid > div:nth-child(2) { + width: 100px; +} + +#DocumentPropertiesDialog #customprops #properties > .ui-grid > div:nth-child(3) { + width: 100%; +} + +#DocumentPropertiesDialog #customprops #properties > .ui-grid > div:nth-child(4) { + width: 45px; +} +#DocumentPropertiesDialog #customprops .jsdialog.ui-scrollwindow { + max-height: min-content; +} diff --git a/browser/css/jssidebar.css b/browser/css/jssidebar.css index becb0f4ecfd4f..78f88d50b4991 100644 --- a/browser/css/jssidebar.css +++ b/browser/css/jssidebar.css @@ -266,6 +266,13 @@ div.sidebar.ui-grid .checkbutton.sidebar, column-gap: 5px; } +/* Separators */ +.jsdialog.sidebar.ui-separator { + /* Hide separators for now. + TODO: re-test and possibily enable them with different style*/ + display: none; +} + button#button2.ui-pushbutton.jsdialog.sidebar { width: 151px; padding: 4px; @@ -368,6 +375,10 @@ button#button2.ui-pushbutton.jsdialog.sidebar { background-color: var(--color-background-dark); color: var(--color-primary); } +[data-theme='dark'] #NavigatorDeck .ui-treeview-entry.selected { + background-color: transparent; + color: var(--color-text-lighter); +} #NavigatorDeck .ui-treeview-entry.selected:not(.ui-listview-expandable-with-icon)::before { content: '–'; font-size: 17px; @@ -384,6 +395,8 @@ button#button2.ui-pushbutton.jsdialog.sidebar { /* Move this whole block away and fix in the main control */ display: flex; align-items: center; + width: 200px; + word-break: break-word; } span.jsdialog.sidebar.ui-treeview-entry.ui-treeview-notexpandable { diff --git a/browser/css/menubar.css b/browser/css/menubar.css index fdaa025bf3d75..daf9249dbebd9 100644 --- a/browser/css/menubar.css +++ b/browser/css/menubar.css @@ -22,6 +22,14 @@ .main-nav.hasnotebookbar.readonly > #main-menu #document-header { display: none; } + +/* hide documen-header to free up space when using narrow windows */ +@media screen and (max-width: 800px) { + .main-nav.hasnotebookbar:not(.readonly) #document-header { + display: none !important; + } +} + .document-logo { position: relative; width: 30px; @@ -32,8 +40,10 @@ height: 32px; white-space: nowrap; display: flex; - align-items: center; - justify-content: flex-start; + align-items: flex-start; + justify-content: center; + gap: 5px; + flex-direction: column; } .readonly .document-title { @@ -54,8 +64,14 @@ } .main-nav.hasnotebookbar:not(.readonly) #document-titlebar { - /* half of #document-name-input height: */ - top: -9px; + display: flex; + align-self: center; +} + +@media screen and (max-width: 1238px) { + .main-nav.hasnotebookbar:not(.readonly) #document-titlebar { + display: none; + } } .main-nav.readonly #optionstoolboxdown { @@ -63,7 +79,7 @@ } .main-nav { height: var(--header-height); /* on mouseover menubar items, border emerges */ - width: auto; + width: 100%; background: var(--color-background-lighter); padding: 3px 3px 3px 0; white-space: nowrap; @@ -87,7 +103,7 @@ .main-nav.hasnotebookbar:not(.readonly) { background: var(--color-main-background); padding: 0px; - overflow-x: auto; + overflow: scroll hidden; } /* Customizations to sm-simple theme to make it look like LO menu, lo-menu class */ diff --git a/browser/css/mobilewizard.css b/browser/css/mobilewizard.css index 26899cd5db616..bf49604fa3363 100644 --- a/browser/css/mobilewizard.css +++ b/browser/css/mobilewizard.css @@ -15,6 +15,10 @@ span.menu-entry-icon img { margin: 4px !important; } +span.menu-entry-icon { + padding-left: 2%; +} + #mobile-wizard.menuwizard .mobile-wizard-back.close-button{ visibility: hidden !important; } @@ -192,9 +196,7 @@ p.mobile-wizard.ui-combobox-text { padding-left: 2% !important; width: 100%; } -.menu-entry-icon.inserttable, .menu-entry-icon.insertfield, .menu-entry-icon.insertheaderfooter, .menu-entry-icon.formattingmark, .menu-entry-icon.formatformmenu { - padding-left: 2% !important; -} + #BackgroundColor > .ui-header-left { width: 100% !important; } @@ -343,7 +345,7 @@ p.mobile-wizard.ui-combobox-text.selected { justify-content: space-between; } -.ui-header.mobile-wizard.disabled .ui-header-left * { +.ui-explorable-entry.mobile-wizard.disabled .ui-header .ui-header-left * { color: var(--color-text-lighter) !important; } @@ -475,9 +477,10 @@ p.mobile-wizard.ui-combobox-text.selected { .ui-tabs.mobile-wizard { text-align: center; height: 42px; - display: table; + display: flex; width: 100%; padding: 0px; + overflow-x: auto; } #mobile-wizard-tabs { @@ -487,20 +490,13 @@ p.mobile-wizard.ui-combobox-text.selected { background-color: var(--color-background-lighter); } -#mobile-wizard-header { - position: sticky; - top: 0; - background-color: var(--color-background-lighter); - z-index: 2; -} - .ui-tab.mobile-wizard { + flex: auto; display: table-cell; - width: 49%; height: 36px; line-height: 36px; vertical-align: middle; - margin: 0px 1%; + margin: 0px 5%; border-radius: 10px; border: none; color: var(--color-text-lighter); @@ -658,7 +654,7 @@ a.leaflet-control-zoom-in { #slide-sorter .preview-img:hover{ border-color: var(--color-primary-darker); } -#slide-sorter .preview-img-currentpart, #mobile-wizard-header .preview-img-currentpart{ +#slide-sorter .preview-img-currentpart{ border-color: var(--color-primary-dark); border-style: solid; border-radius: var(--border-radius); @@ -715,11 +711,7 @@ a.leaflet-control-zoom-in { text-align: end; vertical-align: bottom; } -#DeleteTable{ - background-color: #fbf4f5; - border-radius: var(--border-radius); - padding-right: 4% !important; -} + #DeleteTable > span{ font-weight: bold; color: var(--color-error); @@ -759,6 +751,11 @@ a.leaflet-control-zoom-in { clear: both; } +#mobile-wizard.snackbar .mobile-wizard.ui-text { + border: none; + line-height: inherit; +} + #mobile-wizard [id^='info-modal-label'].mobile-wizard.ui-text { border: none; color: var(--color-text-dark) !important; @@ -839,7 +836,8 @@ div#mobile-wizard-content .spinfieldcontainer .spinfieldimage.disabled { #mobile-wizard #top{background: url('images/sc_aligntop.svg') no-repeat center;} #mobile-wizard #bottom{background: url('images/sc_alignbottom.svg') no-repeat center;} #mobile-wizard #standard{background: url('images/sc_alignverticalcenter.svg') no-repeat center;} -.checkbutton{ +.checkbutton, +.radiobutton{ clear: both; } .checkbutton label { @@ -1016,7 +1014,7 @@ label.disabled { .ui-edit.mobile-wizard, .ui-textarea.mobile-wizard, -#hyperlink-link-box-label.mobile-wizard { +#mobile-wizard-content .cool-annotation-table { /* , textarea was also here assign but it was messing up with all textareas (annotations on desktop and mobile): - added 93038: jsdialog: style dialogs; a5016d547c6242f6f9b28748b5724b0bc10cdb67 @@ -1026,6 +1024,11 @@ label.disabled { margin: 10px 5% !important; } +.ui-textarea.mobile-wizard { + background-color: var(--color-background-dark); + border: 1px solid var(--color-border); +} + #mobile-wizard #label9, #documentlabel-mobile { border: none; font-size: var(--header-font-size); @@ -1278,3 +1281,8 @@ label.disabled { #contentControlList.mobile-wizard li:not(:last-child) { border-bottom: 1px solid var(--color-border-lighter); } + +.unotoolbutton.mobile-wizard .unobutton img{ + width: 24px; + height: 24px; +} diff --git a/browser/css/notebookbar.css b/browser/css/notebookbar.css index d0a2d5a09474f..915f62e2ea88d 100644 --- a/browser/css/notebookbar.css +++ b/browser/css/notebookbar.css @@ -20,11 +20,16 @@ button.ui-tab.notebookbar { display: flex; align-items: center; justify-content: center; - padding: 0px 1em; + padding: 0 clamp(4px, 1vw, 1em); border: 1px solid transparent; border-radius: var(--border-radius); background-color: transparent; - font-size: var(--header-font-size); + /* calc([minimum size] + + ([maximum size] - [minimum size]) + * ((100vw - [minimum viewport width]) / ([maximum viewport width] - [minimum viewport width]))); */ + font-size: calc(var(--tb-min-fs) + (var(--tb-max-fs-u) - var(--tb-min-fs-u)) * ((100vw - 640px) / (1000 - 640))); + /* a minimum value, a preferred value or scaler, and a maximum allowed value. */ + font-size: clamp(var(--tb-min-fs), var(--tb-fs-s), var(--tb-max-fs)); font-family: var(--cool-font); line-height: normal; color: var(--color-main-text); @@ -97,7 +102,7 @@ button.ui-tab.notebookbar { padding: 0 2px; } -#Save.savemodified:after { +#save.savemodified:after { content: ''; display: block; width: 4px; @@ -154,6 +159,13 @@ button.ui-tab.notebookbar { transition: all 0.25s; } +#Open_Local_Editor img { + opacity: .8; +} +[data-theme='dark'] #Open_Local_Editor img { + filter: invert(1); +} + /* options section */ .notebookbar-options-section .cell.notebookbar { padding: 0; @@ -188,18 +200,18 @@ button.ui-tab.notebookbar { z-index: 11; } -.cell.notebookbar { - display: table-cell; - vertical-align: middle; - padding: 2px; -} - -.row.notebookbar { - display: table-row; -} - .vertical.notebookbar { width: max-content; + display: grid; + grid-auto-flow: row; + grid-gap: 4px; +} + +.horizontal.notebookbar { + display: grid; + grid-auto-flow: column; + grid-gap: 4px; + align-items: center; } /* unobuttons */ @@ -310,7 +322,7 @@ button.ui-tab.notebookbar { align-items: center; } -#zoomreset, .unotoolbutton.notebookbar.has-label > *{ /*so they stay side by side*/ +.unotoolbutton.notebookbar.has-label > *{ /*so they stay side by side*/ display: table-cell; width: 100%; height: 100%; @@ -339,10 +351,11 @@ button.ui-tab.notebookbar { /* unobuttons with inline labels */ .inline.notebookbar { - float: inline-start; width: max-content; white-space: nowrap; - display: inline-table; + display: grid; + grid-auto-flow: column; + align-items: center; } #FormatPaintbrush span @@ -374,16 +387,13 @@ button.ui-tab.notebookbar { height: 24px !important; } -#fontsize.notebookbar .select2.select2-container { +#fontsize.notebookbar { width: 65px !important; } -#fontnamecombobox.notebookbar .select2 { +#fontnamecombobox.notebookbar { width: 195px !important; top: -1px; -} - -#fontnamecombobox.notebookbar { padding-right: 0px; } @@ -395,22 +405,14 @@ button.ui-tab.notebookbar { margin-left: 0px !important; } -#fontsizecombobox.notebookbar .select2 { +#fontsizecombobox.notebookbar { width: 50px !important; } -#applystyle.notebookbar .select2 { - width: 170px !important; -} - -.notebookbar.ui-combobox > .select2 * { +.notebookbar.ui-combobox * { line-height: 22px; } -.notebookbar.ui-combobox > .select2 .select2-selection__arrow { - height: 22px; -} - /* Styles preview */ #stylesview { @@ -480,7 +482,7 @@ button.ui-tab.notebookbar { /* Home tab */ -#numbertype .select2.select2-container { +#numbertype { width: 170px !important; } diff --git a/browser/css/spreadsheet.css b/browser/css/spreadsheet.css index 514bbea56b163..5eea70ae1a533 100644 --- a/browser/css/spreadsheet.css +++ b/browser/css/spreadsheet.css @@ -20,12 +20,15 @@ } .spreadsheet-tab { - margin: 5px 4px 0px 0px !important; + margin: 5px 0px 0px !important; padding: 6px 9px 4px !important; text-decoration: none; font: var(--default-font-size)/1.5 var(--cool-font); - display: inline-block; + display: inline-grid; + grid-auto-flow: column; + justify-content: center; + align-items: center; border: 1px solid transparent; border-radius: var(--border-radius); background: var(--color-main-background); @@ -33,20 +36,32 @@ } .spreadsheet-tab.spreadsheet-tab-selected { - background: var(--color-background-dark) !important; - color: var(--color-text-dark) !important; + background-color: var(--color-primary) !important; + color: var(--color-primary-text) !important; border: 1px solid var(--color-border-dark); } +.spreadsheet-tab.spreadsheet-tab-protected > .lock, .spreadsheet-tab.spreadsheet-tab-protected:hover > .lock { + width: 16px; + height: 16px; + background-image: url('images/lc_spreadsheet_protected.svg') !important; + background-repeat: no-repeat !important; +} + +#spreadsheet-tab-scroll button.spreadsheet-tab-selected:hover { + background-color: var(--color-primary-dark) !important; + color: var(--color-primary-text) !important; +} + .spreadsheet-tab:hover { border: 1px solid var(--color-border-darker); background: var(--color-background-darker) !important; color: var(--color-text-darker) !important; } -#first-tab-drop-site { - height: 20px; - width: 3px; +.tab-drop-area { + height: 32px; + width: 4px; opacity: 0; margin-top: 4px; padding-top: 8px; @@ -56,15 +71,23 @@ padding-bottom: 5px; } -.tab-dropsite { - border-right: 5px solid var(--color-border); +.tab-drop-area-active { + background-color: rgb(109, 109, 211); } -#first-tab-drop-site.tab-dropsite { - width: 0 !important; +.tab-drop-area.tab-drop-area-active { opacity: 100% !important; } +#drop-zone-end-container { + height: 32px; + width: 128px; + opacity: 0; + vertical-align: bottom; + display: inline-block; + background-color: var(--color-main-background); +} + #spreadsheet-header-corner-container { border: 1px solid var(--color-border-dark); background-color: var(--colo-background-dark); @@ -207,3 +230,11 @@ #toolbar-wrapper.spreadsheet.tablet.readonly { z-index: -1; } + +/* Sidebar: Style: Hide dialog button + - There is no paragraph style dialog in calc + - The style sidebar pane visible on core side is not implemented in online +*/ +.spreadsheet ~ #main-document-content #sidebar-dock-wrapper .unoEditStyle.sidebar { + display: none; +} diff --git a/browser/css/toolbar.css b/browser/css/toolbar.css index 5a5163a837ba3..86953b458ee5e 100644 --- a/browser/css/toolbar.css +++ b/browser/css/toolbar.css @@ -9,6 +9,30 @@ background-color: transparent; } +#document-name-input-loading-bar { + width: 100%; + height: 2px; + background-color: var(--color-background-dark); + overflow: hidden; + position: relative; + display: none; + margin-block-end: -7px; +} + +#document-name-input-loading-bar::after { + content: ''; + position: absolute; + height: 100%; + width: 25%; + background-color: var(--color-main-text); + animation: moveIndicator 2s linear infinite; +} + +@keyframes moveIndicator { + from { left: -25%; } + to { left: 100%; } +} + #toolbar-down { left: 0; right: 0; @@ -60,9 +84,6 @@ #tb_actionbar_item_zoom .w2ui-tb-caption::after { content: '%'; } -#document-signing-bar { - background-color: var(--color-error); -} #toolbar-search { left: 0; @@ -207,6 +228,13 @@ w2ui-toolbar { background-color: var(--color-background-dark); box-shadow: 0px 0px 7px var(--color-box-shadow); } +#toolbar-wrapper.hasnotebookbar .w2ui-scroll-left, +#toolbar-wrapper.hasnotebookbar .w2ui-scroll-right { + /* .notebookbar-scroll-wrapper's height */ + height: 72px; + /* #toolbar-wrapper:not(.mobile)'s top padding */ + top: 3px; +} .w2ui-scroll-left:hover, .w2ui-scroll-right:hover { background-color: var(--color-background-darker); @@ -284,7 +312,6 @@ w2ui-toolbar { background-color: transparent; border-radius: var(--border-radius); padding: 0px 2px; - transition: 0.5s; } #document-name-input.editable { @@ -512,6 +539,7 @@ button.leaflet-control-search-next background-color: var(--color-background-lighter); border: 1px solid var(--color-border); border-radius: var(--border-radius); + color: var(--color-text-dark); } .select2-container--default .select2-results__option[aria-disabled='true'] { color: var(--color-border-lighter); @@ -524,7 +552,7 @@ button.leaflet-control-search-next margin-right: 5px; width: 150px !important; } -#fontnamecombobox { +#fontnamecombobox.select2 { border-color: transparent; background-color: transparent; line-height: 24px; @@ -572,7 +600,14 @@ button.leaflet-control-search-next color: var(--color-text-darker); } -#conditionalformatmenu-grid tr td { +/* Conditional formatting submenu */ + +#conditionalformatmenu-grid { + display: grid; + grid-template-columns: repeat(3, auto); +} + +#conditionalformatmenu-grid button:not(#iconsetoverlay) { box-sizing: border-box; position: relative; padding: 3px; @@ -580,13 +615,20 @@ button.leaflet-control-search-next border-radius: var(--border-radius); margin: 3px; overflow: auto; /* child margins otherwise don't expand *this* element (parent) */ + min-width: initial; } -#conditionalformatmenu-grid td:hover { +#conditionalformatmenu-grid button:hover { border: 1px solid var(--color-border-darker); background-color: var(--color-background-darker) !important; } +#conditionalformatmenu-grid #iconsetoverlay { + grid-column: 1/4; + width: 100%; + margin: 0px; +} + .w2ui-toolbar table.w2ui-button { background-color: transparent; border: 1px solid transparent; @@ -851,6 +893,104 @@ button.leaflet-control-search-next background-position: 2px center, 20px center, 38px center, 56px center, 74px center !important; width: 94px !important; } +.w2ui-icon.scaleset00 { background: url('images/scale-set-00.png') no-repeat; + background-size: 32px 32px !important; + width: 32px !important; + height: 32px !important; } +.w2ui-icon.scaleset01 { background: url('images/scale-set-01.png') no-repeat; + background-size: 32px 32px !important; + width: 32px !important; + height: 32px !important; } +.w2ui-icon.scaleset02 { background: url('images/scale-set-02.png') no-repeat; + background-size: 32px 32px !important; + width: 32px !important; + height: 32px !important; } +.w2ui-icon.scaleset03 { background: url('images/scale-set-03.png') no-repeat; + background-size: 32px 32px !important; + width: 32px !important; + height: 32px !important; } +.w2ui-icon.scaleset04 { background: url('images/scale-set-04.png') no-repeat; + background-size: 32px 32px !important; + width: 32px !important; + height: 32px !important; } +.w2ui-icon.scaleset05 { background: url('images/scale-set-05.png') no-repeat; + background-size: 32px 32px !important; + width: 32px !important; + height: 32px !important; } +.w2ui-icon.scaleset06 { background: url('images/scale-set-06.png') no-repeat; + background-size: 32px 32px !important; + width: 32px !important; + height: 32px !important; } +.w2ui-icon.scaleset07 { background: url('images/scale-set-07.png') no-repeat; + background-size: 32px 32px !important; + width: 32px !important; + height: 32px !important; } +.w2ui-icon.scaleset08 { background: url('images/scale-set-08.png') no-repeat; + background-size: 32px 32px !important; + width: 32px !important; + height: 32px !important; } +.w2ui-icon.scaleset09 { background: url('images/scale-set-09.png') no-repeat; + background-size: 32px 32px !important; + width: 32px !important; + height: 32px !important; } +.w2ui-icon.scaleset10 { background: url('images/scale-set-10.png') no-repeat; + background-size: 32px 32px !important; + width: 32px !important; + height: 32px !important; } +.w2ui-icon.scaleset11 { background: url('images/scale-set-11.png') no-repeat; + background-size: 32px 32px !important; + width: 32px !important; + height: 32px !important; } + +.w2ui-icon.databarset00 { background: url('images/databar-set-00.png') no-repeat; + background-size: 32px 32px !important; + width: 32px !important; + height: 32px !important; } +.w2ui-icon.databarset01 { background: url('images/databar-set-01.png') no-repeat; + background-size: 32px 32px !important; + width: 32px !important; + height: 32px !important; } +.w2ui-icon.databarset02 { background: url('images/databar-set-02.png') no-repeat; + background-size: 32px 32px !important; + width: 32px !important; + height: 32px !important; } +.w2ui-icon.databarset03 { background: url('images/databar-set-03.png') no-repeat; + background-size: 32px 32px !important; + width: 32px !important; + height: 32px !important; } +.w2ui-icon.databarset04 { background: url('images/databar-set-04.png') no-repeat; + background-size: 32px 32px !important; + width: 32px !important; + height: 32px !important; } +.w2ui-icon.databarset05 { background: url('images/databar-set-05.png') no-repeat; + background-size: 32px 32px !important; + width: 32px !important; + height: 32px !important; } +.w2ui-icon.databarset06 { background: url('images/databar-set-06.png') no-repeat; + background-size: 32px 32px !important; + width: 32px !important; + height: 32px !important; } +.w2ui-icon.databarset07 { background: url('images/databar-set-07.png') no-repeat; + background-size: 32px 32px !important; + width: 32px !important; + height: 32px !important; } +.w2ui-icon.databarset08 { background: url('images/databar-set-08.png') no-repeat; + background-size: 32px 32px !important; + width: 32px !important; + height: 32px !important; } +.w2ui-icon.databarset09 { background: url('images/databar-set-09.png') no-repeat; + background-size: 32px 32px !important; + width: 32px !important; + height: 32px !important; } +.w2ui-icon.databarset10 { background: url('images/databar-set-10.png') no-repeat; + background-size: 32px 32px !important; + width: 32px !important; + height: 32px !important; } +.w2ui-icon.databarset11 { background: url('images/databar-set-11.png') no-repeat; + background-size: 32px 32px !important; + width: 32px !important; + height: 32px !important; } + .w2ui-icon.print{ background: url('images/lc_print.svg') no-repeat center; } .w2ui-icon.undo{ background: url('images/lc_undo.svg') no-repeat center; } .w2ui-icon.redo{ background: url('images/lc_redo.svg') no-repeat center; } @@ -1325,6 +1465,14 @@ button.leaflet-control-search-next background: url('images/dark/lc_nextrecord.svg') no-repeat center/24px; } +[data-theme='dark'] .Open_Local_Editor { + filter: invert(1); +} + +.Open_Local_Editor { + opacity: 0.8; +} + .inserttable-pop { z-index: 1000; } @@ -1490,14 +1638,10 @@ menu-entry-with-icon.padding-left + menu-entry-icon.width */ display: flex !important; align-items: center; font-family: var(--cool-font); - padding-right: 12px; - margin-right: 10px; - margin-left: 10px; font-size: var(--default-font-size); justify-content: end; } -#userListHeader .user-info, #userListHeader .avatar-img { width: var(--btn-size); height: var(--btn-size); @@ -1511,15 +1655,90 @@ menu-entry-with-icon.padding-left + menu-entry-icon.width */ margin-right: 5px; } -#userListSummary { +#followingChipBackground, +#userListSummaryBackground { + border-radius: var(--btn-size); /* We expect the height to be --btn-size, give a bit for a border. To fully round the corners, this needs to be at least 50% of the height so --btn-size should do */ + padding: 2px; /* This will become the grey border around the inner elements */ + + font-size: 0.8em; /* The "Following foo" text overflows the box at the default size, 0.8em seems about right */ + + display: none; +} + +#followingChipBackground { + transform: translateX(calc(4px /* border widths */ + 4px /* background paddings */ + var(--btn-size) - 0.6px /* browser rendering fudge */)); + /* We'd like this to flow over the first item of the userListSummary. I've added a fudge because browser rendering seems to have subpixel errors here and it's far better to + * render the border marginally too far left than leave a gap. */ +} + +#userListSummaryBackground { + margin-right: 5px; +} + +#followingChipBackground:hover:has(#followingChip:hover), +#userListSummaryBackground:hover:has(#userListSummary:hover) { + background-color: var(--color-background-darker); +} + +#followingChipBackground > #followingChip, +#userListSummaryBackground > #userListSummary { + cursor: pointer; + + margin: 0; /* everything is in the respective #fooBackground selectors */ + padding: 0; +} + +#followingChipBackground > #followingChip { + border-style: solid; + border-width: 2px; + border-radius: calc(var(--btn-size)); + + height: var(--btn-size); + padding-left: calc(var(--btn-size) * 0.4); + padding-right: calc(var(--btn-size) * 1.2); + + display: flex; + flex-direction: column; + justify-content: center; + align-items: center; +} + +#followingChipBackground > #followingChip > #followingChipLine1 { + font-weight: bold; +} + +#userListSummaryBackground > #userListSummary { + background: transparent !important; /* we want to override some classes that are added to buttons by default */ + + height: fit-content !important; + width: fit-content !important; + + min-width: 0 !important; /* we want to override some classes that are added to buttons by default */ + display: flex; + justify-content: center; + align-items: center; + + border: none !important; /* we want to override some classes that are added to buttons by default */ +} + +#userListSummary .avatar-img:first-child { + margin-left: 0; +} + +#userListSummary .avatar-img:last-child { + margin-right: 0 !important; } -#userListSummary .user-info, #userListSummary .avatar-img { + background-clip: padding-box; margin-left: -10px; } +#userListSummary:not(:hover) .avatar-img.following { + border-color: transparent !important; +} + #userListPopover { display: none; position: absolute; @@ -1531,6 +1750,9 @@ menu-entry-with-icon.padding-left + menu-entry-icon.width */ filter: drop-shadow(0 1px 3px var(--color-box-shadow)); min-width: 150px; font-size: var(--default-font-size); + max-height: 85vh; + overflow-y: auto; + overflow-x: hidden; } #userListPopover::after { @@ -1603,6 +1825,25 @@ html[dir='rtl'] #userListPopover::after { #userListPopover .user-list-item.selected-user .user-list-item--name { padding: 4px 0 0 8px; } +/* Style for the scrollbar track */ +#userListPopover::-webkit-scrollbar { + width: 6px; +} + +/* Style for the scrollbar handle (thumb) */ +#userListPopover::-webkit-scrollbar-thumb { + background-color: var(--color-border); +} + +/* Style for the scrollbar track when handle is being dragged */ +#userListPopover::-webkit-scrollbar-thumb:hover { + width: 8px; +} + +/* Style for the scrollbar track (not the handle) */ +#userListPopover::-webkit-scrollbar-track { + background: transparent; +} @media only screen and (max-width: 600px) { #userListSummary, diff --git a/browser/css/writer.css b/browser/css/writer.css index 4c8d43c266ac7..289b3a7c1a812 100644 --- a/browser/css/writer.css +++ b/browser/css/writer.css @@ -10,3 +10,8 @@ box-sizing: border-box; box-shadow: 0 0 1px 1px #00000015; } +[data-theme='dark'] .writer-drop-down-marker { + background: url('images/dark/unfold.svg') center/16px var(--color-background-lighter) no-repeat; + border: 1px solid var(--color-primary-lighter); + +} \ No newline at end of file diff --git a/browser/html/cool-help.html b/browser/html/cool-help.html index 1b7888a84b298..34e1ff0e65361 100644 --- a/browser/html/cool-help.html +++ b/browser/html/cool-help.html @@ -6,491 +6,668 @@ .productname { font-weight:bold; font-style:italic; } .ui { font-weight:bold; } .def { font-weight:bold; } - .toc-h2 { font-weight:bold; } - .toc-h3 { margin-left:0.1965in; } + /* Style for toc-h2 and toc-h3 */ + .toc-h2 button, + .toc-h3 button { + border-radius: 5px; /* Add rounded corners */ + transition: background-color 0.3s ease; /* Smooth transition effect */ + font-family: Arial, sans-serif; /* Use a common font family */ + font-size: 16px; /* Font size */ + color: var(--color-main-text); + } + + /* Hover effect for toc-h2 and toc-h3 button */ + .toc-h2 button:hover, + .toc-h3 button:hover { + background-color: #e0e0e0; /* Darker gray background on hover */ + } + + /* Style for toc-h2 and toc-h3 button text when clicked */ + .toc-h2 button:active, + .toc-h3 button:active { + color: #555; /* Darker text color when clicked */ + } + + /* Style for toc-h2 and toc-h3 button text when focused */ + .toc-h2 button:focus, + .toc-h3 button:focus { + outline: none; /* Remove outline when focused */ + } + + /* Add margin to the paragraph to separate each item */ + .toc-h2, + .toc-h3 { + margin-bottom: 2px; /* Adjust margin bottom */ + } + .screenshot { text-align:center; margin: 0.1in; } .screenshot > img { max-width: 100%; height: auto; } .blue { color:#63bbee; } button.border-0 { font-family: "Helvetica Neue", sans-serif; background: none!important; border: none; padding: 0!important; color: -webkit-link; cursor: pointer; text-decoration: underline; font-size: 1em; line-height: 1.5em; } button:active { color: -webkit-activelink; } button:focus { outline: -webkit-focus-ring-color auto 1px; } + + .hide { + display: none; + } + + .show { + display: block; + } + + tr.show { + display: table-row; + } + + #online-help-search-input { + width: 30%; + padding: 5px 10px 5px 15px; + border: 1px solid; + border-radius: 5px; + font-size: 16px; + outline: none; + } + #online-help-search-input:focus { + box-shadow: 0 0 10px rgba(0, 0, 0, 0.2); + } + #online-help-search-input::placeholder { + color: #999; + } + [data-theme='dark'] span.cool-annotation-menu { filter: invert(1);} -
+ +
+ +
+ +

Keyboard Shortcuts

-
-

General Keyboard Shortcuts

+
+

General Keyboard Shortcuts

- - - - - - - - - - + + + + + + + + + +
Undo Ctrl+Z
Redo Ctrl+Y
Cut Ctrl+X
Paste as unformatted text Ctrl+Shift+V
Paste special Ctrl+Alt+Shift+V
Print (Download as PDF) Ctrl+P
Display the Keyboard shortcuts help Ctrl+Shift+?
Focus to notebookbar menu Alt+Shift+F1
Focus to document from menu ESC
Focus to selected comment's menu Alt+C
Undo Ctrl+Z
Redo Ctrl+Y
Cut Ctrl+X
Paste as unformatted text Ctrl+Shift+V
Paste special Ctrl+Alt+Shift+V
Print (Download as PDF) Ctrl+P
Display the Keyboard shortcuts help Ctrl+Shift+?
Focus to notebookbar menu Alt+Shift+F1
Focus to document from menu ESC
Focus to selected comment's menu Alt+C
-