upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-07-16 05:13:10 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 55
57962 commits 1018 branches 1229 tags 8.1 GiB
Commit graph

57962 commits

This branch
This branch
All branches
Author SHA1 Message Date
Joas Schilling
8d3fdf24c8
Merge pull request #26353 from nextcloud/techdebt/noid/make-testcase-class-compatible-with-phpunit-9.5 
Make Testcase class compatible with phpunit-9.5
 2021-03-29 10:47:37 +02:00
Julius Härtl
6bef9e71da
Merge pull request #26337 from nextcloud/dependabot/npm_and_yarn/url-search-params-polyfill-8.1.1 
Bump url-search-params-polyfill from 8.1.0 to 8.1.1
 2021-03-29 10:33:38 +02:00
Joas Schilling
cd35a5c71d
Make Testcase class compatible with phpunit-9.5 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2021-03-29 09:43:08 +02:00
dependabot-preview[bot]
e2216d44fd Bump url-search-params-polyfill from 8.1.0 to 8.1.1 
Bumps [url-search-params-polyfill](https://github.com/jerrybendy/url-search-params-polyfill) from 8.1.0 to 8.1.1.
- [Release notes](https://github.com/jerrybendy/url-search-params-polyfill/releases)
- [Commits](https://github.com/jerrybendy/url-search-params-polyfill/compare/v8.1.0...v8.1.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Signed-off-by: npmbuildbot-nextcloud[bot] <npmbuildbot-nextcloud[bot]@users.noreply.github.com>
 2021-03-29 07:41:21 +00:00
Joas Schilling
602de272c0
Merge pull request #26243 from nextcloud/enh/noid/avatar-privacy-new-scope 
Avatar privacy and new scope
 2021-03-29 09:01:12 +02:00
Nextcloud bot
4564121c56
[tx-robot] updated from transifex 2021-03-29 02:23:55 +00:00
Roeland Jago Douma
1175c0d832
Merge pull request #26348 from nextcloud-pr-bot/automated/noid/psalm-baseline-update 
[Automated] Update psalm-baseline.xml
 2021-03-28 08:45:22 +02:00
Nextcloud-PR-Bot
3b5cb333e4 Update psalm baseline 
Signed-off-by: GitHub <noreply@github.com>
 2021-03-28 04:12:03 +00:00
Nextcloud bot
be83a32411
[tx-robot] updated from transifex 2021-03-28 02:24:04 +00:00
Morris Jobke
83c7b54ba6
Merge pull request #26327 from nextcloud/fix-get-return 
fix return value of Root::get
 2021-03-27 22:26:32 +01:00
Nextcloud bot
aec9c8437a
[tx-robot] updated from transifex 2021-03-27 02:24:25 +00:00
Robin Appelman
c8736e7a23
fix return value of Root::get 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2021-03-26 21:29:24 +01:00
Vincent Petry
00d83a5db0
Capability for federated scope 
Added additional capability in the provisioning API to signal whether
the federation scope values can be used.

This is based on whether the lookup server upload is enabled or not.

Signed-off-by: Vincent Petry <vincent@nextcloud.com>
 2021-03-26 16:54:47 +01:00
Vincent Petry
5a8b7c1cb2
Update autoloader for PlaceholderAvatar 
Signed-off-by: Vincent Petry <vincent@nextcloud.com>
 2021-03-26 13:07:10 +01:00
Vincent Petry
98e4ac39bc
Int tests for provisioning API scopes 
Added integration tests for the scope attributes in the provisioning
API.

Signed-off-by: Vincent Petry <vincent@nextcloud.com>
 2021-03-26 13:07:10 +01:00
Vincent Petry
cc54f718f5
Add known user check in avatar when v2-private scope 
Signed-off-by: Vincent Petry <vincent@nextcloud.com>
 2021-03-26 13:07:10 +01:00
Vincent Petry
5b7a94f84c
Update psalm-baseline for Avatar API quirks 
Signed-off-by: Vincent Petry <vincent@nextcloud.com>
 2021-03-26 13:07:10 +01:00
Vincent Petry
aac7b52c66
Change account property capability 
Include version number in capability

Signed-off-by: Vincent Petry <vincent@nextcloud.com>

Co-authored-by: Joas Schilling <213943+nickvergessen@users.noreply.github.com>
 2021-03-26 13:07:10 +01:00
Vincent Petry
bb008be28a
Added PlaceholderAvatar with own cached images 
When avatar scope is private, the PlaceholderAvatar is used to deliver a
placeholder avatar based on the user's initials.

This was implemented as a separate class for now to avoid messing with
the existing UserAvatar implementation and its generated vs
non-generated logic.

Signed-off-by: Vincent Petry <vincent@nextcloud.com>
 2021-03-26 13:07:09 +01:00
Vincent Petry
b66af8a432
Add capability for editable scopes in provisioning API 
Signed-off-by: Vincent Petry <vincent@nextcloud.com>
 2021-03-26 13:07:09 +01:00
Vincent Petry
b73df5846c
Add property scope tests for AccountManager 
Signed-off-by: Vincent Petry <vincent@nextcloud.com>
 2021-03-26 13:07:09 +01:00
Vincent Petry
cb9d25c162
Enhance UsersControllerTest of provisioning API with scopes 
Signed-off-by: Vincent Petry <vincent@nextcloud.com>
 2021-03-26 13:07:09 +01:00
Vincent Petry
2a312fe4e3
Expose avatarScope through provisioning API 
Signed-off-by: Vincent Petry <vincent@nextcloud.com>
 2021-03-26 13:07:09 +01:00
Vincent Petry
266a6fb5f8
OCS allow reading and writing account property scopes 
Extends the provisioning API to allow a user to get and set their own
account property scopes.

Signed-off-by: Vincent Petry <vincent@nextcloud.com>
 2021-03-26 13:07:08 +01:00
Vincent Petry
5d14fd4396
Make extra user profile fields always editable 
The fields for phone number, address, website and twitter are now
editable regardless whether federated sharing and the lookup server
are enabled or not.

Signed-off-by: Vincent Petry <vincent@nextcloud.com>
 2021-03-26 13:07:08 +01:00
Vincent Petry
278a73789e
Map old account scope properties to new names 
Use new scope values in settings page.
Adjust all consumers to use the new constants.
Map old scope values to new ones in account property getter.

Signed-off-by: Vincent Petry <vincent@nextcloud.com>
 2021-03-26 13:07:08 +01:00
Vincent Petry
9fb447ea42
Adjust scopes menu based on conditions 
Now not all fields have the "v2-private" option in place.
Fix dropdown issue when a scope was stored that is not listed after
disabling the lookup server.
Whenever the lookup server upload is disabled, the scope menu is now
displayed where it makes sense to allow switching between the two private
scopes.

Signed-off-by: Vincent Petry <vincent@nextcloud.com>
 2021-03-26 13:07:08 +01:00
Vincent Petry
b81a1c1bdb
Add new v2-private account scope 
Added new v2-private account manager scope that restricts the scope
further by excluding public link access.

Avatars with v2-private account scope are now showing the guest avatar
instead of the real avatar.

Signed-off-by: Vincent Petry <vincent@nextcloud.com>
 2021-03-26 13:07:05 +01:00
Roeland Jago Douma
a75f0e62fa
Merge pull request #26308 from nextcloud/enhancement/timed-job-interval-description 
Document that the TimedJob interval is in seconds
 2021-03-26 10:45:50 +01:00
Roeland Jago Douma
9fd29173cf
Merge pull request #26281 from hosting-de/fix/email 
Change my email address
 2021-03-26 09:59:35 +01:00
Christoph Wurst
389623a910
Document that the TimedJob interval is in seconds 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2021-03-26 09:13:05 +01:00
John Molakvoæ
fbbcf26099
Merge pull request #22201 from cweiske/20492-move-contacts-with-birthday 
Delete old birthday calendar object when moving contact to another ad…
 2021-03-26 07:59:16 +01:00
Christian Weiske
8ee995f214
Delete old birthday calendar object when moving contact to another address book 
When an contact is moved to another address book, the contact is copied to
the second address book.
During copying, the birthday event is created - but it gets the same UID
as the contact's birthday event in the first address book.

To prevent the "Calendar object with uid already exists" error that followed,
we need to delete the old entry before the new one is created.

Resolves: https://github.com/nextcloud/server/issues/20492
Signed-off-by: Christian Weiske <cweiske@cweiske.de>
 2021-03-26 07:31:16 +01:00
Morris Jobke
09718c20aa
Merge pull request #26304 from nextcloud-pr-bot/automated/noid/psalm-baseline-update 
[Automated] Update psalm-baseline.xml
 2021-03-26 07:08:10 +01:00
Nextcloud-PR-Bot
3319ed8aca Update psalm baseline 
Signed-off-by: GitHub <noreply@github.com>
 2021-03-26 04:16:04 +00:00
Nextcloud bot
630eddf41b
[tx-robot] updated from transifex 2021-03-26 02:25:32 +00:00
Morris Jobke
c25daf5df7
Merge pull request #26299 from nextcloud/enh/noid/log-storage-unavailable 
Log when a storage is marked as unavailable
 2021-03-25 17:08:13 +01:00
Morris Jobke
81fef4ddee
Log when a storage is marked as unavailable 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2021-03-25 16:19:08 +01:00
Roeland Jago Douma
570c25c861
Merge pull request #26287 from nextcloud/Valdnet-patch-6 
Fix l10n
 2021-03-25 13:14:15 +01:00
Roeland Jago Douma
f97491eb8f
Merge pull request #26285 from nextcloud/techdebt/noid/cleanup-update-events 
Remove event listener to udpate events that are not present anymore
 2021-03-25 11:12:34 +01:00
Valdnet
107bbebb6c
Fix l10n 
Issue: #26286
 2021-03-25 10:26:50 +01:00
Christoph Wurst
fab7c84b92
Merge pull request #26283 from nextcloud/revert-25721-do-not-target-vue-buttons 
Revert "Do not target vue buttons with server rules"
 2021-03-25 09:16:34 +01:00
Morris Jobke
ad16b19ec7
Merge pull request #21484 from nextcloud/better-forbidden-path-errors 
show better error messages when a file with a forbidden path is encountered
 2021-03-25 09:15:52 +01:00
Morris Jobke
3388758d04
Remove event listener to udpate events that are not present anymore 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2021-03-25 09:01:09 +01:00
Roeland Jago Douma
c15172bc4e
Merge pull request #21641 from nextcloud/techdebt/noid/bye-bye-database-xml 
Bye bye database xml
 2021-03-25 08:58:07 +01:00
Nextcloud bot
9af8c0b380
[tx-robot] updated from transifex 2021-03-25 02:25:39 +00:00
Morris Jobke
ab48d5e8cb
Cleanup unneeded code around database.xml 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2021-03-24 22:15:44 +01:00
Morris Jobke
2a749882e7
Merge pull request #26282 from nextcloud/psalm/avatar/data 
improve type handling of Avatar::generateAvatarFromSvg
 2021-03-24 21:46:21 +01:00
Joas Schilling
bb0c50717c
Bye bye database.xml 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2021-03-24 20:04:12 +01:00
Greta
6078eab30b Revert "Do not target vue buttons with server rules" 
Signed-off-by: GretaD <gretadoci@gmail.com>
 2021-03-24 20:03:57 +01:00