mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
56,200 Commits 349 Branches 696 Tags 1.6 GiB
Commit Graph

56200 Commits

Author SHA1 Message Date
Morris Jobke 5ec9ce0bf1
Merge pull request #25146 from nextcloud/backport/25142/stable20 
[stable20] Do not redirect to logout after login
 2021-01-15 16:45:36 +01:00
Damien Goutte-Gattat 151abca91c Fix comparison of PHP versions 
Use the builtin function `version_compare` to check an app's
compatibility with the available PHP version, instead of reusing
the `OC\App\CompareVersion::isCompatible` method which is intended
to compare Nextcloud versions. PHP version strings do not always
necessarily follow the simple Major.Minor.Patch format used by
Nextcloud and therefore cannot be properly compared by that method.

Signed-off-by: Damien Goutte-Gattat <dgouttegattat@incenp.org>
 2021-01-15 14:20:51 +00:00
Roeland Jago Douma 23f466fb10 Do not redirect to logout after login 
This can happen when the session was killed due to a timeout. Then
logout was triggered. Nobody wants to login only to be logged out again.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2021-01-15 10:56:18 +00:00
Morris Jobke ac14e42b49
Merge pull request #25143 from nextcloud/backport/25141/stable20 
[stable20] Add a hint about the direction of priority
 2021-01-15 10:10:04 +01:00
Joas Schilling b07ff57b2b Add a hint about the direction of priority 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2021-01-15 08:49:19 +00:00
Morris Jobke 48eea6f74b
Merge pull request #25077 from nextcloud/backport/25034/stable20 
[stable20] Make sure to do priority app upgrades first
 2021-01-15 09:31:57 +01:00
Nextcloud bot 7c8d3709d9
[tx-robot] updated from transifex 2021-01-15 02:20:37 +00:00
blizzz 591c4fdd02
Merge pull request #25120 from nextcloud/backport/25036/stable20 
[stable20] respect DB restrictions on number of arguments in statements and queries
 2021-01-14 21:40:54 +01:00
Robin Appelman 6404627d0c adjust tests 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2021-01-14 16:33:13 +00:00
Robin Appelman e0d85ed9a8 dont offer to edit external config settings if we can't edit them 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2021-01-14 16:33:13 +00:00
Arthur Schiwon 26f77d879e
CI satisfaction 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2021-01-14 13:16:02 +01:00
Arthur Schiwon 5dd7665f21
silence psalm false positive 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2021-01-14 13:04:02 +01:00
Arthur Schiwon b82efbdee5
DB: warn on parameter number constraints 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2021-01-14 13:03:54 +01:00
Arthur Schiwon b0ea654653
respect DB limits limit per statement and query 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2021-01-14 13:03:36 +01:00
Roeland Jago Douma 1ef9a3f039
Merge pull request #25102 from nextcloud/version/20.0.5/final 
20.0.5
 2021-01-14 10:22:39 +01:00
Nextcloud bot 631f28eb74
[tx-robot] updated from transifex 2021-01-14 02:19:15 +00:00
Nextcloud bot 4ca0fb2282
[tx-robot] updated from transifex 2021-01-13 02:20:30 +00:00
Roeland Jago Douma 5f56b1ac67
20.0.5 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2021-01-12 23:01:01 +01:00
Roeland Jago Douma a5738cc175
Merge pull request #25064 from nextcloud/version/20.0.5/rc2 
20.0.5 RC2
 2021-01-12 11:51:22 +01:00
Roeland Jago Douma e89d4a4f40
Merge pull request #25076 from nextcloud/backport/25016/stable20 
[stable20] Add setup check to verify that the used DB version is still supported…
 2021-01-12 11:50:52 +01:00
Morris Jobke 349c9ef74f
Add setup check to verify that the used DB version is still supported in the next major release 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2021-01-12 10:18:19 +01:00
Nextcloud bot 6a1d17312c
[tx-robot] updated from transifex 2021-01-12 02:20:00 +00:00
Julius Härtl f17033fa12 Make sure to do priority app upgrades first 
Otherwise those apps might not be loaded when the others app migrations
are running. The previous loading of authentication apps in the upgrade
step never worked as it just returns in maintenance mode

Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2021-01-11 13:46:47 +00:00
Morris Jobke 4ee41a7679
Merge pull request #25074 from nextcloud/backport/25069/stable20 
[stable20] Don't remove assignable column for now
 2021-01-11 14:26:14 +01:00
Vincent Petry c96f3e830a Don't remove assignable column for now 
It causes side effects.

Signed-off-by: Vincent Petry <vincent@nextcloud.com>
 2021-01-11 12:19:54 +00:00
Roeland Jago Douma 6594ca4bbb
Merge pull request #25066 from nextcloud/psalm/noid/update-psalm-baseline 
[stable20] Update psalm-baseline.xml
 2021-01-11 10:46:08 +01:00
Morris Jobke 08f6444474
Merge pull request #25019 from nextcloud/backport/24999/stable20 
[stable20] Set the user language when adding the footer
 2021-01-11 10:24:17 +01:00
Morris Jobke 568d46a3a5
[stable20] Update psalm-baseline.xml 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2021-01-11 10:18:58 +01:00
Morris Jobke 43ec70d43b
Merge pull request #25035 from nextcloud/backport/25017/stable20 
[stable20] Fix clearing the label of a share
 2021-01-11 10:02:21 +01:00
Roeland Jago Douma f71f9a32ec
20.0.5 RC2 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2021-01-11 09:41:58 +01:00
Nextcloud bot a156722ece
[tx-robot] updated from transifex 2021-01-11 02:20:05 +00:00
Nextcloud bot c7b9964b4a
[tx-robot] updated from transifex 2021-01-10 02:22:51 +00:00
Nextcloud bot df3ba2fde2
[tx-robot] updated from transifex 2021-01-09 02:21:47 +00:00
Daniel Calviño Sánchez b078f28029 Fix clearing the label of a share 
When the label is being edited its value is stored in "newLabel", and
the original label is shown only if "newLabel" is not set. However, as
it was checked against any falsy value instead of only undefined when
the label was cleared and thus it has an empty value the original label
was shown instead.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
Signed-off-by: npmbuildbot-nextcloud[bot] <npmbuildbot-nextcloud[bot]@users.noreply.github.com>
 2021-01-08 17:30:17 +00:00
Roeland Jago Douma f66d88c85a
Merge pull request #25030 from nextcloud/backport/25029/stable20 
[stable20] Change defaultapp in config.sample.php to dashboard to improve docs and align it to source code
 2021-01-08 12:17:42 +01:00
rakekniven a4e6c44581 Change defaultapp to dashboard 
Result of discussion at https://help.nextcloud.com/t/enable-dashboard-on-per-user-basis/94872

Code reference:
db86bea18c/lib/private/legacy/OC_Util.php (L1106)

Signed-off-by: rakekniven <mark.ziegler@rakekniven.de>
 2021-01-08 09:10:24 +00:00
Julius Härtl 36388085f6
Set the user language when adding the footer 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2021-01-08 10:09:41 +01:00
Nextcloud bot 0e20ce014a
[tx-robot] updated from transifex 2021-01-08 02:22:41 +00:00
Roeland Jago Douma 6d5f5bfa61
Merge pull request #24960 from nextcloud/version/20.0.5/rc1 
20.0.5 RC1
 2021-01-07 20:43:19 +01:00
Roeland Jago Douma 102a6fedd0
Merge pull request #25009 from nextcloud/backport/25001/stable20 
[stable20] Fix column name to check prior to deleting
 2021-01-07 19:46:56 +01:00
blizzz b2cfd43b8f
Merge pull request #25013 from nextcloud/backport/25011/stable20 
[stable20] Catch throwable instead of exception
 2021-01-07 18:14:22 +01:00
Roeland Jago Douma cb958df63a Catch throwable instead of exception 
The error that gets thrown can also be a type error etc. So we should
properly catch the Throwable.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2021-01-07 14:25:15 +00:00
Morris Jobke 8295cc90d8
Merge pull request #24590 from nextcloud/backport/24358/stable20 
[stable20] use storage copy implementation when doing dav copy
 2021-01-07 14:08:17 +01:00
Joas Schilling 1142b17cda Fix column name to check prior to deleting 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2021-01-07 12:33:01 +00:00
Morris Jobke fb0067a777
Merge pull request #24592 from nextcloud/backport/23912/stable20 
[stable20] use in objectstore copy
 2021-01-07 13:28:10 +01:00
Roeland Jago Douma 7db2278ef9
Merge pull request #24716 from nextcloud/backport/24402/stable20 
[stable20] LDAP: fix inGroup for memberUid type of group memberships
 2021-01-07 13:17:59 +01:00
Roeland Jago Douma 0f395d8527
Merge pull request #24976 from nextcloud/backport/24961/stable20 
[stable20] Fix unreliable ViewTest
 2021-01-07 13:17:29 +01:00
Roeland Jago Douma 2dbf407f7e
Merge pull request #24963 from nextcloud/backport/24829/stable20 
[stable20] Add migration for oc_share_external columns
 2021-01-07 13:16:56 +01:00
Roeland Jago Douma 2fa3f24d04
Merge pull request #24997 from nextcloud/backport/24988/stable20 
[stable20] Set the JSCombiner cache if needed
 2021-01-07 09:56:06 +01:00
Vincent Petry 9c7d733c01
Also add missing oc_share_external.share_type column 
Signed-off-by: Vincent Petry <vincent@nextcloud.com>
 2021-01-07 09:39:10 +01:00