Skip to content

Commit 0f1827f

Browse files
authored
Merge branch 'master' into enh/noid/remotedesktop-remove-onlyoffice
2 parents e68e33f + c3f1e0d commit 0f1827f

File tree

121 files changed

+768
-553
lines changed

Some content is hidden

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

121 files changed

+768
-553
lines changed

.github/ISSUE_TEMPLATE/bug.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ body:
3838
id: screenshots
3939
attributes:
4040
label: Screenshots, Videos, or Pastebins
41-
description: If applicable, add screenshots and/or a short video to help explain your problem. You can use https://0bin.net for long error messages or logs.
41+
description: If applicable, add screenshots and/or a short video to help explain your problem. You can use https://paste.sh for long error messages or logs.
4242
- type: textarea
4343
id: additional-context
4444
attributes:

.github/workflows/check-code-with-shellcheck.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
name: Github Actions
1111
runs-on: ubuntu-latest
1212
steps:
13-
- uses: actions/checkout@v3
13+
- uses: actions/checkout@v4
1414
- name: Run Shellcheck
1515
uses: ludeeus/action-shellcheck@master
1616
with:

.github/workflows/reviewdog.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
name: Shellcheck testing
1212
runs-on: ubuntu-latest
1313
steps:
14-
- uses: actions/checkout@v3
14+
- uses: actions/checkout@v4
1515
- name: shellcheck
1616
uses: reviewdog/action-shellcheck@v1
1717
with:
@@ -25,7 +25,7 @@ jobs:
2525
runs-on: ubuntu-latest
2626
steps:
2727
- name: spelling or typos
28-
uses: actions/checkout@v3
28+
uses: actions/checkout@v4
2929
- name: misspell
3030
uses: reviewdog/action-misspell@v1
3131
with:

CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,13 @@ PR's are more than welcome. Happy Nextclouding!
1010
### Different versions
1111
If you run Hyper-V or want 500 GB, 1 TB or 2 TB VM you can download it from [T&M Hansson IT's shop](https://shop.hanssonit.se/product-category/virtual-machine/nextcloud/).
1212

13+
## All future releases
14+
15+
### Full changelog:
16+
- [VM](https://github.com/nextcloud/vm/releases/)
17+
- [Nextcloud](https://nextcloud.com/changelog/)
18+
19+
1320
## 26.0.0
1421

1522
### Full changelog:

README.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -106,17 +106,17 @@ Please report any issues you can find. Improvements are welcome!
106106
* You? :)
107107

108108
## Special thanks to
109-
* [Ezra Holm](https://github.com/ezraholm50) @ [Tech and Me](https://www.techandme.se)
109+
* Ezra Holm @ [Tech and Me](https://www.techandme.se)
110110
* [Luis Guzman](https://github.com/Ark74) @ [SwITNet](https://switnet.net)
111111
* [Stefan Heitmüller](https://github.com/morph027) @ [morph027's Blog](https://morph027.gitlab.io/)
112112
* [Lorenzo Faleschini](https://github.com/penzoiders)
113113
* [Georg Großmann](https://github.com/ggeorgg)
114114
* [liao20081228](https://github.com/liao20081228)
115115
* [aaaskew](https://github.com/aaaskew)
116116

117-
[Nextcloud Server]: https://bit.ly/2CHIUkA
118-
[app store]: https://bit.ly/2HUy4v9
119-
[\*nix]: https://bit.ly/2UaCC7b
120-
[A+ security-rated]: https://bit.ly/2mvlyJ3
121-
[Collabora Online]: https://bit.ly/2WjVVZ8
122-
[ONLYOFFICE]: https://bit.ly/2FA0TKj
117+
[Nextcloud Server]: http://shortio.hanssonit.se/r1Rx0GqXa9
118+
[app store]: http://shortio.hanssonit.se/Rz1GEXt9dL
119+
[\*nix]: http://shortio.hanssonit.se/52hOTQbhdh
120+
[A+ security-rated]: http://shortio.hanssonit.se/aMTjg0SJi3
121+
[Collabora Online]: http://shortio.hanssonit.se/IKjBoOfQOT
122+
[ONLYOFFICE]: http://shortio.hanssonit.se/oRLShCfRK3

addons/0-byte-files.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash
22

3-
# T&M Hansson IT AB © - 2023, https://www.hanssonit.se/
3+
# T&M Hansson IT AB © - 2024, https://www.hanssonit.se/
44
true
55
SCRIPT_NAME="Check for 0-Byte files"
66
# shellcheck source=lib.sh

addons/automatic_updates.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash
22

3-
# T&M Hansson IT AB © - 2023, https://www.hanssonit.se/
3+
# T&M Hansson IT AB © - 2024, https://www.hanssonit.se/
44

55
true
66
SCRIPT_NAME="Automatic Updates"

addons/cookielifetime.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash
22

3-
# T&M Hansson IT AB © - 2023, https://www.hanssonit.se/
3+
# T&M Hansson IT AB © - 2024, https://www.hanssonit.se/
44

55
true
66
SCRIPT_NAME="Set Cookie Lifetime"

addons/database_shrinking.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash
22

3-
# T&M Hansson IT AB © - 2023, https://www.hanssonit.se/
3+
# T&M Hansson IT AB © - 2024, https://www.hanssonit.se/
44
# Copyright © 2021 Simon Lindner (https://github.com/szaimen)
55

66
true

addons/deSEC/desec.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash
22

3-
# T&M Hansson IT AB © - 2023, https://www.hanssonit.se/
3+
# T&M Hansson IT AB © - 2024, https://www.hanssonit.se/
44

55
true
66
SCRIPT_NAME="deSEC Registration"
@@ -150,7 +150,7 @@ The hook files will end up in $SCRIPTS/deSEC, please don't touch that folder unl
150150
You can read more about it here: https://github.com/desec-io/desec-certbot-hook
151151
152152
Please remember that you still need to open the port you choose to make your server publicly available.
153-
You can read more about that here: https://goo.gl/iUGE2U"
153+
You can read more about that here: http://shortio.hanssonit.se/ffOQOXS6Kh"
154154

155155
# Run the TLS script
156156
run_script LETS_ENC activate-tls

0 commit comments

Comments
 (0)