Commit Graph

10300 Commits

Author SHA1 Message Date
Clark Tomlinson fc2711e156 Merge pull request #15472 from owncloud/enc_backward_compatibility
make private key handling backward compatible
2015-04-08 09:38:27 -04:00
Morris Jobke 103d451459 Merge pull request #14987 from rullzer/ocs_password_fix2
OCS Fixes to allow setting of password without removing additional settings
2015-04-08 14:44:17 +02:00
Lukas Reschke d01a2acbcf Merge pull request #15469 from owncloud/fix/15463
Fix language level incompatibilties
2015-04-08 14:30:56 +02:00
Bjoern Schiessle 4ce5669419 read cipher from key header and always write a key header if a new private key is stored 2015-04-08 14:26:00 +02:00
Vincent Petry 69ba67ec0f Merge pull request #15464 from owncloud/fixmasterunittests
Replace originalStorage in tests with a proper teardown
2015-04-08 14:24:42 +02:00
Lukas Reschke c3c50fb481 Fix language level incompatibilties
Arbitrary expressions in empty are allowed in PHP 5.5 ands upwards. Seems to only affect master.

Fixed https://github.com/owncloud/core/issues/15463
2015-04-08 13:55:10 +02:00
Vincent Petry 4acf6747d2 Disable trashbin when testing orphaned shares deletion job 2015-04-08 13:04:06 +02:00
Thomas Müller 19834211b4 Merge pull request #15443 from owncloud/encryption-user-hook-tests
adding test for user hooks
2015-04-08 12:56:18 +02:00
Vincent Petry f8cfc03f36 Replace originalStorage in tests with a proper teardown
The purpose of $originalStorage in unit tests was to remount the old
root.
However that storage itself is already wrapped by storage wrapper, so
remounting it would rewrap the storage several times.

This fix makes use of "loginAsUser()" and "logout()" from the TestCase
class to properly initialize and cleanup the FS as expected.
2015-04-08 12:45:38 +02:00
Vincent Petry 9c3893ce69 Added FIXME about registering jobs in apps.php 2015-04-08 12:09:42 +02:00
James Anslow d53aa4a816 Fixing issue #15322 - showing Settings button next to gear icon 2015-04-08 11:57:33 +02:00
Vincent Petry 17b141337a Delete orphaned shares in a background job 2015-04-08 10:47:55 +02:00
Morris Jobke cefdcea021 [command] delete orphaned file cache entries
* ./occ files:cleanup
* delete file cache entries without an existing storage
2015-04-08 10:23:56 +02:00
Bjoern Schiessle 215a9bcbc3 fix function call 2015-04-08 09:32:55 +02:00
Clark Tomlinson 4098f5f7fd adding test for user hooks 2015-04-07 11:49:50 -04:00
Thomas Müller a4483243ac fixing license headers - encryption code related 2015-04-07 17:02:49 +02:00
Thomas Müller 54a3bdf1c5 fixing unit test execution related to trashbin 2015-04-07 13:30:31 +02:00
Clark Tomlinson d637bffac6 adding user setup test and adding 4 tests to keymanager 2015-04-07 13:30:31 +02:00
Clark Tomlinson 28c8017928 adding recoverFileTest 2015-04-07 13:30:31 +02:00
Clark Tomlinson c7c3caedf5 adding recovery tests 2015-04-07 13:30:31 +02:00
Thomas Müller 111fbabfb4 PHPDoc cleanup - clean code \o/ 2015-04-07 13:30:31 +02:00
Bjoern Schiessle b9e4e61759 userRecovery() was replaced by setRecoveryForUser() 2015-04-07 13:30:31 +02:00
Bjoern Schiessle 9a7fbbbc5a fix versions tests 2015-04-07 13:30:31 +02:00
Bjoern Schiessle a7e7151364 remove unused code 2015-04-07 13:30:31 +02:00
Bjoern Schiessle e8fa3a2370 fix versions download and previews 2015-04-07 13:30:31 +02:00
Bjoern Schiessle d3e887a7cf reset init status before login 2015-04-07 13:30:30 +02:00
Thomas Müller 8cf9b423d5 cleanup 2015-04-07 13:30:30 +02:00
Bjoern Schiessle fac7ec3fc4 fix re-shares with encryption 2015-04-07 13:30:30 +02:00
Bjoern Schiessle 60d8a39f03 store init status per user 2015-04-07 13:30:30 +02:00
Bjoern Schiessle 8b1a12a224 use loginHelper from base class 2015-04-07 13:30:30 +02:00
Bjoern Schiessle 391fab35f0 reset storage for each unit test 2015-04-07 13:30:30 +02:00
Thomas Müller 4c899238e9 fixing unit test execution 2015-04-07 13:30:30 +02:00
Clark Tomlinson e507dc11a0 adding util test and reducing keymanager instances to one in test 2015-04-07 13:30:30 +02:00
Bjoern Schiessle 2511c32e61 add more descriptive message to the exception, will be displayed to the user 2015-04-07 13:30:30 +02:00
Bjoern Schiessle ee53ba5ed6 remove encryption specific code from files app 2015-04-07 13:30:30 +02:00
Bjoern Schiessle 5ea94b7c45 add priority to trashbin storage wrapper so that he is always on top 2015-04-07 13:30:30 +02:00
Thomas Müller 664b2bb7af cleaning up exception mess 2015-04-07 13:30:30 +02:00
Bjoern Schiessle de4ec21c39 work arround to make sure that shares are initialized only once 2015-04-07 13:30:30 +02:00
Thomas Müller feb9a6e216 Set human readable module ids 2015-04-07 13:30:30 +02:00
Thomas Müller 43c0af2580 Fix shouldEncrypt and don't throw exception id fileKey not present - can happen 2015-04-07 13:30:30 +02:00
Bjoern Schiessle a057108c0c make recovery key work 2015-04-07 13:30:30 +02:00
Thomas Müller cac83642f2 Finally fixing encryption with public share 2015-04-07 13:30:30 +02:00
Thomas Müller d203296e35 only encrypt files and files_versions 2015-04-07 13:30:30 +02:00
Thomas Müller 035646c0f6 fix exception handling 2015-04-07 13:30:30 +02:00
Bjoern Schiessle d90663704c fix hook registration 2015-04-07 13:30:29 +02:00
Clark Tomlinson 505e0eaf61 remove useless setup base class 2015-04-07 13:30:29 +02:00
Clark Tomlinson 1fb29ec546 adding hook manager test 2015-04-07 13:30:29 +02:00
Bjoern Schiessle c9ca068427 keyManagerTest: remove code which is no longer needed 2015-04-07 13:30:29 +02:00
Bjoern Schiessle 4efbcb0280 cleanup keymanager test and add some additional tests 2015-04-07 13:30:29 +02:00
Bjoern Schiessle dac94679c6 delete recovery keys on disable 2015-04-07 13:30:29 +02:00
Clark Tomlinson ea6b53042d fixing test helper and undoing fubar in class... 2015-04-07 13:30:29 +02:00
Clark Tomlinson 48e3864c77 💯% coverage for session class 2015-04-07 13:30:29 +02:00
Bjoern Schiessle 1358d07d35 let user enable recovery key 2015-04-07 13:30:29 +02:00
Bjoern Schiessle e4895bda01 add helper class accessible for encryption modules to ask for a list of users with access to a file, needed to apply the recovery key to all files 2015-04-07 13:30:29 +02:00
Thomas Müller bd933b1c85 Adding app icon and fixing admin setting 2015-04-07 13:30:29 +02:00
Bjoern Schiessle 6bd83c0422 register settings and hooks only once 2015-04-07 13:30:29 +02:00
Bjoern Schiessle 4b4aeaa5b2 fix set recovery key and implement change password 2015-04-07 13:30:29 +02:00
Thomas Müller a98b7dbf6f Fix double registration of encryption module 2015-04-07 13:30:29 +02:00
Thomas Müller 3458b5ab4c Remove old encryption left overs from trashbin 2015-04-07 13:30:29 +02:00
Thomas Müller f5638d9163 Fix settings 2015-04-07 13:30:29 +02:00
Thomas Müller bf809ac85a Removing left overs from old encryption app 2015-04-07 13:30:29 +02:00
Bjoern Schiessle 4843e5ce30 use password change logic to userhooks to avoid recursions 2015-04-07 13:30:28 +02:00
Bjoern Schiessle 0f28d538a0 add session class to handle all session operations 2015-04-07 13:30:28 +02:00
Clark Tomlinson e6dc6944c2 moving methods to their final places
and updating test some.
2015-04-07 13:30:28 +02:00
Thomas Müller 1b42b492dc kill OC_FileProxy 💥 2015-04-07 13:30:28 +02:00
Thomas Müller dbdd754c3f Further cleanup of files_encryption 2015-04-07 13:30:28 +02:00
Thomas Müller 00338f9dca Removing files_encryption left overs 2015-04-07 13:30:28 +02:00
Bjoern Schiessle e7a68d1c21 remove old encryption app 2015-04-07 13:30:28 +02:00
Bjoern Schiessle 0eee3a2618 remove unencrypted_size from the cache, size will contain the unencrypted size 2015-04-07 13:30:28 +02:00
Thomas Müller a905f641b3 various fixes & start to unit test the encryption storage wrapper 2015-04-07 13:30:28 +02:00
Bjoern Schiessle a85e2e0bfd make recovery settings work 2015-04-07 13:30:28 +02:00
Bjoern Schiessle 2331298380 fix parameter declaration and class initialisation 2015-04-07 13:30:28 +02:00
Thomas Müller 48fc3f3afe fix unit test execution, variable naming and kill no longer used $cacheFactory 2015-04-07 13:30:28 +02:00
Bjoern Schiessle c64e0af4fb check if recovery key exists and encrypt the file with the recovery key if needed 2015-04-07 13:30:28 +02:00
Bjoern Schiessle 24c6604388 add public link share key to file if it was shared as public link 2015-04-07 13:30:28 +02:00
Bjoern Schiessle bd99042a66 add setting templates 2015-04-07 13:30:28 +02:00
Bjoern Schiessle 37e8268447 make sharing and unsharing work 2015-04-07 13:30:27 +02:00
Clark Tomlinson d15c2e52b0 cleanup and removing cachefactory 2015-04-07 13:30:27 +02:00
Bjoern Schiessle 2e00acda07 read encrypted files 2015-04-07 13:30:27 +02:00
Bjoern Schiessle 6c9251d9f8 make sure that all file keys are written to the key storage 2015-04-07 13:30:27 +02:00
Bjoern Schiessle 198b73fe32 write encrypted file to disc 2015-04-07 13:30:27 +02:00
Thomas Müller 7ffd77fac9 enable encryption unit test execution 2015-04-07 13:30:27 +02:00
Bjoern Schiessle c00e728e5f encryption app: remove legacy code, we do only server-side encryption 2015-04-07 13:30:27 +02:00
Thomas Müller ecb3834554 fixing obvious bugs while testing 2015-04-07 13:30:27 +02:00
Clark Tomlinson 0c2f9ca849 Updating keystorage movement and fixing hooks 2015-04-07 13:30:27 +02:00
Clark Tomlinson 39733c8da1 Initial commit 2015-04-07 13:30:27 +02:00
Joas Schilling e16d61e293 Remove server timezone dependency from files list test 2015-04-07 10:12:15 +02:00
Jenkins for ownCloud 95e55aa4ad [tx-robot] updated from transifex 2015-04-07 01:54:47 -04:00
Jenkins for ownCloud 2bff92ade5 [tx-robot] updated from transifex 2015-04-05 01:54:51 -04:00
Thomas Müller 4996706078 Merge pull request #15338 from owncloud/encryption-mount-option
Add mount point to disable the encryption wrapper
2015-04-04 12:51:41 +02:00
Jenkins for ownCloud 9b250baf9e [tx-robot] updated from transifex 2015-04-04 01:54:43 -04:00
Thomas Müller 3bf269e565 Merge pull request #15229 from owncloud/response-setContentLengthHeader
Add OC_Response::setContentLengthHeader() for Apache PHP SAPI workaround...
2015-04-03 22:51:36 +02:00
Jenkins for ownCloud 23f1702f24 [tx-robot] updated from transifex 2015-04-03 01:54:53 -04:00
Robin Appelman 519d568847 add unit test 2015-04-02 18:31:26 +02:00
Robin Appelman 10b85871cc adjust unt tests 2015-04-02 18:17:28 +02:00
Thomas Müller 4082436419 Merge pull request #15367 from owncloud/pre-setup-hook
setup storage wrappers before setting up the filesystem
2015-04-02 17:40:23 +02:00
Jenkins for ownCloud cc96105ebe [tx-robot] updated from transifex 2015-04-02 01:54:47 -04:00
Robin Appelman 3cb53b7756 setup storage wrappers before setting up the filesystem 2015-04-01 17:12:06 +02:00
Roeland Jago Douma 9e3dcd01bc Use URLGenerator instread of OC_Helper 2015-04-01 14:57:01 +02:00
Roeland Douma 8ff94f0d15 Merge pull request #15356 from rullzer/apps_oc_to_ocs
Move core apps from private to public functions (trivial part)
2015-04-01 13:24:54 +02:00
Joas Schilling 730efe25a4 Make scrutinizer happy 2015-04-01 12:13:49 +02:00
Roeland Jago Douma 2b81d0f237 Move core apps from private to public functions
Apps still use OC_Helper and OC_Util functions even when public ones are
already available. Sometimes the public one is even used in the same
file.
2015-04-01 12:06:04 +02:00
Morris Jobke 297e29248d Merge pull request #15336 from owncloud/revive-15215
Properly quote file names in listFiles query for GDrive
2015-04-01 10:35:39 +02:00
Jenkins for ownCloud f5c7ba6b81 [tx-robot] updated from transifex 2015-04-01 01:55:33 -04:00
Joas Schilling efcc2e87ab Adjust by/self filter aswell and fix tests 2015-03-31 17:35:04 +02:00
Joas Schilling 116b257b4d DeMorgan applied the wrong transformation 2015-03-31 17:07:44 +02:00
Robin Appelman bac9b54bef Add mount point to disable the encryption wrapper 2015-03-31 16:25:33 +02:00
Lukas Reschke c052ee7584 Only escape single quotes 2015-03-31 15:30:49 +02:00
Vincent Petry 7036309e22 Added rawurlencode for other params in GDrive storage 2015-03-31 15:14:08 +02:00
Vincent Petry 5c9998179f Properly quote file names in listFiles query for GDrive 2015-03-31 15:14:03 +02:00
Lukas Reschke 53f67fc65d Revert "Properly quote file names in listFiles query for GDrive" 2015-03-31 15:12:35 +02:00
Frank Karlitschek b216b3fad0 Merge pull request #15215 from owncloud/ext-gdrivelistfilequoting
Properly quote file names in listFiles query for GDrive
2015-03-31 09:08:59 -04:00
Jenkins for ownCloud 1d06d93d27 [tx-robot] updated from transifex 2015-03-31 01:55:55 -04:00
Joas Schilling 9233d32834 Move tag related code into a helper so we can test the query without a view 2015-03-30 17:21:06 +02:00
Lukas Reschke 8e0fef74ff Merge pull request #15312 from owncloud/activity-fix-compilation
Correct the app name for sharing events
2015-03-30 17:12:54 +02:00
Robin McCorkell 308a43a10e Merge pull request #15076 from owncloud/fix-smb-oc-admin
Support constructing an SMB_OC without saved session credentials
2015-03-30 15:38:22 +01:00
Joas Schilling e365ea7ec5 Use DI for the objects where possible 2015-03-30 15:23:10 +02:00
Joas Schilling 17f882c3cf Add a filter for favorites and allow limiting the all-list to favorites
WARNING: do not use this, when you have a lot of favorites, ~50 should be the
limit
2015-03-30 15:23:09 +02:00
Joas Schilling 4c9c73bef9 Correct the app name for sharing events 2015-03-30 15:14:31 +02:00
Roeland Jago Douma b0aa17b13f OCS Fixes to allow setting of password without removing additional settings
- Added setPassword to share.php
- Fixed OCS API call
- Added unit tests
2015-03-30 14:00:50 +02:00
Morris Jobke cfe241a959 Merge pull request #13964 from rullzer/capabilities
Add OCS sharing info to capabilities - take 2
2015-03-30 10:06:05 +02:00
Morris Jobke 00b2be11dd Merge pull request #15239 from owncloud/see-no-evil
Move federated cloud sharing, files externals and updater to special pos...
2015-03-30 09:05:31 +02:00
Jenkins for ownCloud da55ff630c [tx-robot] updated from transifex 2015-03-30 01:54:41 -04:00
Jenkins for ownCloud 1db9605afb [tx-robot] updated from transifex 2015-03-29 01:55:31 -04:00
Jenkins for ownCloud 8b9b600644 [tx-robot] updated from transifex 2015-03-28 01:55:46 -04:00
Thomas Müller 4d12c4a38b Merge pull request #13938 from owncloud/deprecate-iappconfig
Deprecated \OCP\IAppConfig - add missing methods to IConfig
2015-03-27 16:07:41 +01:00
Thomas Müller 0ecc1c89ad Merge pull request #15254 from owncloud/fix-14853-master
Adding a pending indicator to the files summary
2015-03-27 14:18:47 +01:00
Vincent Petry 7ad4dfa201 Merge pull request #15227 from owncloud/ocetag-header
Copy Etag header to OC-Etag for sabre calls
2015-03-27 13:10:27 +01:00
Morris Jobke 5aa81833f9 Merge pull request #15260 from owncloud/adjust-controls-bar-width
adjust controls bar width to not overlay scrollbar
2015-03-27 11:56:22 +01:00
Jan-Christoph Borchardt 908538d863 fix layout for Sharing settings 2015-03-27 09:38:13 +01:00
Joas Schilling 495562f40c Move federated cloud sharing, files externals and updater to special positions 2015-03-27 09:38:09 +01:00
Jenkins for ownCloud 880b31c513 [tx-robot] updated from transifex 2015-03-27 01:56:21 -04:00
Jan-Christoph Borchardt d728b85fdd adjust controls bar width to not overlay scrollbar 2015-03-27 01:34:55 +01:00
Thomas Müller 2b0906cdff Adding a pending indicator to the files summary - fixes #14853 2015-03-27 01:16:29 +01:00
Jan-Christoph Borchardt e09fd331eb adjust emptycontent messages for files and files_external 2015-03-26 23:22:26 +01:00
Morris Jobke d082e37270 Merge pull request #15244 from owncloud/use_default_share_folder
always fall back to default share folder
2015-03-26 22:39:04 +01:00
Robin McCorkell c2909355bf Merge pull request #14925 from owncloud/ext-mountoptions-ui
Mount options GUI for external storage
2015-03-26 21:36:34 +00:00
Morris Jobke e8109f0bc3 Merge pull request #13802 from owncloud/share-partfilepermissions
Fix share permission checks
2015-03-26 22:01:05 +01:00
Bjoern Schiessle a3592534ef always fall back to default share folder 2015-03-26 21:56:44 +01:00
Thomas Müller 7bff0681fe Merge pull request #15001 from owncloud/kill-share-proxy
Replace share proxy with a hook
2015-03-26 21:20:05 +01:00
Thomas Müller 232518ac54 Merge pull request #15234 from owncloud/encryption2_core
core part of encryption 2.0
2015-03-26 21:14:59 +01:00
Bjoern Schiessle ff9c85ce60 implement basic encryption functionallity in core to enable multiple encryption modules 2015-03-26 20:56:51 +01:00
Thomas Müller 0cb133003c Merge pull request #15237 from owncloud/remove-ide-autocomplete-fail
Remove IDE autocomplete fail
2015-03-26 20:21:26 +01:00
Morris Jobke d3ed020d34 Merge pull request #15214 from owncloud/no-php-timeouts-on-webdav-master
no php execution timeout for webdav
2015-03-26 20:18:01 +01:00
Robin Appelman 1be7da4a57 replace share proxy with hook 2015-03-26 19:56:57 +01:00
Robin Appelman 173c31e42a rename proxy test 2015-03-26 19:56:31 +01:00
Lukas Reschke c8c722bc6d Merge pull request #15129 from owncloud/version-command-bus
expire versions in a background command
2015-03-26 19:55:13 +01:00
Lukas Reschke 071a339593 Remove IDE autocomplete fail
🙈 *cough* *cough*
2015-03-26 19:39:15 +01:00
Vincent Petry 58b4c2c0e5 Make sure mountOptions keep their data type
str_replace for $user substitution was converting the data type of
mountOptions to string. This fix prevents this to happen by making sure
only strings are processed by substitution.

Also added a int conversion when reading the watcher policy
2015-03-26 19:24:37 +01:00
Jan-Christoph Borchardt e3d60ee5b0 Merge pull request #14958 from owncloud/dropdown-style
popover style for apps and user dropdown menus
2015-03-26 18:07:35 +01:00
Robin Appelman 6447962f2a teardown after we're done 2015-03-26 17:30:43 +01:00
Thomas Müller a8b756154a Merge pull request #14495 from owncloud/update-mailmap-01
Updating .mailmap
2015-03-26 17:17:18 +01:00
Robin Appelman 1969c8d5c8 save uid instead of user object in command 2015-03-26 17:11:34 +01:00
Robin Appelman 176fba83ea Setup the filesystem in the expire command 2015-03-26 17:07:02 +01:00
Robin Appelman 7ec8f12ad4 expire versions in a background command 2015-03-26 17:07:01 +01:00
Andreas Fischer 0f58315543 Add OC_Response::setContentLengthHeader() for Apache PHP SAPI workaround.
Do not send Content-Length headers with a value larger than PHP_INT_MAX
(2147483647) on Apache PHP SAPI 32-bit. PHP will eat them and send 2147483647
instead.

When X-Sendfile is enabled, Apache will send a correct Content-Length header,
even for files larger than 2147483647 bytes. When X-Sendfile is not enabled,
ownCloud will not send a Content-Length header. This prevents progress bars
from working, but allows the actual transfer to work properly.
2015-03-26 16:37:38 +01:00
Vincent Petry 70acd58336 Copy Etag header to OC-Etag for sabre calls 2015-03-26 16:06:43 +01:00
Robin McCorkell a323d781a6 Revert "add https:// placeholder for From Link feature. closes #13255"
This reverts commit 18b5966f3a.
2015-03-26 14:47:21 +00:00
Vincent Petry 534892d456 Added rawurlencode for other params in GDrive storage 2015-03-26 13:57:28 +01:00
Thomas Müller 7804d0445b Merge pull request #15206 from owncloud/mark-dot-files-gray
Show hidden files (dot files) in gray
2015-03-26 12:40:47 +01:00
Jan-Christoph Borchardt f0b0287333 adjust animations of Share, Versions and others to OC.menuSpeed 2015-03-26 12:21:40 +01:00
Vincent Petry 43588fe2f7 Properly quote file names in listFiles query for GDrive 2015-03-26 12:15:02 +01:00
Thomas Müller f9525b153e no php execution timeout for webdav 2015-03-26 11:55:26 +01:00
Jenkins for ownCloud b585d87d9d Update license headers 2015-03-26 11:44:36 +01:00
Vincent Petry ca6b715b31 Added ext storage mount options GUI
Added option to disable autoscan of external storages
Mount option file system scan is now an int
Move priority field to avoid undefined field in storage options

All input elements inside the storage options block get parsed into
storage options.

Moving the priority field outside prevents it to appear in the storage
config, as expected. It is still parsed by special code.
2015-03-26 11:21:03 +01:00
Morris Jobke 20f5290462 Merge pull request #15195 from owncloud/reanimate-add-guzzle
Add wrapper for Guzzle
2015-03-26 11:06:48 +01:00
Morris Jobke 92f0dba3c8 Show hidden files (dot files) in gray 2015-03-26 10:35:27 +01:00
Jenkins for ownCloud 40b77eb97a [tx-robot] updated from transifex 2015-03-26 01:55:29 -04:00
Morris Jobke dac4436807 Merge pull request #15170 from owncloud/middleclickbreadcrumb
Fix middle click on breadcrumb
2015-03-26 00:19:52 +01:00
Vincent Petry bdd749ba5b Merge pull request #15185 from owncloud/fix-14775-master
tearDown the file system before reinitializing
2015-03-25 16:26:58 +01:00
Lukas Reschke 5f044ebf1b Add wrapper for Guzzle 2015-03-25 16:04:41 +01:00
Morris Jobke d83741396a Merge pull request #15180 from owncloud/ext-tabbing
Use individual timers for separate config rows
2015-03-25 15:46:59 +01:00
Vincent Petry 13904a7f89 Merge pull request #15179 from owncloud/trash-recreatetrashfolderafterfulldelete
Recreate trashbin folder after full deletion
2015-03-25 14:58:06 +01:00
Thomas Müller 1f6d8f2fdb tearDown the file system before reinitializing - fixes #14775 2015-03-25 10:55:54 +01:00
Vincent Petry b3de3d7245 Fix breadcrumb click JS unit test 2015-03-25 09:27:55 +01:00
Jan-Christoph Borchardt e188f0e436 Merge pull request #14970 from owncloud/sidebar-enhancements
sidebar fixes
2015-03-25 09:16:49 +01:00
Jenkins for ownCloud fb61889490 [tx-robot] updated from transifex 2015-03-25 01:55:46 -04:00
Robin McCorkell c68fd6d5e3 Use individual timers for separate config rows 2015-03-24 22:25:30 +00:00
Vincent Petry f8f543945f Recreate trashbin folder after full deletion 2015-03-24 23:02:14 +01:00
Vincent Petry 2b8ef3aca9 Fix middle click on breadcrumb 2015-03-24 22:05:02 +01:00
Morris Jobke 1db177b841 Merge pull request #15055 from owncloud/share-activity-grouping
Group sharing activities by user/group and file respectively
2015-03-24 20:23:36 +01:00
Morris Jobke 09ea260957 Merge pull request #15160 from owncloud/deduplicate-external-manager-tests
Deduplicate external manager tests
2015-03-24 20:15:56 +01:00
Roeland Jago Douma 0ea3878111 No longer directly output OC_Image for thumbnails
* Only use public interfaces
  - Injected IPreview
* Added unit tests
2015-03-24 18:55:06 +01:00
Robin Appelman 1bd141b655 Merge pull request #15158 from owncloud/fix-failing-master
Fix failing master unit tests
2015-03-24 17:54:11 +01:00
Joas Schilling 8c33f05e93 Merge the two tests into one 2015-03-24 17:26:38 +01:00
Joas Schilling 7de15f3125 *cough* 2015-03-24 17:08:03 +01:00
Morris Jobke 2370af62ea Merge pull request #14998 from rullzer/ocs_api_new_url
OCS API should return fancy OC url
2015-03-24 17:04:31 +01:00
Jan-Christoph Borchardt 7ea061e6f0 correctly align file list summary when the list has the favorite feature 2015-03-24 15:26:17 +01:00
Jan-Christoph Borchardt fcac7d8c13 double padding to account for Deleted files entry, issue with Firefox 2015-03-24 15:14:20 +01:00
Morris Jobke 965d97a8f5 Merge pull request #14580 from owncloud/issue/13765-duplicate-remote-share
"Integrity constraint violation" when sharing the same item twice with the same user
2015-03-24 15:05:58 +01:00
Vincent Petry 302c19067a Merge pull request #15145 from owncloud/fix-15097-master
Properly catch whether a share is `null`
2015-03-24 13:37:47 +01:00
Vincent Petry 46475bf580 Merge pull request #15003 from owncloud/issue/14859-speed-up-favorite-list
Do not walk over the users directory, but over the list of tagged objects
2015-03-24 13:26:59 +01:00
Robin Appelman d46b7d73e7 when the path doesnt exist show a proper error page 2015-03-24 12:21:25 +01:00
Joas Schilling f2be172ae8 Do not duplicate the empty content css 2015-03-24 11:29:29 +01:00
Lukas Reschke e2453d78c0 Properly catch whether a share is `null`
Despite it's PHPDoc the function might return `null` which was not properly catched and thus in some situations the share was resolved to the sharing users root directory.

To test this perform the following steps:

* Share file in owncloud 7 (7.0.4.2)
* Delete the parent folder of the shared file
* The share stays is in the DB and the share via the sharelink is inaccessible. (which is good)
* Upgrade to owncloud 8 (8.0.2) (This step is crucial. The bug is not reproduceable without upgrading from 7 to 8. It seems like the old tokens are handled different than the newer ones)
* Optional Step: Logout, Reset Browser Session, etc.
* Access the share via the old share url: almost empty page, but there is a dowload button which adds a "/download" to the URL.
* Upon clicking, a download.zip is downloaded which contains EVERYTHING from the owncloud directory (of the user who shared the file)
* No exception is thrown and no error is logged.

This will add a check whether the share is a valid one and also adds unit tests to prevent further regressions in the future. Needs to be backported to ownCloud 8.

Adding a proper clean-up of the orphaned shares is out-of-scope and would probably require some kind of FK or so.

Fixes https://github.com/owncloud/core/issues/15097
2015-03-24 11:21:58 +01:00
Jenkins for ownCloud 9cb07f126d [tx-robot] updated from transifex 2015-03-24 01:55:24 -04:00
blizzz 8906158d3b Merge pull request #15123 from owncloud/fix_14098
offset needs to be considered in computed limit
2015-03-23 17:50:24 +01:00
Lukas Reschke 02c0fe8d43 Merge pull request #13941 from owncloud/fix-folder-upload-on-firefox
Show message if upload of folder isn't allowed
2015-03-23 17:18:46 +01:00
Arthur Schiwon 7520d0fb3d offset needs to be considered in computed limit 2015-03-23 16:51:40 +01:00
Morris Jobke 7f2b06dfa0 Merge pull request #15120 from owncloud/ldap-occ-fix-warnings
fix PHP warnings when using occ with some LDAP commands
2015-03-23 16:29:27 +01:00