Commit graph

19669 commits

Author SHA1 Message Date
Arthur Schiwon
e26d6f080b
fix populating account array with missing default values
- both $userData and $defaultUserData have numeric indices
- each element contains at least the name and other fields
- appending the missing data array is sufficient

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2021-10-22 23:05:43 +02:00
Julius Härtl
6b099ecfe5
Merge pull request #25392 from nextcloud/imountpoint-ocp-storage 2021-10-22 20:14:22 +02:00
John Molakvoæ
2be0eda47c
Merge pull request #29220 from nextcloud/s3-external-list 2021-10-22 12:06:05 +02:00
John Molakvoæ
e673ec0b87
Merge branch 'master' into imountpoint-ocp-storage 2021-10-22 11:47:37 +02:00
John Molakvoæ
0a35937662
Merge pull request #26347 from J0WI/clean-path-regex 2021-10-22 11:42:30 +02:00
John Molakvoæ
aef40c7cf4
Merge pull request #27876 from nextcloud/bugfix/noid/use-cached-user-backend-info-for-password-login 2021-10-22 11:37:43 +02:00
John Molakvoæ
7e3b6e7088
Merge pull request #29344 from nextcloud/dependabot/composer/doctrine/dbal-3.1.3 2021-10-22 11:35:02 +02:00
John Molakvoæ
867579ced2
Merge pull request #29304 from JanBartels/master 2021-10-22 11:33:03 +02:00
John Molakvoæ
a9fe0fc527
Merge pull request #29357 from nextcloud/fix/concurrent-duplicate-auth-token-updates 2021-10-22 10:58:52 +02:00
Christoph Wurst
7dd7256cfe
Prevent duplicate auth token activity updates
The auth token activity logic works as follows
* Read auth token
* Compare last activity time stamp to current time
* Update auth token activity if it's older than x seconds

This works fine in isolation but with concurrency that means that
occasionally the same token is read simultaneously by two processes and
both of these processes will trigger an update of the same row.
Affectively the second update doesn't add much value. It might set the
time stamp to the exact same time stamp or one a few seconds later. But
the last activity is no precise science, we don't need this accuracy.

This patch changes the UPDATE query to include the expected value in a
comparison with the current data. This results in an affected row when
the data in the DB still has an old time stamp, but won't affect a row
if the time stamp is (nearly) up to date.

This is a micro optimization and will possibly not show any significant
performance improvement. Yet in setups with a DB cluster it means that
the write node has to send fewer changes to the read nodes due to the
lower number of actual changes.

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2021-10-22 09:32:22 +02:00
Christoph Wurst
130ab63ca1
Bump doctrine/dbal from 3.0.0 to 3.1.3
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2021-10-22 09:03:45 +02:00
Nextcloud bot
fb18f29148
[tx-robot] updated from transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2021-10-22 02:21:58 +00:00
Carl Schwan
5d9474d324
Merge pull request #29362 from nextcloud/fix/groupfolder-copy-acl
Fix security issues when copying groupfolder with advanced ACL
2021-10-21 18:12:34 +02:00
Carl Schwan
9408f8ae69
Fix security issues when copying groupfolder with advanced ACL
Using advanced ACL, it is possible that an user has access to a
directory but not to a subdirectory, so the copying use
Common::copyFromStorage instead of Local::copyFromStorage.

Fix https://github.com/nextcloud/groupfolders/issues/1692

Signed-off-by: Carl Schwan <carl@carlschwan.eu>
2021-10-21 17:11:52 +02:00
John Molakvoæ
bdf44c7920
Merge pull request #23171 from nextcloud/enh/preview/move_to_bootstrap 2021-10-21 17:07:14 +02:00
Julien Veyssier
0bef570fe9
Merge pull request #29256 from nextcloud/fix/noid/harmonize-appstoreenabled-check
Fix appstoreenabled check
2021-10-21 12:42:14 +02:00
Roeland Jago Douma
8bc25e3324
Move preview provider registration to bootstrap
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2021-10-21 10:35:18 +02:00
Nextcloud bot
732a057167
[tx-robot] updated from transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2021-10-21 02:24:14 +00:00
blizzz
07863f3de3
Merge pull request #29330 from nextcloud/fix/missing-profile-config-defaults
Populate missing profile config defaults
2021-10-20 18:26:25 +02:00
Christoph Wurst
b98f3f31de
Merge pull request #29320 from nextcloud/bugfix/28261/fix-basic-auth-for-oauth-token-endpoint
Fix basic auth for OAuth token endpoint
2021-10-20 17:31:43 +02:00
Joas Schilling
7f1dc52a66
Change origin field to appId
Signed-off-by: Joas Schilling <coding@schilljs.com>
2021-10-20 14:47:28 +02:00
John Molakvoæ
5e23800a95
Do not remove current user on findOne
Signed-off-by: John Molakvoæ <skjnldsv@protonmail.com>
2021-10-20 11:53:45 +02:00
John Molakvoæ
873e8e219c
Add appName to contactsmenu action API
Signed-off-by: John Molakvoæ <skjnldsv@protonmail.com>
2021-10-20 11:53:45 +02:00
Joas Schilling
3ce3c0f117
Add an OCS endpoint for the hovercard contact actions
Signed-off-by: Joas Schilling <coding@schilljs.com>
2021-10-20 10:22:40 +02:00
Nextcloud bot
981d839806
[tx-robot] updated from transifex
Signed-off-by: Nextcloud bot <bot@nextcloud.com>
2021-10-20 02:23:10 +00:00
Christopher Ng
bff02f5e51 Populate defaults into exising profile config
Signed-off-by: Christopher Ng <chrng8@gmail.com>
2021-10-20 01:07:38 +00:00
Christopher Ng
f5bdf02695 Cleanup
Signed-off-by: Christopher Ng <chrng8@gmail.com>
2021-10-20 00:17:22 +00:00
Robin Appelman
5155f2b0c5
Merge pull request #28541 from nextcloud/path-prefix-index2
add a prefix index to filecache.path, attempt 2
2021-10-19 14:41:23 +00:00
Joas Schilling
03936d7762
Fix basic auth for OAuth token endpoint
Don't try to login when a client is trying to get a OAuth token.
OAuth needs to support basic auth too, so the login is not valid
inside Nextcloud and the Login exception would ruin it.

Signed-off-by: Joas Schilling <coding@schilljs.com>
2021-10-19 13:03:23 +02:00
Pytal
f7b3d521f8
Merge pull request #28751 from nextcloud/feat/28139/profile-page 2021-10-18 23:03:58 -07:00
Christopher Ng
309354852f Profile backend
Signed-off-by: Christopher Ng <chrng8@gmail.com>
2021-10-19 04:59:35 +00:00
Christopher Ng
7215148a24 Add new account properties
- New properties
  - Organisation
  - Role
  - Headline
  - Biography
  - Profile Enabled property
- Fix errors with building default account properties
- Fix L10N factory method `getLanguage` not public error
- Update tests

Signed-off-by: Christopher Ng <chrng8@gmail.com>
2021-10-19 04:44:40 +00:00
Carl Schwan
4eb421ee40
Merge pull request #28403 from nextcloud/work/status
Add an API to set and rollback the user status
2021-10-18 21:52:28 +02:00
JanBartels
9068fd4a21 Patch for master-branch 2021-10-18 21:41:01 +02:00
Joas Schilling
285bc55d2c
Merge pull request #29259 from nextcloud/bugfix/29257/fix-app-upgrade
Fix app upgrade
2021-10-18 21:20:05 +02:00
Carl Schwan
2cb48f484b
Add an API to set and rollback the user status
Signed-off-by: Carl Schwan <carl@carlschwan.eu>
2021-10-18 20:31:37 +02:00
Julien Veyssier
facb50ebcc
fix appstoreenabled check in Fetcher so it's coherent with AppSettingsController
Signed-off-by: Julien Veyssier <eneiluj@posteo.net>
2021-10-18 12:39:43 +02:00
John Molakvoæ
a1c8b6e9eb
Merge pull request #28768 from nextcloud/check-file-exists 2021-10-18 09:54:22 +02:00
Vincent Petry
822623109f
Merge pull request #29243 from nextcloud/bugfix/noid/ipropagator-sizedifference
Add already used optional sizeDifference parameter to IPropagator
2021-10-18 08:34:44 +02:00
Carl Schwan
ff67ada049
Merge pull request #29210 from nextcloud/work/status-navbar-vue
Add current status in navbar
2021-10-15 20:59:08 +02:00
Carl Schwan
134167ef3f
Add current status in navbar
This ports the code to vue and if the user_status app is disabled this
goes back to the previous behavior.

The Avatar vue components detects changes of the status automatically.

Signed-off-by: Carl Schwan <carl@carlschwan.eu>
Signed-off-by: Joas Schilling <coding@schilljs.com>
2021-10-15 20:57:58 +02:00
Robin Appelman
55346b5d6c
more reliable return value for Watcher::checkUpdate
Signed-off-by: Robin Appelman <robin@icewind.nl>
2021-10-15 16:03:18 +02:00
Robin Appelman
09ffac5e6d
s3 external storage listing rework
Signed-off-by: Robin Appelman <robin@icewind.nl>
2021-10-15 15:35:02 +02:00
Joas Schilling
59cf2b1789
Fix app upgrade
Signed-off-by: Joas Schilling <coding@schilljs.com>
2021-10-15 14:16:46 +02:00
Daniel
5645b2a18a
Merge pull request #29188 from nextcloud/enhancement/public-write-api
Add calendar object creation API to OCP
2021-10-15 11:33:37 +02:00
John Molakvoæ
f7a4ff4d63
Merge pull request #27217 from nextcloud/techdebt/noid/make-debugging-a-cron-job-easier 2021-10-15 11:09:23 +02:00
John Molakvoæ
b6a3ba136c
Merge pull request #29235 from nextcloud/feat/appstore/enterprise 2021-10-15 11:06:32 +02:00
Anna Larch
0401d6dc0f
Add create method to extended calendar implementation
Signed-off-by: Anna Larch <anna@nextcloud.com>
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2021-10-15 09:35:29 +02:00
Christoph Wurst
67baaaaff9
Merge pull request #29231 from nextcloud/fix/calendar-providers-instances
Build instances of the calendar providers before using them
2021-10-14 19:29:34 +02:00
Julius Härtl
39c4a83f9f
Add already used optional sizeDifference parameter to IPropagator
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2021-10-14 17:11:34 +02:00