Skip to content

Commit 98ef21f

Browse files
skjnldsvskjnldsv
committed
Merge branch 'master' into refactor_lib_private_root_classes_part_3
Signed-off-by: John Molakvoæ <[email protected]>
2 parents f837b57 + 321900d commit 98ef21f

6,383 files changed

Lines changed: 245810 additions & 154026 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.devcontainer/README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
Make sure you have the [VSCode DevContainer](https://code.visualstudio.com/docs/devcontainers/containers) extensions installed. If you open the project, VSCode will ask you if you want to open it inside of the DevContainer. If that's not the case, use <kbd>F1</kbd>&rarr;*Dev Containers: Open Folder in Container*.
66

7-
Alternatively open the project directly in [GitHub Codespaces](https://github.com/features/codespaces).
7+
Alternatively open the project directly in [GitHub Codespaces](https://github.com/codespaces/new?hide_repo_select=true&ref=master&repo=60243197&skip_quickstart=true).
88

99
That's already it. Everything else will be configured automatically by the Containers startup routine.
1010

@@ -69,4 +69,4 @@ any other user.
6969
The Apache webserver is already configured to automatically try to connect to a debugger process
7070
listening on port `9003`. To start the VSCode debugger process, use the delivered debug profile `Listen for XDebug`.
7171
After you started the VSCode debugger, just navigate to the appropriate Nextcloud URL to get your
72-
debug hits.
72+
debug hits.

‎.devcontainer/devcontainer.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
"dockerComposeFile": "docker-compose.yml",
44
"service": "nextclouddev",
55
"postCreateCommand": ".devcontainer/setup.sh",
6+
"postStartCommand": ".devcontainer/postStart.sh",
67
"forwardPorts": [
78
80,
89
8080,

‎.devcontainer/postStart.sh‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
#!/bin/bash
2+
3+
# Set git safe.directory
4+
git config --global --add safe.directory /var/www/html
5+
git config --global --add safe.directory /var/www/html/3rdparty

‎.devcontainer/setup.sh‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,6 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )/../" >/dev/null 2>&1 && pwd )"
33

44
cd $DIR/
55

6-
# Set git safe.directory
7-
git config --global --add safe.directory /var/www/html
8-
git config --global --add safe.directory /var/www/html/3rdparty
9-
106
git submodule update --init
117

128
# Codespace config

0 commit comments

Comments
 (0)