Commit Graph

53696 Commits

Author SHA1 Message Date
Morris Jobke 42d899c4d5
Merge pull request #21710 from nextcloud/backport/21074/stable19
[stable19] Fix releasing a shared lock multiple times
2020-07-06 22:52:46 +02:00
Morris Jobke 341757945f
Merge pull request #21703 from nextcloud/backport/18895/stable19
[stable19] Changes the Birthday calendar color to slightly brighter one
2020-07-06 14:37:32 +02:00
Jaakko Salo 3f1b055828 In LockPlugin, only release a lock if it was acquired
When uploading new files, getNodeForPath() will not succeed
yet so the lock cannot be acquired.

In that case, don't try to unlock it either.

Signed-off-by: Jaakko Salo <jaakkos@gmail.com>
2020-07-06 12:11:47 +00:00
Jaakko Salo 392df2eaf4 Fix releasing a shared lock multiple times
Signed-off-by: Jaakko Salo <jaakkos@gmail.com>
2020-07-06 12:11:46 +00:00
Morris Jobke 2b72b5cea5
Fix unit tests from #18895
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2020-07-06 13:34:02 +02:00
Georg Ehrke da522dc3d5 Changes the Birthday calendar color to slightly brighter one
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2020-07-06 11:25:17 +00:00
Roeland Jago Douma b6aac70529
Merge pull request #21664 from nextcloud/backport/21648/add-tar-header
[stable19] Add missing TarHeader.php
2020-07-06 10:39:29 +02:00
Roeland Jago Douma 4513342478
Merge pull request #21671 from nextcloud/revert-21095-backport/21090/stable19
Revert "[stable19] Do not read certificate bundle from data dir by default"
2020-07-06 10:39:02 +02:00
Daniel Kesselberg 9be971f043
[stable19] Add missing TarHeader.php
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
2020-07-06 09:49:45 +02:00
Nextcloud bot f1b1e1ddb2
[tx-robot] updated from transifex 2020-07-06 02:16:19 +00:00
Roeland Jago Douma facace8234
Merge pull request #21342 from nextcloud/backport/21252/stable19
[stable19] update icewind/smb to 3.2.5
2020-07-04 08:58:17 +02:00
Nextcloud bot 4e21bc608c
[tx-robot] updated from transifex 2020-07-04 02:16:25 +00:00
Christoph Wurst 6296dbeb55
Merge pull request #21663 from nextcloud/backport/21662/stable19
[stable19] Fix static method call for s3 bucket compat check
2020-07-03 16:10:38 +02:00
Roeland Jago Douma 905fab3356
Revert "[stable19] Do not read certificate bundle from data dir by default" 2020-07-03 14:21:38 +02:00
Christoph Wurst 3201e7674f Fix static method call for s3 bucket compat check
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2020-07-03 08:26:00 +00:00
Joas Schilling d203f8f985
Merge pull request #21387 from nextcloud/backport/21380/stable19
[stable19] Increase timeout of the appstore requests
2020-07-03 10:04:55 +02:00
Nextcloud bot a5b279a488
[tx-robot] updated from transifex 2020-07-03 02:17:21 +00:00
Morris Jobke f70b2dba18
Merge pull request #21573 from nextcloud/backport/21558/stable19
[stable19] relax permissions mask check for detecting part file rename
2020-07-02 23:51:03 +02:00
Joas Schilling 9d541ccfd1
Increase timeout of the appstore requests
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-07-02 23:36:24 +02:00
Morris Jobke 79b3923a42
Merge pull request #21584 from nextcloud/backport/21530/stable19
[stable19] Remove rescanDelay from directory mtime
2020-07-02 23:35:17 +02:00
Roeland Jago Douma 0db25f2b69
Merge pull request #21660 from nextcloud/backport/21657/stable19
[stable19] Check if debugMode is defined before using it
2020-07-02 20:50:21 +02:00
Roeland Jago Douma 6c3e9ee87c
Merge pull request #21655 from nextcloud/backport/21653/stable19
[stable19] Fix IPv6 remote addresses from X_FORWARDED_FOR headers before validating
2020-07-02 20:49:11 +02:00
Roeland Jago Douma 41783a0a76 Check if debugMode is defined before using it
Else the sabre error page (where the var is not defined) will throw
warnings all the time.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2020-07-02 18:00:18 +00:00
Joas Schilling a471dba6e1 Fix IPv6 remote addresses from X_FORWARDED_FOR headers before validating
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-07-02 10:09:45 +00:00
Roeland Jago Douma 8054bc921e
Merge pull request #21652 from nextcloud/enh/log_dep_as_debug
Log deprecated events as debug
2020-07-02 12:00:23 +02:00
Roeland Jago Douma c88402db47
Log deprecated events as debug
Since this can spam the log quite agressively we should log it as debug
and not info.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2020-07-02 10:49:11 +02:00
Roeland Jago Douma 7fd34d5d64
Merge pull request #21638 from nextcloud/backport/21588/stable19
[stable19] Update presign method to match with interface again.
2020-07-02 09:06:53 +02:00
Joas Schilling bfdcc4692f
Merge pull request #21405 from nextcloud/backport/21221/stable19
[stable19] Fix pagination of contacts search
2020-07-01 11:53:08 +02:00
Joas Schilling 9e9e74736d
Merge pull request #21538 from nextcloud/backport/21452/stable19
[stable19] Fix autocomplete for LDAP with `shareapi_only_share_with_group_members` on
2020-07-01 10:13:19 +02:00
Nextcloud bot c0b3cd90a6
[tx-robot] updated from transifex 2020-07-01 02:16:24 +00:00
Roeland Jago Douma eabebe8191
Merge pull request #21583 from nextcloud/backport/21576/stable19
[stable19] fix strings being passed where arrays where expected
2020-06-30 20:41:38 +02:00
Daniel Kesselberg 4397e57201 Update presign method to match with interface again.
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
2020-06-30 18:39:08 +00:00
Roeland Jago Douma d87245f84c
Merge pull request #21622 from nextcloud/backport/21594/stable19
[stable19] Precalculate the primary element color for dark mode too
2020-06-30 20:31:14 +02:00
Nextcloud bot b7bab49eb8
[tx-robot] updated from transifex 2020-06-30 02:16:20 +00:00
Joas Schilling b33c074d6e Fix PHP CS
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-06-29 12:08:33 +00:00
Joas Schilling 1c2d8faf34 Precalculate the primary element color for dark mode too
Signed-off-by: Joas Schilling <coding@schilljs.com>
2020-06-29 12:08:33 +00:00
Nextcloud bot e5e833a519
[tx-robot] updated from transifex 2020-06-29 02:16:45 +00:00
Nextcloud bot b2a6b874c4
[tx-robot] updated from transifex 2020-06-28 02:16:19 +00:00
Nextcloud bot 207d3e4a7c
[tx-robot] updated from transifex 2020-06-27 02:16:52 +00:00
Julius Härtl 737b65894b Remove rescanDelay from directory mtime
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2020-06-25 14:54:09 +00:00
Arthur Schiwon 43b8b0c14f fix strings being passed where arrays where expected
also brought type hints up to internal API level

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2020-06-25 08:06:29 +00:00
Nextcloud bot 8a0185d29b
[tx-robot] updated from transifex 2020-06-25 02:16:52 +00:00
blizzz 58804caf89
Merge pull request #21568 from nextcloud/backport/21564/stable19
[stable19] fix obsolete usage of OCdialogs
2020-06-24 22:44:26 +02:00
blizzz ca845138b7
Merge pull request #21571 from nextcloud/backport/21565/stable19
[stable19] comment was wrong, block is needed nevertheless
2020-06-24 22:41:25 +02:00
Robin Appelman 654f5a2109 relax permissions mask check for detecting part file rename
with files drop uploads the original file name isn't always used for the '.ocTransferId' source path

Signed-off-by: Robin Appelman <robin@icewind.nl>
2020-06-24 19:11:18 +00:00
Arthur Schiwon 2a3ebe4353 comment was wrong, block is needed nevertheless
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2020-06-24 19:07:38 +00:00
Arthur Schiwon 003407e094 fix obsolete usage of OCdialogs
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2020-06-24 17:01:17 +00:00
Joas Schilling d4343de3eb
Merge pull request #21541 from nextcloud/backport/21417/stable19
[stable19] Fix modal support for vue apps and dark theme
2020-06-24 13:32:57 +02:00
Roeland Jago Douma 41587bd8fb
Merge pull request #21550 from nextcloud/backport/21535/stable19
[stable19] Fix language in share notes email for users
2020-06-24 09:02:09 +02:00
Nextcloud bot 7824599d71
[tx-robot] updated from transifex 2020-06-24 02:16:54 +00:00