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
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
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
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
Robin McCorkell
c37913b1d5
Introduce async status checking
2015-03-20 09:48:14 +00:00
Jenkins for ownCloud
e8680e6637
[tx-robot] updated from transifex
2015-03-20 01:55:23 -04: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
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
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