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

10282 commits

Author SHA1 Message Date
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
Arthur Schiwon
468fc675a4 fix PHP warnings when using occ with some LDAP commands 2015-03-23 15:19:41 +01:00
Joas Schilling
1a26263123 Do not walk over the users directory, but over the list of tagged objects 
Way quicker
 2015-03-23 15:10:58 +01:00
Clark Tomlinson
0e4ba618cf Merge pull request #14383 from jknockaert/newbranch 
make encryption stream wrapper seekable
 2015-03-23 09:22:36 -04:00
Jenkins for ownCloud
a9b4f0d842 [tx-robot] updated from transifex 2015-03-23 01:54:48 -04:00
Jenkins for ownCloud
a79d973005 [tx-robot] updated from transifex 2015-03-22 01:55:21 -04:00
Roeland Jago Douma
bdde2156da Added extra unit test 2015-03-21 09:47:07 +01:00
Roeland Jago Douma
9ce8e1ddc7 OCS API should return fancy OC url 
* Also use the URLGenerator
 2015-03-21 09:47:06 +01:00
Jenkins for ownCloud
e36a33c89a [tx-robot] updated from transifex 2015-03-21 01:56:09 -04:00
Robin McCorkell
1f3fdf17ef Support constructing an SMB_OC without saved session credentials 2015-03-20 16:24:30 +00:00
Thomas Müller
afa8872955 Merge pull request #14857 from owncloud/preview-provider-registration-in-manager 
Preview provider registration in manager
 2015-03-20 16:34:22 +01:00
Vincent Petry
e44ab2dcfe Merge pull request #11884 from owncloud/ext-appframework 
Cleanup ext storage CRUD code, introduce storage config id
 2015-03-20 14:17:32 +01:00
Vincent Petry
67160e0861 Do not automatically add "update" permission to shared mounts 
In the past it seems the update permission was needed to be able to
rename shared mounts, but it doesn't seem to be the case any more.

Removing the "update" permission that used to be added automatically
fixes the read-only permission check when trying to overwrite a
read-only file over WebDAV.
 2015-03-20 12:33:59 +01:00
Vincent Petry
eef5851a67 Fix share permission related unit tests 2015-03-20 11:30:51 +01:00
Robin McCorkell
c37913b1d5 Introduce async status checking 2015-03-20 09:48:14 +00:00
Joas Schilling
7776e088d6 Group sharing activities by user/group and file respectively 2015-03-20 09:49:33 +01:00
Jenkins for ownCloud
e8680e6637 [tx-robot] updated from transifex 2015-03-20 01:55:23 -04:00
Vincent Petry
5f7b3a4dbe Rename must be possible with update-only permission 
and this as long as the rename is done within the same folder.
 2015-03-19 21:55:56 +01:00
Thomas Müller
c57fb62029 Merge pull request #14946 from owncloud/dropbox-root-fix 
Fix root request path for Dropbox
 2015-03-19 17:19:57 +01:00
Thomas Müller
857b22c61b Merge pull request #15025 from rullzer/ocs_respect_enforced_date 
Ocs respect enforced date
 2015-03-19 17:06:04 +01:00
Robin Appelman
be6edd465a Merge pull request #14537 from owncloud/oci-external-share 
Fix external shares without password on oracle
 2015-03-19 16:20:12 +01:00
Roeland Jago Douma
dd3307dd19 Added unit test 
Tests added to make sure that removing an expire date when this is
enforced is not allowed.
 2015-03-19 10:47:09 +01:00
Jenkins for ownCloud
e40b0701d7 [tx-robot] updated from transifex 2015-03-19 01:55:06 -04:00
Vincent Petry
a9e6eba018 Reenable trashbin after failed rename 
After a failed rename, the post_rename hook is not called.
This quickfix makes sure the trashbin storage logic is reenabled
also after a failed rename.
 2015-03-18 19:56:31 +01:00
Vincent Petry
c2315aa015 Fix shared storage permission checks 2015-03-18 19:56:31 +01:00
Jan-Christoph Borchardt
e5fd6816df fix position of 'Deleted files' sidebar entry, fix #10815 2015-03-18 13:31:16 +01:00
Jenkins for ownCloud
8a95bf18b7 [tx-robot] updated from transifex 2015-03-18 01:55:22 -04:00
Robin McCorkell
760f5fc5e5 Merge pull request #14954 from owncloud/cache-image-path 
Cache \OC\URLGenerator::imagePath
 2015-03-17 19:36:23 +00:00
Morris Jobke
f4b6f3cfd1 fix unit tests 2015-03-17 18:55:44 +01:00
Joas Schilling
8ebb198ef3 Add a unit test for the naming conflict on the mountpoint name 2015-03-17 16:55:03 +01:00
Jan-Christoph Borchardt
ce89f12566 add whitespace to prevent file deletion when wanting to scroll 2015-03-17 16:54:42 +01:00
Joas Schilling
ba3e4ede39 Use insertIfNotExists() instead of manual logic 2015-03-17 16:03:24 +01:00
Joas Schilling
05c4848954 Correctly get the unique mountpoint name when mounting the share 
Previously the mount name was checked for uniqueness prior to inserting the
share. This caused problems, when two shares with the same name where done
or folder, mount point, local share with the same name was done, between
sending and accepting of the remote share
 2015-03-17 16:03:24 +01:00
Lukas Reschke
9e2ebf2dce Cache \OC\URLGenerator::imagePath 
\OC\URLGenerator::imagePath is a really expensive operation due to all the I/O handling and can really benefit from caching.
 2015-03-17 12:35:47 +01:00
Joas Schilling
9c45ab49a1 Use a closure for the files app entry and deprecate old methods 2015-03-17 12:17:09 +01:00
Vincent Petry
e5e30924b1 Fix PHPDoc in files_external, add missing tag 
Fix various PHPDoc issues in external storage app.

Added missing NoAdminRequired tag
 2015-03-17 11:42:52 +01:00
Vincent Petry
5b6ecb2d98 Fix root request path for Dropbox 2015-03-17 10:56:24 +01:00
Lukas Reschke
db033e4e19 Fix PHPDoc and Co. 
Ref https://github.com/owncloud/core/pull/14929#discussion_r26501240
 2015-03-17 10:37:09 +01:00
Vincent Petry
6525911439 Merge pull request #14929 from owncloud/s2s-scanner-warnings 
Fix scanFile signature warnings
 2015-03-17 09:51:45 +01:00
Jenkins for ownCloud
b51b4f0a2c [tx-robot] updated from transifex 2015-03-17 01:55:43 -04:00
Vincent Petry
669ff45625 Merge pull request #14877 from owncloud/smb-constructor-noconnect 
Wait with getting the timezone from the smb server until we need it
 2015-03-16 17:01:49 +01:00
Vincent Petry
b9d9405135 Fix scanFile signature warnings 2015-03-16 16:45:11 +01:00
Vincent Petry
847880803e Fix storage priority in JS unit test 2015-03-16 15:07:38 +01:00
Vincent Petry
06448170cf Fix PHPDoc for StoragesController 2015-03-16 14:39:48 +01:00
Joas Schilling
3052b9571e Fix controller test 2015-03-16 12:45:18 +01:00
Joas Schilling
47af533183 Move mimetype check from template to controller 2015-03-16 12:45:18 +01:00
Joas Schilling
4c4c0fa120 Use the PreviewManager where possible 2015-03-16 12:44:10 +01:00
Vincent Petry
72632ad402 Generate storage config ids when missing 
When reading in old mount.json files, they do not contain config ids.
Since these are needed to be able to use the UI and the new service
classes, these will be generated automatically.

The config grouping is based on a config hash.
 2015-03-16 12:18:01 +01:00
Thomas Müller
1e0d8f1774 Merge pull request #14133 from rullzer/fix_10600 
Always display max upload size in admin panel
 2015-03-16 10:05:57 +01:00
Thomas Müller
bbaf97ca43 Merge pull request #14644 from owncloud/trash-expire-command 
Expire files from the trash in the background
 2015-03-16 10:04:05 +01:00
Thomas Müller
b159c7f274 Merge pull request #14848 from owncloud/kill-curl-fallback-master 
drop any fallback code related to curl
 2015-03-16 09:56:31 +01:00
Jenkins for ownCloud
c1a3394f48 [tx-robot] updated from transifex 2015-03-16 01:55:15 -04:00
Jenkins for ownCloud
84b6ca9b81 [tx-robot] updated from transifex 2015-03-15 01:54:38 -04:00
Jenkins for ownCloud
8c5be2bc48 [tx-robot] updated from transifex 2015-03-14 01:54:45 -04:00
Vincent Petry
fb4cf53253 Fix mount config unit tests 
Fix expected result now that it returns the status.
Added isset for some properties that are not always present.
 2015-03-13 17:43:38 +01:00
Robin Appelman
3159af1983 Wait with getting the timezone from the smb server until we need it 2015-03-13 14:36:34 +01:00
Vincent Petry
34c8b1ac77 Mount options for ext storage are now passed around 
The mount options are now passed to the UI and stored in a hidden field.
The ext storage controllers and services also know how to load/save them
from the legacy config.
 2015-03-13 12:49:11 +01:00
Arthur Schiwon
f28f7754ae support paged results against 389ds. 2015-03-12 22:47:20 +01:00
Thomas Müller
5855108e9b drop any fallback code related to curl - refs https://github.com/owncloud/core/pull/14838#issuecomment-78586447 2015-03-12 21:43:41 +01:00
Robin McCorkell
680ec056dc Implement priority on client side in hidden input 2015-03-12 18:51:02 +01:00
Vincent Petry
ce94a998dd Use storage id + appframework for ext storage CRUD 
- Added StorageConfig class to replace ugly arrays
- Implemented StorageService and StorageController for Global and User
  storages
- Async status checking for storages (from Xenopathic)
- Auto-generate id for external storage configs (not the same as
  storage_id)
- Refactor JS classes for external storage settings, this mostly
  moves/encapsulated existing global event handlers into the
  MountConfigListView class.
- Added some JS unit tests for the external storage UI
 2015-03-12 18:51:02 +01:00
Thomas Müller
5054b8e4aa Merge pull request #14785 from owncloud/issue/14733-active-class-missing-for-admin-navigation-entry 
Do not overwrite the active menu entry of the navigation
 2015-03-12 10:45:03 +01:00
Jenkins for ownCloud
454a2563bc [tx-robot] updated from transifex 2015-03-12 01:55:59 -04:00
Roeland Jago Douma
ec31ee9117 Mark functions private 2015-03-11 16:30:54 +01:00
Lukas Reschke
cf25e6f569 Merge pull request #14773 from owncloud/allow-iframes-from-self-in-share-view 
Allow iframes from same domain in share view
 2015-03-11 15:13:59 +01:00
Roeland Jago Douma
e9a003fe21 Slight better formatting 2015-03-11 15:11:50 +01:00
Roeland Jago Douma
09ee297356 New array syntax 2015-03-11 15:02:55 +01:00
Roeland Jago Douma
c985186246 Added new header 2015-03-11 15:02:55 +01:00
Roeland Jago Douma
af76716775 Now added enabled element 
This change allows for more generic parsing for the capabilities.
 2015-03-11 15:02:55 +01:00
Roeland Jago Douma
0bf1152a51 Added route again 2015-03-11 15:02:55 +01:00
Roeland Jago Douma
39b0f0725e Add file_sharing info to capabilities 
Display the capabilities regarding file sharing in the capabilities API.
This will allow the clients to provide users a better experince.
 2015-03-11 15:02:55 +01:00
Thomas Müller
0f3e36fdfd Adding a more meaningful message for sabre dav exception - fixes #14516 2015-03-11 11:53:31 +01:00
Joas Schilling
6a677ce8fe Do not make setupMounts() public just because of testing 2015-03-11 11:10:43 +01:00
Joas Schilling
981c60f5f5 Do not overwrite the active menu entry of the navigation 2015-03-11 09:27:28 +01:00
Jenkins for ownCloud
01ea056ac8 [tx-robot] updated from transifex 2015-03-11 01:55:38 -04:00
Thomas Müller
1757d01604 Merge pull request #14640 from owncloud/rescanversionsonlyonce 
Only rescan versions once in trashbin
 2015-03-11 00:54:20 +01:00
Thomas Müller
4ffca58bc4 don't rely on \OCP\User::getUser() - it is not set properly in case of async operations 2015-03-10 11:47:52 +01:00
Thomas Müller
7cb6811a7b tearDown the filesystem right before setting it up again 2015-03-10 11:47:06 +01:00
Lukas Reschke
6dc59019af Merge pull request #14346 from owncloud/storage-based-path-validation 
adding storage specific filename verification
 2015-03-10 11:02:47 +01:00
Robin Appelman
dcd2d7aff5 Add unit tests for external share mananger 2015-03-10 10:17:53 +01:00
Lukas Reschke
48243a2949 Allow iframes from same domain in share view 
This is required because the PDF Viewer itself is embedded using an iframe from the same domain. The default policy is blocking this.

Going on further, we have to come up with a solution in the future how to handle previews by applications, one example might be that they call their own endpoint and not the generic share page to allow applications to have full control over how to display previews.

Anyways, to test this behaviour use a decent newer browser (such as Chrome 41) and share a PDF file, obviously the PDF viewer needs to be enabled as well. Without this patch publicly shared PDF files should not get previewed and an error is thrown. (if it isn't then your browser is probably not obeying our Content-Security-Policy and you might consider switching to another one ;))
 2015-03-10 10:06:15 +01:00
Jenkins for ownCloud
e069d9d3f9 [tx-robot] updated from transifex 2015-03-10 01:55:39 -04:00
Morris Jobke
94b7fa17c5 Merge pull request #14720 from owncloud/fix-shareetagpropagation 
Fix size propagation over shared storage boundary
 2015-03-09 16:24:06 +01:00
Vincent Petry
ec19d9c267 Add unit test for size propagation across share boundaries 2015-03-09 12:56:22 +01:00
Thomas Müller
abacfd84da fixing js unit tests 2015-03-09 10:38:38 +01:00
Thomas Müller
4bac595068 adding storage specific filename verification - refs #13640 2015-03-09 10:38:37 +01:00
Morris Jobke
348fe105b1 Merge pull request #14706 from owncloud/ldap-reset-paged-search-on-null-limit 
LDAP: set up paged search even if limit is 0
 2015-03-09 08:12:25 +01:00
Jenkins for ownCloud
174f8cef64 [tx-robot] updated from transifex 2015-03-09 01:54:36 -04:00
Jenkins for ownCloud
377165ae51 [tx-robot] updated from transifex 2015-03-08 01:54:36 -05:00
Jenkins for ownCloud
73c2157171 [tx-robot] updated from transifex 2015-03-07 01:54:37 -05:00
Jenkins for ownCloud
d11f040720 [tx-robot] updated from transifex 2015-03-06 01:54:52 -05:00
Vincent Petry
4322287fc3 Fix size propagation over shared storage boundary 2015-03-05 22:23:47 +01:00
Arthur Schiwon
42d3ed47e2 set up paged search when limit is 0 2015-03-05 13:15:21 +01:00
Jenkins for ownCloud
7e0fd8fb50 [tx-robot] updated from transifex 2015-03-05 01:56:35 -05:00
Morris Jobke
cffc256479 Merge pull request #14672 from Crote/master 
Add --show-password option to ldap:show-config
 2015-03-04 20:21:14 +01:00
Vincent Petry
e56727e27b Merge pull request #14690 from owncloud/trash-deletelink-unittest 
Add unit test for selection overlay actions in trashbin
 2015-03-04 14:50:11 +01:00
Laurens Post
8149217371 Add --show-password option to ldap:show-config 2015-03-04 14:15:33 +01:00
Vincent Petry
3f6e7d6a43 Add unit test for selection overlay actions in trashbin 2015-03-04 13:49:19 +01:00
Thomas Müller
2831a1790c Merge pull request #14675 from owncloud/files-external-smb-windows 
adding a windows smb config for testing to ci
 2015-03-04 12:27:59 +01:00
Robin McCorkell
ed4dc4db07 Fix slash normalization error in AmazonS3Migration unit test 
Since aa821ecc00 leading and trailing slashes are
trimmed in the file cache paths
 2015-03-04 09:22:21 +00:00
Jenkins for ownCloud
84785a6a39 [tx-robot] updated from transifex 2015-03-04 01:55:19 -05:00
Robin McCorkell
d6b9b37ddb Use dummy storages instead of real storages in files_external unit tests 
We were using the SMB and SFTP backends, which since Icewind's new SMB library
results in an actual attempted connection just by constructing the storage.
This commit replaces all references to real storages (except when necessary)
with a dummy storage class.
 2015-03-03 17:29:17 +01:00
Thomas Müller
7d3e228365 adding a windows smb config for testing 2015-03-03 17:29:10 +01:00
Vincent Petry
133c37fe22 Merge pull request #14652 from owncloud/kill-download-from-url 
Remove "Download from URL" feature
 2015-03-03 10:10:15 +01:00
Jenkins for ownCloud
e271fa3ee8 [tx-robot] updated from transifex 2015-03-03 01:55:50 -05:00
Thomas Müller
345c527ed0 remove $content parameter 2015-03-02 21:33:17 +01:00
Lukas Reschke
acabd81f42 Remove "Download from URL" feature 
Fixes https://github.com/owncloud/core/issues/13326
 2015-03-02 21:06:25 +01:00
Robin Appelman
c80522ed63 Expire files from the trash in the background 2015-03-02 15:25:50 +01:00
Vincent Petry
e61aa3723e Merge pull request #14573 from owncloud/enc-migrate-disable-updater 
Disable the cache updater when doing the encryption migration
 2015-03-02 14:53:29 +01:00
Vincent Petry
7432c73f5c Only rescan versions once in trashbin 
Whenever versions need to be rescanned, only do it once per PHP request.
Happens whenever multiple files need to be expired.
 2015-03-02 12:59:38 +01:00
Thomas Müller
58ec0ea734 Merge pull request #14535 from owncloud/fix-files-external 
fix files external test run and add common-tests option
 2015-03-02 00:51:38 -08:00
Morris Jobke
7194952db4 Merge pull request #14570 from rullzer/ocs_sane_permissions 
Shares should have a least read permission
 2015-03-02 08:38:36 +01:00
Jenkins for ownCloud
3f91e3757f [tx-robot] updated from transifex 2015-03-02 01:55:00 -05:00
Roeland Jago Douma
4436a9ce35 Shares should have a least read permission 
* Throw 400 when a share is created or updated without read permissions
* Added unit tests
 2015-03-01 17:13:17 +01:00
Jenkins for ownCloud
ff85d38c2a [tx-robot] updated from transifex 2015-03-01 01:54:38 -05:00
Jenkins for ownCloud
42f6448da2 [tx-robot] updated from transifex 2015-02-28 01:55:32 -05:00
Vincent Petry
22bc622f9b Move keys instead of copy during encryption key migration 2015-02-27 17:14:17 +01:00
Robin Appelman
6f000ffc7b Disable the cache updater when doing the encryption migration 2015-02-27 17:14:16 +01:00
Robin Appelman
c65c717379 Fix external shares without password on oracle 2015-02-27 13:22:57 +01:00