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

31367 commits

This branch
This branch
All branches
Author SHA1 Message Date
Thomas Müller
808a25bc5d Merge pull request #23767 from owncloud/remove-unrequired-randomlib 
Remove unrequired randomlib
 2016-04-05 09:17:00 +02:00
Jenkins for ownCloud
6b571ea2db [tx-robot] updated from transifex 2016-04-05 01:55:53 -04:00
Morris Jobke
96cdc07255 Merge pull request #23682 from owncloud/group_sharing_disabled_capability 
Add capability to show if group sharing is enabled
 2016-04-04 23:21:03 +02:00
Roeland Jago Douma
ab034f0593 Add intergration tests 2016-04-04 19:35:01 +02:00
Roeland Jago Douma
db5ea95e29 Add capability to show if group sharing is enabled 
fixes #23477

Now clients can correct wording to properly reflect who a user can share
with.
 2016-04-04 19:35:01 +02:00
Morris Jobke
6ecd1d9e86 Fix PHP memory leak in file_get_contents() 
* ref https://bugs.php.net/bug.php?id=61961

* ref https://github.com/owncloud/core/issues/20261#issuecomment-180000256

* code is based on the proposal of @chriseqipe

* fixes #20261
 2016-04-04 16:48:09 +02:00
Lukas Reschke
737807a378 Remove unrequired randomlib 2016-04-04 14:30:14 +02:00
Thomas Müller
f6cea3c9c4 Merge pull request #23557 from owncloud/sabre-plugin-browser-error-page 
In case of exception we return an html page in case the client is a b…
 2016-04-04 13:51:23 +02:00
Björn Schießle
53c1902706 Merge pull request #23743 from owncloud/issue-23686-files-transferownership-share-unmount 
Unmount the share before deleting it, so we don't try to use it later on
 2016-04-04 11:11:24 +02:00
Stefan Weil
62a5952a72 core: Fix typos (found by codespell) 
Signed-off-by: Stefan Weil <sw@weilnetz.de>
 2016-04-04 10:57:17 +02:00
Pau
e0bae32288 Fixed 'Help Translate' link 2016-04-04 10:56:36 +02:00
Bernhard Posselt
4887f0f9b5 Add better messages for sometimes obscure exceptions 
* add better messages for sometimes obscure exceptions

* fix formatting
 2016-04-04 10:55:46 +02:00
Thomas Müller
64d68eb2da Merge pull request #23722 from owncloud/also-hide-password-for-private-key-password-update 
Also replace password in updatePrivateKeyPassword
 2016-04-04 10:54:59 +02:00
Joas Schilling
1d542e4ed2 Merge pull request #23728 from owncloud/sanitize-more-data-for-config-report 
Sanitize more data in config report
 2016-04-04 09:47:02 +02:00
Joas Schilling
ac330daef2 Inject the Mount Manager 2016-04-04 09:08:55 +02:00
Jan-Christoph Borchardt
a0e2eae7de Merge pull request #23638 from owncloud/new-placeholder-colours-generator 
New colour generator
 2016-04-03 12:26:22 +02:00
Jenkins for ownCloud
deca08a683 [tx-robot] updated from transifex 2016-04-02 01:55:25 -04:00
Joas Schilling
3dac3a01c5 Unmount the share before deleting it, so we don't try to use it later on 2016-04-01 21:05:55 +02:00
John Molakvoæ
dcc28a3ad7 New colour generator 2016-04-01 18:00:47 +02:00
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
a5f2f22c12 Sanitize more data in config report 
This sanitizes the following keys as well:

- `proxyuserpwd`
- `shared_secret` of `log.condition`
- `license-key`
- `password` of `redis`
 2016-04-01 13:03:34 +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
Lukas Reschke
09b14ceffc Also replace password in updatePrivateKeyPassword 
Fixes https://github.com/owncloud/core/issues/23717
 2016-04-01 10:32:23 +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