upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-05-15 01:49:53 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 30
47616 commits 928 branches 1207 tags 8.1 GiB
Commit graph

16391 commits

Author SHA1 Message Date
Nextcloud bot
c1fa96596a
[tx-robot] updated from transifex 2019-03-27 12:06:38 +00:00
Nextcloud bot
bca4a9ecbb
[tx-robot] updated from transifex 2019-03-26 10:41:42 +00:00
Joas Schilling
d19355b25a Fix placeholder in disable message 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2019-03-25 16:01:33 +00:00
Vlastimil Pecinka
7cab488c6f Store user object later in the code 
Signed-off-by: Vlastimil Pecinka <pecinka@email.cz>
 2019-03-21 21:37:41 +00:00
Nextcloud bot
2c7f1fd001
[tx-robot] updated from transifex 2019-03-21 01:14:06 +00:00
Morris Jobke
6fffd09a7c
Merge pull request #14759 from nextcloud/backport/14691/stable15 
[stable15] always allow moving mountpoints inside the same mountpoint
 2019-03-20 16:41:14 +01:00
Morris Jobke
8781a77d37
Merge pull request #14709 from HuemerGroup/groupname_like_username-allow_share_with_both 
groupname like username - allow share with both
 2019-03-20 16:32:53 +01:00
Morris Jobke
38beea8642
Update lib/private/Share20/Manager.php 
tabulator change

Co-Authored-By: aignerat <46312655+aignerat@users.noreply.github.com>
 2019-03-20 12:51:26 +01:00
Morris Jobke
2a3645a5a8
Update lib/private/Share20/Manager.php 
fixed tabulator

Co-Authored-By: aignerat <46312655+aignerat@users.noreply.github.com>
 2019-03-20 12:50:48 +01:00
Robin Appelman
9b6ead8abf always allow moving mountpoints inside the same mountpoint 
even if that mountpoint isn't normally a valid target for moving mounts into

Signed-off-by: Robin Appelman <robin@icewind.nl>
 2019-03-20 09:59:17 +00:00
Roeland Jago Douma
086f41b0bc Fix getting the access list on external storage 
If a file is on external storage there is no owner. WHich means we can't
check. So just return an empty array then.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-03-19 17:44:32 +00:00
Nextcloud bot
590ea7c5fb
[tx-robot] updated from transifex 2019-03-18 01:12:37 +00:00
Nextcloud bot
cec3fd4dcf
[tx-robot] updated from transifex 2019-03-17 01:13:33 +00:00
Nextcloud bot
d33cec3d7d
[tx-robot] updated from transifex 2019-03-16 01:12:43 +00:00
Christian Aigner
cde8a2896d groupname like username - allow share with both 
Signed-off-by: Christian Aigner <christian.aigner@huemer-it.com>
 2019-03-15 10:18:27 +01:00
Robin Appelman
54b14946b4 handle long etags from dav external storage 
we can only store etags up to 40 characters long in the database, so when we get an etag that's longer we simply hash it to bring down the length

Signed-off-by: Robin Appelman <robin@icewind.nl>
 2019-03-14 16:19:09 +00:00
Nextcloud bot
92634ec842
[tx-robot] updated from transifex 2019-03-14 16:08:44 +00:00
Morris Jobke
144cf16221 Remove sensitive SMB arguments from exception log 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2019-03-13 13:00:57 +00:00
Morris Jobke
42cd3876d4
Merge pull request #14597 from nextcloud/backport/14425/stable15 
[stable15] Do not calculate folder size for parent that also needs proper scan, fixes #3524
 2019-03-08 17:31:54 +01:00
Morris Jobke
1b53d46466
Merge pull request #14596 from nextcloud/backport/14587/stable15 
[stable15] Remove Google+ from Social Sharing Bundle
 2019-03-08 17:30:14 +01:00
Morris Jobke
634390a299
Merge pull request #14534 from nextcloud/backport/14502/add-activities-for-group-membership-changes 
[stable15] Add activities for group membership changes
 2019-03-08 10:26:01 +01:00
Ari Selseng
264b4ad3a9 Avoid calculating folder size for parent that needs scan. 
Signed-off-by: Ari Selseng <ari@selseng.net>
 2019-03-08 08:14:33 +00:00
Marius Blüm
7fa1cfcb17 Remove Google+ from Social Sharing Bundle (2) 
Signed-off-by: Marius Blüm <marius@lineone.io>
 2019-03-08 08:06:52 +00:00
Roeland Jago Douma
30e790606e Use a tmp file for swift writes 
Else this leads to a seekable stream error with chunked uploads

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-03-06 14:34:15 +00:00
Morris Jobke
3acee4f1b4
Merge pull request #14416 from nextcloud/backport/14343/stable15 
[stable15] Parse multiple navigation items
 2019-03-06 13:16:25 +01:00
Joas Schilling
e828bfca1e
Update autoloader 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2019-03-05 11:32:00 +01:00
Nextcloud bot
068b754d31
[tx-robot] updated from transifex 2019-03-01 01:12:48 +00:00
Daniel Kesselberg
f32fd975cb Generate id for navigation item 
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
 2019-02-27 15:09:32 +00:00
Daniel Kesselberg
ee9eba54e5 Parse multiple navigation items 
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
 2019-02-27 15:09:31 +00:00
Tomasz Paluszkiewicz
e690658018 changed order of methods 
Signed-off-by: Tomasz Paluszkiewicz <tomasz.paluszkiewicz@gmail.com>
 2019-02-26 13:42:41 +00:00
Tomasz Paluszkiewicz
22cfc5b87f fix(EMailTemplate): malformed HTML in some cases 
when an addBodyListItem() is not directly followed by addBodyButton(), resulting HTML is broken

Signed-off-by: Tomasz Paluszkiewicz <tomasz.paluszkiewicz@gmail.com>
 2019-02-26 13:42:40 +00:00
Nextcloud bot
bb6f832ec3
[tx-robot] updated from transifex 2019-02-26 09:10:14 +00:00
Roeland Jago Douma
8ea0e721ed Always query lookup server in GS mode 
Without the lookupserver GS is kind of useless.
If the admin places their lookup sever outside of the reachable network
that is not something we can help.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-02-25 09:24:30 +00:00
Joas Schilling
5b22b1e6c8 Fix "Undefined index: user_uid" on login page 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2019-02-22 11:43:13 +00:00
Nextcloud bot
b42e3fa1b3
[tx-robot] updated from transifex 2019-02-21 01:12:14 +00:00
Morris Jobke
37cb480900
Merge pull request #14312 from nextcloud/backport/14255/stable15 
[stable15] Fix ocm end-point discovery discovery
 2019-02-20 16:46:30 +01:00
Bjoern Schiessle
2bf2633c05
make sure that the ocm end-point discovery /ocm-provider is not redirected to the index.php 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2019-02-20 15:41:38 +01:00
Morris Jobke
52662fb928
Merge pull request #14308 from nextcloud/backport/14178/stable15 
[stable15] Fix OC.getCurrentUser() on guest pages
 2019-02-20 15:31:37 +01:00
Roeland Jago Douma
c9a4f010dc
Merge pull request #14273 from nextcloud/backport/14210/stable15 
[stable15] Fix empty file uploads to S3 (and other streaming storages)
 2019-02-20 15:26:36 +01:00
Joas Schilling
2f98c873fa Fix OC.getCurrentUser() on guest pages 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2019-02-20 12:22:31 +00:00
Roeland Jago Douma
6e110c35b0
Merge pull request #14275 from nextcloud/backport/12573/stable15 
[stable15] Do not do redirect handling when loggin out
 2019-02-20 08:55:30 +01:00
Daniel Kesselberg
30c69e6394 Set false as default for requirePNG 
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
 2019-02-19 13:59:01 +00:00
Joas Schilling
5823cd652c Correctly determinate the owner in case of shared external storages 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2019-02-19 09:29:17 +00:00
Roeland Jago Douma
58fd016b27
Fix empty file uploads to S3 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-02-19 10:16:11 +01:00
Roeland Jago Douma
78842d29b3
Do not do redirect handling when loggin out 
Fixes #12568
Since the clearing of the execution context causes another reload. We
should not do the redirect_uri handling as this results in redirecting
back to the logout page on login.

This adds a simple middleware that will just check if the
ClearExecutionContext session variable is set. If that is the case it
will just redirect back to the login page.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-02-18 22:22:12 +01:00
Maxence Lange
6ada63be8e fixing phpdoc 
Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
 2019-02-18 13:30:54 +00:00
Nextcloud bot
4651c25f17
[tx-robot] updated from transifex 2019-02-17 01:13:40 +00:00
Nextcloud bot
5eb304a69a
[tx-robot] updated from transifex 2019-02-16 01:12:35 +00:00
Roeland Jago Douma
c021b5bfc6
Merge pull request #14195 from nextcloud/backport/14185/stable15 
[stable15] Fix recent files
 2019-02-14 21:18:20 +01:00
Roeland Jago Douma
a26a0bf75d
Merge pull request #14085 from nextcloud/backport/14023/stable15 
[stable15] Fix: Check if `$this->params['user']` is an array
 2019-02-14 19:47:43 +01:00