rebase ionos_dev on v30.0.5 #91
Closed
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
printminion-co
force-pushed
the
ionos-dev-v30.0.5
branch
from
3273654 to
568bd4f
Compare
Closes: HDFRONT-6801 Signed-off-by: Misha M.-Kupriyanov <kupriyanov@strato.de>
Closes: HDFRONT-6655/HDFRONT-6801 Signed-off-by: Misha M.-Kupriyanov <kupriyanov@strato.de>
in order to be able to build/deploy dev state Closes: HDFRONT-6801 Signed-off-by: Misha M.-Kupriyanov <kupriyanov@strato.de>
Closes: HDFRONT-6832
Closes: HDFRONT-6832
Although not used yet let's take this naming convention to have app directories nearby.
Subsequent container build scripts will need it.
Signed-off-by: Misha M.-Kupriyanov <kupriyanov@strato.de>
We will maintain our additional and custom apps in these directories. Closes: HDFRONT-6832
To ensure these directories exist Closes: HDFRONT-6832
At current stable29 *branch* Command: $ git submodule add https://github.com/nextcloud/viewer.git apps-external/viewer/
This is a submodules, but other apps will be installed via download.
Changes there: * install script for user_oidc * shellcheck for the repo Closes: HDFRONT-6832
Signed-off-by: Thomas Lehmann <t.lehmann@strato.de>
The "redirects" config allows configuring redirects from paths to routes.
Example config:
"redirects" => { "^/path/regexp" => "an.apps.controller.route.locator" }
Use case:
* An administrator can configure another app as target for certain paths.
Differentiation from Apache redirects:
* this allows configuring redirects in one place and avoids spreading
the configuration in multiple places.
* the target route locator is more expressive/easier to trace than a
path
Signed-off-by: Thomas Lehmann <t.lehmann@strato.de>
Signed-off-by: Misha M.-Kupriyanov <kupriyanov@strato.de>
simplesettings The config for the previously added "redirects" feature. Signed-off-by: Thomas Lehmann <t.lehmann@strato.de>
Signed-off-by: Franziska Bath <franziska.bath@strato.de>
* Fixed missing routes for wiping devices * Fix missing package which prevents from-scratch build Signed-off-by: Thomas Lehmann <t.lehmann@strato.de>
Latest changes: * app install / enable refactoring * enabling apps Signed-off-by: Thomas Lehmann <t.lehmann@strato.de>
Actually required for the custom and external apps. Since the workflow starts in the project root, it initially "sees" the Nextcloud package.json. Since entering each app directory and setting up different Node/npm versions is no feasible anyway, let's set it here. Signed-off-by: Thomas Lehmann <t.lehmann@strato.de>
Signed-off-by: Thomas Lehmann <t.lehmann@strato.de>
To track it as submodule in version control Signed-off-by: Thomas Lehmann <t.lehmann@strato.de>
Exclude node_modules, tests and GitHub/Gut dirs too. Signed-off-by: Thomas Lehmann <t.lehmann@strato.de>
…pps-external/ Build simplesettings (custom) and user_oidc (external) Signed-off-by: Thomas Lehmann <t.lehmann@strato.de>
* Enable custom apps too * user_oidc will no longer be downloaded Signed-off-by: Thomas Lehmann <t.lehmann@strato.de>
Fix missing package which prevents from-scratch build (updated amended commit) Signed-off-by: Thomas Lehmann <t.lehmann@strato.de>
Signed-off-by: Thomas Lehmann <t.lehmann@strato.de>
As long as translations for these keys aren't provided from 'files' translations, we need this workaround to provide the translations via the 'core' themes app. Signed-off-by: Franziska Bath <franziska.bath@strato.de>
Signed-off-by: Kai Henseler <kai.henseler@strato.de>
Signed-off-by: Kai Henseler <kai.henseler@strato.de>
Signed-off-by: Kai Henseler <kai.henseler@strato.de>
Signed-off-by: Misha M.-Kupriyanov <kupriyanov@strato.de>
…styling) Signed-off-by: Franziska Bath <franziska.bath@strato.de>
Signed-off-by: Misha M.-Kupriyanov <kupriyanov@strato.de>
Signed-off-by: Kai Henseler <kai.henseler@strato.de>
…sktop, tablet, mobile) Signed-off-by: Tatjana Kaschperko Lindt <kaschperko-lindt@strato.de>
…ion) Signed-off-by: Misha M.-Kupriyanov <kupriyanov@strato.de>
Signed-off-by: Tatjana Kaschperko Lindt <kaschperko-lindt@strato.de>
git submodule add git@github.com:nextcloud/serverinfo.git apps-external/serverinfo Signed-off-by: Misha M.-Kupriyanov <kupriyanov@strato.de>
in order to have latest v30 release version Signed-off-by: Misha M.-Kupriyanov <kupriyanov@strato.de>
via https://support.nextcloud.com/#ticket/zoom/71685 Signed-off-by: Misha M.-Kupriyanov <kupriyanov@strato.de>
Signed-off-by: Kai Henseler <kai.henseler@strato.de>
Signed-off-by: Kai Henseler <kai.henseler@strato.de>
Signed-off-by: Kai Henseler <kai.henseler@strato.de>
…umb) Signed-off-by: Kai Henseler <kai.henseler@strato.de>
…acy) Signed-off-by: Tatjana Kaschperko Lindt <kaschperko-lindt@strato.de>
… share) Signed-off-by: Tatjana Kaschperko Lindt <kaschperko-lindt@strato.de>
…ternal share) Signed-off-by: Tatjana Kaschperko Lindt <kaschperko-lindt@strato.de>
Signed-off-by: Tatjana Kaschperko Lindt <kaschperko-lindt@strato.de>
printminion-co
force-pushed
the
ionos/rebase/ionos-dev-v30.0.5
branch
from
fe94337 to
7de626b
Compare
…om v5.3.1 Signed-off-by: Misha M.-Kupriyanov <kupriyanov@strato.de>
Signed-off-by: Misha M.-Kupriyanov <kupriyanov@strato.de>
Signed-off-by: Misha M.-Kupriyanov <kupriyanov@strato.de>
Signed-off-by: Misha M.-Kupriyanov <kupriyanov@strato.de>
printminion-co
force-pushed
the
ionos/rebase/ionos-dev-v30.0.5
branch
from
44d6c8f to
288a30e
Compare
bromiesTM
requested changes
Jan 31, 2025
bromiesTM
left a comment
bromiesTM
left a comment
There was a problem hiding this comment.
there also is a issue with styling of mimetype icons and the filename
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
Review and merge dependencies
TODO
serverinfoviewernc-vue-material-design-iconsnc-nextcloud-vuerebase log
checkout tag as branch
checkout ionos-dev
create branch for rebase
rebase onto nextcloud-v30.0.5
65648889is the hash of the last commit before our changesresolve conflicts
git rebase --continuegit restore --staged package-lock.json && npm i --package-lock-only && git add package-lock.jsongit rebase --continuegit restore --staged package-lock.json && npm i --package-lock-only && git add package-lock.jsongit rebase --continuegit restore --staged package-lock.json && npm i --package-lock-only && git add package-lock.jsongit rebase --continuegit restore --staged package-lock.json && npm i --package-lock-only && git add package-lock.jsongit rebase --continuegit restore --staged package-lock.json && npm i --package-lock-only && git add package-lock.jsongit rebase --continuegit restore --staged package-lock.json && npm i --package-lock-only && git add package-lock.jsongit rebase --continueNotes
package-lock.json- should not contain "@fortawesome/*"