upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-12 18:21:40 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 21
52484 commits 1042 branches 1221 tags 8.4 GiB
Commit graph

52484 commits

This branch
This branch
All branches
Author SHA1 Message Date
Nextcloud bot
3df6adb63d
[tx-robot] updated from transifex 2020-04-03 12:08:26 +00:00
Roeland Jago Douma
3c7e708ffd
Merge pull request #20274 from nextcloud/fix/19127/ldap-silence-deprecation-stable18 
silence LDAP deprecation logs in NC 18
 2020-04-02 20:24:09 +02:00
Roeland Jago Douma
ae08c56855
Merge pull request #20258 from nextcloud/backport/19781/stable18 
[stable18] Dont always use the current users quota when calculating storage info
 2020-04-02 19:22:31 +02:00
Arthur Schiwon
9359d8b0a4
silence LDAP deprecation logs in NC 18 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2020-04-02 16:51:12 +02:00
Robin Appelman
bd5a8f7efb Dont always use the current users quota when calculating storage info 
instead pass the quota as parameter.

Without this fix, when 'quota_include_external_storage' is enabled, the
webui will show the quota configured for the admin for every user
instead of the users quota

Signed-off-by: Robin Appelman <robin@icewind.nl>
 2020-04-01 12:26:29 +00:00
Roeland Jago Douma
a9db39170a
Merge pull request #20202 from nextcloud/backport/19978/stable18 
[stable18] Actually check if the owner is not null
 2020-04-01 09:50:03 +02:00
John Molakvoæ
b2c616cc60
Merge pull request #20238 from nextcloud/backport/20234/stable18 
[stable18] Remove Acrobat logo from PDF filetype icon
 2020-03-31 12:09:50 +02:00
Jan-Christoph Borchardt
0f6f4cb178 Remove Acrobat logo from PDF filetype icon 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2020-03-31 06:49:36 +00:00
Nextcloud bot
a1bc7891c5
[tx-robot] updated from transifex 2020-03-31 02:19:13 +00:00
Nextcloud bot
78ec3680c2
[tx-robot] updated from transifex 2020-03-30 02:18:44 +00:00
Nextcloud bot
63d9341844
[tx-robot] updated from transifex 2020-03-29 02:20:24 +00:00
Nextcloud bot
7ffe3b3465
[tx-robot] updated from transifex 2020-03-28 02:18:25 +00:00
Roeland Jago Douma
874c468c02 Actually check if the owner is not null 
Else this can error out on storages that do not have an owner (e.g.
groupfolders).

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2020-03-27 13:51:47 +00:00
Roeland Jago Douma
918c64a200
Merge pull request #20195 from nextcloud/bump-version-18.0.3 
Bump version on stable18
 2020-03-27 10:25:06 +01:00
Joas Schilling
831d2536e8
Bump version on stable18 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2020-03-27 08:14:13 +01:00
Nextcloud bot
91a39ec03d
[tx-robot] updated from transifex 2020-03-27 02:18:30 +00:00
Christoph Wurst
73bfc3af61
Merge pull request #20166 from nextcloud/backport/20127/stable18 
[stable18] Check the user on remote wipe
 2020-03-26 09:46:54 +01:00
Nextcloud bot
a2dcf2c85b
[tx-robot] updated from transifex 2020-03-26 02:18:44 +00:00
Joas Schilling
5aa47e5549 Check the user on remote wipe 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2020-03-25 15:50:12 +00:00
Roeland Jago Douma
87a91e6a4d
Merge pull request #20161 from nextcloud/backport/20150/stable18 
[stable18] Auto accept group shares for users added to a group
 2020-03-25 15:49:05 +01:00
Roeland Jago Douma
87dac804f6 Auto accept group shares for users added to a group 
In case auto accepting is enabled (the default). Users that are newly
added to a group should not have to accept those shares.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2020-03-25 12:06:39 +00:00
Roeland Jago Douma
1fd49180ec
Merge pull request #20144 from nextcloud/backport/stable18/18818 
[stable18] change quota design
 2020-03-25 08:12:50 +01:00
Roeland Jago Douma
1ed78e6710
Merge pull request #20136 from nextcloud/backport/20019/stable18 
[stable18] Fix language multiselect action
 2020-03-25 08:12:31 +01:00
Nextcloud bot
bf88c3d9d6
[tx-robot] updated from transifex 2020-03-25 02:18:37 +00:00
GretaD
281f52a747 Backport of 18818 
Signed-off-by: GretaD <gretadoci@gmail.com>
Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
 2020-03-24 20:22:37 +00:00
Roeland Jago Douma
e9a9646a46
Merge pull request #20140 from nextcloud/backport/20128/stable18 
[stable18] Remove admin_notifications since it is obsolete since Nextcloud 14
 2020-03-24 20:16:10 +01:00
Julius Härtl
6e7a833016 Remove admin_notifications since it is obsolete since Nextcloud 14 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2020-03-24 13:56:18 +00:00
GretaD
25766ff34e Fix language multiselect action 
Signed-off-by: GretaD <gretadoci@gmail.com>
 2020-03-24 10:52:19 +00:00
Nextcloud bot
5f8319677b
[tx-robot] updated from transifex 2020-03-24 02:18:54 +00:00
Roeland Jago Douma
4ea22abfb6
Merge pull request #20104 from nextcloud/backport/20042/stable18 
[stable18] fix dav browser error page not styled
 2020-03-23 20:59:14 +01:00
Arthur Schiwon
45e96c0c64 use core templates for displaying dav errors in the browser 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2020-03-23 08:45:36 +00:00
Arthur Schiwon
f11283ac4b fix dav browser error page not styled 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2020-03-23 08:45:36 +00:00
Nextcloud bot
f886e7c848
[tx-robot] updated from transifex 2020-03-23 02:19:13 +00:00
Roeland Jago Douma
e7a2c7b1b9
Merge pull request #20046 from nextcloud/backport/20039/stable18 
[stable18] fixes auto-detecting UUID attributes
 2020-03-22 14:22:58 +01:00
Nextcloud bot
881c36f5c6
[tx-robot] updated from transifex 2020-03-22 02:18:46 +00:00
Roeland Jago Douma
3c7312a8ff
Merge pull request #20044 from nextcloud/backport/20032/stable18 
[stable18] Allow the video player on the hide download
 2020-03-21 08:25:09 +01:00
Roeland Jago Douma
b9e8251100
Merge pull request #20051 from nextcloud/backport/20049/stable18 
[stable18] Force compatible dependency versions in acceptance tests
 2020-03-21 08:23:28 +01:00
Roeland Jago Douma
8f51c630f0
Merge pull request #20060 from nextcloud/backport/20057/stable18 
[stable18] Adjust acceptance tests to incoming shares being accepted by default
 2020-03-21 08:10:38 +01:00
Nextcloud bot
51073eb941
[tx-robot] updated from transifex 2020-03-21 02:19:13 +00:00
Daniel Calviño Sánchez
2b42fbe63f Add acceptance test for accepting an incoming share 
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2020-03-20 20:24:56 +00:00
Daniel Calviño Sánchez
ba67eddabe Fix timeout capping 
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2020-03-20 20:24:56 +00:00
Daniel Calviño Sánchez
4147595188 Revert (partially) "Accept incoming shares in acceptance tests" 
This reverts commit f402e23448.

Since eb4c42d3d1 now shares are accepted
by default, so no notification is shown to accept them.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2020-03-20 20:24:56 +00:00
Daniel Calviño Sánchez
988c633246 Force compatible dependency versions in acceptance tests 
behat/mink 1.8 and behat/mink-selenium2-driver 1.4 introduced behaviour
changes that broke the acceptance tests. Until the tests are updated to
work with the newer versions the last known versions are forced.

Note that some acceptance tests still fail after enforcing the
compatible versions, although that is caused by changes in the Nextcloud
server itself.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2020-03-20 14:49:55 +00:00
Arthur Schiwon
29495f0c6d fixes auto-detecting UUID attributes 
the continue (and later the early return) avoided proper looping over the
attribute candidates.

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2020-03-20 10:07:54 +00:00
Joas Schilling
184155555b Allow the video player on the hide download 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2020-03-20 08:06:51 +00:00
Nextcloud bot
ee5ed6a3ed
[tx-robot] updated from transifex 2020-03-20 02:18:30 +00:00
Robin Appelman
1e302f0637
Merge pull request #20030 from nextcloud/backport/19242/stable18 
[stable18] Handle long dav property paths by hashing them
 2020-03-19 15:02:21 +00:00
Robin Appelman
41ae68a74a rebuild autoloader 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2020-03-19 12:44:25 +00:00
Robin Appelman
20e27c7fc5 fix tests 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2020-03-19 12:44:24 +00:00
Robin Appelman
3602a35972 remove the detour trough node and work with path directly 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2020-03-19 12:44:24 +00:00