wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
31344 commits 157 branches 562 tags 714 MiB
Commit graph

31344 commits

This branch
This branch
All branches
Author SHA1 Message Date
Vincent Petry
8d11c3b87b Merge pull request #23487 from owncloud/core-globalajaxerrorwhengoingaway 
Detect user navigating away, don't interpret as ajax error
 2016-04-01 17:03:55 +02:00
Lukas Reschke
e7ac5dccb6 Merge pull request #23719 from owncloud/pr-16857-printcss-followup 
Initialise the printcss array
 2016-04-01 10:56:01 +02:00
Joas Schilling
0235a79b4e Initialise the printcss array 2016-04-01 09:46:15 +02:00
Jenkins for ownCloud
cce6194368 [tx-robot] updated from transifex 2016-04-01 01:56:19 -04:00
Thomas Müller
63b01a3616 Merge pull request #22834 from owncloud/webdav_property_for_share_permissions 
Add sharePermissions webdav property
 2016-03-31 23:18:53 +02:00
Thomas Müller
690eef26dd Merge pull request #23274 from Senorsen/add-urlencode-ftp-sftp 
Add urlencode to username part of ftp and sftp links
 2016-03-31 23:18:10 +02:00
Thomas Müller
2714dfce21 Merge pull request #23713 from owncloud/small_encryption_fix 
make sure that we always remove the file again from the cache after t…
 2016-03-31 23:13:52 +02:00
Morris Jobke
1fac22c2c8 Merge pull request #23564 from owncloud/public-ajaxbasicauth 
Return 401 DummyBasicAuth in case of ajax call in public link page
 2016-03-31 22:23:12 +02:00
Morris Jobke
3b4903a3ea Merge pull request #23655 from owncloud/better-ldap-design 
Design LDAP wizard to better integrate into the design
 2016-03-31 22:22:55 +02:00
Morris Jobke
902abe33f5 Merge pull request #23676 from owncloud/handle-null-return-getAppInfo 
Properly handle return values of OC_App::getAppInfo()
 2016-03-31 22:21:50 +02:00
Morris Jobke
1256235dad Merge pull request #23694 from owncloud/add-cov-graph 
Adding coverage graph to see how we progress
 2016-03-31 22:21:35 +02:00
C. Montero Luque
0393e80c7c Merge pull request #16857 from owncloud/printStylesheets 
Support for print stylesheets
 2016-03-31 22:13:44 +02:00
Bjoern Schiessle
e4b451491b make sure that we always remove the file again from the cache after the version was created 2016-03-31 21:52:23 +02:00
Roeland Jago Douma
89478a0961 Fix unit tests 2016-03-31 21:25:23 +02:00
Frank Karlitschek
6d40e69e29 Merge pull request #23517 from owncloud/gdrive-stream-download 
GDrive stream download with RetryWrapper
 2016-03-31 21:17:10 +02:00
Frank Karlitschek
3142dcc331 Merge pull request #23397 from paurisa/Fixed_23316 
Fixed Issue 23316 - Invisible buttons should be visible
 2016-03-31 21:15:59 +02:00
Frank Karlitschek
f5709b511b Merge pull request #23445 from owncloud/enc_small_improvement 
small performance improvement: no need to calculate the header size
 2016-03-31 20:38:42 +02:00
Frank Karlitschek
2bff34be56 Merge pull request #23707 from owncloud/make-sure-that-encrypted-version-is-set 
Make sure that the encrypted version is set
 2016-03-31 20:37:17 +02:00
Frank Karlitschek
fdb59079a2 Merge pull request #23675 from owncloud/fix_encryption_versions_on_external_storages 
fix creation of versions of encrypted files on external storages
 2016-03-31 20:36:03 +02:00
Roeland Jago Douma
5334bcce66 Correct share permissions for external storages 2016-03-31 20:17:59 +02:00
Roeland Jago Douma
8c0ef4c4bd Add sharePermissions webdav property 
This property can be queries by the clients so they know the max
permissions they can use to share a file with. This will improve the UX.

The oc:permissions proptery is not enough since mountpoints have
different permissions (delete + move by default).

By making it a new property the clients can just request it. On older
servers it will just return a 404 for that property (and thus they know
they have to fall back to their hacky work arounds). But if the property
is returned the client can show proper info.

* unit tests
* intergration test
 2016-03-31 20:12:34 +02:00
Thomas Müller
dea3985e86 Merge pull request #23516 from owncloud/dropbox-stream-download 
Dropbox stream download with RetryWrapper
 2016-03-31 20:07:36 +02:00
Frank Karlitschek
ba8c81e6d1 Merge pull request #23526 from owncloud/fix_23337 
Add setId and setProviderId to IShare interface
 2016-03-31 20:07:02 +02:00
Lukas Reschke
ba69a90ab5 Enforce type 2016-03-31 19:32:30 +02:00
Vincent Petry
262547ba3d Return 401 DummyBasicAuth in case of ajax call 2016-03-31 19:31:31 +02:00
Bjoern Schiessle
93ed965cbb fix creation of versions of encrypted files on external storages 
in order to create a 1:1 copy of a file if a version gets created
we need to store this information on copyBetweenStorage(). This
allows us to by-pass the encryption wrapper if we read the source file.
 2016-03-31 19:24:47 +02:00
Lukas Reschke
c427bf3b5d Make sure that the encrypted version is set 
The code path called when using external storage with WebDAV is using `\OC\Files\Storage\Wrapper\Encryption::getMetaData` which did not contain the actual encrypted version inside the cache entry version. This lead to the following:

1. User uploaded a file
2. File is created and `\OC\Files\Storage\Wrapper\Encryption::getMetaData` is called. It has an empty `encryptedVersion` but sets `encrypted` to either `true` or `false`.
3. The call when updating the file cache will use the old version.
 2016-03-31 18:06:37 +02:00
Jan-Christoph Borchardt
bfb5748f1f Merge pull request #23702 from owncloud/emptycontent 
improve emptycontent styles
 2016-03-31 17:00:53 +02:00
Jan-Christoph Borchardt
a8a98d42cb improve emptycontent styles 2016-03-31 15:31:04 +02:00
Thomas Müller
de1ad94487 Adding coverage graph to see how we progress 2016-03-31 12:44:11 +02:00
Thomas Müller
8ef6c6c7bc Merge pull request #23690 from owncloud/add-codecov-icon 
Add codecov icon
 2016-03-31 12:00:31 +02:00
Lukas Reschke
0dcc5a4764 Add codecov icon 2016-03-31 11:58:42 +02:00
Thomas Müller
8394985e14 Merge pull request #23672 from owncloud/use-retry-wrapper-for-sftp 
Use RetryWrapper for SFTP storage
 2016-03-31 11:24:47 +02:00
Thomas Müller
52f51c94db Merge pull request #15750 from owncloud/loading-feedback-email-usermanagement 
Add loading feedback for email change in user management
 2016-03-31 11:24:27 +02:00
Jenkins for ownCloud
82da373ee7 [tx-robot] updated from transifex 2016-03-31 01:55:24 -04:00
Thomas Müller
d7072ee8e5 Merge pull request #23642 from stweil/master 
apps: Fix some typos found by codespell
 2016-03-30 23:47:00 +02:00
Thomas Müller
395c3d852d Merge pull request #23508 from owncloud/text-columns-should-have-length 
Text columns should really have a length 🙈
 2016-03-30 23:46:26 +02:00
Morris Jobke
f5beeec833 Properly handle return values of OC_App::getAppInfo() 
* fixes #23668
 2016-03-30 23:29:26 +02:00
Roeland Jago Douma
8da48a4482 Add unit tests 
Add some unit tests for setting the internal id and the provider id
 2016-03-30 23:08:35 +02:00
Roeland Jago Douma
d883b877d1 Move OCP\Share over to PSR-4 
Touching the code so moving it over to PSR-4
 2016-03-30 22:55:03 +02:00
Roeland Jago Douma
2f4294e781 Add setId and setProviderID to the public interface 
Fixes #23337

We only allow the id to be set once!
 2016-03-30 22:55:03 +02:00
Lukas Reschke
3dc5c59e57 Use RetryWrapper for SFTP storage 
Equivalent to https://github.com/owncloud/core/pull/23442

Required for making encryption work with external storage reliable.
 2016-03-30 22:45:09 +02:00
Thomas Müller
00c9974d94 Merge pull request #23663 from owncloud/share-displayownerfix 
Fix displaying owner before share icon in file list
 2016-03-30 18:42:25 +02:00
Vincent Petry
7be541bda1 GDrive stream download with RetryWrapper 2016-03-30 18:39:41 +02:00
Thomas Müller
510e8db1ba Merge pull request #23660 from owncloud/master-make-google-drive-drumpf-again 
Use the shipped cacerts.pem instead of the global one
 2016-03-30 18:34:36 +02:00
Vincent Petry
a9aa39efbf Fix displaying owner before share icon in file list 
Initial display of owner was missing
 2016-03-30 18:09:02 +02:00
Thomas Müller
66ee9d56fc Merge pull request #23628 from owncloud/avatar-remove 
only remove avatars from the folder we store them in
 2016-03-30 17:00:09 +02:00
Lukas Reschke
bd93722e12 Use the shipped cacerts.pem instead of the global one 
The one we ship may cause problems since Equifax is not included anymore (SHA-1 certs) are deprecated. We should just be consistent here and also use the certificate file which is used by the other calls in the library.
 2016-03-30 16:58:39 +02:00
Thomas Müller
748a59db11 Merge pull request #23654 from owncloud/issue-23653-xcache-detection-fails 
xcache.var_size with 64M should evaluate to isAvailable
 2016-03-30 16:57:02 +02:00
Thomas Müller
7d7a595969 Merge pull request #23651 from owncloud/fix_23536 
Non moveable mount points should always be UPDATE+DELETE shareable
 2016-03-30 16:56:23 +02:00