upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-12 10:10:49 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 20
55112 commits 1040 branches 1221 tags 8.4 GiB
Commit graph

18244 commits

Author SHA1 Message Date
Morris Jobke
34d2ae25f7
Merge pull request #22643 from nextcloud/bugfix/noid/fix-installing-on-oracle 
Fix installing on Oracle
 2020-09-07 20:55:50 +02:00
Morris Jobke
6f4ea73e0c
Merge pull request #22644 from nextcloud/fix/license-headers-20-2 
Update license headers for Nextcloud 20 (again)
 2020-09-07 20:34:36 +02:00
Roeland Jago Douma
99ee00be8c
Merge pull request #22548 from nextcloud/bugfix/noid/improved_status_cleanup 
Improved status cleanup
 2020-09-07 15:19:42 +02:00
Christoph Wurst
1f7f93a695
Update license headers for Nextcloud 20 (again) 
There are still lots of outdated headers, so time for another round of
updates.

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2020-09-07 14:37:44 +02:00
Joas Schilling
50230847ce
Warn about adding NotNull columns with nullable default 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2020-09-07 13:14:49 +02:00
blizzz
3eb748fc39
Merge pull request #22589 from nextcloud/bugfix/noid/allow-additional-personal-settings-via-normal-registration 
Allow additional personal settings via normal registration
 2020-09-07 11:34:06 +02:00
Georg Ehrke
d7ccc616e4
Always use IUserStatus consts 
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
 2020-09-07 11:30:18 +02:00
Nextcloud bot
da8cff9061
[tx-robot] updated from transifex 2020-09-07 02:16:39 +00:00
Nextcloud bot
27fbab131c
[tx-robot] updated from transifex 2020-09-06 02:16:52 +00:00
Roeland Jago Douma
c538b1e4c6
Merge pull request #22597 from nextcloud/techdebt/noid/allow-to-di-the-settings-manager 
Add missing alias for OCP\Settings\IManager and deprecate the old one
 2020-09-04 20:22:52 +02:00
John Molakvoæ
593d64d935
Merge pull request #17456 from brad2014/feature/brad2014/12391-improve-imip-mail-message-take-2 2020-09-04 19:53:02 +02:00
Joas Schilling
770d12d191
Add missing alias for OCP\Settings\IManager and deprecate the old one 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2020-09-04 16:39:01 +02:00
Joas Schilling
cb146c8486
Allow additional personal settings via normal registration 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2020-09-04 15:21:48 +02:00
Joas Schilling
e690f0e7e3
Merge pull request #22550 from nextcloud/bugfix/13556/use-correct-root-when-compiling-scss 
Use the correct root to determinate the webroot for the resource
 2020-09-04 08:58:07 +02:00
Nextcloud bot
84fe4447a7
[tx-robot] updated from transifex 2020-09-04 02:17:18 +00:00
Roeland Jago Douma
0452877a67
Fix app password updating out of bounds 
When your password changes out of bounds your Nextcloud tokens will
become invalid. There is no real way around that. However we should make
sure that if you successfully log in again your passwords are all
updates

* Added event listener to the PostLoggedInEvent so that we can act on it
  - Only if it is not a token login
* Make sure that we actually reset the invalid state when we update a
  token. Else it keeps being marked invalid and thus not used.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2020-09-03 21:13:36 +02:00
Brad Rubenstein
442af8c5d5 Minor cleanup: php-cs-fixer, tests, interface consistency 
IMipPlugin.php Removed blank lines to make php-cs-fixer happy.
Minor cleanup:  bugs found by Psalm static checker
IEMailTemplate: The public interface to addBodyListItem also needs to include the new plainIndent parameter.
IMipPlugin: Fixes an undefined variable for events that do not have DTEND.  Also use explicit string conversion for parameters and properties in several places.

The new email template adds an additional blank line before "button" links in plain text, so the tests were fixed to include that additional blank line.

Signed-off-by: Brad Rubenstein <brad@wbr.tech>
 2020-09-02 17:54:36 +02:00
Joas Schilling
87aa9b187e
Use the correct root to determinate the webroot for the resource 
Since all the compiled routes are based on the server webroot,
we have to use this, independent from which app this belongs to.

Signed-off-by: Joas Schilling <coding@schilljs.com>
 2020-09-02 17:13:24 +02:00
Roeland Jago Douma
6bda2c26c7
Merge pull request #22423 from nextcloud/bugfix/noid/direct-editing-encryption 
Do not expose direct editing if no master key is available
 2020-09-01 20:32:21 +02:00
Roeland Jago Douma
ab6bd79c02
Only disable zip64 if the size is known 
Else we might run into the issue that for an external storage where the
size is not known yet we do not use zip64. Which then of course fails on
large zip files.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2020-09-01 15:01:12 +02:00
Julius Härtl
e0ae37745a
Do not expose direct editing if no master key is available 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2020-09-01 11:40:27 +02:00
Roeland Jago Douma
d0a7f833cc
Merge pull request #22116 from nextcloud/bugfix/noid/transfer-ownership-share-root 
Fix share transfer of single files and on the transfered node
 2020-09-01 08:50:22 +02:00
Roeland Jago Douma
e0d767d3e1
Merge pull request #16632 from nextcloud/bugfix/external-reshare 
Set proper root path for single file shares originating from other storages
 2020-09-01 08:48:31 +02:00
Roeland Jago Douma
8dd249937f
Merge pull request #22514 from nextcloud/fix/s3/only_delete_new_failed 
Fix S3 error handling
 2020-08-31 19:03:24 +02:00
Robin Appelman
81c5aa9819
set the mount id before calling storage wrapper 
this allows the storage wrapper to use the mount id for it's own logic

Signed-off-by: Robin Appelman <robin@icewind.nl>
 2020-08-31 16:38:47 +02:00
blizzz
849c13f202
Merge pull request #22472 from nextcloud/fix/contacts-interaction-blob-postgres 
Fix writing BLOBs to postgres with recent contacts interaction
 2020-08-31 15:07:22 +02:00
Julius Härtl
ac2999a26a
Transfer shares of the transferred root node 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2020-08-31 14:23:34 +02:00
Roeland Jago Douma
789b33aba4
Only update the filecache entry once the file has been written to S3 
If we already update before we have no way to revert if the upload
fails.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2020-08-31 12:28:04 +02:00
Roeland Jago Douma
6ffd7173f9
Don't lose filecache entry on s3 overwrite error 
If the object store errors we should not always delete the filecache
entry. As this might lead to people losing access to their files.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2020-08-31 12:25:20 +02:00
Roeland Jago Douma
c43189beae
Merge pull request #22476 from nextcloud/setting-sections-unique 
ignore duplicate setting sections
 2020-08-30 21:15:50 +02:00
Robin Appelman
eb4154cee0
ignore duplicate setting sections 
this prevents some 'Section with the same ID already registered' errors in the log

also includes an improvement of the error message to make other cases easier to find

Signed-off-by: Robin Appelman <robin@icewind.nl>
 2020-08-28 17:06:48 +02:00
Roeland Jago Douma
7b8364e001
Merge pull request #21288 from lmamane/master 
Return correct loginname in credentials
 2020-08-28 16:11:46 +02:00
Christoph Wurst
3bc54bfd06
Fix writing BLOBs to postgres with recent contacts interaction 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2020-08-28 14:30:33 +02:00
Robin Appelman
2879472f81
trim slashes 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2020-08-28 11:14:50 +02:00
Julius Härtl
7512dc2b34
Set proper root path for single file shares originating from other storages 
Co-authored-by: Christoph Wurst <christoph@winzerhof-wurst.at>
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2020-08-28 10:50:15 +02:00
Nextcloud bot
40e2339151
[tx-robot] updated from transifex 2020-08-28 02:16:21 +00:00
Nextcloud bot
f6ad09ad58
[tx-robot] updated from transifex 2020-08-27 02:16:40 +00:00
Roeland Jago Douma
b5e9f7e846
Merge pull request #22432 from nextcloud/enh/phpdoc 
Add php docs build script
 2020-08-26 21:18:11 +02:00
Roeland Jago Douma
7685d1fc61
Merge pull request #22421 from nextcloud/group-folder-quota-warning 
show better quota warning for group folders and external storage
 2020-08-26 21:15:47 +02:00
Julius Härtl
45a474071e
Remove @package annotations from public namespace 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2020-08-26 16:59:40 +02:00
Julius Härtl
94c0ca4b8c
Remove wrongly annotated package names 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2020-08-26 12:35:27 +02:00
Nextcloud bot
00459adfa2
[tx-robot] updated from transifex 2020-08-26 02:16:29 +00:00
Robin Appelman
c077c15875
show better quota warning for group folders and external storage 
instead of showing the generic 'Your storage is full' message, better explain that it's the group folder/external storage that is full

Signed-off-by: Robin Appelman <robin@icewind.nl>
 2020-08-25 16:05:16 +02:00
Joas Schilling
0934aee46b
Merge pull request #22359 from nextcloud/fix/noid/flow-leaking-scope 
fix possible leaking scope in Flow
 2020-08-25 10:40:26 +02:00
Roeland Jago Douma
7e6f04490e
Merge pull request #22393 from nextcloud/fix/license-headers-20 
Update the license headers for Nextcloud 20
 2020-08-24 22:03:00 +02:00
Joas Schilling
df857604d5
Merge pull request #21894 from nextcloud/fix-file-quota 
fix: file quota was not applied in all cases
 2020-08-24 15:48:48 +02:00
Christoph Wurst
2a054e6c04
Update the license headers for Nextcloud 20 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2020-08-24 14:54:25 +02:00
John Molakvoæ
dd054f0bdb
Merge pull request #22382 from nextcloud/bugfix/22380 
Add repair step to remove old dashboard app config
 2020-08-24 14:00:41 +02:00
Arthur Schiwon
28c0eea8cb
fix possible leaking scope in Flow 
- a configured flow can be brought into consideration, despite its event
  was not fired
- it could either run through
- or run into a RuntimeException and killing processing of valid flows

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2020-08-24 13:44:01 +02:00
Julius Härtl
17579c6471
Add repair step to remove old dashboard app config 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2020-08-24 10:16:15 +02:00