upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-04-15 22:11:17 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 25
61839 commits 882 branches 1195 tags 7.2 GiB
Commit graph

61839 commits

This branch
This branch
All branches
Author SHA1 Message Date
Côme Chilliet
7fa8b2eef7
Add a guard to check that trashbin folder is a folder 
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
 2022-03-24 17:31:21 +01:00
Côme Chilliet
ecbcfca98a
Improve wording of output for trashbin migrator 
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
 2022-03-24 11:04:09 +01:00
Côme Chilliet
53c731d8f9
Rename PATH constants to show if folder or file 
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
 2022-03-22 09:21:18 +01:00
Côme Chilliet
865ac4b6e0
Rename $insert var to $qb 
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
 2022-03-17 14:49:29 +01:00
Côme Chilliet
51d228932f
Add trashbin migrator to export and import trashbin data 
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
 2022-03-17 14:45:56 +01:00
Joas Schilling
04a4562a01
Merge pull request #31513 from nextcloud/techdebt/noid/enforce-primary-keys 
Enforce primary keys as they are required to be performant in MySQL c…
 2022-03-15 10:53:11 +01:00
Louis
1ae6b2be71
Merge pull request #31498 from Erikvv/s3-versioning-not-implemented 
AmazonS3: allow not implemented versioning
 2022-03-15 10:26:43 +01:00
Vanessa
2469640725
Merge pull request #31397 from nextcloud/fix/31237/new-button-SetStatusModal 
add new button component SetStatusModal
 2022-03-15 08:11:26 +01:00
Vanessa
ae79c0cc1c
Merge pull request #31378 from nextcloud/fix/31237/new-button-UserList 
use new button component UserList
 2022-03-15 08:08:37 +01:00
Nextcloud bot
a74ab5bd48
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2022-03-15 02:48:57 +00:00
Pytal
e9999ec90c
Merge pull request #31516 from nextcloud/enh/improve-user_migration-api 2022-03-14 19:17:47 -07:00
Pytal
a5e1e31350
Merge pull request #31572 from nextcloud/fix/select2_settings_admin 2022-03-14 19:07:13 -07:00
Erik van Velzen
17f3e5e4b5 AmazonS3: allow not implemented versioning 
In case the S3 implementation does not implement versioning, set it to
false. Versioning was introduced in Nexcloud in commit
09ffac5e6d

This is needed for compatibility with the Storj gateway.

Signed-off-by: Erik van Velzen <erik@evanv.nl>
 2022-03-15 00:40:38 +01:00
Louis Chemineau
7e8ae46a01 Use global $ in settings admin.js 
Fix https://github.com/nextcloud/server/issues/31570

Signed-off-by: Louis Chemineau <louis@chmn.me>
Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
 2022-03-14 20:00:37 +00:00
Carl Schwan
bf75b1d5c5
Merge pull request #31567 from nextcloud/update-composer-files 
Update composer generated files to latest version
 2022-03-14 16:55:30 +01:00
Louis
ee2f3bcaf1
Merge pull request #31561 from nextcloud/dependabot/npm_and_yarn/karma-chrome-launcher-3.1.1 
Bump karma-chrome-launcher from 3.1.0 to 3.1.1
 2022-03-14 15:12:24 +01:00
Côme Chilliet
8f97f722ec
Extends UserMigrationException in CalendarMigratorException 
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
 2022-03-14 14:34:16 +01:00
Côme Chilliet
1973b2fb75
Fix autoloader and phpdoc for new class 
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
 2022-03-14 14:34:15 +01:00
Côme Chilliet
b63d22b6ea
Improve wording of pathExists description 
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
Signed-off-by: Christopher Ng <chrng8@gmail.com>
 2022-03-14 14:34:15 +01:00
Côme Chilliet
b4b9e8adf7
Add getOriginalUid in IImportSource to simplify code when importing under another uid 
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
 2022-03-14 14:34:14 +01:00
Côme Chilliet
5534f70c5d
Add pathExists method to IImportSource to test if a path exists in the archive 
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
 2022-03-14 14:34:14 +01:00
Côme Chilliet
d8b2d32a5e
Move UserMigrationException to OCP and add @throws documentation 
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
 2022-03-14 14:33:57 +01:00
Simon L
a74248b0a0
Merge pull request #31566 from nextcloud/fix/unit-audit 
Fix unit tests by importing the class
 2022-03-14 13:23:30 +01:00
dependabot[bot]
b9632de066
Bump karma-chrome-launcher from 3.1.0 to 3.1.1 
Bumps [karma-chrome-launcher](https://github.com/karma-runner/karma-chrome-launcher) from 3.1.0 to 3.1.1.
- [Release notes](https://github.com/karma-runner/karma-chrome-launcher/releases)
- [Changelog](https://github.com/karma-runner/karma-chrome-launcher/blob/master/CHANGELOG.md)
- [Commits](https://github.com/karma-runner/karma-chrome-launcher/compare/v3.1.0...v3.1.1)

---
updated-dependencies:
- dependency-name: karma-chrome-launcher
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-03-14 11:22:02 +00:00
Louis
bd89a39076
Merge pull request #31459 from nextcloud/dependabot/npm_and_yarn/karma-6.3.17 
Bump karma from 6.3.16 to 6.3.17
 2022-03-14 12:20:48 +01:00
Carl Schwan
5ce985f9be Update composer generated files to latest version 
Signed-off-by: Carl Schwan <carl@carlschwan.eu>
 2022-03-14 11:30:41 +01:00
Carl Schwan
371fa1c49a
Merge pull request #31542 from nextcloud/psalm-userCounts 
Fix psalm issue about userCounts
 2022-03-14 11:27:43 +01:00
Carl Schwan
6e45b298bf Fix unit tests by importing the class 
Signed-off-by: Carl Schwan <carl@carlschwan.eu>
 2022-03-14 11:24:39 +01:00
Vanessa Pertsch
c1dfd6f784 use new button component 
Signed-off-by: Vanessa Pertsch <vanessa.pertsch@nextcloud.com>

Signed-off-by: Vanessa Pertsch <vanessa.pertsch@posteo.com>
Signed-off-by: Vanessa Pertsch <vanessa.pertsch@posteo.de>
Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
 2022-03-14 09:34:27 +00:00
Carl Schwan
1bf5ab35a8 Use "use" to import namespaces 
Signed-off-by: Carl Schwan <carl@carlschwan.eu>
 2022-03-14 09:35:01 +01:00
Nextcloud bot
4e96db8608
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2022-03-14 02:27:10 +00:00
Nextcloud bot
3e067edcbe
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2022-03-13 02:26:40 +00:00
Carl Schwan
653f2b7e32
Merge pull request #31555 from nextcloud/enh/noid/fix-drone-tests 
fix drone tests on master
 2022-03-12 12:55:53 +01:00
dependabot[bot]
1f23164607
Bump karma from 6.3.16 to 6.3.17 
Bumps [karma](https://github.com/karma-runner/karma) from 6.3.16 to 6.3.17.
- [Release notes](https://github.com/karma-runner/karma/releases)
- [Changelog](https://github.com/karma-runner/karma/blob/master/CHANGELOG.md)
- [Commits](https://github.com/karma-runner/karma/compare/v6.3.16...v6.3.17)

---
updated-dependencies:
- dependency-name: karma
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-03-12 03:33:26 +00:00
MichaIng
161195aecc
Merge pull request #31560 from nextcloud/dependabot/npm_and_yarn/puppeteer-13.5.1 
Bump puppeteer from 13.4.1 to 13.5.1
 2022-03-12 04:32:19 +01:00
dependabot[bot]
6e3d7bf511
Merge pull request #31562 from nextcloud/dependabot/npm_and_yarn/css-loader-6.7.1 2022-03-12 03:23:24 +00:00
Nextcloud bot
bff0f92870
[tx-robot] updated from transifex 
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
 2022-03-12 02:26:53 +00:00
dependabot[bot]
9361900586
Bump css-loader from 6.7.0 to 6.7.1 
Bumps [css-loader](https://github.com/webpack-contrib/css-loader) from 6.7.0 to 6.7.1.
- [Release notes](https://github.com/webpack-contrib/css-loader/releases)
- [Changelog](https://github.com/webpack-contrib/css-loader/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack-contrib/css-loader/compare/v6.7.0...v6.7.1)

---
updated-dependencies:
- dependency-name: css-loader
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-03-12 02:06:00 +00:00
dependabot[bot]
807cdf8b4a
Bump puppeteer from 13.4.1 to 13.5.1 
Bumps [puppeteer](https://github.com/puppeteer/puppeteer) from 13.4.1 to 13.5.1.
- [Release notes](https://github.com/puppeteer/puppeteer/releases)
- [Changelog](https://github.com/puppeteer/puppeteer/blob/main/CHANGELOG.md)
- [Commits](https://github.com/puppeteer/puppeteer/compare/v13.4.1...v13.5.1)

---
updated-dependencies:
- dependency-name: puppeteer
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-03-12 02:03:38 +00:00
MichaIng
bd05f84637
Merge pull request #31496 from nextcloud/automated/noid/psalm-baseline-update-1646799120 
[Automated] Update psalm-baseline.xml
 2022-03-12 01:01:00 +01:00
szaimen
351357047a fix drone tests on master 
Signed-off-by: szaimen <szaimen@e.mail.de>
 2022-03-11 20:45:26 +01:00
John Molakvoæ
5ad55fad35
Merge pull request #31274 from nextcloud/fix/carddav-backend-1000-orache1 2022-03-11 16:59:37 +01:00
John Molakvoæ
bcb1fc5a81
Merge pull request #31531 from nextcloud/fix/sftp-offset 2022-03-11 16:02:40 +01:00
Joas Schilling
db1c2a5375
Merge pull request #31511 from nextcloud/bugfix/noid/allow-installing-unstable-versions 
Allow installing unstable app versions based on channel and with `--allow-unstable` just like on updates
 2022-03-11 14:26:30 +01:00
Joas Schilling
4ac4f4b0a6
Merge pull request #31538 from nextcloud/bug/noid/eventlogger-debug 
Only log events when enabled in debug mode
 2022-03-11 14:20:44 +01:00
Joas Schilling
b2075db3bd
Merge pull request #31539 from nextcloud/bugfix/31532/user-status-not-resetting-after-a-call 
Fix user status not resetting correctly after a call
 2022-03-11 14:20:14 +01:00
Carl Schwan
8d7380a15d Fix psalm issue about userCounts 
Signed-off-by: Carl Schwan <carl@carlschwan.eu>
 2022-03-11 14:17:29 +01:00
John Molakvoæ
3c2aba4f35
Merge pull request #31454 from nextcloud/fix/audit-log-critical 2022-03-11 13:36:42 +01:00
Joas Schilling
bac2508d77
Fix user status not resetting correctly after a call 
Only happens when the user navigated away and came back,
so the heartbeat updates the status to "Online + In a call"
After that resetting away from "Away + In a call" does not match anymore
and the previous status sticks

Signed-off-by: Joas Schilling <coding@schilljs.com>
 2022-03-11 13:03:15 +01:00
Julius Härtl
27f3aa5890
Only log events when enabled in debug mode 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2022-03-11 12:26:07 +01:00