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

12804 commits

Author SHA1 Message Date
Arthur Schiwon
b9b85e32be take the first result of that array, if present. Fixes 2nd display name to be 'Array', if cache is configured and enabled. 2016-02-24 21:32:03 +01:00
Lukas Reschke
db2ddb5441 Properly cast type 
The current logic is checking whether:

1. The returned value is a boolen
2. The returned value is a string and then matches for "true"

Since the config is now written to the database the data is now a string with the value "1" if HTTPS is set to true. Effectively this option was thus always disabled at the moment, falling back to plain HTTP.

This change casts the data to a boolean if it is defined as boolean.

Fixes https://github.com/owncloud/core/issues/22605
Fixes https://github.com/owncloud/core/issues/22016
 2016-02-24 19:58:41 +01:00
Victor Dubiniuk
aac6932e92 Skip users with no trashbin 2016-02-24 18:08:45 +03:00
Vincent Petry
4829a2d421 Disable sharing by default for external storage mounts 
This is for newly created mount points.

Migrated mount points will have sharing enabled as before.
 2016-02-24 13:58:21 +01:00
Thomas Müller
ac9de4ee95 Print docker logs to the console fro debugging 2016-02-24 13:58:13 +01:00
Thomas Müller
faf65e73b7 Merge pull request #22593 from owncloud/swift-docker-fix 
Enable upstream entrypoint changes with Ceph Docker
 2016-02-24 12:17:58 +01:00
Thomas Müller
473cd97a45 Merge pull request #22592 from owncloud/fix-response-header 
Add header for attachment disposition only once
 2016-02-24 12:15:32 +01:00
Thomas Müller
9a0950f10b Merge pull request #22569 from owncloud/issue-22566-too-much-mapping-entries 
Allow defining a limit and offset for getObjectIdsForTags
 2016-02-23 15:02:08 +01:00
Morris Jobke
403f11633c Drop unneeded use statements 2016-02-23 14:53:12 +01:00
Robin McCorkell
1d8c1f5692 Enable upstream entrypoint changes with Ceph Docker 2016-02-23 11:52:05 +00:00
Lukas Reschke
fc2c5fe414 Add header for attachment disposition only once 
Recent refactorings have resulted in the header being added twice, this makes browsers ignore the header which removes any security gains.

This changeset adds the header only once and adds integration tests ensuring the correct header in future.

https://github.com/owncloud/core/issues/22577
 2016-02-23 12:23:41 +01:00
Thomas Müller
fae6643e6d Merge pull request #22582 from owncloud/case-insensitive-contact-search 
Case insensitive contact search
 2016-02-23 10:48:38 +01:00
Thomas Müller
a3d1b2637d Merge pull request #22516 from owncloud/core-cumulativenotifications 
Accumulate notifications instead of blinking
 2016-02-23 10:36:34 +01:00
Joas Schilling
3a65bdf4d5 Fix dav unit tests 2016-02-23 09:04:15 +01:00
Thomas Müller
4dfdb2720c Case insensitive search in contacts - fixes #22575 2016-02-22 19:47:10 +01:00
Vincent Petry
27544144ce Fix unit tests affected by side effects 
The notification tests were not restoring the clock properly, but
indirectly helped other tests pass.

Since now we're restoring the clock properly, the other tests were fixed
to still work.
 2016-02-22 17:25:32 +01:00
Vincent Petry
8ea80e114a Accumulate notifications instead of blinking 
This makes it possible to display multiple notifications.
If the options.type is set to "error", it will also add a close button.
 2016-02-22 17:25:32 +01:00
Joas Schilling
a0d0edc754 Make non-public-method protected 2016-02-22 15:26:59 +01:00
Thomas Müller
f3b13c7656 Merge pull request #22536 from owncloud/add-integration-tests-for-tags 
Add integration tests for tags plus fix permissions
 2016-02-22 14:14:51 +01:00
Thomas Müller
7f2b3dbfd2 Merge pull request #22555 from owncloud/jenkins-19978 
Show username when writing "Insufficient storage" into owncloud.log
 2016-02-22 14:13:59 +01:00
Vincent Petry
642190f333 Fix public page footer position in IE 
The content element needs hasLayout, so triggering it with a display
attribute.

Without this, the #content element's height would be as high as the
window's height instead of adjusting itself to its contents' height.
 2016-02-22 11:26:50 +01:00
Pierre Jochem
1a8a667863 Solution for Proposal #19974 
Show username when writing into owncloud.log
 2016-02-22 10:02:45 +01:00
Morris Jobke
3e59c04c7f Fixes pagination in IE 
* tested in Firefox, Chrome, Safari, IE and Edge with folder and file shares
* fixes #20044
 2016-02-22 08:55:20 +01:00
Lukas Reschke
3bd95cca6b Check if user has permission to create such a tag 
Fixes https://github.com/owncloud/core/issues/22512
 2016-02-19 20:45:20 +01:00
Thomas Müller
f8677628d4 Merge pull request #22503 from owncloud/issue_22500 
When (re-)sharing an incomming federated share set the corrent owner
 2016-02-19 16:07:43 +01:00
Thomas Müller
5b3a79a28b Merge pull request #22509 from owncloud/add-filesplugin-to-new-webdav-endpoint 
Add FilesPlugin
 2016-02-19 14:44:02 +01:00
Thomas Müller
66f0ba837f Merge pull request #22348 from owncloud/issue-21812-calendar-old-caldav-url 
Fix old calendar dav urls
 2016-02-19 13:33:16 +01:00
Bjoern Schiessle
4ef035cc61 make sure that the file name doesn't end with a trailing slash. Can for example happen single files shared across servers 2016-02-19 13:15:09 +01:00
Thomas Müller
e987d8cd47 Add FilesPlugin - fixes #22507 2016-02-19 12:37:24 +01:00
Thomas Müller
1106c354ac Merge pull request #22515 from owncloud/webdav_checksum_only_for_files 
Only add checksum headers for 'real' files
 2016-02-19 12:36:56 +01:00
Joas Schilling
b216be8cca Add correct principals for the current user before ACL check 2016-02-19 12:35:33 +01:00
Joas Schilling
4e2f9ce05b Convert the old principal to the new principal before getting calendars 2016-02-19 12:35:33 +01:00
Thomas Müller
ffc2950393 Merge pull request #22198 from owncloud/birthday-calendar 
Sync a users contacts birthday to the users birthday calendar
 2016-02-19 12:33:19 +01:00
Roeland Jago Douma
751d3df469 Only add checksum headers for files 
We can only add the checksum header for real ownCloud files (so we have
a fileinfo object etc).
 2016-02-19 10:56:43 +01:00
Thomas Müller
ae2304f23f Merge pull request #22405 from owncloud/gdrive-mimetype-and-office-fixes 
Fix GDrive handling of office files
 2016-02-19 09:13:35 +01:00
Thomas Müller
f6e61a296f Merge pull request #22424 from owncloud/add-generic-csrf-protection-to-webdav 
Require CSRF token for non WebDAV authenticated requests
 2016-02-19 09:13:00 +01:00
Thomas Müller
d1ef43481d Merge pull request #22444 from owncloud/fix-federated-share-delete 
get the actual user instead of a federated cloud id
 2016-02-18 16:44:57 +01:00
Thomas Müller
d8de7d1e73 Adding cli command to sync birthday calendar 2016-02-18 14:49:45 +01:00
Thomas Müller
6c4cdddba8 Merge pull request #21610 from owncloud/quota-sharedfile 
Fix quota check for single shared files
 2016-02-18 14:25:32 +01:00
Vincent Petry
e1dbae1467 Properly trigger testRemote after getting a 404 from remote fed share 
Whenever a remote fed share's shareinfo call returns a 404, don't
directly assume the storage is not available by throwing
StorageNotAvailableException. We need to properly throw
NotFoundException to trigger the later logic that calls testRemote()
that verifies that the 404 is not from a broken server but really from
an obsolete share.
 2016-02-18 11:57:03 +01:00
Thomas Müller
981c73000c Prevent deletion of birthday calendar 2016-02-18 11:49:16 +01:00
Thomas Müller
c9187cc820 Sync a users contacts birthday to the users birthday calendar 2016-02-18 11:48:34 +01:00
Lukas Reschke
9b3c4e8dc4 Require CSRF token for non WebDAV authenticated requests 2016-02-18 11:18:36 +01:00
Thomas Müller
73d46afc3c Merge pull request #22399 from owncloud/issue-22394-index-names-for-oracle 
Add index names so Doctrine does not use a too long random string
 2016-02-18 11:18:32 +01:00
Thomas Müller
bba8875fb5 Merge pull request #22434 from owncloud/share_ocs_api_handle_invalid_shares 
OCS Share API should not return invalid shares
 2016-02-18 11:17:41 +01:00
Thomas Müller
9d24de0ceb Merge pull request #22478 from owncloud/external-missing-auth 
dont die when missing an auth backend
 2016-02-18 11:17:19 +01:00
Bjoern Schiessle
8985181305 get the actual user instead of a federated cloud id 
$view->getUidAndFilename($filename); returns the federated cloud id in case of
a federated share. But in this case we need the local user who "owns" the file
which is the current logged in user in case of a federated share
 2016-02-18 10:17:00 +01:00
Bjoern Schiessle
ac1c3d27b7 get the actual user instead of a federated cloud id 
$view->getUidAndFilename($filename); returns the federated cloud id in case of
a federated share. But in this case we need the local user who "owns" the file
which is the current logged in user in case of a federated share
 2016-02-18 10:16:59 +01:00
Thomas Müller
3a97a0ad7f Merge pull request #22475 from owncloud/fix-js-issues 
Fixes code analysis issues
 2016-02-18 10:14:31 +01:00
Thomas Müller
8798f85e88 Merge pull request #22418 from owncloud/issue-22393-filelist-plugins-for-other-views 
Show the comments and tags on the share filters
 2016-02-18 10:14:20 +01:00
Thomas Müller
bfd4a9548b Merge pull request #22408 from owncloud/gdrive-remove-mimetype-detection 
Fix GDrive mime type detection with encryption
 2016-02-18 10:14:01 +01:00
Robin Appelman
65a283f967 dont die when missing an auth backend 2016-02-17 16:51:40 +01:00
Vincent Petry
ceaefc2c54 Defer quota check in web UI when overwriting shared file 
When receiving a shared file, the quota for that file counts in the
owner's storage, not the current user's storage.

To make it possible to overwrite the file even when the current user
doesn't have enough space, the quota check is deferred for such files.
 2016-02-17 15:38:21 +01:00
Morris Jobke
d55cfb4f89 Fixes code analysis issues 2016-02-17 15:19:42 +01:00
Thomas Müller
7af7d18cfa Merge pull request #16783 from owncloud/handle-redirects-global 
Adding global error handler for ajax calls which run into redirection…
 2016-02-17 14:49:04 +01:00
Roeland Jago Douma
670557ffbb Add unit tests for formatShare 2016-02-17 13:55:39 +01:00
Roeland Jago Douma
2aa0b885f6 OCS Share API should not return invalid shares 
Since we have lazy shares it can happen that a share is actually
invalid. See https://github.com/owncloud/core/issues/20908

This add checks for the get methods to handle the NotFound exception.
 2016-02-17 13:55:39 +01:00
Robin Appelman
c2c6caee93 remove global credentials 2016-02-17 13:55:27 +01:00
Vincent Petry
53eff9792f Check the quota on the actual file's storage in dav quota plugin 
Fix quota plugin to use the correct file name when chunking

When chunking, the file name is the compound name, so need to convert it
to the correct final file name before doing the free space check.
This ensures that in the case of shared files, the correct storage is
used for the quota check.
 2016-02-17 11:52:49 +01:00
Thomas Müller
9e415a956a Merge pull request #22451 from owncloud/use-proper-user-folder 
Handles null as return code and uses proper UserFolder in trashbin
 2016-02-17 10:58:31 +01:00
Thomas Müller
ff4e040971 Merge pull request #22435 from owncloud/trashbin-hook-nouser 
Don't resize trash when no user
 2016-02-17 10:57:50 +01:00
Jenkins for ownCloud
fe29feae9a [tx-robot] updated from transifex 2016-02-17 01:56:11 -05:00
Morris Jobke
de58364eb8 Handles null as return code and uses proper UserFolder in trashbin 2016-02-16 18:45:25 +01:00
Vincent Petry
7bed529951 Don't resize trash when no user 
Happens when overwriting files on federated shares.
 2016-02-16 16:29:07 +01:00
Thomas Müller
c6b2457306 Merge pull request #22432 from owncloud/files_external-backends 
remove login credentails and user provided backends
 2016-02-16 16:08:21 +01:00
Robin Appelman
176fb191b7 remove login credentails and user provided backends 2016-02-16 15:27:55 +01:00
Jenkins for ownCloud
7942f3d7ec [tx-robot] updated from transifex 2016-02-16 08:49:12 -05:00
Thomas Müller
3503eb69f2 Adding transifex to new core apps 2016-02-16 14:40:10 +01:00
Joas Schilling
077a407285 Show the comments and tags on the share filters 2016-02-16 11:24:44 +01:00
Thomas Müller
1cb3583a9a Merge pull request #22398 from owncloud/fix-card-properties 
Queries on the cards table by uri require the addressbook as well
 2016-02-16 10:19:51 +01:00
Thomas Müller
3a55229915 Merge pull request #22400 from owncloud/files-select-closesidebar 
Close file detail sidebar when selecting/unselecting files
 2016-02-16 09:15:14 +01:00
Thomas Müller
f850871415 Merge pull request #22385 from owncloud/issue-22384-invalid-content-location-on-commenting 
Posting a comment replies with invalid location URL
 2016-02-16 08:30:11 +01:00
Thomas Müller
9942263409 Merge pull request #22392 from owncloud/create-default-calendar-and-addressbook 
On login we create a default calendar and a default addressbook for t…
 2016-02-16 08:29:54 +01:00
Thomas Müller
e5641247a3 Merge pull request #22403 from owncloud/improved-error-handling 
Remove background job if the server accepted to ask for the shared secret
 2016-02-16 08:29:38 +01:00
Jenkins for ownCloud
3dd1961f92 [tx-robot] updated from transifex 2016-02-16 01:55:39 -05:00
Bjoern Schiessle
9d1d08bf9b forbidden (403) is a valid return status, don't log the whole exception in this case 2016-02-15 18:03:10 +01:00
Bjoern Schiessle
835e70dbe2 throw exception if we don't find a token for a given server 2016-02-15 18:03:10 +01:00
Bjoern Schiessle
cc397da1be Remove background job if the server accepted to ask for the shared secret 
If we don't remove it the server will later ask the remote server to ask for
the shared secret which will result in a error log message on the remote server
and in some circumstances maybe even to a failure
 2016-02-15 18:03:10 +01:00
Vincent Petry
d38b71f206 Fix GDrive mime type detection with encryption 
When encryption is enabled, GDrive would think that all files are text
files. This fix falls back to the extension based detection when a
non-special mime type is returned
 2016-02-15 17:09:08 +01:00
Vincent Petry
075dd54f6c Fix GDrive handling of office files 
1) Properly detect empty file extension, can be null.

2) When renaming part file to final file, use the correct file name
without extension, if it exists

3) When renaming a file, do not delete the original file if it had the
same id, which can happen with part files
 2016-02-15 16:49:12 +01:00
Vincent Petry
d565290d16 Close file detail sidebar when selecting/unselecting files 
Interacting with the checkboxes, also "Select all" will automatically
close the sidebar now.
 2016-02-15 14:58:44 +01:00
Joas Schilling
7e4c3b577c Add index names so Doctrine does not use a too long random string 2016-02-15 14:52:41 +01:00
Thomas Müller
722809c2bd On login we create a default calendar and a default addressbook for the user - fixes #22360 2016-02-15 14:41:54 +01:00
Thomas Müller
df7280a3c7 Queries on the cards table by uri require the addressbook as well - fixes #22284 2016-02-15 14:29:24 +01:00
Vincent Petry
b8b77709c0 Add handler for global ajax errors 2016-02-15 12:48:47 +01:00
Thomas Müller
46b39c3465 Merge pull request #22337 from owncloud/new_reshare_no_initiator 
On backend hickups don't crash OCS output
 2016-02-15 12:02:52 +01:00
Thomas Müller
fd21bfd9e8 Merge pull request #22358 from owncloud/fix-22278 
Fix race condition when switching filter mode. Fixes #22278
 2016-02-15 12:02:35 +01:00
Joas Schilling
cb836158f0 Deduplicate slashes 2016-02-15 10:54:56 +01:00
Jenkins for ownCloud
be34cea970 [tx-robot] updated from transifex 2016-02-15 01:55:28 -05:00
Jenkins for ownCloud
7061416016 [tx-robot] updated from transifex 2016-02-14 01:55:37 -05:00
Thomas Müller
11707dffce Merge pull request #22351 from owncloud/fix_22277 
show remote server on federated share auto-complete
 2016-02-13 18:25:04 +01:00
Thomas Müller
248c571c56 Merge pull request #22331 from owncloud/dav-nonexisting-part 
fix getNodeForPath for non existing part files
 2016-02-13 18:24:00 +01:00
Jenkins for ownCloud
2344c8e07d [tx-robot] updated from transifex 2016-02-13 01:55:39 -05:00
Arthur Schiwon
62aac81c45 Fix race condition when switching filter mode. Fixes #22278 2016-02-12 21:51:06 +01:00
Lukas Reschke
ab5768f7dd Only register admin page when update is available 
Fixes https://github.com/owncloud/core/issues/22353
 2016-02-12 18:45:42 +01:00
Thomas Müller
ad9dea8edf Merge pull request #22292 from owncloud/smb-handle-forbidden 
handle forbidden exceptions in smb backend
 2016-02-12 16:09:05 +01:00
Bjoern Schiessle
11abf2487c add remote server to the result 2016-02-12 15:52:51 +01:00
Thomas Müller
b3323a51c9 Merge pull request #22294 from owncloud/carddav-report-list-groups-2 
Adding a custom webdav property which holds the list of contacts groups
 2016-02-12 13:22:05 +01:00
Thomas Müller
cb1051dae4 Merge pull request #22305 from owncloud/sharestatus_to_ocs_22298 
Calculate the share statuses in js from the OCS Response
 2016-02-12 11:12:14 +01:00
Thomas Müller
e99c4d83dc Merge pull request #22317 from owncloud/fix_invisible_linkshares 
Do not allow invisible link shares
 2016-02-12 11:10:58 +01:00