mirrors/nextcloud-server
3
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2025-10-26 19:21:34 +00:00
Code Issues Packages Projects Releases Wiki Activity
60,165 Commits 696 Branches 1,154 Tags 27 GiB
e26d6f080b
Commit Graph

60165 Commits

This Branch
This Branch
All Branches
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
Julius Härtl
3b06b47607
Merge pull request #29382 from nextcloud/techdebt/noid/500-on-OCS-after-internal-error 2021-10-22 15:16:32 +02:00
John Molakvoæ
8b742ab394
Merge pull request #28997 from nextcloud/fix/set-attendee-as-recipient 2021-10-22 12:07:39 +02:00
John Molakvoæ
2be0eda47c
Merge pull request #29220 from nextcloud/s3-external-list 2021-10-22 12:06:05 +02:00
John Molakvoæ
b2c32b7e6c
Merge pull request #27731 from ZitronePlus/master 2021-10-22 12:04:07 +02:00
John Molakvoæ
09bcb766f4
Merge pull request #26989 from fuchsi3010/master 2021-10-22 11:58:14 +02:00
John Molakvoæ
c98039c1df
Merge pull request #26725 from nextcloud/fix-federated-scope-not-shown-when-public-addressbook-upload-is-disabled 2021-10-22 11:52:56 +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
Joas Schilling
c160668b07
Return 500 and the exception message (on debug) on OCS 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2021-10-22 11:26:18 +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
szaimen
686f293eee
Merge pull request #29375 from nextcloud/bugfix/noid/translate-calendar-schedule-response 
Make calendar schedule options translatable
 2021-10-22 10:41:11 +02:00
Daniel
e75d226fba
Merge pull request #29373 from nextcloud/automated/noid/psalm-baseline-update 
[Automated] Update psalm-baseline.xml
 2021-10-22 10:23:25 +02:00
Julius Härtl
b30f499597
Make calendar schedule options translatable 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2021-10-22 09:33:40 +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-command
4a3234500c Update psalm baseline 
Signed-off-by: GitHub <noreply@github.com>
 2021-10-22 04:11:24 +00: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
Pytal
8a511de8cb
Merge pull request #29345 from nextcloud/fix/profile-preview-card 2021-10-21 15:18:07 -07:00
Christopher Ng
06c9a8d9bf Remove unused click handler 
- Handle long lines unbroken by white space
- Cleanup

Signed-off-by: Christopher Ng <chrng8@gmail.com>
Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
 2021-10-21 20:54:06 +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
Christoph Wurst
9a8bb5e9ed
Merge pull request #29343 from nextcloud/dependachristoph/composer/symfony-4.4.30-and-friends 
Bump Symfony family and friends to v4.4.30
 2021-10-21 17:45:15 +02:00
John Molakvoæ
acea728053
Merge pull request #29332 from nextcloud/sendPasswordByMail 2021-10-21 17:41:18 +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
Louis
4b8bf7571a
Merge pull request #29355 from nextcloud/fix/carl/loging-button-arrow 
Fix login button alignment
 2021-10-21 15:14:24 +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
Carl Schwan
6c5152e6ed
Fix login button alignment 
Signed-off-by: Carl Schwan <carl@carlschwan.eu>
 2021-10-21 12:00:58 +02:00
Louis
c5405befcf
Merge pull request #29346 from nextcloud/fix/biography-resize 
Allow resize of Biography/About box
 2021-10-21 10:57:49 +02:00
Louis
23582089f0
Merge pull request #29351 from nextcloud/automated/noid/psalm-baseline-update 
[Automated] Update psalm-baseline.xml
 2021-10-21 10:53:49 +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
Christoph Wurst
88490ea630
Bump Symfony family and friends to v4.4.30 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2021-10-21 10:00:48 +02:00
Joas Schilling
f24e8212c3
Fix unit tests 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2021-10-21 09:27:12 +02:00
tobiasKaminsky
5217cb3df4
Adjust test 
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
 2021-10-21 06:52:31 +02:00
nextcloud-command
bd95a77f25 Update psalm baseline 
Signed-off-by: GitHub <noreply@github.com>
 2021-10-21 04:11:44 +00: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
5f95a0636a
Merge pull request #29342 from nextcloud/fix/noid/upgrade-22.2-to-23 
allow upgrading from 22.2.x
 2021-10-20 19:28:00 +02:00
Christopher Ng
3afe3916cd Allow textarea resize 
Signed-off-by: Christopher Ng <chrng8@gmail.com>
Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
 2021-10-20 17:15:38 +00:00
John Molakvoæ
4dc226ee91
Merge pull request #27196 from nextcloud/fix/ApiControllerTest-testShowHiddenFiles 2021-10-20 18:48:04 +02: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
Arthur Schiwon
ed9199495e
allow upgrading from 22.2.x 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2021-10-20 18:01:43 +02:00
John Molakvoæ
49e727fe6a
Merge pull request #29334 from nextcloud/fix/dav-availability-settings-duplicate-slots 2021-10-20 17:38:23 +02:00
Christoph Wurst
1021c89454
Merge pull request #28314 from nextcloud/sharing-ibootstrap 
move files_sharing to IBootStrap
 2021-10-20 17:32:10 +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
0e951eb9dc
Merge pull request #29269 from nextcloud/feature/28751/provide-contactsmenu-as-ocs-simple 
Add an OCS endpoint for the hovercard contact actions
 2021-10-20 16:25:07 +02:00
Carl Schwan
cf6bac8d6e
Merge pull request #29313 from nextcloud/fix/status-menu-update 
Fix status menu item not listening to status change events
 2021-10-20 16:00:38 +02:00