upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-05-27 20:22:36 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 54
15560 commits 988 branches 1211 tags 9.7 GiB
Commit graph

15560 commits

This branch
This branch
All branches
Author SHA1 Message Date
Vincent Petry
39354eaaf1 Fixed sharing results to include the correct permissions 
Passing $includeCollections would return more than one entry which gives
mixed up file permissions.

Added a method getFile() that doesn't set $includeCollections to make
sure we only get one result which is the file itself.

Fixes #6265
 2014-01-23 15:31:14 +01:00
Bjoern Schiessle
2e8418b362 fix infinite loop if folder and subfolder has the same name 2014-01-23 13:36:33 +01:00
Bjoern Schiessle
1a93891222 add path relative to the files folder of the currently logged in user to the output of getFolderContent() 2014-01-23 13:36:22 +01:00
Vincent Petry
099ccfa254 Fixed isPreviewAvailable warnings in log 
isPreviewAvailable wasn't always set as the files formatting code is
slightly different than the one from the files app.

Fixes #6423

Backport of f4c198b to stable6
 2014-01-23 12:32:10 +01:00
Björn Schießle
d41b2c5401 Merge pull request #6891 from owncloud/version_fix_array_order_stable6 
Version fix array order stable6
 2014-01-22 03:21:50 -08:00
Myles McNamara
5f7bc2cf4d change publicUploadButtonMock to public_upload 
Changed jQuery selector for public preview to public_upload to correctly show preview
 2014-01-22 11:36:47 +01:00
Myles McNamara
6d330e8a3f change em to px 2014-01-22 11:36:42 +01:00
Myles McNamara
72b680ca2d modify js to move upload wrapper, modify css to match core values 2014-01-22 11:36:38 +01:00
Myles McNamara
5e1c3732e5 remove extra upload controls 2014-01-22 11:36:29 +01:00
Myles McNamara
7251c65996 fix upload button layout 2014-01-22 11:36:24 +01:00
Bjoern Schiessle
fea0ba84c5 fix size calculation 2014-01-22 11:28:09 +01:00
Bjoern Schiessle
cdfc6ff5d5 fix array ordering issue 2014-01-22 11:25:19 +01:00
Björn Schießle
50721da77b Merge pull request #6874 from owncloud/versioning_expire_fixes_stable6 
selective backport of the bug fixes from pr #6863
 2014-01-22 02:21:55 -08:00
Frank Karlitschek
14cbec6d6b 6.0.1 2014-01-22 09:28:41 +01:00
Thomas Müller
ea334cfa18 fixing comment + adding unit test for checkPasswordProtectedShare 2014-01-21 20:52:16 +01:00
Thomas Müller
c10af30381 in case no share is found for the given token we can return right away 2014-01-21 20:52:16 +01:00
Thomas Müller
4351609df9 adding password protection check to getShareByToken() 2014-01-21 20:52:16 +01:00
Thomas Müller
c430fe6612 Merge pull request #6869 from owncloud/fix-setupfs-only-for-existing-users-stable6 
Fix setupfs only for existing users stable6
 2014-01-21 10:18:29 -08:00
Tigran Mkrtchyan
3501007074 webdav: return SPACE_UNKNOWN if server do not support quota 
Backport of a78dc11732 to stable6
 2014-01-21 18:15:14 +01:00
Bjoern Schiessle
603828366f selective backport of the bug fixes from pr #6863 2014-01-21 17:49:56 +01:00
Vincent Petry
e46df97c3a Replaced time() with uniqid() to make sure the file name is unique 
The cache isn't cleared properly because unlink() doesn't remove the
cache entry which caused side-effects when reusing the same file name
(which randomly happens when time() returns the same value)

This fix first makes sure the unit tests don't fail any more.
The unlink() case with the cache will be investigated separately.

Backport of f09c19c to stable6
 2014-01-21 17:47:46 +01:00
Björn Schießle
180bb9fa9f Merge pull request #6867 from owncloud/protect-versions-preview-stable6 
don't use the user id within the versions preview call as it could be us...
 2014-01-21 07:46:37 -08:00
Thomas Müller
81f1c04b85 Merge pull request #6456 from owncloud/fix_home_storage_quota_stable6 
Fix home storage quota stable6
 2014-01-21 07:42:35 -08:00
Thomas Müller
b722ce6cc3 OC_Util::setupFS($user) will create a data dir for the given string - no matter if the user really exists - OCP\JSON::checkUserExists($owner); introduces a ready to use check which will bail out with an JSON error 
Conflicts:
	lib/public/json.php
 2014-01-21 16:39:31 +01:00
Jörn Friedrich Dreyer
65fa896bc2 add getOwner impementation to Home Storage 2014-01-21 15:18:46 +01:00
Thomas Müller
464b31157e don't use the user id within the versions preview call as it could be used to access previews of another user 2014-01-21 15:18:36 +01:00
Thomas Müller
a9f7764879 Merge pull request #6865 from owncloud/fix_user_ldap_sql_on_oracle_stable6 
user workarount to compare CLOB column with CHAR value
 2014-01-21 06:15:02 -08:00
Jörn Friedrich Dreyer
047ae7fb23 user workarount to compare CLOB column with CHAR value 2014-01-21 14:03:51 +01:00
Thomas Müller
98db90ba70 Merge pull request #6862 from owncloud/neutral_download_zip_default_name_stable6 
use 'download.zip' as default name for zip downloads instead of 'owncloud.zip'
 2014-01-21 04:20:02 -08:00
Jörn Friedrich Dreyer
0b11762b1c use 'download.zip' as default name for zip downloads instead of 'owncloud.zip' 2014-01-21 12:43:43 +01:00
Vincent Petry
127ab3cb47 When reading the size of "files" mountpoints need to be excluded 
The versions and trashbin app are now passing "includeMountPoints=false"
to "getFileInfo()" to make sure that the calculated total size doesn't
include mount points like Shared or external storage.

This is because the default call (legacy) used to return the size of
mount points as well.

Fixes #6731

Backport of ca57a84 to stable6
 2014-01-20 18:29:27 +01:00
Vincent Petry
09cc0c5cc9 Fixed quota wrapper to not wrap failed fopen streams 
When calling fopen() on some storage types, these return false instead
of throwing an exception.

This fix makes sure that in case the stream wasn't opened (for example
when a file doesn't exist any more) the stream isn't wrapped.

Also added 'rb' as another case that doesn't need to be wrapped.

Fixes #6832
 2014-01-20 14:32:57 +01:00
rnveach
c4c5e34110 added trigger to redo selection text on a directory change 2014-01-20 13:03:40 +01:00
rnveach
89d60a2680 fixed selector string and removed all checkbox if it was selected 2014-01-20 13:03:34 +01:00
Thomas Müller
369ec65d12 Merge pull request #6828 from owncloud/dont_add_queuedtasks_during_upgrade 
add needUpgrade() check to addQueuedTask()
 2014-01-18 03:46:31 -08:00
Jörn Friedrich Dreyer
40c2f47cd9 add needUpgrade() check to addQueuedTask() 2014-01-17 19:50:37 +01:00
Vincent Petry
bc22799160 Fix array access syntax for older PHP 
There was a syntax error when running tests in PHP 5.3.10.
 2014-01-17 14:39:49 +01:00
Bjoern Schiessle
4c1510b729 updated description of the files encryption app 2014-01-17 12:56:58 +01:00
Vincent Petry
d44b98d3dd Fix to not destroy draggable when no draggable was set 
When a dir has no delete permission, the draggable isn't initialized on
files. This fix makes sure we don't try to destroy a draggable when it
wasn't inited in the first place.

Fixes #6254

Backport of 8135828 to stable6
 2014-01-16 17:50:07 +01:00
Frank Karlitschek
a4e842f19a 6.0.1 RC1 2014-01-16 17:09:54 +01:00
Volkan Gezer
aec0f06501 Fix untranslated text when deleting user 
This should fix issue #6728
 2014-01-16 12:23:34 +01:00
ben-denham
f9e4d0a5e2 updated the unit test for OCP\Share::unshareAll() to verify that shares by all users are removed for an item. 2014-01-16 12:14:53 +01:00
ben-denham
3093c63024 Unshare all will now delete all shares for the item, instead of only for a single owner. 2014-01-16 12:14:37 +01:00
Thomas Müller
b0edbd8ebd Merge pull request #6783 from owncloud/backport-6530-stable6 
Backport 6530 stable6
 2014-01-15 11:01:47 -08:00
Vincent Petry
5dd20db05f Fixed Dropbox/Google storage async save call 
When clicking "Grant access", the settings for Dropbox/Google were saved
through a call that gets cancelled when redirecting to the grant page
(for example in Firefox)

This fix makes sure the "save settings" call finished before redirecting
to the grant page.

Fixes #6176

Backport of e13be94 to stable6
 2014-01-15 16:41:54 +01:00
Thomas Müller
0c140d5f6e in order to work properly with encryption ocTransferId is added to the file path - questionable usage of magic string 2014-01-15 16:37:23 +01:00
Thomas Müller
49969825ad Adding a random postfix to the part file. 2014-01-15 16:37:23 +01:00
Bjoern Schiessle
3b21499b34 extended test to also check the status messages 2014-01-15 16:10:31 +01:00
Bjoern Schiessle
3fde29ead4 keep response message 2014-01-15 16:10:22 +01:00
Bjoern Schiessle
afe35ca12d call getFileInfo to enforce a file cache entry for the new version, fix #6286 2014-01-15 16:01:48 +01:00