forked from nextcloud/server
-
Notifications
You must be signed in to change notification settings - Fork 0
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[pull] master from nextcloud:master #1610
Open
pull
wants to merge
1,900
commits into
saurasambit:master
Choose a base branch
from
nextcloud:master
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
+121,355
−109,124
Conversation
This file contains 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
fix: improve wording of occ:upgrade command when no upgrade is required
Signed-off-by: provokateurin <[email protected]>
Signed-off-by: Nextcloud bot <[email protected]>
Signed-off-by: Nextcloud bot <[email protected]>
Bumps [pinia](https://github.com/vuejs/pinia) from 2.2.8 to 2.3.0. - [Release notes](https://github.com/vuejs/pinia/releases) - [Commits](vuejs/pinia@v2.2.8...v2.3.0) --- updated-dependencies: - dependency-name: pinia dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]>
Signed-off-by: nextcloud-command <[email protected]>
Signed-off-by: Nextcloud bot <[email protected]>
Signed-off-by: provokateurin <[email protected]>
…2.2.6 Signed-off-by: Richard Steinmetz <[email protected]>
Signed-off-by: Richard Steinmetz <[email protected]>
Signed-off-by: SebastianKrupinski <[email protected]>
…ad of purging it When doing a PROPFIND on default-calendar-url, if the current default calendar (fallbacking on personal uri) is in the trashbin, it's being purged so that it's recreated. This leads to loss of data. We can simply rename the calendar URI and add a unique suffix so that it doesn't conflict with the new calendar being created. Shares are fine because they reference the resourceid and not the calendar URI. Signed-off-by: Thomas Citharel <[email protected]>
By default, the MP3 audio files get the mimetype `audio/mpeg` and the M3U and M3U8 playlist files get the mimetype `audio/mpegurl`. PreviewManager had such a problem that it registered the MP3 preview provider with a regular expression which matched also the M3U files. This caused an error message to be logged on the info (1) level for each M3U file every time a folder with such files was viewed: "Error while getting cover from mp3 file: File /path/to/some/playlist.m3u is not mpeg/audio!". Signed-off-by: Pauli Järvinen <[email protected]>
…r to allow openapi-extractor to detect it as OCS Signed-off-by: provokateurin <[email protected]>
Signed-off-by: provokateurin <[email protected]>
Signed-off-by: provokateurin <[email protected]>
Signed-off-by: Robin Appelman <[email protected]>
fix: improve checks for moving shares/storages into other mounts
…o when possible Signed-off-by: Robin Appelman <[email protected]>
Signed-off-by: Nextcloud bot <[email protected]>
fix(HTTP): Adjust JSONResponse data type
fix: change translation logic to handle plurals better
… account creation Signed-off-by: Jan C. Borchardt <[email protected]>
fix: block moving files to it's own parent with dav
Signed-off-by: Côme Chilliet <[email protected]>
Signed-off-by: Côme Chilliet <[email protected]>
Signed-off-by: Côme Chilliet <[email protected]>
…ssion Signed-off-by: Maksim Sukharev <[email protected]>
Prevent a regression of #48403 Signed-off-by: Ferdinand Thiessen <[email protected]>
test(dashboard): Add regression test for loading unneeded data
docs: Use proper return type for custom template listing
perf: use more optimized way to get user storage info in ocs user info
Limit ldap user count
fix: skip transfering shares that we can't find
Signed-off-by: skjnldsv <[email protected]>
Signed-off-by: skjnldsv <[email protected]>
test(e2e): copy-move actions with insufficient share permissions
…shares fix(sharing): send share emails for internal users too
Signed-off-by: skjnldsv <[email protected]>
fix(files): conversion api simplification and conflict check
In the account management settings (default settings) the quota was parsed not consistently with how we do it everywhere else. Meaning `1 KB` should be 1024 bytes not 1000 bytes. Also this fixes an issue where searching "1KB" does not yield any output because of the space in the parsed value "1 KB". Signed-off-by: Ferdinand Thiessen <[email protected]>
Signed-off-by: Ferdinand Thiessen <[email protected]>
Signed-off-by: Elizabeth Danzberger <[email protected]>
Signed-off-by: Elizabeth Danzberger <[email protected]>
fix(settings): Correctly parse and display default quota
…ling Improve ldap avatar handling
- Add default value to non-required Vue props - Reformat function to async function if needed - Add some documentation - Allow `any` in places where it makes sense (tests) - Order vue component sections as required Signed-off-by: Ferdinand Thiessen <[email protected]>
Signed-off-by: Ferdinand Thiessen <[email protected]>
chore: Resolve ESLint warnings
Signed-off-by: Nextcloud bot <[email protected]>
Signed-off-by: Julius Knorr <[email protected]>
fix: Log exceptions that happen during file conversion
Signed-off-by: Nextcloud bot <[email protected]>
Bumps [eslint-plugin-cypress](https://github.com/cypress-io/eslint-plugin-cypress) from 3.5.0 to 3.6.0. - [Release notes](https://github.com/cypress-io/eslint-plugin-cypress/releases) - [Commits](cypress-io/eslint-plugin-cypress@v3.5.0...v3.6.0) --- updated-dependencies: - dependency-name: eslint-plugin-cypress dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]>
…nt-plugin-cypress-3.6.0
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.
See Commits and Changes for more details.
Created by pull[bot]
Can you help keep this open source service alive? 💖 Please sponsor : )