Commit Graph

56751 Commits

Author SHA1 Message Date
Julius Härtl 14306222df
Merge pull request #24856 from nextcloud/psalm/whitelist-apps 2020-12-28 18:33:28 +01:00
Julius Härtl 2d932b6b86
Add whitelist for apps inside of the server repo
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2020-12-28 11:26:50 +01:00
Roeland Jago Douma 86e6f07162
Merge pull request #24833 from nextcloud/fix-total-upload-size-overwritten-by-next-upload
Fix total upload size overwritten by next upload
2020-12-28 11:18:48 +01:00
Roeland Jago Douma 4ea1f29f9c
Merge pull request #24775 from nextcloud/dependabot/npm_and_yarn/marked-1.2.7
Bump marked from 1.2.6 to 1.2.7
2020-12-28 10:47:55 +01:00
Roeland Jago Douma 7bca3daa8c
Merge pull request #24832 from nextcloud/enh/24813/trash-autoid-bigint
Make oc_files_trash.auto_id a bigint
2020-12-28 10:43:16 +01:00
dependabot-preview[bot] 943d95efbe
Merge pull request #24843 from nextcloud/dependabot/npm_and_yarn/webpack-cli-4.3.0 2020-12-28 09:39:48 +00:00
Christoph Wurst b981cb0718
Merge pull request #19942 from ACTom/add-mindmap-icon
Add mindmap type file icon
2020-12-28 10:13:38 +01:00
ACTom d9db6ae84e
Readd test getOnlyDefaultAliases()
Signed-off-by: ACTom <i@actom.me>
2020-12-28 13:59:10 +08:00
Nextcloud bot a7862479c7
[tx-robot] updated from transifex 2020-12-28 02:19:08 +00:00
Nextcloud bot 3d60c9611f
[tx-robot] updated from transifex 2020-12-27 02:24:43 +00:00
dependabot-preview[bot] 46200ce931
Bump webpack-cli from 4.2.0 to 4.3.0
Bumps [webpack-cli](https://github.com/webpack/webpack-cli) from 4.2.0 to 4.3.0.
- [Release notes](https://github.com/webpack/webpack-cli/releases)
- [Changelog](https://github.com/webpack/webpack-cli/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack/webpack-cli/compare/webpack-cli@4.2.0...webpack-cli@4.3.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-12-26 03:10:42 +00:00
dependabot-preview[bot] 842689cf1a
Merge pull request #24844 from nextcloud/dependabot/npm_and_yarn/webpack-merge-5.7.3 2020-12-26 03:08:07 +00:00
Nextcloud bot cefaeb2eb1
[tx-robot] updated from transifex 2020-12-26 02:19:48 +00:00
dependabot-preview[bot] 537b35e1bb
Bump webpack-merge from 5.7.2 to 5.7.3
Bumps [webpack-merge](https://github.com/survivejs/webpack-merge) from 5.7.2 to 5.7.3.
- [Release notes](https://github.com/survivejs/webpack-merge/releases)
- [Changelog](https://github.com/survivejs/webpack-merge/blob/develop/CHANGELOG.md)
- [Commits](https://github.com/survivejs/webpack-merge/compare/v5.7.2...v5.7.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-12-26 02:17:13 +00:00
Nextcloud bot c15b0b0250
[tx-robot] updated from transifex 2020-12-24 02:20:06 +00:00
Roeland Jago Douma 07f607e148
Merge pull request #24765 from nextcloud/version/21/beta3
21 beta3
2020-12-23 20:08:32 +01:00
Christoph Wurst 4cc85805d6
Merge pull request #24830 from nextcloud/bugfix/noid/readme-mention-autoloader
Add README section for committing back-end code
2020-12-23 20:07:10 +01:00
Roeland Jago Douma be7d582c7e
21 beta3
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2020-12-23 19:40:11 +01:00
Daniel Calviño Sánchez fc2069c1dd Fix total upload size overwritten by next upload
The upload progress is based on the "totalToUpload" variable. However,
as the variable is set when an upload is submitted, if another upload is
submitted before the previous one finished the upload progress only took
into account the size of the new upload (although the upload itself
worked fine; the files of the new submitted upload are added to the
active one). Now "totalToUpload" is either increased or set depending on
whether an upload is active or not.

Note that although "data.total" holds the total size of the files being
uploaded "totalToUpload" needs to be used in "fileuploadprogressall"
instead; "totalToUpload" is calculated when the upload is submitted, but
since 7c4c5fe6ae the actual upload of the files, and thus updating the
value of "data.total", may be deferred until the parent folders were
created.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2020-12-23 18:53:01 +01:00
Vincent Petry bdbec28a8f
Make oc_files_trash.auto_id a bigint
Adjusted migration.
Added to occ command to update existing tables.

Signed-off-by: Vincent Petry <vincent@nextcloud.com>
2020-12-23 17:50:50 +01:00
Christoph Wurst b1783ada27
Merge pull request #24812 from nextcloud/dependencies/zipstreamer-2.0.0
Bump deepdiver/zipstreamer to 2.0.0
2020-12-23 17:41:36 +01:00
Vincent Petry eaa1493123
Add README section for committing back-end code
Signed-off-by: Vincent Petry <vincent@nextcloud.com>
2020-12-23 15:59:38 +01:00
Christoph Wurst 2b93c28e28
Bump deepdiver/zipstreamer to 2.0.0
For PSR-4 compat. The rest is unchanged.

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-12-23 14:45:34 +01:00
Julius Härtl 5b61120491
Merge pull request #24816 from nextcloud/techdept/dead-packages
Drop all dead packages
2020-12-23 14:37:45 +01:00
Roeland Jago Douma 6846a83d56
Merge pull request #24610 from nextcloud/enh/adding-missing-event-on-deleted-shares
adding a ShareDeletedEvent
2020-12-23 12:45:34 +01:00
Julius Härtl d32af39c25
Merge pull request #24824 from nextcloud/enh/catch_heartbeat_error
Catch the error on heartbeat update
2020-12-23 12:18:19 +01:00
Roeland Jago Douma bb411c75c6
Move to single share event. Just emit more if needed
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2020-12-23 11:05:29 +01:00
Maxence Lange e0bafb7475
deleteChildren only returns array
Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
2020-12-23 11:00:47 +01:00
Maxence Lange 874a1a4c43
cs fix
Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
2020-12-23 11:00:47 +01:00
Maxence Lange 85783e45e9
+ShareDeletedEvent
Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
2020-12-23 11:00:45 +01:00
Roeland Jago Douma ea6a9594ca Catch the error on heartbeat update
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
Signed-off-by: npmbuildbot-nextcloud[bot] <npmbuildbot-nextcloud[bot]@users.noreply.github.com>
2020-12-23 09:47:09 +00:00
Christoph Wurst 1e0eaa25d0
Drop all dead packages
Apparently we have plenty of leftover of previous sub-dependencies.
Composer automatically dumps those with any future dependency update, so
I'm dropping them in an atomic step.

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-12-23 09:11:23 +01:00
Nextcloud bot 61791962f2
[tx-robot] updated from transifex 2020-12-23 02:20:11 +00:00
Christoph Wurst 7e9d8a8bd0
Merge pull request #24819 from nextcloud/techdept/update-psalm-baseline
Update the Psalm baseline
2020-12-22 18:31:03 +01:00
Christoph Wurst 3570ca82cf
Update the Psalm baseline
Some issues were resolved, hence every CI run shows this diff.

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-12-22 17:44:16 +01:00
Julius Härtl e28d21a6a4
Merge pull request #24770 from nextcloud/fix-dialog-buttons 2020-12-22 15:49:38 +01:00
Roeland Jago Douma ee57ef4903
Merge pull request #22222 from nextcloud/enh/social-index
re-index contacts with social profiles
2020-12-22 14:42:28 +01:00
Marco Ambrosini 23b61de21e Increase horizontal padding
Signed-off-by: Marco Ambrosini <marcoambrosini@pm.me>
Signed-off-by: npmbuildbot-nextcloud[bot] <npmbuildbot-nextcloud[bot]@users.noreply.github.com>
2020-12-22 12:28:47 +00:00
Roeland Jago Douma adc4f1a811
Merge pull request #22916 from J0WI/unifiy-links-to-php.net
Unify links to php.net
2020-12-22 09:53:31 +01:00
call-me-matt 22cf5447cf
re-index contacts with social profiles
Signed-off-by: call-me-matt <nextcloud@matthiasheinisch.de>
2020-12-22 09:48:40 +01:00
Roeland Jago Douma 72fda10333
Merge pull request #22085 from nextcloud/enh/index-socialprofile
adding social profile to search index
2020-12-22 09:43:12 +01:00
Julius Härtl 5094e29ebd
Merge pull request #24594 from kofemann/dcache 2020-12-22 09:26:07 +01:00
John Molakvoæ a5c55891f5
Merge pull request #24604 from nextcloud/feat/dav/move-calendar-rename
Allow to force rename a conflicting calendar
2020-12-22 08:33:10 +01:00
Nextcloud bot 8e9af2bb56
[tx-robot] updated from transifex 2020-12-22 02:19:06 +00:00
Tigran Mkrtchyan 4f2dc18f58 storage: update IStorage#file_put_contents docs to match usage
The current phpdoc of IStorage#file_put_contents doesnt corresponds to
it's actual usage in code, e.g.

Signed-off-by: Tigran Mkrtchyan <tigran.mkrtchyan@desy.de>
2020-12-21 19:04:18 +01:00
Christoph Wurst b37397d4fc
Merge pull request #24732 from nextcloud/tcitworld-patch-1
Add another of my emails to mailmap
2020-12-21 16:58:11 +01:00
Thomas Citharel 98b89e3ea6
Add another of my emails to mailmap
Because apparently I edited directly from Github and selected default email

Signed-off-by: Thomas Citharel <nextcloud@tcit.fr>
2020-12-21 15:53:49 +01:00
Roeland Jago Douma 5579b1d252
Merge pull request #24796 from nextcloud/fix/set_ttl_on_set_redis
Actually set the TTL on redis set
2020-12-21 14:49:03 +01:00
Roeland Jago Douma 4f0fae8f00
Actually set the TTL on redis set
Else well the keys remain for ever and ever.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2020-12-21 13:33:16 +01:00
dependabot-preview[bot] 4621dc5d3c
Bump marked from 1.2.6 to 1.2.7
Bumps [marked](https://github.com/markedjs/marked) from 1.2.6 to 1.2.7.
- [Release notes](https://github.com/markedjs/marked/releases)
- [Changelog](https://github.com/markedjs/marked/blob/master/release.config.js)
- [Commits](https://github.com/markedjs/marked/compare/v1.2.6...v1.2.7)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Signed-off-by: npmbuildbot-nextcloud[bot] <npmbuildbot-nextcloud[bot]@users.noreply.github.com>
2020-12-21 10:02:57 +01:00