Commit Graph

14111 Commits

Author SHA1 Message Date
Lukas Reschke 95820fbd5b Add magical regex to catch browsers 2016-03-24 19:02:16 +01:00
Thomas Müller c46f480031 In case of exception we return an html page in case the client is a browser 2016-03-24 19:02:16 +01:00
Thomas Müller 89cd6e228d Handle group shares of addressbooks on v1 as well ... now FINALLY .... 2016-03-24 17:11:07 +01:00
Thomas Müller a7e7f5e180 Merge pull request #23511 from owncloud/sidebar-click
sidebar click modification
2016-03-24 13:30:27 +01:00
Thomas Müller 3d51682440 Merge pull request #23342 from owncloud/fix-group-sharing-for-v1-caldav-and-carddav
Fix group shares on v1 caldav and carddav
2016-03-24 12:47:18 +01:00
Vincent Petry 9ee1f506f2 Return remote shares in oc:share-types Webdav property
Fixes web UI to properly display the share status icon when an outgoing
remote share exists
2016-03-24 12:16:57 +01:00
Erik Pellikka 50655cbf7f sidebar click modification 2016-03-24 11:57:40 +01:00
Thomas Müller 06e8c70400 Fix acls for calendar objects and cards - fixes #23273 2016-03-24 09:53:36 +01:00
Thomas Müller 8c2b19d2bc Return proper current-user-principal on v1 endpoints - fixes #23306 2016-03-24 09:53:36 +01:00
Thomas Müller 4c738ea9c4 Fix group shares on v1 caldav and carddav - fixes #23328 2016-03-24 09:53:36 +01:00
Lukas Reschke cc8c0b6a90 Check if request is sent from official ownCloud client
There are authentication backends such as Shibboleth that do send no Basic Auth credentials for DAV requests. This means that the ownCloud DAV backend would consider these requests coming from an untrusted source and require higher levels of security checks. (e.g. a CSRF check)

While an elegant solution would rely on authenticating via token (so that one can properly ensure that the request came indeed from a trusted client) this is a okay'ish workaround for this problem until we have something more reliable in the authentication code.
2016-03-24 08:59:56 +01:00
Jenkins for ownCloud 4b3af9dfe7 [tx-robot] updated from transifex 2016-03-24 01:57:28 -04:00
Achim Königs 4b2f9e4027 add VALARM for birthday events
ACTION=DISPLAY *should* prevents audible alarms.
2016-03-23 23:21:10 +01:00
Arthur Schiwon c9587cea76 disable Paged Search when chunksize is set to 0, fixes #21136 2016-03-23 19:47:31 +01:00
Vincent Petry 02c2568442 Dropbox stream download with RetryWrapper 2016-03-23 18:06:01 +01:00
Thomas Müller 765cff49fa Merge pull request #23507 from owncloud/fix-23496-master
Avoid fatal php error dring cron execution
2016-03-23 17:21:49 +01:00
Thomas Müller c8d6a9594a Propagate birthday to group shares as well 2016-03-23 14:12:50 +01:00
Thomas Müller ea07a428f4 Merge pull request #22506 from owncloud/node-get-from-cache
Query the cache when checking if a node exists
2016-03-23 13:08:17 +01:00
Thomas Müller e979b9c735 Propagate birthdays of shared addressbooks to the sharee's birthday calendar as well 2016-03-23 12:29:45 +01:00
Thomas Müller 1da18a8ceb Text columns should really have a length 🙈 2016-03-23 12:03:54 +01:00
Thomas Müller 765c64c73e fixes #23496 2016-03-23 11:37:00 +01:00
Thomas Müller 24331be991 Merge pull request #23431 from owncloud/use-dav-sabre-plugin-for-browser-2
Fix display of vcard and calendar object details page in browser plugin
2016-03-23 11:03:55 +01:00
Thomas Müller 164282c72e Fix display of vcard and calendar object details page in browser plugin 2016-03-23 10:35:21 +01:00
Thomas Müller 61c5717281 Merge pull request #23463 from owncloud/lets-consistently-use-no-referer
Consistently use rel=noreferrer
2016-03-23 09:14:54 +01:00
Thomas Müller a25872e034 Merge pull request #23495 from owncloud/disable-paste-zone
Disable pastezone for jquery.fileupload
2016-03-23 09:03:50 +01:00
Jenkins for ownCloud e6fb139eb9 [tx-robot] updated from transifex 2016-03-23 01:57:22 -04:00
Thomas Müller d5be21fe81 Merge pull request #23398 from owncloud/block_group_sharing
Allow blocking of group sharing
2016-03-22 21:28:13 +01:00
Lukas Reschke f8ae1bb36e Disable pastezone for jquery.fileupload
jquery.fileupload offers the [`pastezone`](https://github.com/blueimp/jQuery-File-Upload/wiki/Options#pastezone) functionality. This functionality is enabled by default and if somebody copy-pastes something into Chrome it will automatically trigger an upload of the content to any configured jquery.fileupload element embedded in the JS.

This implementation triggers some problems:

1. The pastezone is defined globally by default (🙈). So if there are multiple fileupload's on a page (such as in the personal settings) then stuff is going to be uploaded to all embedded uploads.
2. Our server code is not able to parse the data. For example for uploads in the files app we expect a file name which is not specified => Just an error is thrown. You can reproduce this by taking a file into your clipboard and in Chrome then pressing <kbd>CTRL + V</kbd>.
3. When copy-pasting some string from MS Office on the personal page a temporary avatar with said content is created.

Considering that this is anyways was never working at all and causes bugs I've set the `pastezone` to `null`. This mens that upload via copy and paste will be disabled.

Lesson learned: Third-party JS libraries can have some weird details.
2016-03-22 20:28:57 +01:00
Roeland Jago Douma 00f48ec37b When the Share API is disabled do not return shares
Fixes #22668

Block everything in the OCS Share API
2016-03-22 19:43:23 +01:00
Roeland Jago Douma e69a09756b Respect disabled group sharing in sharee endpoint
* Fix tests
2016-03-22 17:13:34 +01:00
Roeland Jago Douma 52826d0e24 Block group sharing in API and in share manager
* Fix tests
2016-03-22 17:13:34 +01:00
Thomas Müller 48ec8ab3d3 Merge pull request #23404 from owncloud/fix-22988
adjust PrincipalUri as returned from Sabre to effective username
2016-03-22 14:49:54 +01:00
Thomas Müller 9fc371e436 Merge pull request #23320 from owncloud/early-creation-of-birthday-calendar
Create the contact birthday calendar right away as soon as the comman…
2016-03-22 10:31:01 +01:00
Thomas Müller 5e4f9b8627 Merge pull request #23440 from owncloud/fix_22286
apply retry wrapper to make sure that we always read/write a complete block
2016-03-22 09:50:05 +01:00
Thomas Müller ac799a40e3 Merge pull request #23422 from owncloud/icon-and-you-translation-for-comments
Add comment icon and "You commented" translations to activities
2016-03-22 09:49:30 +01:00
Jenkins for ownCloud aa5bb56010 [tx-robot] updated from transifex 2016-03-22 01:55:40 -04:00
Arthur Schiwon be572de7f0 fix unittest 2016-03-21 21:53:16 +01:00
Thomas Müller 2357bbf80a Merge pull request #23439 from owncloud/smb-permissions
properly use smb permissions
2016-03-21 18:05:45 +01:00
Thomas Müller 36e1476270 Merge pull request #23388 from owncloud/issue-22887-infinite-background-job-loop-for-old-versions
Do not create a new job when federation failed to connect but use existing job
2016-03-21 18:04:02 +01:00
Thomas Müller 736b80f0cb Merge pull request #23323 from owncloud/gdrive-chunkupload
Chunk upload for GDrive
2016-03-21 18:02:55 +01:00
Thomas Müller beef371398 Merge pull request #23292 from owncloud/dav-chunking-onlyfirehooksonce
Do not fire pre/post hooks twice on chunk upload
2016-03-21 18:02:30 +01:00
Thomas Müller 492a1ded1c Merge pull request #23083 from owncloud/generate-birthdays-on-upgrade
Birthday events are generated on upgrade
2016-03-21 17:48:02 +01:00
Bjoern Schiessle f761733f17 apply retry wrapper to make sure that we always read/write a complete block 2016-03-21 17:39:43 +01:00
Vincent Petry f28f538029 Do not fire pre/post hooks twice on chunk upload 2016-03-21 15:14:58 +01:00
Robin Appelman 8ab70b1231 properly use smb permissions 2016-03-21 14:35:41 +01:00
Robin Appelman 792752772d update icewind/smb to 1.0.8 2016-03-21 14:24:00 +01:00
Robin Appelman dfbd85d723 update icewind/streams to 0.4.0 and icewind/smb to 1.0.7 in files_external 2016-03-21 14:24:00 +01:00
Robin Appelman d0dd76bb8a set watch policy in test 2016-03-21 13:53:33 +01:00
Thomas Müller 8852fdaee3 Merge pull request #22789 from owncloud/dav-sharesproperty
Add webdav property for share info in PROPFIND response
2016-03-21 11:15:00 +01:00
Joas Schilling b7f7fc7241 Do not create a new job when it failed to connect atm 2016-03-21 10:29:53 +01:00
Thomas Müller e983bd7db0 Merge pull request #23368 from owncloud/use-dav-sabre-plugin-for-browser
In debugging mode we enable Sabre's browser plugin since it helps a l…
2016-03-21 10:13:27 +01:00
Thomas Müller c77412b1ac Merge pull request #22792 from owncloud/no-recovery-key-if-the-master-key-is-enabled
disable the recovery key if the master key is enabled
2016-03-21 09:49:15 +01:00
Thomas Müller 8442516e10 Merge pull request #23329 from owncloud/fix-21555
Avatar must be saved after login is done and external storages set up…
2016-03-21 09:47:50 +01:00
Joas Schilling b2f4e4559f Add comment icons and "You commented" translations 2016-03-21 09:41:13 +01:00
Jenkins for ownCloud 35bc315f59 [tx-robot] updated from transifex 2016-03-21 01:55:40 -04:00
Lukas Reschke 6ad957906e Consistently use rel=noreferrer
When linking to external entities we should consistently use rel=noreferrer
2016-03-20 15:27:20 +01:00
Jenkins for ownCloud 1f1d87d413 [tx-robot] updated from transifex 2016-03-20 01:55:09 -04:00
Jenkins for ownCloud 9c053ed465 [tx-robot] updated from transifex 2016-03-19 01:55:39 -04:00
Arthur Schiwon 117c1bffa7 adjust PrincipilUri as returned from Sabre to effective username 2016-03-18 23:31:11 +01:00
Pau 3f3498164c Fixed hidden settings and delete icons 2016-03-18 17:51:36 +01:00
Bjoern Schiessle 89223379ad replaceUserKeys() actually deletes the users keys -> update method name and doc-block 2016-03-18 11:06:14 +01:00
Bjoern Schiessle 5e267589d4 only create and update user specific key if no master key is enabled 2016-03-18 11:06:14 +01:00
Jenkins for ownCloud a6c921267e [tx-robot] updated from transifex 2016-03-18 01:59:00 -04:00
Thomas Müller 0bc51b9118 Merge pull request #23272 from owncloud/dropbox-downloadnotthefullfileinmemory
Fix dropbox storage to not store the whole file in memory
2016-03-17 20:52:41 +01:00
Thomas Müller 31ee463690 Merge pull request #23282 from owncloud/fix-caching-unavailable-ldap
fix writing to cache when fallback server should be used immediately
2016-03-17 20:52:22 +01:00
Thomas Müller d6d59fe227 Merge pull request #23346 from owncloud/fix_23325
Set proper public webdav permissions when public upload disabled
2016-03-17 20:51:54 +01:00
Roeland Jago Douma 6e6e002280 Remove duplicated copyright 2016-03-17 19:24:25 +01:00
Thomas Müller 520724d757 Necessary code changes to make browser plugin properly work 2016-03-17 18:00:06 +01:00
Thomas Müller 7d638fdb34 In debugging mode we enable Sabre's browser plugin since it helps a lot when debugging 2016-03-17 16:51:19 +01:00
Vincent Petry 950530b162 Display share status info in favorite list
Returns the shareTypes share status info to the favorites file list.
2016-03-17 15:35:21 +01:00
Vincent Petry f778e48ee5 Add webdav property for share info in PROPFIND response 2016-03-17 15:35:21 +01:00
Thomas Müller 8fb3e44610 Merge pull request #23287 from owncloud/issue-22786-absolute-paths
Fix absolute path creation for remote shares with /oc webroot
2016-03-17 14:29:57 +01:00
Vincent Petry 5db41dfbed Only use GDrive chunks when needed 2016-03-17 12:36:47 +01:00
Roeland Jago Douma 533fdb4075 Set proper public webdav permissions when public upload disabled
Fixes #23325

It can happen that a user shares a folder with public upload. And some
time later the admin disables public upload on the server.

To make sure this is handled correctly we need to check the config value
and reduce the permissions.

Fix is kept small to be easy backportable.
2016-03-17 11:35:31 +01:00
Pellaeon Lin 48430d4481 Handle case when breadcrumb and filelist item overlap
and both receive a drop.

Build breadcrumb over and out callback in filelist.js and
pass them as options to utilize local selectors of filelist

Re-enable td elements after drop to bread crumb

Fix# drop handler still being called after enable,
it seems that waiting for a short time before re-enabling solves the
problem

* Add explanations for setTimeout re-enable td.filename drop handler
2016-03-17 10:20:57 +01:00
Thomas Müller 828cb08d49 Merge pull request #23334 from owncloud/ext-user-mounting-gui
Display external storage GUI even if user mounting disabled
2016-03-17 09:55:23 +01:00
Thomas Müller b5c56a7322 Merge pull request #23336 from owncloud/occ-typos
Some typo corrections in occ command output
2016-03-17 09:31:11 +01:00
Jenkins for ownCloud ace1812026 [tx-robot] updated from transifex 2016-03-17 01:56:06 -04:00
Carla Schroder 0c9eaede41 Some typo corrections in occ command output 2016-03-16 16:14:25 -07:00
Robin McCorkell a51ece97e3 Display external storage GUI even if user mounting disabled 2016-03-16 22:06:49 +00:00
Thomas Müller f3f08cf910 Merge pull request #23192 from owncloud/make-ancient-users-happy-with-totally-untested-stuff
Fallback for crappy ancient distributions
2016-03-16 21:56:36 +01:00
Arthur Schiwon d8621c78ed Avatar must be saved after login is done and external storages set up properly, fixes #21555 2016-03-16 20:51:03 +01:00
Vincent Petry aa2674e7e2 Chunk upload for GDrive
Instead of storing the WHOLE file in memory in a PHP variable, use the
library's chunk upload support.
2016-03-16 17:57:54 +01:00
Thomas Müller b4ea527fb2 Merge pull request #23253 from owncloud/give-swift-more-time
Give swift 15 seconds after startup
2016-03-16 17:32:55 +01:00
Thomas Müller fdb7c59e6c Create the contact birthday calendar right away as soon as the command is executed once - fixes #23203 2016-03-16 17:23:02 +01:00
Thomas Müller d188ed938c Merge pull request #23082 from owncloud/contacts_calendar_name_color
add title and color to birthday calendar
2016-03-16 17:17:21 +01:00
Morris Jobke e7e743bdb4 Give swift 15 seconds after startup 2016-03-16 16:16:04 +01:00
Arthur Schiwon 8e0bd5630c fix writing to cache when fallback server should be used immediately 2016-03-16 14:44:18 +01:00
Robin Appelman d498282e12 handle connection errors as storage not available in smb 2016-03-16 13:15:54 +01:00
Thomas Müller 225eebd8f9 Merge pull request #23155 from owncloud/fed-unshare-with
Specify the target user when unsharing a federated share
2016-03-16 11:19:09 +01:00
Joas Schilling 140d5f7df3 Make sure to append the web root as per doc 2016-03-16 09:37:48 +01:00
Jenkins for ownCloud 631ae2f0f4 [tx-robot] updated from transifex 2016-03-16 01:55:43 -04:00
Senorsen a6631eceb4 Add urlencode to username part of ftp and sftp links
according to #17796
2016-03-16 01:49:40 +08:00
Vincent Petry ab50ba7a58 Fix dropbox storage to not store the whole file in memory
Since the library can only store the full response in memory on
download, we use an alternate client lib and set the correct headers to
be able to stream the content to a temp file.
2016-03-15 18:05:27 +01:00
Lukas Reschke 7183854509 Close session for publicwebdav
We need to close the session otherwise streaming will lead to a blocked ownCloud.
2016-03-15 16:08:55 +01:00
Thomas Müller 8feb42c22e Merge pull request #23251 from owncloud/fix_22907
allow group shares, even if not all public keys are available
2016-03-15 16:00:47 +01:00
Thomas Müller d4a8d5d2ea Merge pull request #22998 from owncloud/delay-loading-the-scanner
Delay check till scanner is used
2016-03-15 12:16:02 +01:00
Thomas Müller 0f6ea9fd29 Merge pull request #23039 from owncloud/invalid-share-storage
dont break when there is an invalid share
2016-03-15 12:15:05 +01:00
Thomas Müller e9eeb3607f Merge pull request #23074 from owncloud/issue-22835-correctly-use-querybuilder-api
Correctly escape join statements and use selectAlias
2016-03-15 12:14:17 +01:00
Bjoern Schiessle 9de4a8338e allow group shares, even if not all public keys are available 2016-03-15 11:33:19 +01:00
Jenkins for ownCloud 2c6617da60 [tx-robot] updated from transifex 2016-03-15 01:55:47 -04:00
Robin Appelman 7d42bdfde0 Specify the target user when unsharing a federated share 2016-03-14 14:34:05 +01:00
Jenkins for ownCloud e0998c27ff [tx-robot] updated from transifex 2016-03-14 01:56:12 -04:00
Thomas Müller 31aeca32c2 Merge pull request #23201 from owncloud/mark-testing-app-as-compatible-with-9-1
Mark testing app as compatible with 9.1
2016-03-13 19:59:47 +01:00
Thomas Müller 101e446577 Merge pull request #23091 from owncloud/issue-23085-csae-insensitive-group-search
Return the correct group casing in sharee api
2016-03-13 19:51:07 +01:00
Lukas Reschke 239f1c067c Mark testing app as compatible with 9.1 2016-03-13 19:47:30 +01:00
Roeland Jago Douma 6509220f82 Fix intergration tests 2016-03-13 13:31:28 +01:00
Roeland Jago Douma 4b1fe0083a Remove the old OCS Share API code 2016-03-13 13:31:28 +01:00
Lukas Reschke 3a5f58c9b0 Fallback for crappy ancient distributions
Fixes https://github.com/owncloud/core/issues/23181
2016-03-12 23:11:31 +01:00
Jenkins for ownCloud 5862a067d9 [tx-robot] updated from transifex 2016-03-12 01:55:36 -05:00
Joas Schilling aad8aa0970 Correctly lower the search input as well 2016-03-11 14:08:13 +01:00
Joas Schilling 8cd52ed36d Return the correct group casing in sharee api 2016-03-11 14:08:12 +01:00
Robin Appelman a8db587b1f move failedstorage to core 2016-03-11 13:15:45 +01:00
Robin Appelman 3bd6fc797d dont break when there is an invalid share 2016-03-11 13:15:45 +01:00
Thomas Müller 750ec93394 Merge pull request #23080 from owncloud/use-non-localized-birthday-title
Use a birthday title which does not require translation because we ha…
2016-03-11 11:49:13 +01:00
Jenkins for ownCloud 1ed831564e [tx-robot] updated from transifex 2016-03-11 01:55:49 -05:00
Thomas Müller 866de3c174 Merge pull request #23086 from owncloud/ldap-sort-deprecated
remove deprecated ldap_sort
2016-03-11 00:23:13 +01:00
Thomas Müller 07a1313114 Merge pull request #23119 from owncloud/fix-getOwner-on-fileshome-master
getOwner is not available on FileHome
2016-03-10 23:12:51 +01:00
Thomas Müller e0210058ef Merge pull request #23094 from owncloud/fake-lock-for-windows-7-8-10
Fake LOCK statement for Windows 7, 8 and 10 network mounts
2016-03-10 23:07:45 +01:00
Thomas Müller b502667f3a Merge pull request #23121 from owncloud/scrutinizer_share_fixes
Fix some scrutinizer warning in the sharing code
2016-03-10 22:17:06 +01:00
Roeland Jago Douma e6712c47a6 Fix some scrutinizer warning in the sharing code
* Better phpdoc
* Promper use statements
* Unused parameter
2016-03-10 21:35:22 +01:00
Thomas Müller 8e51634e6d Merge pull request #23056 from owncloud/fix_23044
Add mimetype to OCS Share API output
2016-03-10 21:18:19 +01:00
Georg Ehrke 856ca641d1 add title and color to birthday calendar 2016-03-10 21:02:54 +01:00
Thomas Müller b7adf371c6 getOwner is not available on FileHome - fixes #23116 2016-03-10 20:53:56 +01:00
Thomas Müller 7f16aaefc8 Merge pull request #23048 from owncloud/no-fatal-error-if-DSTART-is-not-set
No fatal error if dstart is not set
2016-03-10 17:58:01 +01:00
Thomas Müller ad61c552ea Merge pull request #23087 from owncloud/allow-migrating-all-calendars
Allow to migrate calendars of all users
2016-03-10 17:44:23 +01:00
Roeland Jago Douma 517ef52560 Add mimetype to OCS Share API output
Fixes #23044
2016-03-10 15:41:17 +01:00
Morris Jobke 48e03e0c49 Fake LOCK statement for Windows 7, 8 and 10 network mounts
* fixes #22596
2016-03-10 15:02:37 +01:00
Thomas Müller 5fc859f7ea Generate birthdays on upgrade from 8.2 as well 2016-03-10 14:17:21 +01:00
Joas Schilling 94915e39db Allow to migrate calendars of all users 2016-03-10 13:42:09 +01:00
Arthur Schiwon fe2a506e56 remove deprecated ldap_sort 2016-03-10 13:13:38 +01:00
Thomas Müller b021c8c475 Birthday events are generated on upgrade 2016-03-10 13:04:50 +01:00
Thomas Müller 85521879cd The birthday_calendar is read-only 2016-03-10 12:50:07 +01:00
Thomas Müller fe7103506b Use a birthday title which does not require translation because we have no idea about the target device language and forcing English upon all users is kind of bad 2016-03-10 12:41:37 +01:00
Thomas Müller 262ec35d50 Merge pull request #23017 from owncloud/first-stop-the-dockers
docker containers should be stopped before being removed - refs https…
2016-03-10 10:58:20 +01:00
Thomas Müller 41aae971a9 Merge pull request #23050 from owncloud/href-target-blank
make sure links open in new tabs
2016-03-10 10:54:53 +01:00
Joas Schilling 6b4117df34 Correctly escape join statements and use selectAlias 2016-03-10 10:24:08 +01:00
Thomas Müller 6133253a2c fixes #23004 2016-03-10 09:20:53 +01:00
Thomas Müller 845a45ae4a Merge pull request #23064 from owncloud/typo-comments-app-desc
fix typo in comments app meta data
2016-03-10 08:24:40 +01:00
Jenkins for ownCloud 96d70aa270 [tx-robot] updated from transifex 2016-03-10 01:55:35 -05:00
Arthur Schiwon 6aefc8fba7 fix typo 2016-03-09 22:31:30 +01:00
Jan-Christoph Borchardt ecbe4aea31 make sure links open in new tabs 2016-03-09 18:49:46 +01:00
Thomas Müller bc434b252c fixes #23020 2016-03-09 18:12:39 +01:00
Thomas Müller 822541b689 Merge pull request #23035 from owncloud/fix-syncing-of-all-birthday-calendars
Fix syncing of all birthday calendars in one go
2016-03-09 16:44:19 +01:00
Thomas Müller fe3ffcbfc3 Merge pull request #23026 from stweil/master
apps/files: Fix typos in comments (found and fixed by codespell)
2016-03-09 16:43:05 +01:00
Joas Schilling 8c4af74ce7 Fix syncing of all birthday calendars in one go 2016-03-09 16:14:33 +01:00
Lukas Reschke 80b91264e1 Delay check till scanner is used
Fixes https://github.com/owncloud/core/issues/22973 and https://github.com/owncloud/core/issues/22987
2016-03-09 16:01:53 +01:00
Stefan Weil 692f312513 apps/files: Fix typos in comments (found and fixed by codespell)
This contribution is AGPL and MIT licensed.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
2016-03-09 15:14:05 +01:00
Thomas Müller 42bcea1ef0 Merge pull request #22986 from owncloud/remove-disabled-autocorrect-new-file
Remove disabled autocorrect for new file names
2016-03-09 15:05:32 +01:00
Thomas Müller cf3cb4d75e docker containers should be stopped before being removed - refs https://github.com/docker/docker/issues/18758 2016-03-09 14:02:08 +01:00
Thomas Müller 290a16e5d7 Merge pull request #22930 from owncloud/bugfix-submit-disable-password-length-zero
Public link share disabled if password length is equal to 0
2016-03-09 12:22:01 +01:00
Thomas Müller 447e8d2313 Merge pull request #22961 from owncloud/fix-gdrive-on-php54
Fix compatibility with PHP 5.4
2016-03-09 12:20:42 +01:00
Thomas Müller 30cec687ae Merge pull request #22972 from owncloud/use-httpclient-instead-of-file-get-contents
Use HTTPClient instead of file_get_contents
2016-03-09 12:20:06 +01:00
Thomas Müller 3608421800 Merge pull request #22974 from owncloud/php-automagics-type-conversion-is-fun
Use "hasKey" instead of checking the value
2016-03-09 12:19:45 +01:00
Morris Jobke 52f02fe93e Remove disabled autocorrect for new file names
* ref #22784
2016-03-09 08:38:05 +01:00
Jenkins for ownCloud afe3fdbf49 [tx-robot] updated from transifex 2016-03-09 01:55:42 -05:00
Lukas Reschke c0200bc5c3 Use "hasKey" instead of checking the value
If the check is negative it would depending on the used cache store the value as an empty string. When reading the value this check would thus return "false" even if a value exists.
2016-03-08 23:24:44 +01:00
Lukas Reschke 8214fae9ae Use HTTPClient instead of file_get_contents
Allows us to catch exceptions like 404's and thus prevents stuff like:

```
{"reqId":"fnmS0hc+fL4+WXKAruo5","remoteAddr":"192.168.39.100","app":"PHP","message":"file_get_contents(http:\/\/ckamm.blaucloud.de\/\/status.php): failed to open stream: HTTP request failed! HTTP\/1.1 404 Not Found\r\n at \/var\/www\/owncloud\/apps\/files_sharing\/lib\/external\/storage.php#260","level":3,"time":"2016-03-08T21:00:33+00:00","method":"PROPFIND","url":"\/remote.php\/webdav\/"}
```
2016-03-08 22:13:00 +01:00
Lukas Reschke d14adb2351 Fix compatibility with PHP 5.4
Fixes https://github.com/owncloud/core/issues/22960
2016-03-08 18:04:24 +01:00
Vincent Petry e5a107cc45 Fix share mounting recursion 2016-03-08 14:46:42 +01:00
Thomas Müller 20db92c71a Fix group sharing and sharing permissions - fixes #22932 2016-03-08 11:22:07 +01:00
Thomas Müller 31c89bd3a2 Merge pull request #22885 from owncloud/master-show-version-to-update-to
Show version to update to properly
2016-03-08 09:41:52 +01:00
Thomas Müller 2ebf512412 Merge pull request #22915 from owncloud/cleanup_ocs_share_api
Cleanup OCS Share Api
2016-03-08 09:41:20 +01:00
Jenkins for ownCloud a8bafb9bf3 [tx-robot] updated from transifex 2016-03-08 01:55:39 -05:00
prastut 7e52aac771 Public link share disabled if password length is equal to 0 2016-03-08 04:25:35 +05:30
Thomas Müller 0487b541a0 Merge pull request #22880 from owncloud/fix-21656
improve log output when no LDAP user was found on login attempt
2016-03-07 17:12:01 +01:00
Roeland Jago Douma b1dae2a4b9 Can't convert node to string 2016-03-07 16:15:01 +01:00
Roeland Jago Douma 218d042142 Move common code to function
The code to get a share by id is somewhat messy. And was duplicated.
Now this is done is a separate function
2016-03-07 16:14:57 +01:00
Thomas Müller deca1979aa Calendar and addressbook migration commands are always available 2016-03-07 15:04:19 +01:00
Thomas Müller 3b25ccef65 Handle addressbook migration issue by writing the faulty event to the log and continue 2016-03-07 15:04:19 +01:00
Thomas Müller d32b35fc7f Handle calendar migration issue by writing the faulty event to the log and continue 2016-03-07 15:04:19 +01:00
Thomas Müller a61fa5b526 Merge pull request #22902 from owncloud/share-archivenamedownloadall
Fix archive file name when downloading public share
2016-03-07 14:47:35 +01:00
Thomas Müller 8ef760eb5d Merge pull request #22898 from owncloud/quota-allowuploadwhenfreespaceisunlimited
Fix uploading to fed share when free space is unlimited
2016-03-07 14:47:01 +01:00
Thomas Müller e5b5eca5a9 Merge pull request #22787 from owncloud/versions-fixmtimetooltip
Fix tooltip for versions mtime
2016-03-07 14:41:46 +01:00
Thomas Müller 46af7db3e3 Merge pull request #22785 from owncloud/trash-returnfalseon401
Return false on 401 in file list + trash file list
2016-03-07 14:41:31 +01:00
Thomas Müller bd4b61f52b Merge pull request #22896 from owncloud/fix-v1-carddav-endpoint
Correctly default to null and add type hint
2016-03-07 13:50:53 +01:00
Thomas Müller 296a46cc38 Merge pull request #22244 from owncloud/dont-update-shared-resource-properties
For 9.0 we don't have the possibility to store calendar and addressbo…
2016-03-07 12:42:52 +01:00
Vincent Petry dbea268332 Remove "files" arg from download URL in public link page
When no files were specified for download, it means folder download.
In this case, no need to pass an empty "files" argument.
2016-03-07 11:55:55 +01:00
Vincent Petry d8e592d670 Fix archive file name when downloading public share
When download a public link share folder using the button on the top
right, it doesn't provide a list of files.

This fix makes sure to trigger the correct logic when no file list was
given.
2016-03-07 11:37:49 +01:00
Joas Schilling c99ae62c33 Correctly default to null and add type hint 2016-03-07 10:48:16 +01:00
Vincent Petry 60d8046c35 Fix uploading when free space is unlimited
A federated share can report unlimited quota as -3, so the
ajax/upload.php code needs to be adjusted to block uploads when the free
space is unlimited.
2016-03-07 10:42:36 +01:00
Jenkins for ownCloud c07b731689 [tx-robot] updated from transifex 2016-03-07 01:56:53 -05:00
Thomas Müller f2088cafb8 Merge pull request #22859 from owncloud/cache-results-in-memcache-for-is-owncloud
Cache results of testRemoteUrl
2016-03-06 20:00:47 +01:00
Thomas Müller 6dcf70f244 Merge pull request #22807 from owncloud/remove-empty-translations
ne, or_IN, uz and yo have been removed from transifex and will be rem…
2016-03-06 19:59:57 +01:00
Thomas Müller 6f6d659f56 Merge pull request #22888 from owncloud/use-custom-header
Use custom header
2016-03-06 19:53:35 +01:00
Jenkins for ownCloud 05d0d9e9e2 [tx-robot] updated from transifex 2016-03-06 01:55:08 -05:00
Lukas Reschke 4301e30741 Use custom header
PHP in CGI mode eats the Authorization header => 💣
2016-03-05 23:04:49 +01:00
Lukas Reschke 4caa9e18b0 Show version to update to properly
Properly shows the version that will be updated to.
2016-03-05 21:58:58 +01:00
Jenkins for ownCloud a98f5c03dc [tx-robot] updated from transifex 2016-03-05 01:56:08 -05:00
Arthur Schiwon 5d3183afcd improve log output when no LDAP user was found on login attempt 2016-03-05 00:18:34 +01:00
C. Montero Luque b3656f1434 Merge pull request #22878 from owncloud/use-clob-for-timezone
Use CLOB for timezone
2016-03-04 18:00:48 -05:00
C. Montero Luque fe86e0c2f8 Merge pull request #22870 from owncloud/autoenable-federation-app
Automatically enable "federation" app
2016-03-04 17:44:50 -05:00
Lukas Reschke b302ec8381 Use CLOB for timezone
TEXT defaults to a length of 255 which is going to fail in some cases as the timezone can be rather long.

This changes it back to a CLOB as it has been before as well: 8d8bb68b01. I'm not super convinced that CLOB is the best choice here but at least it seems to work.

Fixes https://github.com/owncloud/core/issues/22876
2016-03-04 21:59:08 +01:00
C. Montero Luque 89315722a1 Merge branch 'master' into autoenable-federation-app 2016-03-04 13:37:42 -05:00
C. Montero Luque 7a0720f300 Merge branch 'master' into fix-db-locking-cleanup 2016-03-04 13:35:04 -05:00
C. Montero Luque 45f49a090a Merge pull request #22860 from owncloud/trashbin-checkpath
Properly check path validity before deleting to trash
2016-03-04 13:33:07 -05:00
Lukas Reschke 1b64982e27 Automatically enable "federation" app 2016-03-04 17:38:51 +01:00
Morris Jobke 138219d74a Run cleanup of expired DB file locks to background job
* fixes #22819

The old way fired a DELETE statement on each destruction of the
DBLockingProvider. Which could cause a lot of queries. It's enough
to run this every 5 minutes in a background job, which in the end
could result in file locks that exists 5 minutes longer - in the
worst case and for not properly released locks.

This makes the DB based locking a lot more performant and could
result in a similar performance to the Redis based locking provider.
2016-03-04 15:52:23 +01:00
Thomas Müller e2642129a1 Merge pull request #22857 from owncloud/add-release-channel-selection
Add release channel selection back
2016-03-04 15:29:52 +01:00
Thomas Müller b56dbd0607 Merge pull request #22816 from owncloud/external-unavailable-recheck
allow availability recheck for external storages
2016-03-04 15:29:17 +01:00
Vincent Petry 0eb5292aaf Properly check path validity before deleting to trash
This prevents deleting the whole "files" folder of the user whenever
$ownerPath is empty. This can happen in concurrency situations.
2016-03-04 15:27:31 +01:00
Lukas Reschke 63bd6b25db Cache results of testRemoteUrl
Otherwise setting up the storage will result in a HTTP request and thus slowing down ownCloud.

Replaces https://github.com/owncloud/core/pull/22855
2016-03-04 15:13:56 +01:00
Lukas Reschke e3a0a69c73 Add release channel selection back
Allows to select the release channels again and also shows the last check date
2016-03-04 14:37:35 +01:00
Thomas Müller 048e11d25f Merge pull request #22830 from owncloud/fix_dav_permissions
Rename and move permissions are set when a file is updatable
2016-03-04 12:01:32 +01:00
Vincent Petry 3a36163e91 Fix download spinner to work with CSS styles
A recent change replaced img elements with CSS icons for file actions.
This fix adjusts the logic to work properly with CSS icons instead of
images.
2016-03-04 10:48:08 +01:00
Jenkins for ownCloud bcc200cf9b [tx-robot] updated from transifex 2016-03-04 01:55:53 -05:00
Roeland Jago Douma 3bdafc2122 Rename and move permissions are set when a file is updatable
* Fix unit tests
2016-03-03 20:03:06 +01:00
Vincent Petry 4255dd2b39 Properly set exception in FailedStorage 2016-03-03 14:37:23 +01:00
Robin Appelman 6990100e6e allow availability recheck for external storages 2016-03-03 14:19:34 +01:00
Lukas Reschke 72c8187cbb Keep "encryptedVersion" when calling `\OC\Files\View::copy`
When calling `\OC\Files\View::copy` we should also keep the version to ensure that the file will always have the correct version attached and can be successfully decrypted.

To test this the following steps are necessary (from https://github.com/owncloud/core/issues/22781#issuecomment-191328982):

1. setup a new ownCloud 9.0 beta2
2. enable encryption
2. upload a docx (5.7MB large)
3. upload the same file again and overwrite the existing file
4. I can download the original file and the first version
5. I restore the first version
6. restored version can no longer be downloaded with the error described above

The manual cache operation in `\OCA\Files_Versions\Storage` is unfortunately necessary since `\OCA\Files_Versions\Storage::copyFileContents` is not using `\OCP\Files\Storage::moveFromStorage` in the case when an object storage is used. Due to the workaround added in 54cea05271 the stream is directly copied and thus bypassing the FS.
2016-03-03 14:15:36 +01:00
Bjoern Schiessle b6050b44c2 disable the recovery key if the master key is enabled 2016-03-03 12:16:39 +01:00
Thomas Müller 4f25f34178 Merge pull request #22778 from owncloud/fix-22770
untangle different user manager instances, fixes #22770
2016-03-03 11:55:10 +01:00
Thomas Müller c590372aef Merge pull request #22784 from owncloud/files-newmenu-removebrowsercomplete
Remove browser autocomplete in new file menu
2016-03-03 11:54:48 +01:00
Thomas Müller 8cacfce83d ne, or_IN, uz and yo have been removed from transifex and will be removed from git here now as well 2016-03-03 11:29:57 +01:00
Vincent Petry dbdf2173ac Return false on 401 in file list + trash file list
This gives a chance to the global ajax error handler to do its work if
the session expired.
2016-03-03 09:09:30 +01:00
Jenkins for ownCloud 8b76e8c57b [tx-robot] updated from transifex 2016-03-03 01:56:04 -05:00
Vincent Petry 03b90cec35 Fix tooltip for versions mtime
It was missing a call to jquery.tooltip
2016-03-02 17:50:46 +01:00
Vincent Petry 5676216e56 Remove browser autocomplete in new file menu 2016-03-02 17:10:29 +01:00
Arthur Schiwon 82b55c4db9 untangle different user manager instances, fixes #22770 2016-03-02 13:02:43 +01:00
Joas Schilling 1b3e7ae82b Translate strings of federation admin section 2016-03-02 12:54:53 +01:00
Joas Schilling 8885cb1eb9 Increase all versions on master which is now 9.1 2016-03-02 08:53:42 +01:00
Jenkins for ownCloud 702c1a8962 [tx-robot] updated from transifex 2016-03-02 01:56:33 -05:00
C. Montero Luque 4d69e562a0 Merge pull request #22757 from owncloud/apply-license
Update copyright information and author file
2016-03-01 15:36:37 -05:00
C. Montero Luque 5a2fe4107c Merge branch 'master' into part-file-root 2016-03-01 13:35:04 -05:00
C. Montero Luque 745fdc4800 Merge pull request #22742 from owncloud/ceph-keystone-readiness
Use readiness notification socket to be absolutely sure this works
2016-03-01 13:34:23 -05:00
Lukas Reschke 3067367ff3 Add new apps 2016-03-01 17:52:32 +01:00
Lukas Reschke c353d51810 Remove Scrutinizer Auto Fixer 2016-03-01 17:48:23 +01:00
Lukas Reschke c430f5ba53 Map Maci 2016-03-01 17:45:05 +01:00
Lukas Reschke 933f60e314 Update author information
Probably nice for the people that contributed to 9.0 to see themselves in the AUTHORS file :)
2016-03-01 17:25:15 +01:00
Robin Appelman 37f1206818 allow putting the part file in the view root 2016-03-01 15:21:24 +01:00
Thomas Müller 900dcf6594 Merge pull request #22699 from owncloud/checksum_int_test
Checksum intergration tests and fixes
2016-03-01 14:47:09 +01:00
Thomas Müller a83af96dd3 Merge pull request #22686 from owncloud/cleanup_remote_address_books
remove remote address book if access was revoked
2016-03-01 14:46:51 +01:00
Vincent Petry 57babe032b Save some calls to refreshInfo during upload 2016-03-01 11:44:49 +01:00
Roeland Jago Douma ac392457f2 Fix unit tests 2016-03-01 11:37:16 +01:00
Roeland Jago Douma ec140fa2ec Checksums on chunked files
We should also store checksums on chunked files.
We do not checksum individual chunks but only the final file.
2016-03-01 11:37:16 +01:00
Roeland Jago Douma 3e88a5067f Remove checksum on upload of non checksumed file
When we overwrite a checksumed file with a file without a checksum we
should remove the checksum from the server.

This is done by setting the column to empty.
2016-03-01 11:37:16 +01:00
Thomas Müller 5fe5233f41 Merge pull request #22681 from owncloud/add-autodiscovery-for-ocs
Add autodiscovery support to server-to-server sharing implementation
2016-03-01 11:27:28 +01:00
Thomas Müller 73e145cf63 Merge pull request #22728 from owncloud/external-share-testremote
use ocs discover endpoint to test remote
2016-03-01 11:27:07 +01:00
Bjoern Schiessle 1832bd0fa1 increase version number 2016-03-01 11:21:24 +01:00
Thomas Müller a66899c528 Handle null case 2016-03-01 10:41:05 +01:00
Thomas Müller 1652541150 Merge pull request #22700 from owncloud/only_1_linkshare
For now only allow 1 link share per file/folder
2016-03-01 09:22:39 +01:00
Thomas Müller 25a4571dcd Merge pull request #22731 from owncloud/hide-nodes-from-listening
Hides nodes from listing that the user has no access to
2016-03-01 09:22:08 +01:00
Thomas Müller fd4742d430 Merge pull request #22613 from owncloud/quota-changedavreturnvaluewhennoquotaset
Don't return quota when none set
2016-03-01 08:30:58 +01:00
Roeland Jago Douma ffce4fc6a9 For now only allow 1 link share per file/folder
Fixes #22692
This is a temp fix util we get #22327

We just block it in the OCS Share API since we have 1 endpoint now
anyway.
2016-03-01 08:25:40 +01:00
Thomas Müller eb740d1dac Merge pull request #22727 from owncloud/decrypt_all_master_key
make decrypt all work with the master key
2016-03-01 08:23:27 +01:00
Thomas Müller f3050b3adb Merge pull request #22740 from owncloud/fix_resare_updates
Check correct permissions when resharing
2016-03-01 08:17:56 +01:00
Jenkins for ownCloud a06f59c580 [tx-robot] updated from transifex 2016-03-01 01:55:33 -05:00
Thomas Müller 3adb6ae0f5 Merge pull request #22707 from owncloud/use-our-public-api
Use IQueryBuilder::PARAM_* instead of \PDO::PARAM_*
2016-03-01 07:24:57 +01:00
Lukas Reschke 9ca1e9c7e9 Only use scanner if remote is an ownCloud 2016-03-01 07:01:52 +01:00
Lukas Reschke e965dcaebf /shareinfo is not required 2016-03-01 07:01:52 +01:00
Lukas Reschke 8f95d69954 Fix tests 2016-03-01 07:01:52 +01:00
Lukas Reschke 74e47da883 Add missing trailing slash 2016-03-01 07:01:51 +01:00
Robin Appelman 080a62231e use ocs discover endpoint to test remote 2016-03-01 07:01:51 +01:00
Lukas Reschke 88fc5149ed Fix Scrutinizer issues 2016-02-29 22:44:40 +01:00
Robin McCorkell 078cc3b3f0 Use readiness notification socket to be absolutely sure this works 2016-02-29 21:20:11 +00:00
Lukas Reschke d04edfaf0d Hides nodes from listing that the user has no access to 2016-02-29 20:53:38 +01:00
Roeland Jago Douma 8924b0a0dc Check correct permissions when resharing
Fixes #22675

Since we only get a share id we do not know the path for the sharer.
Now if we edit a share we start searching for shares for that user of
that node. And deduce the permissions that way.

* Intergration test added
* Fix unit tests
2016-02-29 19:30:14 +01:00
Joas Schilling 7a46b30c94 Allow to change properties of readonly calendars 2016-02-29 17:17:57 +01:00
Bjoern Schiessle 9e9cb73987 fix doc-block 2016-02-29 16:50:34 +01:00
Bjoern Schiessle 87e47afed8 remove synced remote address book if the remote server revoked access to his system address book 2016-02-29 16:50:34 +01:00
Bjoern Schiessle 7189c72c33 remove remote address book if the admin removes the server from the trusted servers list 2016-02-29 16:50:33 +01:00
Joas Schilling 6f22784d3d Allow to hide a shared calendar 2016-02-29 16:49:55 +01:00
Thomas Müller 95e218b00c For 9.0 we don't have the possibility to store calendar and addressbook properties on a per-user basis and therefore we simple don't allow this for now 2016-02-29 16:49:55 +01:00
Thomas Müller 52d217d775 Merge pull request #22623 from owncloud/docker-logs-on-swift-external
Print docker logs to the console fro debugging
2016-02-29 16:36:34 +01:00
Bjoern Schiessle 95ea2ccb53 make decrypt all work with the master key 2016-02-29 14:54:32 +01:00
Vincent Petry 11215f4e27 Return -3 for unlimited quota
Returns -3 for unlimited quota in Webdav response.
Also adjusted personal page to show unlimited quota when set.
2016-02-29 14:36:20 +01:00
Thomas Müller a38e8b6436 Merge pull request #22662 from owncloud/comments-count
remove comments count because it is not that relevant to show directly
2016-02-29 13:44:56 +01:00
Joas Schilling 2a0cda74d4 Use IQueryBuilder::PARAM_* instead of \PDO::PARAM_* 2016-02-29 09:44:40 +01:00
Jenkins for ownCloud 5800585039 [tx-robot] updated from transifex 2016-02-29 01:55:04 -05:00
Jenkins for ownCloud a39332832c [tx-robot] updated from transifex 2016-02-28 01:55:12 -05:00
Jenkins for ownCloud f9826ec948 [tx-robot] updated from transifex 2016-02-27 01:56:08 -05:00
Bjoern Schiessle eccd7cf654 reuse the url_hash instead of calculating a new hash for the address book 2016-02-26 20:00:13 +01:00
Thomas Müller e9237dd83c Merge pull request #22671 from owncloud/issue-22670
Move the tag filter at the end for now
2016-02-26 10:48:55 +01:00
Thomas Müller 66536f912e Merge pull request #22640 from owncloud/fix_22587
Remove delete permissions for read-only federated reshares
2016-02-26 10:48:07 +01:00
Thomas Müller c6c15ba825 Merge pull request #22608 from owncloud/collaborative-tags
Rename system tags app to collaborative tags
2016-02-26 10:47:40 +01:00
Thomas Müller 96f15a12a9 Merge pull request #22461 from owncloud/fix_6773
Allow theming of actions
2016-02-26 10:47:20 +01:00
Joas Schilling 4549b82553 Move the tag filter at the end for now 2016-02-26 10:15:07 +01:00
Lukas Reschke 59028cced0 Add autodiscovery support to server-to-server sharing
Adds autodiscovery support to server-to-server sharing as specified in the specification. If no discovery data is found it is using the fallback ownCloud endpoints for legacy support.
2016-02-26 09:26:55 +01:00
Joas Schilling 4471f359b1 Rename system tags app to collaborative tags 2016-02-26 09:14:28 +01:00
Jenkins for ownCloud 5718402277 [tx-robot] updated from transifex 2016-02-26 01:55:44 -05:00
Vincent Petry 867a8aca12 Fix favorite icon unit test for icon image 2016-02-25 23:01:09 +01:00
Vincent Petry b634f1e2c7 Make more action icons themable + style fixes
Action icons now appear properly in public link page.
More actions are now CSS icons.
2016-02-25 23:01:07 +01:00
Roeland Jago Douma c767030f07 Close class 2016-02-25 22:49:52 +01:00
Roeland Jago Douma 92cff0984d Make file actions use icon CSS classes
This makes theming of file actions possible
2016-02-25 22:49:52 +01:00
Jan-Christoph Borchardt 6e97ab1b71 remove comments count because it is not that relevant to show directly 2016-02-25 20:48:19 +01:00
Thomas Müller 3772a8acdb Merge pull request #22644 from owncloud/external-share-manager
inject the correct external share manager into the storage
2016-02-25 16:58:00 +01:00
Thomas Müller 29e3c4a60e Merge pull request #22628 from owncloud/fix-thrashbin-cronjob
Skip users with no trashbin
2016-02-25 16:55:36 +01:00
Robin Appelman f338329ddf inject the correct external share manager into the storage 2016-02-25 14:49:25 +01:00
Thomas Müller 914ac09aae Merge pull request #22636 from owncloud/fix-ssl-on-external-storages
Fix HTTPS support on external storages
2016-02-25 14:36:00 +01:00
Thomas Müller 202bf17e4a Merge pull request #22604 from owncloud/fix-google-drive-encryption
Copy into local file
2016-02-25 14:35:39 +01:00
Thomas Müller 5ecf2d5987 Merge pull request #22600 from owncloud/extstorage-disablesharingoptionbydefault
Disable sharing by default for external storage mounts
2016-02-25 14:35:24 +01:00
Thomas Müller dfaebc36d2 Merge pull request #22599 from owncloud/fix_ldap-cache-2nd-displayname
take the first result of that array, if present. Fixes 2nd display na…
2016-02-25 14:35:06 +01:00
Roeland Jago Douma 0c9c7737b4 Remove delete permissions for read-only federated reshares
An incomming federated share is just a mount point. Therefor if we
request the permissions on the mountpoint DELETE permissions will be
returned (among others). Since we can always remove a mountpoint, update
a mount point.

However now when trying to reshare we will try to reshare with DELETE
permissions. Which is false.

This PR removes the delete permissions if it is a shared storage.

Basically a quick hack.
Fixes #22587
2016-02-25 12:19:38 +01:00
Lukas Reschke aebb900cd4 More error handling 2016-02-25 10:12:31 +01:00
Lukas Reschke 3b5ddb417c Copy into local file
Using the Guzzle stream directly here will only return 1739 characters for `fread` instead of all data. This leads to the problem that the stream is read incorrectly and thus the data cannot be properly decrypted => 💣

This approach copies the data into a local temporary file, as done before in all stable releases as well as other storage connectors.

While this approach will load the whole file into memory, this is already was has happened before in any stable release as well. See d608c37c90 for the breaking change.

To test this enable Google Drive as external storage and upload some files with encryption enabled. Reading the file should fail now.

Fixes https://github.com/owncloud/core/issues/22590
2016-02-25 09:40:30 +01:00
Jenkins for ownCloud 32f4bea0ae [tx-robot] updated from transifex 2016-02-25 01:58:06 -05:00
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
Roeland Jago Douma 479c458428 The owner and recipient can also be null
If we have backend hickups it can be that we are unable to retrive the
owner and recipient user as well. In such cases just return the UID.
2016-02-12 10:45:33 +01:00
Roeland Jago Douma 0a33cdee0c If the initiator no longer exists return UID
It can happen that the share initiator is deleted. Because of the new
resharing behaviour this share then still exists. We just can fetch the
displayname properly.
2016-02-12 10:45:33 +01:00
Jenkins for ownCloud f8607ac132 [tx-robot] updated from transifex 2016-02-12 01:56:04 -05:00
Robin Appelman c3e4ced64a fix getNodeForPath for non existing part files 2016-02-11 17:22:40 +01:00
Thomas Müller e3a67d0505 Merge pull request #22320 from owncloud/files_external-crypt
encrypt passwords for files_external
2016-02-11 17:19:29 +01:00
Thomas Müller 4d24929e05 Merge pull request #22307 from owncloud/remove-notification-on-unshare-and-on-errors
Remove notification on unshare and on errors
2016-02-11 14:02:44 +01:00
Thomas Müller 26939a2873 Merge pull request #22290 from owncloud/dav-upload-scan-in-lock
scan the file in the write lock when uploading over dav
2016-02-11 14:02:08 +01:00
Robin Appelman 80eb1aada5 encrypt passwords for files_external 2016-02-11 14:00:08 +01:00
Roeland Jago Douma 745bfda41f Fix migration step to avoind invisible shares 2016-02-11 13:29:23 +01:00
Roeland Jago Douma 0284c60c3a Add tests 2016-02-11 13:29:23 +01:00
Roeland Jago Douma a823485638 Reload list of shares on directory change 2016-02-11 11:06:26 +01:00
Thomas Müller 06af9b817e Merge pull request #22281 from owncloud/activity-100-unshare-activities
Add translations of unshare activities
2016-02-11 11:01:47 +01:00
Joas Schilling 31c9e047a8 Delete the notification when the owner unshares the remote before the user did anything 2016-02-11 10:41:55 +01:00
Joas Schilling 2263b8b693 Remove the notification if accepting/declining failed because of 404 2016-02-11 10:41:55 +01:00
Jenkins for ownCloud 5165998723 [tx-robot] updated from transifex 2016-02-11 01:55:35 -05:00
Vincent Petry f79fafcf06 Revert back to non-webdav download link for public URLs
Fixes issues with browsers not happy with the token.
Fixes activities which were not sent.
2016-02-10 19:09:52 +01:00
Thomas Müller 6b836325cf Merge pull request #22276 from owncloud/harden-updater-auth
Harden updater authentication
2016-02-10 17:31:38 +01:00
Thomas Müller 6ffb83ae19 Merge pull request #22269 from owncloud/issue-22243-avoid-deadlock-with-lots-of-entries-to-cleanup
Chunk the cleanup queries to make sure they don't time out
2016-02-10 17:26:11 +01:00
Thomas Müller 10613f7265 Merge pull request #22273 from owncloud/versions-fixpathasrecipient
Fix versions path as share recipient when different than owner path
2016-02-10 17:25:14 +01:00
Thomas Müller c919b41395 Adding a custom webdav property which holds the list of contacts groups 2016-02-10 17:06:13 +01:00
Robin Appelman edbe5d7b6d handle forbidden exceptions in smb backend 2016-02-10 16:52:13 +01:00
Robin Appelman bef70e9448 also fix lock order for chunked dav uploads 2016-02-10 16:31:32 +01:00
Lukas Reschke 5680743c2b Harden updater authentication
- Reset tokens after 2 hours as discussed at https://github.com/owncloud/updater/issues/220#issuecomment-182033453
- Used BCrypt for storing the password in the config.php. This makes it substantially harder in case of a leakage of the token to bruteforce it. In the future we can evaluate also an HMAC including the IP. That's a bit tricker though at the moment considering that we support reverse proxies. Didn't feel brave enough to touch that dragon now as well ;)
2016-02-10 16:31:11 +01:00
Robin Appelman 65554ec333 scan the file in the write lock when uploading over dav 2016-02-10 16:21:13 +01:00
Joas Schilling 5dc63e34b4 Add translations of unshare activities 2016-02-10 15:42:48 +01:00
Thomas Müller 5c89cf9565 Merge pull request #22267 from owncloud/fix_encryption2
calculate and update the version of the encryption signature correctly
2016-02-10 15:14:52 +01:00
Thomas Müller 159a0eb597 Merge pull request #20073 from owncloud/files-should-add-download-disposition
Serve files with an attachment disposition for new DAV endpoint
2016-02-10 14:35:50 +01:00
Thomas Müller c4d2f6bb25 Merge pull request #22270 from owncloud/use-cache-directly
Use cache directly instead of QueryBuilder
2016-02-10 14:23:04 +01:00
Thomas Müller c1d21cf873 Merge pull request #22263 from owncloud/fix-group-principals
Fix group principal
2016-02-10 14:22:18 +01:00
Vincent Petry 1b9e291913 Use full path of known file when handling versions
Instead of relying on the versions API response, use the known file path
when populating version models.
2016-02-10 13:39:25 +01:00
Vincent Petry a6f997ddae Remove path from versions response
The path attribute contains the path relative to the owner's home
folder, not the one from the recipient, which is useless for the client
and needlessly discloses the owner's original path.

The requested already has access to the full path of the file, so no
need to add it to the response.
2016-02-10 13:38:38 +01:00
Bjoern Schiessle 9dc759b4dc remember signature version and only set it on update to make sure that other
apps like files_versions still get the old signature version
2016-02-10 13:27:32 +01:00
Joas Schilling 0ebb205010 Chunk the queries to make sure they don't time out 2016-02-10 13:04:37 +01:00
Lukas Reschke 762636efcd Use cache directly instead of QB
In case somebody does not use oc_filecache
2016-02-10 12:30:39 +01:00
Bjoern Schiessle 43ed86313c use the version of the original file if we write the part file to have a proper version if we move the file over to the original location 2016-02-10 11:08:03 +01:00
Thomas Müller 2e94d34dfd Fix group principal 2016-02-10 10:43:32 +01:00
Joas Schilling fa893762a2 Fix oracle by using less quotes 2016-02-10 08:40:45 +01:00
Joas Schilling 75d552b29e Listen to the notification event to reload the file list 2016-02-10 08:40:45 +01:00
Joas Schilling 65e1e4a202 Mark the accept button as primary 2016-02-10 08:40:45 +01:00
Joas Schilling c769f5775d Create the actions with the correct ID 2016-02-10 08:40:45 +01:00
Joas Schilling 31cf3b8288 Make sure the share ID is an integer 2016-02-10 08:40:45 +01:00
Joas Schilling cb8024ca14 Fix action paths 2016-02-10 08:40:45 +01:00
Joas Schilling 49dd693d8f Bring the messages inline 2016-02-10 08:40:45 +01:00
Joas Schilling a4a7cf40a1 Fix the notification API usage 2016-02-10 08:40:45 +01:00
Joas Schilling 3ff88c8c84 Revert "Disable the remote sharing notifications until they work properly"
This reverts commit 6bc93c7401.

Conflicts:
	apps/files_sharing/lib/external/manager.php
2016-02-10 08:40:44 +01:00
Jenkins for ownCloud 9ebcc4ce31 [tx-robot] updated from transifex 2016-02-10 01:56:05 -05:00
Lukas Reschke ca350294a6 Add tests for setVersion 2016-02-09 23:43:28 +01:00
Vincent Petry 45c78476f5 Use cache update instead of put for encryption version
Saves a call to fetch the file id which didn't even work for a reason.

This fix properly sets the version in the database.
2016-02-09 23:43:28 +01:00
Lukas Reschke 6724f76573 Use cache and add tests 2016-02-09 23:43:27 +01:00
Bjoern Schiessle 377d7fb8a8 don't decrease ->version for part files but only a local variable, otherwise it can happen that we decrease it twice and end up with the wrong value 2016-02-09 23:43:27 +01:00
Bjoern Schiessle 966eb4b084 realPath should contain the path to the file we want to read, e.g. the version and not the original file 2016-02-09 23:43:27 +01:00
Lukas Reschke 5ccb9dfa7e Use database for keeping track of the version 2016-02-09 23:43:27 +01:00
Lukas Reschke 3badf5caf5 Use number of chunk for HMAC as well
Prevents switching single blocks within the encrypted file.
2016-02-09 23:43:26 +01:00
Lukas Reschke b5824f024a Keep track of file version
This way it is not possible anymore for an external storage admin to put up old versions of the file.
2016-02-09 23:43:26 +01:00
Lukas Reschke d5c1596887 Clarify documentation 2016-02-09 23:43:26 +01:00
Lukas Reschke 3b62459c41 Use hash with appended "a" of the original password for the authentication 2016-02-09 23:43:26 +01:00
Björn Schießle 9bb97c714b fixing unit tests 2016-02-09 23:43:26 +01:00
Lukas Reschke b9ff16498b Use random_bytes instead OpenSSL 2016-02-09 23:43:26 +01:00
Björn Schießle 61dd191253 meta data are at the end of the file 2016-02-09 23:43:25 +01:00
Björn Schießle e7ff84df5c always use default cipher for write operations, no matter how the file was encrypted before 2016-02-09 23:43:25 +01:00
Björn Schießle cf3a8f274f make it backward compatible to work with signed and un-signed files 2016-02-09 23:43:25 +01:00
Björn Schießle 40a5ba72fc sign all encrypted blocks and check signature on decrypt 2016-02-09 23:43:25 +01:00
Lukas Reschke db8f267647 Add note about the addPadding function 2016-02-09 23:43:25 +01:00
Lukas Reschke 59ebad0b53 Use an actual 16 byte long IV
The previous IV was actually 12 byte extended to 16 byte using base64. As the encrypted file should be fine with containing binary data as well we can simply remove the encoding like that here.
2016-02-09 23:43:24 +01:00
Lukas Reschke d25b8dacb3 Use AES-256-CTR as default
CTR is recommended over CFB mode.
2016-02-09 23:43:24 +01:00
Thomas Müller 4cfb7ca7dd Merge pull request #22255 from owncloud/add-sso-for-updatechecker
Add SSO for updater application
2016-02-09 23:37:32 +01:00
Thomas Müller 57ef23dadf Merge pull request #22251 from owncloud/smb-105
update icewind/smb to 1.0.5
2016-02-09 23:37:09 +01:00
C. Montero Luque f64dbc67c6 Merge pull request #20928 from owncloud/publicdav-check-permissions
Check that the owner of a link share still has share permissions on access
2016-02-09 22:01:08 +01:00
C. Montero Luque 962d0c3290 Merge pull request #22252 from owncloud/consolidate-user-set-quota
Consolidate getQuota and setQuota methods in User instance
2016-02-09 22:00:24 +01:00
Lukas Reschke b9e3ed1468 Add SSO for updater application
Allows logging-in into the updater application by visiting the admin panel and pressing "Open updater".
2016-02-09 20:28:30 +01:00
Arthur Schiwon d19c47a381 More fixed tests :) 2016-02-09 18:11:30 +01:00
Lukas Reschke abc675d87e Move update notification code into app
Moves the update notification code in a single app. This is required since we want to use SSO for the new updater and for this have some code running in ownCloud as well (and we don't want that in core neccessarily). This app can provide that in the future, right now it's only the update notification itself. Will continue working on the SSO right away but wanted to keep the PR small.

Furthermore also makes some more code unit-testable...
2016-02-09 18:05:51 +01:00
Arthur Schiwon 3a796d1e15 Consolidate getQuota and setQuota methods in User instance 2016-02-09 17:16:43 +01:00
Robin Appelman 3982c8f87a update icewind/smb to 1.0.5 2016-02-09 17:09:30 +01:00
Thomas Müller 2982017682 Merge pull request #22228 from owncloud/comments-limit-message
Limit comment message to 1k chars
2016-02-09 16:35:23 +01:00
Thomas Müller d89ddba3a2 Merge pull request #22241 from owncloud/more-info-in-case-of-trusted-server-add
Forward exception message to the admin in case of errors and in case …
2016-02-09 16:11:18 +01:00
Thomas Müller 81d4042af4 Adjust command description 2016-02-09 15:42:41 +01:00
Thomas Müller 10b9bf15f4 Set share owner and share initiator on upate as well 2016-02-09 15:41:06 +01:00
Thomas Müller cbb7934fb3 Introduce console command to transfer ownerships of files - refs #19154 2016-02-09 15:41:06 +01:00
Thomas Müller 4659bf9b4a Merge pull request #22234 from owncloud/systemtags-filter-intersect-empty
Fix system tag filter AND condition
2016-02-09 15:34:06 +01:00
Thomas Müller 1199b539f2 Merge pull request #21773 from owncloud/files_external-list-authtype
Show the proper auth identifier when listing mounts as json
2016-02-09 15:33:47 +01:00
Thomas Müller 232bb75329 Merge pull request #21893 from owncloud/migrate-calendars
Migrate calendars
2016-02-09 15:14:33 +01:00
Robin Appelman acd8c72d3d add tests 2016-02-09 15:03:00 +01:00
Roeland Jago Douma 359c62d90e Fix unit tests 2016-02-09 15:03:00 +01:00
Robin Appelman f9f2800016 check share permissions in share controller 2016-02-09 15:03:00 +01:00
Robin Appelman fd9166488b Check that the owner of a link share still has share permissions on access 2016-02-09 15:02:34 +01:00
Thomas Müller bc8632856a Forward exception message to the admin in case of errors and in case the remote server version is to low and appropriate message is displayed as well 2016-02-09 14:41:26 +01:00
Arthur Schiwon bbc86e0756 on DAV throw Bad Request if provided message is too long 2016-02-09 13:59:13 +01:00
Thomas Müller a6ade67dfb Merge pull request #22197 from owncloud/files-filterbysystemtags
Add file list filter to filter by system tags
2016-02-09 13:31:00 +01:00
Thomas Müller 9639981041 Merge pull request #22202 from owncloud/global-auth-no-user
handle no user set for personal global auth
2016-02-09 13:30:41 +01:00
Thomas Müller 6474866aff Merge pull request #22225 from owncloud/sharing-moar-hooks
More sharing hooks for extended auditing
2016-02-09 13:30:22 +01:00
Joas Schilling e8d9c288bc Stop when a mid result is empty 2016-02-09 12:07:30 +01:00
Joas Schilling 178914104c Add a test for empty mid-result 2016-02-09 12:07:17 +01:00
Vincent Petry 3028684d89 Fix system tag filter AND condition
If one of the results is empty, no need to do array_intersect and return
an empty result directly.
2016-02-09 11:39:22 +01:00
Vincent Petry 847a2426b8 Fix unit tests for system tag filter section 2016-02-09 11:22:05 +01:00
Thomas Müller bf3a843e89 Migration of calendars 2016-02-09 11:20:31 +01:00
Vincent Petry e378a757ff Add system tags filter section for files app 2016-02-09 10:59:29 +01:00
Roeland Jago Douma 623a0e4637 Example hook check 2016-02-09 10:36:44 +01:00
Roeland Jago Douma 38cbfed476 Fix unit test 2016-02-09 10:20:25 +01:00
Thomas Müller 98497aa423 Merge pull request #22199 from owncloud/multiple_checksums
Make checksum propfind future proof
2016-02-09 09:10:32 +01:00
Thomas Müller bfa404b441 Merge pull request #22217 from owncloud/fix_22215
Federates shares have to set a file_target
2016-02-09 09:10:17 +01:00
Jenkins for ownCloud e749a02e6b [tx-robot] updated from transifex 2016-02-09 01:55:36 -05:00
Arthur Schiwon cd68500731 throw hooks when accessing a link share 2016-02-09 00:34:10 +01:00
Vincent Petry ae367c7e97 Fix elementToFile to also return path when defined
Fixes issue when opening the share dialog for a file inside the favorite
list, and the file is from a subfolder
2016-02-08 22:33:39 +01:00
Thomas Müller b77a4b0c6a Merge pull request #22112 from owncloud/dav-filesreport
Provide REPORT method on files DAV to filter/search files
2016-02-08 21:41:40 +01:00
Thomas Müller 75bbd4f8b6 Merge pull request #22211 from owncloud/versions-hook-info
versions provide more information when throwing hooks
2016-02-08 21:06:03 +01:00
Vincent Petry 2f1a60a64d Add REPORT on files endpoint for filtering
For now only supports filtering by system tags
2016-02-08 21:04:53 +01:00
Roeland Jago Douma 7f2cb6ab60 Federates shares have to set a file_target
The old code path is still used to get the sharing info in the webui.
This requires the file_target to be set. This does not mean anything
for federated shares.

Fixes #22215
2016-02-08 18:30:51 +01:00
Arthur Schiwon d2d6644702 use int values and constants instead of strings 2016-02-08 18:16:27 +01:00
Thomas Müller 698a6b07a8 Merge pull request #22206 from owncloud/share2_migration_with_federated
Update the migration step to include federated shares
2016-02-08 17:58:26 +01:00
Thomas Müller 703f3551dc Only set the header if the node exists and in case the request is a GET 2016-02-08 17:49:25 +01:00
Lukas Reschke 2cad9d2b8c Serve files with an attachment disposition for new DAV endpoint
This adds a `Content-Disposition: attachment` header to all files served via the DAV endpoint.
2016-02-08 17:08:34 +01:00
Arthur Schiwon b6e03fe261 versions provide more information when throwing hooks 2016-02-08 16:33:49 +01:00
Robin Appelman 87179eaae2 Add tests 2016-02-08 15:53:46 +01:00
Thomas Müller 33eed35ae4 Merge pull request #21817 from owncloud/support-old-carddav-endpoint
Adding pre oc 9.0 CardDAV endpoint for migration of old clients
2016-02-08 15:46:38 +01:00
Thomas Müller acc7d63a69 Merge pull request #22164 from owncloud/files_external-verify
Add occ command to verify storage configurations
2016-02-08 15:21:07 +01:00
Roeland Jago Douma 3c4e511792 Update the migration step to include federated shares
Now federated shares will also be updated to the flat
reshare model.
2016-02-08 15:11:48 +01:00
Thomas Müller cf1f92cc12 Merge pull request #22080 from owncloud/fed_share_provider
implementation of the federated share provider
2016-02-08 14:12:20 +01:00
Robin Appelman b95e388526 Add occ command to verify storage configurations 2016-02-08 14:07:58 +01:00
Robin Appelman 678a3abf6d handle no user set for personal global auth 2016-02-08 13:45:52 +01:00
Roeland Jago Douma 5486a2b149 For possible future usage allow multiple checksums
Instead of returning

<oc:checksum>TYPE:CHECKSUM</oc:checksum>

Return

<oc:checksums>
  <oc:checksum>TYPE:CHECKSUM</oc:checksum>
</oc:checksums>

This will allow us to expand in the future to multiple checksums.
Without doing just string concatenation.

And even for a single checksum it is now correct.
2016-02-08 11:55:07 +01:00
Lukas Reschke 7199ea2f5e Fix PHPDoc 2016-02-08 11:36:58 +01:00
Thomas Müller c1ae8b0d81 Adding common name to sharee 2016-02-08 11:36:57 +01:00
Thomas Müller 5b86148d3a Original resources should not be overwritten by shared resources 2016-02-08 11:36:57 +01:00
Roeland Jago Douma 2f6ffdbce5 Added tests for used parts 2016-02-08 11:30:48 +01:00
Roeland Jago Douma a506f9ca3f Respect not allowing outgoing shares 2016-02-08 11:30:48 +01:00
Roeland Jago Douma bec1de8a38 Update OCS Share API to use federated share provider 2016-02-08 11:30:48 +01:00
Bjoern Schiessle 9079388e02 implementation of the federated share provider 2016-02-08 11:30:48 +01:00
Thomas Müller 6a550d44e9 Fix path 2016-02-08 10:52:30 +01:00
Thomas Müller 0c9a469f74 Adding pre oc 9.0 CalDAV endpoint for migration of old clients 2016-02-08 10:52:30 +01:00
Thomas Müller a67f7ad1f3 Remove calendar-proxy support - did this ever work? 2016-02-08 10:52:30 +01:00
Thomas Müller cca2ade199 Adding pre oc 9.0 CardDAV endpoint for migration of old clients 2016-02-08 10:52:30 +01:00
Thomas Müller 9eef38c593 Merge pull request #22190 from owncloud/fix_22189
Even single shares are returned as array
2016-02-08 10:47:55 +01:00
Roeland Jago Douma ca32778975 Even single shares are returned as array
When fetching a single share using ../shares/<ID> we should still return
an array of shares.

Fixes #22189
2016-02-08 10:11:22 +01:00
Vincent Petry 78864dc6fa Collapse long comments
Very crude a naive implementation that relies on length and number of
newlines. Should be good enough for most cases.

Clicking on such comments will expand them.
2016-02-08 10:05:03 +01:00
Thomas Müller 83b4e2c8d1 Merge pull request #22160 from owncloud/files_external-create
Add occ files_external:create command to add new mounts
2016-02-08 09:58:43 +01:00
Jenkins for ownCloud 4130639a7e [tx-robot] updated from transifex 2016-02-08 01:54:46 -05:00
Jenkins for ownCloud feb0522cd0 [tx-robot] updated from transifex 2016-02-07 01:55:33 -05:00
Thomas Müller 69a4cd2898 Merge pull request #22102 from owncloud/ldap_2nddispname-master
[LDAP] add second field for additional/optional display name attribute
2016-02-06 13:27:01 +01:00
Thomas Müller 5832178f59 Merge pull request #22139 from owncloud/comments-files-cleanup
cleanup jobs for comments and comment read marks
2016-02-06 13:26:00 +01:00
Thomas Müller 7297408150 Merge pull request #22163 from owncloud/comments-sizelimit
Limit comment size to 1000 in UI
2016-02-06 13:25:38 +01:00
Thomas Müller 7141c70cd0 Merge pull request #20618 from owncloud/action-icon-size
Fix image sizing for action icons in Edge
2016-02-06 13:25:10 +01:00
Thomas Müller 079ebe2be6 Merge pull request #22165 from owncloud/comments-markowncommentasread
Mark own comments as read after posting
2016-02-06 13:22:20 +01:00
Jenkins for ownCloud 9fa09b67e6 [tx-robot] updated from transifex 2016-02-06 01:55:36 -05:00
Joas Schilling 065141f6f4 Move casting to IExpressionBuilder 2016-02-05 21:26:30 +01:00
Thomas Müller 7568c40275 Merge pull request #22159 from owncloud/fix_21678
Gracefull handle link shares rename hook
2016-02-05 16:36:04 +01:00
Vincent Petry d2a495f190 Mark own comments as read after posting 2016-02-05 16:30:37 +01:00
Robin Appelman 96b592b45b output mount id on create 2016-02-05 15:54:19 +01:00
Robin Appelman 16ad612c83 verify that the auth backend is valid for the storage backend 2016-02-05 15:51:38 +01:00
Robin Appelman 239cdd099a list supported auth backends for storage backends 2016-02-05 15:48:10 +01:00
Vincent Petry 142a2dd2eb Limit comment size to 1000 in UI
Whenever the limit is almost reached (90% of the length), a tooltip will
appear.

Once the limit is exceeded, the "Post" button will be disabled and the
field will become red.
2016-02-05 15:45:30 +01:00
Arthur Schiwon 9d2c433b24 fix pgsql 2016-02-05 15:36:21 +01:00
Arthur Schiwon d537cae063 cleanup jobs for comments and comment read marks 2016-02-05 15:36:21 +01:00
Thomas Müller 0196f0e546 Merge pull request #22157 from owncloud/use-https-instead-of-http
Use HTTPS instead of HTTP
2016-02-05 14:31:40 +01:00
Robin Appelman 54d2175bf5 Add occ files_external:create command to add new mounts 2016-02-05 14:20:22 +01:00
Roeland Jago Douma f4edfb6dfb Gracefull handle link shares rename hook
Fixes #21678

The hook is called on all renames. However when we use a link share
the getUserFolder fails. We now just opt out.
2016-02-05 13:57:57 +01:00
Thomas Müller e15a120f83 Merge pull request #22152 from owncloud/activities-for-comments
Activities for comments
2016-02-05 13:50:38 +01:00
Lukas Reschke 35e4acbc1f Use HTTPS instead of HTTP
This is now supported by github.io
2016-02-05 13:05:04 +01:00
Joas Schilling 733db5c14a Add a filter for comment activities 2016-02-05 11:30:53 +01:00
Joas Schilling 070ff71a2d Add activities for comments 2016-02-05 11:30:53 +01:00
Thomas Müller 342c2aac98 Merge pull request #20920 from owncloud/issue_20888
Add dialog to enter credentials on errored mount point
2016-02-05 10:05:23 +01:00
Thomas Müller 96ccbca2e3 Merge pull request #22135 from owncloud/global-auth-warning
fix warning caused by global auth
2016-02-05 10:04:22 +01:00
Jenkins for ownCloud 0ed2108b7f [tx-robot] updated from transifex 2016-02-05 01:56:20 -05:00
Vincent Petry d4da2f0ac7 Improve credentials dialog usability a bit
Automatically focus on the first field.
Pressing enter submits the form.
2016-02-04 17:18:21 +01:00
Robin Appelman b7d27ab141 fix warning caused by global auth 2016-02-04 16:53:13 +01:00
Robin Appelman d83b1f3b8b fix error code for unconfigured user provided auth 2016-02-04 16:47:41 +01:00
Robin Appelman b12d449ec7 set read permissions on failed mount root 2016-02-04 16:41:27 +01:00
Robin Appelman e420ae068c handle exception in availibilty check 2016-02-04 16:33:08 +01:00
Robin Appelman 53fbaf70c0 fix input type 2016-02-04 16:33:08 +01:00
Robin Appelman 2e3a5ccaaa show failed external storages properly 2016-02-04 16:33:08 +01:00
Robin Appelman 4b4bf87f95 Use handlebars template 2016-02-04 16:33:08 +01:00
Jesús Macias 7162d66373 Fix PR from comments 2016-02-04 16:33:08 +01:00
Jesús Macias 8fa96435b0 Add credentials dialog for user provided auth 2016-02-04 16:33:08 +01:00
Thomas Müller 089b60cd25 Merge pull request #22107 from owncloud/external-auth-global
Add global auth backend for files external
2016-02-04 16:18:23 +01:00
Robin Appelman 76d9586339 add tests 2016-02-04 16:14:17 +01:00
Robin Appelman 71992f9d29 update import logic for the new export logic 2016-02-04 15:31:05 +01:00
Robin Appelman e3eda917ef Show the proper auth identifier when listing mounts as json 2016-02-04 15:31:05 +01:00
Thomas Müller 52ce83993d Merge pull request #22124 from owncloud/comments-author-check
Check for authorship on edit attempt
2016-02-04 15:16:33 +01:00
Robin Appelman 9dfe9f77f2 Add global auth backend for files external 2016-02-04 14:57:17 +01:00
Thomas Müller 899444103a Merge pull request #22121 from owncloud/comments-deleteduser
Special label for deleted users in comments list
2016-02-04 13:03:18 +01:00
Arthur Schiwon a480b2261b Check for authorship on edit and delete attempts 2016-02-04 12:57:48 +01:00
Thomas Müller cd16ba5cb3 Merge pull request #22025 from owncloud/21838-jenkins
[jenkins] + rebased, of #21838
2016-02-04 11:58:45 +01:00
Vincent Petry 2e46576e83 Special label for deleted users in comments list 2016-02-04 11:26:11 +01:00
Thomas Müller e64044d43e Merge pull request #21964 from owncloud/calendar-sharing-3
Add calendar sharing
2016-02-04 10:48:36 +01:00
Thomas Müller 6a5b0eafa5 Merge pull request #22108 from owncloud/comments-edit
Comment owner can now edit or delete
2016-02-04 10:47:49 +01:00
Jenkins for ownCloud a022584e4a [tx-robot] updated from transifex 2016-02-04 01:55:08 -05:00
Arthur Schiwon e370b601db fix unit tests 2016-02-03 22:45:33 +01:00
alexweirig cd19b648c6 change error logging
replaced variable with print_r call
2016-02-03 21:50:27 +01:00
alexweirig f4d4bed10b Fixed undefined variable $dnGroup and variable name
I renamed $memberURL into $dynamicGroup and print that variable in the writeLog.

I think this makes more sense.
2016-02-03 21:50:27 +01:00
alexweirig 39aac2c66b Refactored code to avoid performance problem
Moved the dynamic group processing to the top and removed condition in memberOf processing.

Also, changed variable name $value to $memberUrl
2016-02-03 21:50:27 +01:00
Alex Weirig 0d797637f3 code changes for user_ldap Dynamic Group Membership
Added new setting of “Dynamic Group Member URL”
(ldapDynamicGroupMemberURL) - see LDAP settings advanced tab.

Added public function getDynamicGroupMembers.

Updated function _groupMembers.

Updated function getUserGroups.
2016-02-03 21:50:27 +01:00
Vincent Petry 805ba20bae Added unit tests for edit/delete comments 2016-02-03 21:06:55 +01:00
Vincent Petry 1caee3ac2e Move comment delete action into edit mode 2016-02-03 21:06:55 +01:00
Vincent Petry bbefe1ed64 Comment owner can now edit or delete 2016-02-03 21:06:55 +01:00
Thomas Müller da04620155 Merge pull request #22101 from owncloud/comments-filerow
Add file row indicator for unread comments
2016-02-03 20:53:40 +01:00
Thomas Müller 81b9721700 Remove entries in dav_shares on deletion of a calendar 2016-02-03 20:18:56 +01:00
Roeland Jago Douma 453ea6698d [Share 2.0] Fix public link sharing 2016-02-03 19:25:29 +01:00
Roeland Jago Douma c1841892d0 [Share 2.0] Fix OCS endpoint 2016-02-03 19:25:29 +01:00
Thomas Müller a3cc448c9d Adding propfind property to retrieve sharee information from a dav resource 2016-02-03 17:18:23 +01:00
Thomas Müller 8c14ce01ba Deleting a shared address book results in unshare 2016-02-03 17:18:22 +01:00
Thomas Müller ef06d6bdaa Deleting a shared calendar results in unshare 2016-02-03 17:18:22 +01:00
Thomas Müller 6f933fde60 Disallow to share with the owner of the resource 2016-02-03 17:18:22 +01:00
Thomas Müller 4b14ca672f Fix ACLs on shared calendars 2016-02-03 17:18:22 +01:00
Thomas Müller 0753067bcd No duplicate address book if shared with user and group and the user is part of the group 2016-02-03 17:18:22 +01:00
Thomas Müller 18c35bf812 No duplicate calendars if shared with user and group and the user is part of the group 2016-02-03 17:18:22 +01:00
Thomas Müller 9106595608 Add calendar sharing 2016-02-03 17:18:22 +01:00
Vincent Petry 85bec3ffcb Reset comments read marker after loading comments 2016-02-03 16:18:14 +01:00
Thomas Müller e34ec0a138 Merge pull request #22095 from owncloud/public_link_with_port
Public link downloads should work on instance on non default port
2016-02-03 16:06:54 +01:00
Thomas Müller 74abbbc0d6 Merge pull request #22098 from owncloud/cleanup-core-apps
Cleanup core apps
2016-02-03 14:17:10 +01:00
Arthur Schiwon c1871f5787 Port of test_ldap_2nddispname to master 2016-02-03 13:55:39 +01:00
Thomas Müller aaf7299d28 Merge pull request #22070 from owncloud/share2_exceptions
Add sharing exceptions to OCP
2016-02-03 13:36:14 +01:00
Vincent Petry 8bb1437e24 Add file row indicator for unread comments 2016-02-03 13:00:55 +01:00
Joas Schilling 78d5c89e86 Make sure encryption has a valid licence tag 2016-02-03 12:57:03 +01:00
Joas Schilling d79b0886d0 Remove deprecated and unused standalone tag 2016-02-03 12:56:42 +01:00
Joas Schilling 13c8fd4558 Remove invalid app user doc links 2016-02-03 12:56:17 +01:00
Thomas Müller 621f54da51 Merge pull request #21997 from owncloud/checksums
Checksums
2016-02-03 11:36:22 +01:00
Roeland Jago Douma 4bb96a5553 Construct valid URL 2016-02-03 11:29:36 +01:00
Thomas Müller d66a836251 Merge pull request #21772 from owncloud/occ-external-applicable
Add occ command to manage applicables
2016-02-03 09:03:59 +01:00
Roeland Jago Douma 2035a179bc Add store/retrieve checksums
* Add extra db column to filecache
* Bump version
* Update filecache code to actually handle checksum
* Webdav code to store/retrieve checksums
2016-02-03 09:03:51 +01:00
Thomas Müller d4b356e0e9 Merge pull request #21961 from owncloud/comments-gui
Comments GUI in files sidebar
2016-02-03 09:03:43 +01:00
Thomas Müller 77942ad38a Merge pull request #22059 from owncloud/comments-readmark-dav
Comments DAV methods for read mark manipulation (mark comments of a file as read) + return isUnread status
2016-02-03 09:00:32 +01:00
Thomas Müller 1531e7f440 Merge pull request #22053 from owncloud/files_external-params-flags
Remove magic flags from files_external backend params
2016-02-03 09:00:17 +01:00
Jenkins for ownCloud 92a1d1c0e3 [tx-robot] updated from transifex 2016-02-03 01:55:26 -05:00
Vincent Petry 8b98cf5a5b Fixed report name 2016-02-02 18:06:16 +01:00
Vincent Petry 03f4b49ecc Added JS unit tests for comments 2016-02-02 18:01:15 +01:00
Vincent Petry 9028457ea2 Add spinner when submitting comments 2016-02-02 18:01:15 +01:00
Vincent Petry 3a6d065e50 Fix formatting messages with newlines 2016-02-02 18:01:15 +01:00
Vincent Petry 64ad99db70 Better comments pagination logic 2016-02-02 18:01:15 +01:00
Vincent Petry fdf555e814 Improve comments style, add avatars 2016-02-02 18:01:15 +01:00
Vincent Petry 67a36a2cca Use last comment's time for pagination 2016-02-02 18:01:15 +01:00
Vincent Petry 29386eccf9 Add pagination support for comments GUI 2016-02-02 18:01:15 +01:00
Vincent Petry d1518045ec Improve comment date format 2016-02-02 18:01:15 +01:00
Vincent Petry cca33942aa Comments GUI 2016-02-02 18:01:15 +01:00
Joas Schilling 5a3d2ef2a1 Don't enable tag activities by default 2016-02-02 16:29:49 +01:00
Robin Appelman f4e1a1677b Remove magic flags from files_external backend params 2016-02-02 15:10:59 +01:00
Roeland Jago Douma dc32f49c6e [Share 2.0] Use GenericShareException 2016-02-02 14:23:45 +01:00
Roeland Jago Douma 4d7130ad31 [Share 2.0] Add exceptions to OCP 2016-02-02 14:07:11 +01:00
Thomas Müller 8049b6e998 Merge pull request #22023 from owncloud/interruptable-commands
Interruptable commands
2016-02-02 14:07:07 +01:00
Thomas Müller 2d1d89ee29 Merge pull request #22049 from owncloud/issue-22041-activities-for-systemtags
Issue 22041 activities for systemtags
2016-02-02 13:08:01 +01:00
Robin Appelman 51b5179839 Add occ command to manage applicables 2016-02-02 12:45:10 +01:00
Thomas Müller 37d6fff976 Merge pull request #22055 from owncloud/systemtags-checkfileidowner
Make sure user has access to file for system tag operations
2016-02-02 12:37:52 +01:00
Thomas Müller dfb88612af Filter contacts from the local system addressbook - remote share with local users is not allowed 2016-02-02 11:24:26 +01:00
Joas Schilling 7f563dc3e9 Fix path match 2016-02-02 11:12:16 +01:00
Thomas Müller 22de25c382 PHP 5.4 compatibility 2016-02-02 10:56:33 +01:00
Thomas Müller 847b1e3af0 In some cases $contact['CLOUD'] is not an array 2016-02-02 10:56:33 +01:00
Thomas Müller ca25055cc8 Register all system address books to the contacts manager 2016-02-02 10:56:33 +01:00
Thomas Müller 4777f78187 Merge pull request #20903 from owncloud/sharing-mount-option
Add mount option to disable sharing
2016-02-02 10:26:24 +01:00
Thomas Müller e60b217156 Merge pull request #22015 from owncloud/share-no-permissions
Block shares that dont have the correct source permissions
2016-02-02 10:26:06 +01:00
Joas Schilling 25cbc17bec Add activities when a tag is (un-)assigned 2016-02-02 10:11:58 +01:00
Joas Schilling dfe677fabb Add activities for admins when a tag is created/updated/deleted 2016-02-02 09:57:43 +01:00
Joas Schilling aa3fdccb8e App needs to be of type logging to be able to have activities 2016-02-02 09:57:43 +01:00
Jenkins for ownCloud 9861a7f6cc [tx-robot] updated from transifex 2016-02-02 01:55:41 -05:00
Thomas Müller 333bb5a227 Merge pull request #22050 from owncloud/fix_sync_addressbook
pass parameter in the right order to syncRemoteAddressBook()
2016-02-01 23:20:42 +01:00
Vincent Petry d72c0ffbc6 Make sure user has access to file for system tag operations
Fixes DAV's SystemTagsObjectTypeCollection to not give access to files
where the current user doesn't have access to.
2016-02-01 18:23:40 +01:00
Arthur Schiwon 29f57eb85c set read marker via proppatch against entity 2016-02-01 17:43:13 +01:00
Arthur Schiwon b1c8b077b0 Return isUnread property per comment 2016-02-01 16:55:24 +01:00
Björn Schießle 2f739a89f5 pass parameter in the right order to syncRemoteAddressBook() 2016-02-01 16:30:05 +01:00
Thomas Müller b4853f3fce Merge pull request #21967 from owncloud/comments-webdav
Comments WebDAV adjustements
2016-02-01 16:17:45 +01:00
Thomas Müller a2e13aea15 Merge pull request #21909 from owncloud/files-external-visibility
Prevent invalid storages being displayed in the storages view
2016-02-01 15:05:54 +01:00
Thomas Müller 1232943aaa Merge pull request #22046 from owncloud/improved_error_handling
Improved error handling
2016-02-01 14:10:24 +01:00
Thomas Müller 95199013f0 Merge pull request #22045 from owncloud/ext-storage-auth-backend-rewording
Reword external storage auth backends
2016-02-01 13:52:30 +01:00
Björn Schießle 2d469e39af catch all exceptions 2016-02-01 13:39:13 +01:00
Björn Schießle 8e3fcb120f add context to the error messages 2016-02-01 13:38:46 +01:00
Vincent Petry 04b88b4aaa Reword external storage auth backends 2016-02-01 12:20:21 +01:00
Thomas Müller 181b43da4e Merge pull request #22004 from Pookay/patch-1
Fix the result at the bottom on IE
2016-02-01 11:26:33 +01:00
Thomas Müller c091ac5d19 Merge pull request #22021 from owncloud/fix-system-addressbook-sync-with-encryption
Catch potential exceptions when accessing the users avatar - e.g. iss…
2016-02-01 11:26:08 +01:00
Thomas Müller 0202acb926 Move signal handling to the base class to allow other commands to reuse this feature 2016-02-01 09:47:13 +01:00
Thomas Müller a025b2865f Merge pull request #22022 from owncloud/share_ocs_filter_path_sharedwithme
Add path filter to OCS Share API shared_with_me=true
2016-02-01 09:00:31 +01:00
Thomas Müller 21e9c6d1d0 Merge pull request #21999 from owncloud/properly-decode-cached-objects
[user_ldap] properly decode cached objects
2016-02-01 08:59:55 +01:00
Jenkins for ownCloud 3ada5c02a6 [tx-robot] updated from transifex 2016-02-01 01:54:40 -05:00
Jenkins for ownCloud 2b376b9e5c [tx-robot] updated from transifex 2016-01-31 01:54:49 -05:00
Jenkins for ownCloud c14464875f [tx-robot] updated from transifex 2016-01-30 01:55:56 -05:00
Thomas Müller b961ada089 Merge pull request #22018 from owncloud/occ-external-delete
Add delete command for external storages
2016-01-29 17:03:42 +01:00
Thomas Müller ca5d72e6b0 Catch potential exceptions when accessing the users avatar - e.g. issues with the encrypted file system - fixes #21983 2016-01-29 15:39:39 +01:00
Roeland Jago Douma a24e7f6558 Add path filter to OCS Share API ?shared_with_me=true
This allows all clients to quickly get the share info for a given path.
Instead of returning everything and filtering it then manually on the
client side.
2016-01-29 15:36:23 +01:00
Robin Appelman 6b18134ceb inject logger 2016-01-29 14:51:30 +01:00
Robin Appelman d0f5687687 Dont set null values when validating storage definition 2016-01-29 14:51:30 +01:00
Robin Appelman efcf790eff minor fixes 2016-01-29 14:51:30 +01:00
Robin Appelman eb29bc64de set auth mechanism in tests 2016-01-29 14:51:30 +01:00
Robin Appelman 03c79ac24f remove custom controler for user provided password auth 2016-01-29 14:51:30 +01:00
Robin Appelman 5bdcd534b1 dont show user provided auth as option for personal mounts 2016-01-29 14:51:30 +01:00
Robin Appelman 860d51487b Allow setting user provided credentials from the personal settings page 2016-01-29 14:51:30 +01:00
Robin Appelman f3e9729a5f expose user provided credentials for admin mounts 2016-01-29 14:50:52 +01:00
Robin Appelman 419507c118 Add user provided credentials mechanism 2016-01-29 14:50:52 +01:00
Robin Appelman adbc5a0b41 Fix invalid storages not showing in directory listing 2016-01-29 14:50:52 +01:00
Thomas Müller 8ad45dad38 Merge pull request #21660 from owncloud/sharing2_update_reshares
upgrade to sharing 2.0, remove hierarchical re-shares
2016-01-29 14:43:16 +01:00
Thomas Müller e78be6f21e Merge pull request #21928 from owncloud/files-external-js-checkbox-fix
Fix validation of inputs that aren't text
2016-01-29 14:18:13 +01:00
Thomas Müller e8c449612d Merge pull request #21990 from owncloud/systemtags-cleanup-orphans
Background cleanup job for system and user tag orphaned when file was deleted
2016-01-29 14:16:50 +01:00
Robin Appelman b9b74d935f Add delete command for external storages 2016-01-29 14:10:43 +01:00
Arthur Schiwon 6dc793338a url encode id 2016-01-29 13:28:17 +01:00
Robin Appelman 279a54bc87 adjust js unit test 2016-01-29 13:14:26 +01:00
Robin Appelman 3c8aac3867 Add mount option to disable sharing 2016-01-29 13:14:26 +01:00
Arthur Schiwon 24025f32f4 standardize datetime output 2016-01-29 13:08:02 +01:00
Arthur Schiwon d2882b9021 Comments WebDAV adjustements 2016-01-29 13:08:02 +01:00
Robin Appelman e3b5639fc1 Block shares that dont have the correct source permissions 2016-01-29 13:05:53 +01:00
Robin McCorkell 241ed17dc0 Add storage validation JS unit tests 2016-01-29 11:47:23 +00:00
Vincent Petry f0caf41232 Cleanup job for system and user tag orphaned when file was deleted
Whenever a file was deleted (also from trash), the tag mapping is
pointing at a fileid that doesn't exist any more.

This cleanup job will delete such orphaned mapping entries.
2016-01-29 11:51:47 +01:00
Thomas Müller b65a23ca4b Merge pull request #21701 from owncloud/scan_files_more_details_II
occ scan:files Adding more details in the base print out (II)
2016-01-29 11:41:36 +01:00
Pookay 9bfc31e666 Fix the result at the bottom on IE
view issue #21898
2016-01-29 10:07:15 +01:00
Thomas Müller ede1cbf612 Merge pull request #21932 from owncloud/comments-dav-refinements
provide info about plugin, and do not run commit ourselves on proppatch
2016-01-29 10:03:20 +01:00
martin.mattel@diemattels.at e05592d797 occ scan:files Adding more details in the base print out (II)
Use proper method name

Fixed the interruption logic

Checks the availability of the pcntl_signal function

Fixed typo crtl-c --> ctrl-c

one overseen crtl-c typo
2016-01-29 08:42:03 +01:00
Jenkins for ownCloud 1765e11f75 [tx-robot] updated from transifex 2016-01-29 01:55:53 -05:00
Morris Jobke e4ad4c7e98 [user_ldap] properly decode cached objects
* fixes #21896
2016-01-29 07:51:16 +01:00
Thomas Müller 6fc3269670 Merge pull request #21333 from owncloud/migrate-contacts
Migrate contacts
2016-01-28 19:47:48 +01:00
Lukas Reschke 128d9d7aa6 Add copyright header 2016-01-28 19:27:04 +01:00
Roeland Jago Douma 6151a0540b Update the initiator of the share as well in migration 2016-01-28 19:24:23 +01:00
Roeland Jago Douma b85770d636 Update reshares in batches as not to run out of memory 2016-01-28 19:24:23 +01:00
Björn Schießle dc8d43575f upgrade to sharing 2.0, remove hierarchical re-shares 2016-01-28 19:24:23 +01:00
Roeland Jago Douma 2831884e74 Fix OCS unit tests after two share merges
* Use getNode
* Return IShare object so typechecking is happy
2016-01-28 13:17:16 +01:00
Thomas Müller 295de6aad7 Merge pull request #21960 from owncloud/share2_ocs_fix_passing_empty_strings
Share2 ocs fix passing empty strings
2016-01-28 11:58:35 +01:00
Robin Appelman 1369f2c684 cleanup shared cache 2016-01-28 11:46:43 +01:00
Roeland Jago Douma 34e912ab6b [Share 2.0] Fix interfaces and comments
* Made comments more clear
* Removed unneeded methods
* IShares shareTime is now a proper DateTime object
* IShares getPath -> getNode & setPath -> setNode
* Fix unit tests
2016-01-28 07:54:09 +01:00
Roeland Jago Douma 185b9c6edd [Share 2.0] Move IShare to OCP 2016-01-27 22:04:37 +01:00
Roeland Jago Douma 6957917b20 [Share 2.0] Allow using permissions to update link share 2016-01-27 20:36:36 +01:00
Roeland Jago Douma f5c45dfe7b [Share 2.0] Still allow isolated updates
Still allow isolated updates of parameters
2016-01-27 20:36:31 +01:00
Roeland Jago Douma b321ceef60 [Share 2.0] Also handle empty parameter in updateShare
* More sanity checks
* More unit tests
2016-01-27 20:34:06 +01:00
Roeland Jago Douma 35a3432793 [Share 2.0] When passing empty strings don't fail
The password and expiration date can be set to empty strings when
created. This is now handled gracefully.
2016-01-27 20:34:06 +01:00
Thomas Müller 0f51851d7d Merge pull request #21895 from owncloud/calendar-sharing
Migrate from CardDAV sharing to more general DAV sharing
2016-01-27 19:32:05 +01:00
Thomas Müller 6973718fb8 Merge pull request #21940 from owncloud/share2_do_not_returned_removed_group_shares
[Share 2.0] Properly handle user deleted group shares
2016-01-27 16:16:06 +01:00
Thomas Müller c7abad65ea Fix sql to get shared addressbooks including unit tests 2016-01-27 12:10:06 +01:00
Thomas Müller 8f4ab55b4b Unit testing database access to old contacts tables 2016-01-27 12:10:06 +01:00
Thomas Müller b2976eb72c Unit testing migration logic 2016-01-27 12:10:06 +01:00
Thomas Müller 07a5c26583 Add app to migrate contacts and calendars
Add group sharing migration

Migrate all users
2016-01-27 12:10:06 +01:00
Thomas Müller ea93310623 Merge pull request #21947 from owncloud/oc-backbone-webdav-put-bool-tojson
Fix system tags proppatch with booleans
2016-01-27 11:43:57 +01:00
Vincent Petry cfba90a78d Fix system tags proppatch with booleans
Backbone webdav adapter now converts booleans and ints to strings.

Fixed system tags to use "true" / "false" strings for booleans instead
of 1 / 0.
2016-01-27 11:09:43 +01:00
Thomas Müller c264f9362d Merge pull request #21856 from owncloud/sync-federated-cloud-users-in-cron
Sync federated clouds using a cron job
2016-01-27 10:11:01 +01:00
Thomas Müller ba565edc1e Extract sharing functionality into own backend class for reusability 2016-01-27 09:45:32 +01:00
Thomas Müller 92c7d15739 Fix server ctor including unit test - this shall never happen again 2016-01-27 09:43:44 +01:00
Thomas Müller d1104954aa Migrate from CardDAV sharing to more generalk DAV sharing 2016-01-27 09:43:44 +01:00
Thomas Müller 1594371c8c Merge pull request #21741 from owncloud/l10n-improvements
Move methods to the factory that are not related to translating, but to guessing/finding the language
2016-01-27 09:37:00 +01:00
Thomas Müller 5b7a1b13f3 Merge pull request #21887 from owncloud/share2_updateShare
[Sharing 2.0] update share
2016-01-27 09:36:41 +01:00
Roeland Jago Douma a4900d721f [Share 2.0] Properly handle user deleted group shares
If a user deletes a group share we create a special share entry. To the
API this is just a normal group share for that user with permissions 0.
But we should not return this.
2016-01-27 09:02:12 +01:00
Arthur Schiwon a5c528ff7e provide info about plugin, and do not run commit ourselves on proppatch 2016-01-26 21:35:12 +01:00
Robin McCorkell 405e2d9b50 Fix validation of inputs that aren't text 2016-01-26 17:42:35 +00:00
Lukas Reschke b6ca05f9a0 Add fake locking support for OneNote 2013
Fixes https://github.com/owncloud/core/issues/21925
2016-01-26 17:32:52 +01:00
Lukas Reschke a0cb52c90e Fix PHPDoc and signature 2016-01-26 17:27:58 +01:00
Thomas Müller aa598fc701 Merge pull request #21664 from owncloud/comments-dav
Comments DAV implementation
2016-01-26 17:20:32 +01:00
Lukas Reschke 8bdf2f5c25 Do not use duplicated tag
Fixes "This app has no minimum ownCloud version assigned. This will be an error in ownCloud 11 and later.", the tag can only be there once. Also set to 9.0 as this will be the next major release.
2016-01-26 16:42:31 +01:00
Thomas Müller 6deb553dc2 Merge pull request #21833 from owncloud/use-proper-shared-uri-for-contacts
Reassemble behavior on shared address books with respect to uri and d…
2016-01-26 16:13:32 +01:00
Thomas Müller 22010517f5 Merge pull request #21752 from owncloud/files-delete-fix
Only check selection for delete permissions, not parent folder
2016-01-26 16:13:10 +01:00
Thomas Müller 022ac12ab4 Merge pull request #21916 from owncloud/sftp-handle-no-user
Handle no user set in sftp constructor
2016-01-26 16:12:38 +01:00
Arthur Schiwon 3b7ded863b files_sharing requires int as file id 2016-01-26 15:45:37 +01:00
Thomas Müller 7b678a8c17 Reassemble behavior on shared address books with respect to uri and displayname 2016-01-26 15:07:50 +01:00
Robin Appelman 54e58b520c Handle no user set in sftp constructor 2016-01-26 14:48:45 +01:00
Joas Schilling d46cd6a245 Fix tests 2016-01-26 14:02:32 +01:00
Roeland Jago Douma 46045ecc52 [Share 2.0] Add update share 2016-01-26 13:59:58 +01:00
Arthur Schiwon e5ba28f934 adjust unit tests 2016-01-26 13:16:14 +01:00
Arthur Schiwon 8afa39682c Revert "utilize elementMap for parsing DateTime string input argument for REPORT method"
This reverts commit 2027bf2686.
2016-01-26 13:04:41 +01:00
Arthur Schiwon 49c8f3d6e4 return 404 instead of 403 when attempting to create a comment on an not existing or unavailable file 2016-01-26 12:47:33 +01:00
Arthur Schiwon 2027bf2686 utilize elementMap for parsing DateTime string input argument for REPORT method 2016-01-26 12:40:05 +01:00
Arthur Schiwon 11ae468c89 smaller changes related to reviews 2016-01-26 12:10:56 +01:00
Arthur Schiwon ed546bd2a5 Comments DAV implementation 2016-01-26 12:10:14 +01:00
Robin McCorkell 30509a479f Prevent invalid storages being displayed in the storages view 2016-01-26 10:41:59 +00:00
Thomas Müller 6cb95f4e42 Merge pull request #21853 from owncloud/tags-fixpropertyma
Fix oc:tags tag list serializer
2016-01-26 11:37:37 +01:00
Jenkins for ownCloud ecf2d178b1 [tx-robot] updated from transifex 2016-01-26 01:56:06 -05:00
Thomas Müller 4c9e328211 Merge pull request #21892 from owncloud/issue-21890-parameters
Add parameters types to IQueryBuilder
2016-01-25 21:13:41 +01:00
Joas Schilling 09ae160463 Replace other usages 2016-01-25 17:17:36 +01:00
Thomas Müller 2d7528bc64 Adding unit tests 2016-01-25 11:39:57 +01:00
Vincent Petry 0a1350d5ac System tags sidebar selector now respects permissions
For admins: display the namespace behind the tag name.
For users: no namespace, don't display non-assignable tags in the
dropdown, display already assigned non-assignable tags with a different
style
2016-01-25 10:45:02 +01:00
Thomas Müller 9d36972e0f Merge pull request #21401 from owncloud/dav-cache-getchildren
Put nodes from Directory->getChildren in the ObjectTree cache
2016-01-25 10:02:32 +01:00
Thomas Müller ef4fca22d1 Merge pull request #21844 from owncloud/drop-image-path
Remove OC_Helper::imagePath and use the proper public interface
2016-01-25 10:00:21 +01:00
Roeland Jago Douma d0799af484 Add missing use statements for IGroupManager and IUserSession 2016-01-25 08:05:53 +01:00
Jenkins for ownCloud a331979a67 [tx-robot] updated from transifex 2016-01-25 01:54:39 -05:00
Morris Jobke 75e6734ef4 Remove OC_Helper::imagePath and use the proper public interface 2016-01-24 18:04:20 +01:00
Jenkins for ownCloud 82d3852815 [tx-robot] updated from transifex 2016-01-24 01:54:40 -05:00
Jenkins for ownCloud f92119e02f [tx-robot] updated from transifex 2016-01-23 01:55:35 -05:00
Thomas Müller 0a4142d5df Merge pull request #19002 from UoM-ResPlat-DevOps/swift-streaming-download
Streaming download from Swift in files_external
2016-01-22 17:27:41 +01:00
Thomas Müller 7731b29136 Merge pull request #21719 from owncloud/move-notification-api-to-ocp
Move the notification API to public namespace
2016-01-22 16:20:26 +01:00
Thomas Müller 21131d133a Merge pull request #21814 from owncloud/systemtags-backend-permissions
Fix DAV backend to respect system tags permissions
2016-01-22 16:08:22 +01:00
Vincent Petry 2ef62b0115 Fix TagList serializer 2016-01-22 15:55:54 +01:00
Thomas Müller 7909c47b7c Sync federated clouds using a cron job 2016-01-22 14:58:49 +01:00
Vincent Petry 2f3e62a27f Fix oc:tags tag list serializer
Fixes propfind/proppatch of oc:tags
2016-01-22 14:07:26 +01:00
Thomas Müller 9b4c9a0357 Merge pull request #18531 from owncloud/ext-user-credentials
External storage 'Login credentials' auth mechanism
2016-01-22 13:14:14 +01:00
Thomas Müller 57b17cdd98 Merge pull request #21826 from owncloud/dav-fix-user-deletion
No card ID when deleting is acceptable
2016-01-22 11:16:30 +01:00
Thomas Müller 1410120758 Merge pull request #20768 from owncloud/mount-cache
cache mountpoints in the db
2016-01-22 11:01:54 +01:00
Joas Schilling ee02165005 Move the notification API to public namespace 2016-01-22 10:32:42 +01:00
Thomas Müller 766ba1cd5f Merge pull request #21532 from owncloud/share2.0_getShares
[Share 2.0] get shares
2016-01-22 07:58:36 +01:00
Thomas Müller ad39ca72d5 Merge pull request #21829 from owncloud/remove-duplicated-value
remove duplicated array value
2016-01-21 16:27:03 +01:00
Roeland Jago Douma 3a582e88e5 Comments from Vincent 2016-01-21 16:06:12 +01:00
Roeland Jago Douma 0a9cd91e1d [Share 2.0] Add subfiles=x 2016-01-21 15:56:44 +01:00
Roeland Jago Douma 3666c34a19 [Sharing 2.0] Start with getShares 2016-01-21 15:56:44 +01:00
Thomas Müller e2f231d051 Merge pull request #21761 from owncloud/share2_link
Share2 link
2016-01-21 15:43:08 +01:00
Thomas Müller 5a4edeea70 Merge pull request #21808 from owncloud/testing-app-details
Testing app details
2016-01-21 14:29:11 +01:00
Vincent Petry 94a763a084 Inject user session to check for admin in system tags DAV handlers 2016-01-21 14:22:46 +01:00
Vincent Petry 5639e41cb0 Fix DAV to respect system tags permissions
When queried as regular user, visible tags are not displayed in result
sets and queries for existence will return false.

Non-assignable or non-visible tags cannot be
renamed/assigned/unassigned.

User is not allowed to change tag permissions, only to change the name
if the tag is also assignable.
2016-01-21 14:09:27 +01:00
blizzz 7e853e2c69 remove duplicated array value 2016-01-21 13:59:36 +01:00
Thomas Müller 2540ac431c Merge pull request #21778 from owncloud/share-calendars
More tests for CalDAV
2016-01-21 12:31:26 +01:00
Joas Schilling df27a939ce No card ID when deleting is acceptable 2016-01-21 12:19:28 +01:00
Jan-Christoph Borchardt e6246bea73 testing app: fix app name capitalization 2016-01-21 12:12:43 +01:00
Jan-Christoph Borchardt 8bf7b8f538 testing app: add max version 2016-01-21 12:12:43 +01:00
Jan-Christoph Borchardt 89397d5949 testing app: add logo 2016-01-21 12:12:43 +01:00
Thomas Müller ec8022d241 Merge pull request #20847 from owncloud/systemtags-ui
System tags sidebar section
2016-01-21 12:12:40 +01:00
Jenkins for ownCloud 50b303f3ad [tx-robot] updated from transifex 2016-01-21 01:55:20 -05:00
Roeland Jago Douma 18421e7e68 Directly get from the server container
* Updated unit tests
2016-01-20 21:12:26 +01:00
Roeland Jago Douma 67f5216160 Do not use deprected activities API 2016-01-20 21:12:26 +01:00
Roeland Jago Douma 9467859e42 Get correct path for activity downloads 2016-01-20 21:12:26 +01:00
Roeland Jago Douma 894a88ca51 [Share 2.0] Make public link work without view 2016-01-20 21:12:26 +01:00
Roeland Jago Douma 8734ebe505 [Share 2.0] Make link share download use share manager 2016-01-20 21:12:26 +01:00
Roeland Jago Douma 717697313b [Share 2.0] Move tests over the sharemanager
Nice side effect... pure unit tests!
2016-01-20 21:12:26 +01:00
Roeland Jago Douma 0ebc92c44a [Share 2.0] Move showing link share to sharing 2.0 2016-01-20 21:12:26 +01:00
Robin Appelman 483c6b68e2 clear mount cache when removing applicables 2016-01-20 16:32:56 +01:00
Thomas Müller 77069f5582 Use IUser::setEMailAddress in ldap as well 2016-01-20 15:21:33 +01:00
Thomas Müller f16ddef96a React on OC_User::changeUser hook and update the user's vcard 2016-01-20 14:57:20 +01:00
Thomas Müller aeb89947a2 Introduce IUser::setEMailAddress and add hook mechanism 2016-01-20 14:57:20 +01:00
Vincent Petry 5d4bb4b9c1 Adjust system tags app max version 2016-01-20 14:03:02 +01:00
Vincent Petry 38cacd9405 Fix app metadata/test issues for system tags app 2016-01-20 12:26:50 +01:00
Vincent Petry cc0f0a940e Fix content type parsing in system tags plugin 2016-01-20 11:51:06 +01:00
Thomas Müller dd733d8925 Merge pull request #20804 from owncloud/fix-ldap-process-user-wo-displayname
LDAP: do not attempt to process user records without display name, fi…
2016-01-20 11:33:26 +01:00
Thomas Müller c9dcf5ceba Merge pull request #21795 from owncloud/remove-unneeded-markup
Remove unneeded markup for scan process - ref #20545
2016-01-20 11:30:28 +01:00
Morris Jobke 61c104dcde Remove unneeded markup for scan process - ref #20545 2016-01-20 10:09:59 +01:00
Jenkins for ownCloud f076bfac32 [tx-robot] updated from transifex 2016-01-20 01:54:54 -05:00
Thomas Müller 33171f5c78 Merge pull request #21785 from owncloud/cron-sync-system-addressbook
Add daily cron job to sync system address book
2016-01-20 07:29:10 +01:00
Vincent Petry ffba6d0a7e Added system tags GUI in sidebar
Added files details sidebar panel to assign/unassign/rename/delete
system tags.
2016-01-19 16:24:26 +01:00
Thomas Müller c1d8d60754 Add back the current-user-principal test suite 2016-01-19 15:33:57 +01:00
Thomas Müller f18f1e40b7 CalDAV sync tests 2016-01-19 14:03:46 +01:00
Thomas Müller e1d18a8ded Adjust CalDAV tests 2016-01-19 14:03:46 +01:00
Thomas Müller bf9f4f20e1 Merge pull request #21626 from owncloud/share-addressbooks-with-groups-2
Show group shared addressbooks
2016-01-19 13:54:26 +01:00
Thomas Müller 177387b13c Install cron job on install and update 2016-01-19 12:36:23 +01:00
Thomas Müller f0f308dfbf Merge pull request #21744 from owncloud/scrutinizer-patch-1
Scrutinizer Auto-Fixes
2016-01-19 12:17:25 +01:00
Morris Jobke 6e096936e5 update JS humanFileSize to use KB instead of kB 2016-01-19 10:51:57 +01:00
Thomas Müller 54cbfcbaa1 Add daily cron job to sync system address book 2016-01-18 22:51:23 +01:00
Thomas Müller ac55bac461 Fix test for ensureSystemAddressBookExists 2016-01-18 22:17:07 +01:00
Thomas Müller 2d16ba9084 Fix join condition for oracle 2016-01-18 22:15:17 +01:00
Thomas Müller 3f041a5b4b Adjust ctor call 2016-01-18 22:15:17 +01:00
Thomas Müller f772572249 Fix xml namespace in test 2016-01-18 22:15:17 +01:00
Thomas Müller ed24511185 Readjust sharing methods 2016-01-18 22:15:17 +01:00
Thomas Müller dca0a0eaf1 Save access properly 2016-01-18 22:14:51 +01:00
Thomas Müller b912bf81b5 Fixing sharing unit test 2016-01-18 22:14:51 +01:00
Thomas Müller f833782720 Fix CalDAV test suite 2016-01-18 22:14:51 +01:00
Thomas Müller 45baf03a2a Test ownCloud CardDAV sharing using CalDAVTester 2016-01-18 22:14:51 +01:00
Thomas Müller 1448215055 Call ctors properly 2016-01-18 22:14:51 +01:00
Thomas Müller 992ccc899a Fix unit test - optimize code 2016-01-18 22:14:30 +01:00
Thomas Müller 8b8edc1f5d Show group shared addressbooks 2016-01-18 22:14:30 +01:00
Thomas Müller 816df90aec Merge pull request #21700 from owncloud/update-system-addressbook-on-user-change
Updating system addressbook as soon as a user is added or removed
2016-01-18 20:28:11 +01:00
Thomas Müller 11e774dd7b Merge pull request #21770 from owncloud/files_external-export
Add files_external:export command
2016-01-18 16:58:26 +01:00
Thomas Müller e895ce69fe Merge pull request #21757 from owncloud/files-external-applicable-db-fix
Correctly remove global applicable
2016-01-18 16:58:08 +01:00
Thomas Müller e3b6642a91 Merge pull request #21754 from owncloud/ocs_share_api_add_share_owner
[Share 2.0] Add share owner information to OCS Share API
2016-01-18 16:57:48 +01:00
Thomas Müller 14c98b4df7 Merge pull request #21519 from owncloud/propagate-folder-size
propagate folder size in the same query for write updates
2016-01-18 16:57:30 +01:00
Robin Appelman 1fcb36cc39 Add files_external:export command 2016-01-18 14:17:27 +01:00
Thomas Müller a32f8aa87a Merge pull request #21732 from owncloud/gdrive-stream-download
Use Guzzle stream to download files from GDrive
2016-01-18 14:16:19 +01:00
Robin Appelman 15451b29da bumb app version 2016-01-18 12:09:44 +01:00
Robin Appelman 7ba715d144 fix test 2016-01-18 12:08:58 +01:00
Robin Appelman 7e01f32c27 Pass the user when updating external storage status 2016-01-18 11:10:41 +01:00
Robin McCorkell 3fe802d931 Introduce 'login credentials' auth mechanism
Stores user credentials in the database after user login, uses the new
CredentialsManager class
2016-01-18 11:10:41 +01:00
Robin Appelman 97a2fb8a54 Put nodes from Directory->getChildren in the ObjectTree cache 2016-01-17 09:33:05 +01:00
Jenkins for ownCloud 2095a31000 [tx-robot] updated from transifex 2016-01-17 01:54:53 -05:00
Robin McCorkell 0b7fc9fd11 Correctly remove global applicable 2016-01-15 23:17:22 +00:00
Robin McCorkell df7db3685e Remove faulty directory permissions test 2016-01-15 20:46:39 +00:00
Roeland Jago Douma d33e578665 [Share 2.0] Add share owner information to OCS Share API 2016-01-15 20:21:47 +01:00
Thomas Müller 3a9dbc88ec Merge pull request #21739 from owncloud/issue_21110
Fix bug issue 21110
2016-01-15 20:15:03 +01:00
Robin McCorkell a49aff2db7 Only check selection for delete permissions, not parent folder 2016-01-15 16:52:51 +00:00
Robin Appelman 30d6222e64 handle noopscanner in shared scanner 2016-01-15 15:37:31 +01:00
Robin Appelman ddbbe1742f propagate folder size in the same query for write updates 2016-01-15 15:36:52 +01:00
Scrutinizer Auto-Fixer 83a8e75614 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2016-01-15 12:54:26 +00:00
Thomas Müller 6a7be4d277 Merge pull request #20927 from owncloud/handle-return-code-on-webdav-put
Handle return code of streamCopy in WebDAV put
2016-01-15 13:33:01 +01:00
Thomas Müller 6824704699 Merge pull request #21117 from owncloud/owner-file-exists
Only return an owner if the file exists + improved getUidAndFilename
2016-01-15 13:31:56 +01:00
Thomas Müller 13ce6d0f1c Merge pull request #21544 from owncloud/trashbin-permissions
set etag and permission fields for trashbin entries
2016-01-15 13:22:54 +01:00
Jesús Macias 3ae928c661 Change icon only on WND and Sharepoint external storages 2016-01-15 13:06:12 +01:00
Thomas Müller d8867f7692 Merge pull request #21723 from owncloud/prevent-group-enable-for-apps
Prevent group enable for apps
2016-01-15 12:26:43 +01:00
Thomas Müller 64fb3c0606 Merge pull request #21735 from owncloud/files-external-checkbox-settings
Consolidate user mounting check code
2016-01-15 12:25:27 +01:00
Jesús Macias 5aa5d3a9ae Fis bug issue 21110 2016-01-15 12:13:16 +01:00
Thomas Müller 52040a3f23 Merge pull request #20898 from owncloud/cache-interfaces
Public Cache interfaces
2016-01-15 12:02:31 +01:00
Jenkins for ownCloud cd840f01ae [tx-robot] updated from transifex 2016-01-15 01:54:57 -05:00
Robin McCorkell 4ffe8d70fa Consolidate user mounting check code 2016-01-14 22:13:28 +00:00
Vincent Petry d608c37c90 Use Guzzle stream to download files from GDrive
The API library does not support streaming and always reads the full
file into memory.

This workaround copies the signed headers to a Guzzle request and
returns the response as stream.
2016-01-14 17:52:30 +01:00
Joas Schilling 0461b9dbb9 Add a new app type that can not be enabled for groups 2016-01-14 15:45:47 +01:00
Thomas Müller 01a6656c37 Fix ctor 2016-01-14 14:46:51 +01:00
Thomas Müller 052583bcb6 Unit tests for updateUser and deleteUser 2016-01-14 13:01:10 +01:00
Robin Appelman a3d50ef49a add watcher interface 2016-01-14 12:54:42 +01:00
Robin Appelman 5fae07f422 add scanner interface 2016-01-14 12:54:42 +01:00
Robin Appelman 6d321f5f6b Return a class from cache operations instead of an array 2016-01-14 12:54:42 +01:00
Robin Appelman 5d0451b848 Safe teardowns 2016-01-14 12:54:42 +01:00
Thomas Müller fbfca80f42 Add test for ensureSystemAddressBookExists 2016-01-14 12:21:42 +01:00
Thomas Müller a91954907b Start updating system addressbook 2016-01-14 12:10:45 +01:00
Thomas Müller 8f89e3520d Merge pull request #21679 from owncloud/bump-sabre-3.0.7
[3rdparty] Bump sabre to 3.0.7 (PHP7 support)
2016-01-14 11:55:46 +01:00
Jenkins for ownCloud 205fbcbfa3 [tx-robot] updated from transifex 2016-01-14 01:55:43 -05:00
Thomas Müller d0a690fde4 Merge pull request #21692 from owncloud/external-add-global
Fix adding global applicable when removing all other applicables
2016-01-13 17:36:52 +01:00
Roeland Jago Douma cbd3050f4c [Share 2.0] Use full share id (providerId:shareId)
Now that we support multiple managers we communicate shares to the
outside as 'providerId:shareId'. This makes sures that id's are unique
when references from the OCS API.

However, since we do not want to break the OCS API v1 we need to
somewhat hack around this.

When we switch to OCS API v2 (which we should when we support more
custom providers). We will change the id to always be the fullShareId.
2016-01-13 16:35:15 +01:00
Roeland Jago Douma 67b7ebccd1 [Share 2.0] Add share provider factory
* Add providers
* Add share manager to server container
* Use share manager from server container
* Properly get the share manager
2016-01-13 16:35:14 +01:00
Roeland Jago Douma b4de427c1e [Share 2.0] Allow registering of share providers
* Properly register the default share provider
2016-01-13 16:35:07 +01:00
Robin Appelman b613db9e16 Fix adding global applicable when removing all other applicables 2016-01-13 15:31:26 +01:00
Roeland Jago Douma 172f6cd714 Fix carddav unit tests 2016-01-13 15:00:05 +01:00
Erik Pellikka ace66057f2 Fixed issue #21452
removed whitespace

removed whitespace

Changed it based on PVince81's suggestion
2016-01-13 14:47:00 +01:00
Roeland Jago Douma 4a3b6da183 Fix mock call to download
We can only mock public and protected functions in phpunit.
2016-01-13 12:27:48 +01:00
Thomas Müller 4cff03f56b Add missing dispatcher 2016-01-13 12:18:46 +01:00
Thomas Müller f0c869d22e Merge pull request #21662 from owncloud/external-list-non-admin
Allow non admins to list their own mounts
2016-01-13 11:01:27 +01:00
Thomas Müller cddc1ae9cb Merge pull request #21655 from owncloud/remove-listener-plugin
Remove the listener dav plugin
2016-01-13 10:39:27 +01:00
Thomas Müller 7a569a0915 Merge pull request #21392 from owncloud/files_external-import
Add import command for files external
2016-01-13 10:35:10 +01:00
Thomas Müller e0aa6e01ab Merge pull request #21612 from owncloud/fix_21598
fix public link sharing if the master key is enabled
2016-01-13 10:34:48 +01:00
Thomas Müller a5e46226ef Merge pull request #21615 from owncloud/shared-islocal
implement isLocal for shared storage
2016-01-13 10:34:23 +01:00
Thomas Müller 1e0ea46e9e Merge pull request #21620 from owncloud/fix-wrong-classname-in-phpdoc
fix wrong class name in phpdoc
2016-01-13 10:34:07 +01:00
Thomas Müller 5565b19382 Merge pull request #21648 from owncloud/smb-statcache-cap
cap the number of entries we cache in smb's statcache
2016-01-13 10:33:43 +01:00
Joas Schilling 3bdcfef395 Remove the listener plugin 2016-01-13 10:33:08 +01:00
Thomas Müller a11f6093b7 Merge pull request #21663 from owncloud/occ-external-mountpoint
allow setting mountpoint with occ files_external:config
2016-01-13 10:30:17 +01:00
Thomas Müller c5a200c419 Merge pull request #21653 from owncloud/update-license-headers-2016
Update license headers 2016
2016-01-13 08:29:42 +01:00
Thomas Müller 59e9b93be6 Merge pull request #20948 from owncloud/fed-sync-contacts
Syncing system addressbooks across federated ownClouds
2016-01-13 08:27:51 +01:00
Jenkins for ownCloud eb90fa78ad [tx-robot] updated from transifex 2016-01-13 01:55:56 -05:00
Robin Appelman b1a706999f Allow non admins to list their own mounts 2016-01-12 17:46:53 +01:00
Robin Appelman 1861dda313 allow setting mountpoint with occ files_external:config 2016-01-12 17:34:22 +01:00
Thomas Müller 682821c71e Happy new year! 2016-01-12 15:02:18 +01:00
Thomas Müller eac5d9fb3a Merge pull request #21336 from owncloud/system-root-certs
Allow admins to add system wide root certificates
2016-01-12 15:01:46 +01:00
Thomas Müller bf1a2f28c2 Reuse backend as provided by the app container 2016-01-12 14:27:50 +01:00
Thomas Müller 23a8c93fd2 Fix ctor call 2016-01-12 14:24:47 +01:00
Björn Schießle e7a8be2588 fix doc-block 2016-01-12 14:24:47 +01:00
Björn Schießle fa561071d2 create urls in a way that sabredav handles it correctly 2016-01-12 14:24:47 +01:00
Thomas Müller 94856cb892 Catch exceptions during sync 2016-01-12 14:24:47 +01:00
Thomas Müller ca8c9f6ad5 federation has to be of type filesystem so that we load this app for webdav requests 2016-01-12 14:24:47 +01:00
Thomas Müller 693617d8a5 Inject DbHandler .... 2016-01-12 14:24:47 +01:00
Thomas Müller 6d223df2f4 md5 -> sha1 2016-01-12 14:24:47 +01:00
Thomas Müller 06dac9726e Address comments 2016-01-12 14:24:47 +01:00
Thomas Müller 451ab84d11 Adding unit tests for the sync service 2016-01-12 14:24:47 +01:00
Thomas Müller 1a20af253b Adding tests and adjust PHPDoc 2016-01-12 14:24:47 +01:00
Thomas Müller 0bf026ccea Fix registration of sync command 2016-01-12 14:24:47 +01:00
Thomas Müller 90d9834c8c Decouple federation and dav app 2016-01-12 14:24:47 +01:00
Thomas Müller dbddbb634b Use EventDispatcher to allow additional setup of auth backends - move federation auth to federation app 2016-01-12 14:24:01 +01:00
Thomas Müller cdc536c423 Allow trusted servers to authenticate 2016-01-12 14:24:01 +01:00
Thomas Müller 4fc0fbe8d0 Merge pull request #21616 from owncloud/introduce-dav-application-class
Unit test contact provider registration
2016-01-12 14:22:46 +01:00
Robin Appelman d8d6368dd7 cap the number of entries we cache in smb's statcache 2016-01-12 13:26:58 +01:00
Robin Appelman c15cab7ed6 Allow admins to add system wide root certificates 2016-01-12 12:50:59 +01:00
Roeland Jago Douma be8125b8e2 Add unit tests to make sure we do not lower the search 2016-01-12 10:34:38 +01:00
Roeland Jago Douma 71976a095f Do not lower the sharee search
Fixes #21639

When lowering the remote search it break remotes that have uppercase
letters like foo@example.com/ownCloud/

Backends do the mathcing so they should also make sure that the search
string is converted to the format they require.
2016-01-12 10:05:09 +01:00
Thomas Müller 3ec8789c77 Merge pull request #21628 from owncloud/deprecated_secure_random_funcions
Replace deprecated function calls to SecureRandom
2016-01-12 09:12:13 +01:00
Jenkins for ownCloud 44e91bb90a [tx-robot] updated from transifex 2016-01-12 01:56:33 -05:00
Daniel Tosello 8783eb99f7 Modified swift handling to explicitly set 404 responses to false 2016-01-12 16:47:52 +11:00
Roeland Jago Douma 07fd3889b1 Fix unit tests 2016-01-11 20:29:48 +01:00
Roeland Jago Douma 876fb83ddc getMediumStrengthGenerator is deprecated and does not do anything anymore 2016-01-11 20:06:30 +01:00
Roeland Jago Douma 98c4951f45 getLowStrengthGenerator does not do anything anymore 2016-01-11 19:59:15 +01:00
blizzz 89e5556c60 fix wrong class name in phpdoc 2016-01-11 15:15:21 +01:00
Thomas Müller 6f526e638c Unit test contact provider registration 2016-01-11 14:36:20 +01:00
Thomas Müller 3143555256 Merge pull request #21613 from owncloud/dav-fix-constructor
fix principal constructor for dav
2016-01-11 14:21:31 +01:00
Robin Appelman af1e810607 implement isLocal for shared storage 2016-01-11 13:58:22 +01:00
Thomas Müller c1d8a03662 Merge pull request #21517 from owncloud/ext-oauth-fix
Fix OAuth external storage auth for step 2
2016-01-11 13:36:58 +01:00
Robin Appelman 56c3686ad6 fix principal constructor for dav 2016-01-11 13:36:26 +01:00
Björn Schießle 46f6c289ca only use master key ID if a user is logged in. Otherwise keep the public link share key 2016-01-11 13:09:06 +01:00
Morris Jobke 43f5d8ab70 Handle return code of streamCopy in WebDAV put
* throw a different exception if streamCopy failed
2016-01-11 12:13:01 +01:00
Robin Appelman 50857e6d7b Add import command for files external 2016-01-11 11:55:00 +01:00
Thomas Müller df2abda814 Merge pull request #21438 from owncloud/settings-anchors
remove unneeded 'goto' prefix from settings anchors
2016-01-11 11:53:40 +01:00
Robin Appelman 94200b682c removed unused imports 2016-01-11 11:40:58 +01:00
Robin Appelman 282f67dad1 improve handling of non existing files in the trashbin 2016-01-11 11:40:58 +01:00
Robin Appelman 8890c88c11 handle not found in trash hook 2016-01-11 11:40:58 +01:00
Robin Appelman 300eb54c87 de-deplicate getUidAndFilename 2016-01-11 11:40:58 +01:00
Thomas Müller 05f9b40419 Merge pull request #21589 from owncloud/mobile-webDAV-select
webDAV select bug fixed
2016-01-11 11:31:33 +01:00
Thomas Müller 2ee39cf4cf Merge pull request #21573 from owncloud/fix_21535_21534
Do not increase filecount in web on file update
2016-01-11 11:22:09 +01:00
Arthur Schiwon 1ed6132899 LDAP: do not attempt to process user records without display name, fixes fatal error 2016-01-11 11:21:02 +01:00
Julian Müller 0249911536 webDAV select bug fixed 2016-01-11 08:41:16 +01:00
Jenkins for ownCloud 77a8085f84 [tx-robot] updated from transifex 2016-01-11 01:55:34 -05:00
Jenkins for ownCloud 580deb09f8 [tx-robot] updated from transifex 2016-01-10 01:55:57 -05:00
Roeland Jago Douma 665d7b25b0 Add unit test for file update 2016-01-09 22:47:26 +01:00
Roeland Jago Douma 86735c6b5a Updating a file should not update the summary 2016-01-09 22:07:34 +01:00
Jenkins for ownCloud 72b34575df [tx-robot] updated from transifex 2016-01-09 01:55:50 -05:00
Roeland Jago Douma 17a066c18e Properly close db cursors 2016-01-08 20:27:01 +01:00
Roeland Jago Douma 629bac22fd Make sure to respect deleted group shares by user 2016-01-08 20:27:01 +01:00
Roeland Jago Douma 066e3770bb Make sure that permissions stay in sync for share_type 2
When a file/folder is shared with a group and one of the group members
moves this file/folder an extra entry is created in the share table.

When the permission of the group share is updated we used to only
sometimes update the shares for individual users.

* Added intergration tests
2016-01-08 20:27:01 +01:00
Thomas Müller d7d0cfc775 Merge pull request #21008 from owncloud/UoM-ResPlat-DevOps-swift-acl-shared-containers
Allowing access to Swift containers shared by ACL
2016-01-08 20:13:13 +01:00
Thomas Müller ea227aadf2 Merge pull request #20961 from owncloud/provis-api-group-special-char
Remove unnecessary group name validation in provisioning_api
2016-01-08 20:11:20 +01:00
Thomas Müller 1f21f0eb73 Merge pull request #21491 from owncloud/webdav_auth_no_basic_auth
Also allow 'only cookie' auth to webdav
2016-01-08 20:09:16 +01:00
Thomas Müller 2659661cb0 Merge pull request #21546 from owncloud/jsunit-stubportinpublicappspec
Fix public page URL JS test
2016-01-08 20:08:01 +01:00
Thomas Müller 977e104cd4 Merge pull request #21553 from owncloud/gwdg-master
Respect user enumeration
2016-01-08 18:21:15 +01:00
Thomas Müller 37265fd094 Merge pull request #21467 from owncloud/external-status-check-userglobal
Fix checking external storage status as non admin user
2016-01-08 18:19:48 +01:00
Thomas Müller 5618e9a8b1 Merge pull request #21468 from owncloud/getmount-id-filter
Filter getStorage to make sure the user has access to it
2016-01-08 18:19:28 +01:00
Thomas Müller 173c1640c0 Merge pull request #21540 from owncloud/group-principals
Adding group principals to new dav endpoint
2016-01-08 18:18:57 +01:00
Thomas Müller 0f281cdd30 Merge pull request #21286 from owncloud/use-owncloud-mail-when-sending-caldav-schedule-mails
Adding IMip scheduling which uses ownClouds mail delivery
2016-01-08 17:58:33 +01:00
Ralph Krimmel 26d0f42dac Respect user enumeration
Respect shareapi_allow_share_dialog_user_enumeration in user_ldap filter
generation function to increase search performance in sharing dialog.
2016-01-08 15:32:31 +01:00
Thomas Müller bb01efdcbd Adding unit tests for SystemPrincipalBackend 2016-01-08 15:31:33 +01:00
Robin Appelman 88bfe1477d Filter getStorage to make sure the user has access to it 2016-01-08 15:30:45 +01:00
Thomas Müller 427dbdabba Merge pull request #21215 from owncloud/files_external-db-set-mountpoint
fix setting mountpoint and auth backend of external storages
2016-01-08 13:36:30 +01:00
Tom Needham 3327857c1a Update log message when error occurs during addGroup 2016-01-08 13:35:00 +01:00
Roeland Jago Douma 1af3bca720 Fix provisioning API unit test 2016-01-08 13:35:00 +01:00
Tom Needham 673a8a1e4a Remove unnecessary group name validation 2016-01-08 13:35:00 +01:00
Vincent Petry 9b595474af Fix public page URL JS test
Stub the port so it doesn't use the one configured by karma
2016-01-08 13:25:38 +01:00
Robin Appelman cb3d3ebf50 set etag and permission fields for trashbin entries 2016-01-08 13:07:23 +01:00
Robin Appelman a696d6c561 Fix checking external storage status as non admin user 2016-01-08 12:42:22 +01:00
Thomas Müller 074a7fd475 Merge pull request #21027 from owncloud/fix-undefined-behaviour
Fix PHPDoc + Add handling for error cases
2016-01-08 12:35:26 +01:00
Thomas Müller 70b58cf367 Merge pull request #17924 from owncloud/ldap-fix-appending-port
ensure an LDAP URL is used, append the port to the host URL when necessary, and just in one place
2016-01-08 12:34:15 +01:00
Thomas Müller b3550db02d Adding IMip scheduling which uses ownClouds mail delivery 2016-01-08 12:21:41 +01:00
Thomas Müller f9c08112da Adding group principals to new dav endpoint 2016-01-08 12:11:02 +01:00
Robin Appelman 68bd003e4b correctly set applicables when updating user storage 2016-01-08 11:54:32 +01:00
Robin Appelman 8da3c3f125 update tests 2016-01-08 11:54:32 +01:00
Robin Appelman 3895ab8451 improve setting applicable for personal mounts 2016-01-08 11:54:31 +01:00
Robin Appelman ab549970ca fix setting mountpoint and auth backend of external storages 2016-01-08 11:54:31 +01:00
Tim Dettrick 8799d5563f Allowing access to Swift containers shared by ACL
To avoid a confusing extra field, the bucket field is overloaded to
optionally take a URL.
2016-01-08 11:42:28 +01:00
Roeland Jago Douma 791c7a6dcc Bump vobject version in carddav unittest 2016-01-08 11:30:28 +01:00
Jenkins for ownCloud 88c4cba1f5 [tx-robot] updated from transifex 2016-01-08 01:56:39 -05:00
Lukas Reschke 0654d37da8 Remove undefined variable 2016-01-07 21:30:44 +01:00
Lukas Reschke 00a01a8de2 Fix PHPDoc + Add handling for error cases
Makes static code analyzers happier.
2016-01-07 21:30:44 +01:00
Thomas Müller 1cc6fddead Merge pull request #21498 from owncloud/cleanup-OC_DB
Cleanup OC_DB methods
2016-01-07 20:13:16 +01:00
Robin McCorkell 430c5df6c4 Fix OAuth external storage auth for step 2
Parameters are only available after the onCompletion promise is run
2016-01-07 16:44:17 +00:00
Thomas Müller 6a796ff3cc Merge pull request #21066 from owncloud/behat_capabilities_changing_server_configuration
Added new capabilities test with changes in server configuration
2016-01-07 17:07:29 +01:00
Thomas Müller 46107f82d4 Merge pull request #21506 from owncloud/issue-20218-min-max-owncloud-version-warning
Issue 20218 min max owncloud version warning
2016-01-07 16:51:00 +01:00
Thomas Müller 629061d00a Merge pull request #21481 from owncloud/ext-smb-dependencies
Check libsmbclient-php as well as smbclient binary
2016-01-07 16:19:20 +01:00
Thomas Müller fddbdbd0e6 Merge pull request #21455 from owncloud/fix-method-signature
Fix method call + undefined variable
2016-01-07 16:18:02 +01:00
Joas Schilling ae285c0654 Remove deprecated shipped flag from info.xml which has no use anymore 2016-01-07 15:15:58 +01:00
Joas Schilling 40f786060e Add ownCloud min and max version for shipped apps 2016-01-07 15:11:49 +01:00
Thomas Müller 601457d221 Merge pull request #20773 from owncloud/share2.0_create
[Sharing 2.0] create share
2016-01-07 14:57:05 +01:00
Morris Jobke 547fbfdb76 Remove OC_DB::dropTable 2016-01-07 14:54:54 +01:00
Thomas Müller 29416b07ac Merge pull request #21359 from owncloud/check-changes
remove mention of 'filesystem_check_changes' => 2 from the config sample
2016-01-07 14:07:38 +01:00
Vincent Petry 9742e9b113 Add token in webdav download link of public page 2016-01-07 13:37:18 +01:00
Lukas Reschke fb12063ae5 Fix method call + undefined variable
1. Variable is not defined
2. Method does not expect any parameters

```
Undefined variable: user at /Users/lukasreschke/Documents/Programming/master/apps/encryption/settings/settings-admin.php#45
```
2016-01-07 13:22:06 +01:00
Roeland Jago Douma 4a38793d11 Allow only cookie auth to webdav 2016-01-07 10:44:26 +01:00
Morris Jobke 06708cc172 fix js unit tests 2016-01-07 08:57:15 +01:00
Robin Appelman dbafec0c28 Also remove it from the web interface 2016-01-07 08:57:15 +01:00
Robin McCorkell fc52327d2c Check libsmbclient-php as well as smbclient binary 2016-01-07 08:56:45 +01:00
Thomas Müller 470bf234c5 Merge pull request #21343 from owncloud/ldap-showremnants-json-output
Add an option to occ ldap:showremnants to output a json encoded array…
2016-01-07 08:45:06 +01:00
Jenkins for ownCloud 27dfa74d89 [tx-robot] updated from transifex 2016-01-07 01:55:48 -05:00
Roeland Jago Douma 26280e1f19 [Sharing 2.0] Add L10N instance to manager for translated errors 2016-01-06 14:53:43 +01:00
Roeland Jago Douma 527b434cd2 [Sharing 2.0] Do not use static function to get numeric storage id 2016-01-06 14:53:43 +01:00
Roeland Jago Douma 0ab227310f [Sharing 2.0] General exceptions return 403
This is the same as the old behaviour
2016-01-06 14:53:43 +01:00
Roeland Jago Douma 38d3a638ed [Share 2.0] Enable share creation via OCS API 2016-01-06 14:53:43 +01:00
Morris Jobke 553a981980 Make LDAP more robust to exceptions and log them properly 2016-01-06 13:46:55 +01:00
Lukas Reschke 88c7face07 Inject OCSClient
Fixes https://github.com/owncloud/core/issues/21451
2016-01-06 11:40:22 +01:00
Jenkins for ownCloud c77917f48c [tx-robot] updated from transifex 2016-01-06 01:55:16 -05:00
Morris Jobke 80e75aae49 Use color instead of transparency for proper tooltip appearance
* fixes #21436
2016-01-05 09:39:24 +01:00
Jenkins for ownCloud d4034ffca0 [tx-robot] updated from transifex 2016-01-05 01:57:14 -05:00
Jan-Christoph Borchardt bfee488c56 remove unneeded 'goto' prefix from settings anchors 2016-01-04 12:59:32 +01:00
Jenkins for ownCloud 157bb50a39 [tx-robot] updated from transifex 2016-01-04 01:55:05 -05:00
Jenkins for ownCloud 970495a067 [tx-robot] updated from transifex 2015-12-31 01:55:16 -05:00
Thomas Müller edd051dc02 Merge pull request #21291 from owncloud/refactor-call-check
Refactor OC_Util::callCheck
2015-12-28 10:21:44 +01:00
Thomas Müller 7693c6d84a Merge pull request #21254 from owncloud/files-uploadcanceliconfix
Correctly render uploadtext indicator only on folders
2015-12-28 10:21:38 +01:00
Thomas Müller 24271cf953 Merge pull request #21216 from owncloud/fopen-statcache
Clear SMB statcache after fopen
2015-12-28 10:21:26 +01:00
Jenkins for ownCloud 89584716f8 [tx-robot] updated from transifex 2015-12-28 01:55:10 -05:00
Jenkins for ownCloud 6fe60569f5 [tx-robot] updated from transifex 2015-12-27 01:54:38 -05:00
Jenkins for ownCloud 33a83a0926 [tx-robot] updated from transifex 2015-12-25 01:55:16 -05:00
Robin Appelman 5f3c462743 Merge pull request #21093 from owncloud/migrate-no-user
Dont break the files_external migrator if no user is logged in
2015-12-24 16:43:28 +01:00
Jenkins for ownCloud 726f7e5fa8 [tx-robot] updated from transifex 2015-12-23 02:02:31 -05:00
Stephen Colebrook 064580a56e Add an option to occ ldap:showremnants to output a json encoded array for use in scripts and other tools. 2015-12-22 16:28:32 -05:00
Vincent Petry ca14277fca Make a modifiable copy of the webdav properties in JS file list
Plugins can extend _getWebdavProperties to add custom properties.
These should not be added to the original properties list, so now the
FileList makes a copy of the array.
2015-12-22 11:17:24 +01:00
Thomas Müller d17c2fb8d9 Merge pull request #21287 from owncloud/travis-dav-caldavtester
Adding integration tests for CalDAV
2015-12-22 10:52:54 +01:00
Morris Jobke 6f00729124 Refactor OC_Util::callCheck 2015-12-22 09:32:14 +01:00
Robin Appelman ef9a231f6c Add error logging to federated sharing handshake 2015-12-21 16:37:54 +01:00
Thomas Müller d3883ca9d4 Adding integration tests for CalDAV 2015-12-21 16:04:27 +01:00
Thomas Müller 38a006b1e8 Merge pull request #21293 from owncloud/restructure-travis-dav-testing
Restructure travis tests
2015-12-21 12:07:21 +01:00
Thomas Müller ac78d248b7 Sleep in carddavtester as well 2015-12-21 11:43:15 +01:00
Thomas Müller 40d796dde9 Merge pull request #21195 from owncloud/test-carddav-sharing-plugin
Fix carddav sharing plugin + adding unit tests
2015-12-21 11:40:03 +01:00
Thomas Müller 0b597c37b3 Restructure travis tests 2015-12-21 11:35:48 +01:00
Jenkins for ownCloud bc25015bf9 [tx-robot] updated from transifex 2015-12-21 01:55:07 -05:00
Jenkins for ownCloud 7080594670 [tx-robot] updated from transifex 2015-12-20 01:55:09 -05:00
Jenkins for ownCloud d0cb4c9ab3 [tx-robot] updated from transifex 2015-12-19 01:55:14 -05:00
Vincent Petry 7ecb9696ba Use showBusyState for upload into folder
This makes sure that the original icon will be restored properly in case
it's not the default folder icon
2015-12-18 18:09:54 +01:00
Vincent Petry d27826bac0 Correctly render uploadtext indicator only on folders 2015-12-18 18:09:46 +01:00
Roeland Jago Douma b460bde7c6 Removed deprecated OC_Helper::mimeTypeIcon function 2015-12-18 14:00:20 +01:00
Roeland Jago Douma 4f20e3bac0 Removed deprecated OC_Helper::getSecureMimeType 2015-12-18 13:42:59 +01:00
Thomas Müller 9e97bef935 Merge pull request #21268 from owncloud/cleanup-OC_Helper-getFileNameMimeType
Use proper public API for OC_Helper::getFileNameMimeType
2015-12-18 10:15:33 +01:00
Thomas Müller 551e553bf4 Merge pull request #21264 from owncloud/deprecated_oc_user_methods
Cleanup OC_User deprecated methods
2015-12-18 10:15:18 +01:00
Thomas Müller 67e9506261 Fix failing unit tests 2015-12-18 09:18:38 +01:00
Thomas Müller aac06a33f1 Fix carddav sharing plugin + adding unit tests 2015-12-18 09:18:38 +01:00
Morris Jobke ecdf88e41b Use proper public API for OC_Helper::getFileNameMimeType 2015-12-17 17:07:48 +01:00
Thomas Müller 792b270f22 Merge pull request #20696 from owncloud/add-carddav-backends-to-ocp-contactsmanager
Add carddav backend to OCP\ContactsManager
2015-12-17 16:36:48 +01:00
Roeland Jago Douma 1f715289bf Removed deprecated function OC_User::deleteUser
Replaced with proper OCP calls
2015-12-17 16:18:40 +01:00
Roeland Jago Douma 835911bce5 Removed deprecated private OC_User::createUser
All function calls are replaced with the recommended (which was already
the body of the function).
2015-12-17 16:18:40 +01:00
Roeland Jago Douma 7e44ea5da0 Remove deprecated function OC_User::getManager
Private deprecated function => removed
Replaced all instances with suggested replacement
2015-12-17 16:18:34 +01:00
Thomas Müller 1285b78086 Merge pull request #21200 from owncloud/files-authorizationheader
Use Authorization headers for public webdav in web UI
2015-12-17 15:30:13 +01:00
Thomas Müller 38f4407761 Merge pull request #21201 from mmattel/scanFiles_stat_output_II
Statistics output for ./occ files:scan (rework)
2015-12-17 14:43:55 +01:00
Jenkins for ownCloud a7cd8103b5 [tx-robot] updated from transifex 2015-12-17 01:55:09 -05:00
Morris Jobke 89233cab83 add unit test for #21230 2015-12-16 15:03:50 +01:00
Morris Jobke 66c0f4eb59 Use name of ICollection for exception message
* fixes #21230
2015-12-16 14:44:28 +01:00
Jenkins for ownCloud 1d932e4c98 [tx-robot] updated from transifex 2015-12-16 01:55:55 -05:00
martin.mattel@diemattels.at b7e8258d99 Statistics output for ./occ files:scan 2015-12-15 19:05:05 +01:00
C. Montero Luque a376fec984 Merge pull request #21133 from owncloud/fix-shared-files-of-deleted-users
Fix shared files of deleted users, detect DN change when checking for existence on LDAP
2015-12-15 12:14:58 -05:00
Björn Schießle 3ce845e2b1 avoid duplicates on search 2015-12-15 15:40:47 +01:00
Thomas Müller 70e9e31497 Fix last Oracle issue 2015-12-15 14:52:27 +01:00
Thomas Müller e5469a1121 Fix Oracle insert error 2015-12-15 14:52:27 +01:00
Björn Schießle cd55a19034 implement delete, create, update, search, get permissions 2015-12-15 14:52:27 +01:00
Robin Appelman 667d7383e1 clear statcache after fopen for smb 2015-12-15 14:24:02 +01:00
Thomas Müller 1ecda59c24 Merge pull request #21189 from owncloud/fix_21187
File shares can't have create permissions
2015-12-15 13:18:22 +01:00
Thomas Müller 67263ef8b4 Merge pull request #21067 from owncloud/fix_20296
don't allow to create a federated share if source and target are the same
2015-12-15 13:18:04 +01:00
Morris Jobke 7608af6f7d Remove unneeded upgrade code
stable8.2 has version 0.7.0 of the user_ldap app
2015-12-15 09:38:29 +01:00
Arthur Schiwon e39415c946 fix find DN by UUID for AD 2015-12-14 22:42:27 +01:00
Vincent Petry 1d37e7abfc Fixed JS unit tests for fed owner display name 2015-12-14 18:00:35 +01:00
Vincent Petry ab9849e72f Use Authorization headers for public webdav instead of URL
Instead of prepending the token as username in the URL, use the
Authorization header instead. This is because IE9 considers this a
cross-domain call and refuses to do it in the first place.
2015-12-14 17:42:13 +01:00
Björn Schießle c4b65170f2 show display name but internally use the user name 2015-12-14 17:25:10 +01:00
Björn Schießle efc030aa25 don't allow to create a federated share if source and target server are the same 2015-12-14 17:16:14 +01:00
Roeland Jago Douma 843cf906b1 File shares can't have create permissions
fixes #21187
2015-12-14 14:03:14 +01:00
Robin Appelman f27e98a3e2 Migrate files external for the user that the filesystem is being setup for 2015-12-14 13:38:54 +01:00
Vincent Petry 4d9e12b8bc Fix mount type root detection
Since Webdav doesn't contain that information, we need to rely on the
parent folder's mount type to find out whether a child item is a
shared/external root or not.

Fixed the mount type detection logic and added unit test.

Also added a fix that ignores detection if no parent folder exists (ex:
shared file list, favorites, etc)
2015-12-14 10:44:47 +01:00
Jenkins for ownCloud 74de12c698 [tx-robot] updated from transifex 2015-12-13 01:54:51 -05:00
Jenkins for ownCloud f2ac1a80d8 [tx-robot] updated from transifex 2015-12-12 01:55:39 -05:00
Thomas Müller 32525fa977 save wip 2015-12-11 17:39:27 +01:00
Arthur Schiwon 35a2639701 unit test on getHome in combination with OfflineUser 2015-12-11 17:25:57 +01:00
Joas Schilling 7d3e40c065 Add an OCS app for testing instead of using sudo and exec 2015-12-11 16:20:04 +01:00
Thomas Müller aee4887224 Merge pull request #21153 from owncloud/files-deleteactiontext
Bring back file delete action text to be based on context
2015-12-11 16:04:06 +01:00
Vincent Petry baa5a69c55 Bring back file delete action text to be based on context
For received shares, the delete action becomes "Unshare" and for
personal mounts it becomes "Disconnect storage".

This also makes it possible from now on to pass a function to a file
action's "displayName" attribute.
2015-12-11 15:14:30 +01:00
Robin Appelman 5b2957bad1 skip test if we cant use the filesystem when not logged in 2015-12-11 14:29:38 +01:00
Robin Appelman 415cf92784 Fix thrashbin wrapper when no user is loggedin 2015-12-11 14:27:37 +01:00
Arthur Schiwon aedbc0c626 adjust unit test 2015-12-11 12:52:12 +01:00
Thomas Müller f799b27f0e Merge pull request #21144 from owncloud/dav-auth-checkduplicateheader
Properly check X-Requested-With header in case of multiple values
2015-12-11 11:44:43 +01:00
Thomas Müller 6317ba8cb4 Merge pull request #21135 from owncloud/add-polyfill
Add polyfills for PHP55, PHP56 and PHP70 functionalities
2015-12-11 11:40:51 +01:00
Thomas Müller c14f4e8506 Merge pull request #21045 from owncloud/scrutinizer-patch-1
Scrutinizer Auto-Fixes
2015-12-11 11:39:25 +01:00
Vincent Petry 13ec2bda2d Properly check X-Requested-With header in case of multiple values
Saw this happening in IE8...
2015-12-11 11:22:38 +01:00
Lukas Reschke f3360d51c6 Use PHP polyfills 2015-12-11 08:47:36 +01:00
Arthur Schiwon 4020d5b77a look for DN changes before marking a user as deleted 2015-12-11 01:56:53 +01:00
Arthur Schiwon 8c79300156 throw NoUserException in getHome when the requested user does not exist anymore 2015-12-11 00:12:41 +01:00
Thomas Müller 19d1e0ebb9 adjust PHPDoc 2015-12-10 16:43:37 +01:00
Scrutinizer Auto-Fixer ffc49a24f0 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2015-12-10 16:43:37 +01:00
Vincent Petry 174f7599e5 Catch exception when querying direct download link 2015-12-10 16:17:44 +01:00
Thomas Müller 7094ed05ad Merge pull request #21114 from owncloud/group-propagation-tests
Add test case for group share propagation
2015-12-10 16:16:20 +01:00
Robin Appelman 3d5a7b307f Add test case for group share propagation 2015-12-10 13:53:50 +01:00
Morris Jobke fb87441fd9 Deduplicate version expire jobs
* versionSize is calculated anyway in the expire job - > dropped
* offset/neededSpace was needed for expiry before the file is moved to the versions -> now this is included already in the currently used space because the expiry job is defered to a point in time after the version creation
* fixes #21108
2015-12-10 11:21:28 +01:00
Thomas Müller e5dbddaab8 Merge pull request #21071 from owncloud/fix-swift-unit-test-execution-master
Looks like ceph requires more time to come up ....
2015-12-10 10:59:58 +01:00
Jenkins for ownCloud 078ca149b5 [tx-robot] updated from transifex 2015-12-10 01:55:17 -05:00
Daniel Tosello 41f1feaf23 Fixing swift fopen by ensuring stream is a valid resource 2015-12-10 16:40:17 +11:00
Tim Dettrick cb9a4d4cdc Streaming download from Swift external storage
Speeds up downloads as they no longer need to buffer completely on the
ownCloud server before being sent to the client.
2015-12-10 15:55:45 +11:00
Thomas Müller d4a4270adb Merge pull request #21077 from owncloud/external-index-names
Let doctrine generate index names for files_external
2015-12-09 18:22:55 +01:00
Thomas Müller 5cf376ccb7 Looks like ceph requires more time to come up ....
Use sed - not replace

apply btrfs hack
2015-12-09 16:06:25 +01:00
Robin Appelman ce3adb8121 Let doctrine generate index names 2015-12-09 15:38:49 +01:00