]>
source.dussan.org Git - nextcloud-server.git/log
Florin Peter [Tue, 23 Apr 2013 17:08:52 +0000 (19:08 +0200)]
improved file size handling
Florin Peter [Mon, 22 Apr 2013 16:54:23 +0000 (18:54 +0200)]
fix wrong file path in proxy
Florin Peter [Mon, 22 Apr 2013 16:51:11 +0000 (18:51 +0200)]
Merge branch 'files_encryption' of https://github.com/owncloud/core into files_encryption
Florin Peter [Mon, 22 Apr 2013 16:50:59 +0000 (18:50 +0200)]
fix wrong file path in util
Björn Schießle [Mon, 22 Apr 2013 13:29:58 +0000 (15:29 +0200)]
delete all share keys if a file gets deleted
Björn Schießle [Mon, 22 Apr 2013 12:30:10 +0000 (14:30 +0200)]
fix encryption to owncloud user for public link shares
Björn Schießle [Mon, 22 Apr 2013 12:14:28 +0000 (14:14 +0200)]
fix comment, remove unused variable
Björn Schießle [Mon, 22 Apr 2013 12:13:59 +0000 (14:13 +0200)]
check if the item source was shared to me to decide if it is a re-share or not. Re-sharing of encrypted files should work now, we might still need to test some corner cases
Björn Schießle [Mon, 22 Apr 2013 12:12:18 +0000 (14:12 +0200)]
the owner uid is not interesting. We want to get all users who have access to the given item source, no matter from whom it was shared
Björn Schießle [Mon, 22 Apr 2013 10:32:38 +0000 (12:32 +0200)]
removed some leftover code; use already existing var for path to users file folder
Florin Peter [Mon, 22 Apr 2013 10:32:35 +0000 (12:32 +0200)]
Merge branch 'files_encryption' of https://github.com/owncloud/core into files_encryption
Florin Peter [Mon, 22 Apr 2013 10:25:55 +0000 (12:25 +0200)]
improved handling for getSharingUsersArray
Björn Schießle [Mon, 22 Apr 2013 10:22:07 +0000 (12:22 +0200)]
remove util::getPaths(), this function was broken and is replaced my util::getAllFiles(). When unsharing a folder only remove the share key for sub files if the user really no longer have access to the file. Can happen that a sub-file/-folder is shared to a group the user is a member of or explicitly once more to the same user
Björn Schießle [Mon, 22 Apr 2013 09:59:26 +0000 (11:59 +0200)]
Merge branch 'files_encryption' of github.com:owncloud/core into files_encryption
Björn Schießle [Mon, 22 Apr 2013 09:58:39 +0000 (11:58 +0200)]
fix sharing of folders. First we need to collect all files. Than we need to find all users with access to the file because this can vary from file to file and than we can encrypt it for all recipients
Florin Peter [Mon, 22 Apr 2013 02:40:49 +0000 (04:40 +0200)]
improved rename and file size support
fix missing user_id on write
FlorinPeter [Sat, 20 Apr 2013 12:35:29 +0000 (05:35 -0700)]
Merge pull request #2992 from FlorinPeter/files_encryption
fix for trashbin
Björn Schießle [Fri, 19 Apr 2013 11:17:08 +0000 (13:17 +0200)]
make sure that all share keys get deleted if a file/folder gets unshared from a user/group
Florin Peter [Thu, 18 Apr 2013 20:34:22 +0000 (22:34 +0200)]
fixed incorrect filesize, download via web is now possible
fixed broken file-info
Björn Schießle [Thu, 18 Apr 2013 18:02:27 +0000 (20:02 +0200)]
getUsersSharingFile() no longer needed, use getSharingUsersArray() instead; fix filterShareReadyUsers() to return the correct results
Björn Schießle [Thu, 18 Apr 2013 18:00:45 +0000 (20:00 +0200)]
Session needs filesystem view as parameter; use getSharingUsersArray(), this function also adds the owner to the list
Björn Schießle [Thu, 18 Apr 2013 15:53:59 +0000 (17:53 +0200)]
necessary changes in util.php after the changes in \OCP\Share::getUsersSharingFile() (
fe58e4b1a6a0f3b63afe74690986493facdad2c4 )
Björn Schießle [Thu, 18 Apr 2013 15:52:27 +0000 (17:52 +0200)]
some fixes to the keymanager class to identify the file owner and the owner path correctly.
Björn Schießle [Thu, 18 Apr 2013 15:46:04 +0000 (17:46 +0200)]
we need to add the owner of the file as parameter in case someone else like the owner edits the file; if $includeOwner is set than add owner also if no other recipient was found. This changes enable all user with write access to the file to edit it and to encrypt it to the right list of users again
Björn Schießle [Thu, 18 Apr 2013 14:37:49 +0000 (16:37 +0200)]
rename $shareFilePath to $path to avoid confusions, it is not about paths to share files but about general path to files stored in ownCloud
Björn Schießle [Thu, 18 Apr 2013 14:34:23 +0000 (16:34 +0200)]
fix file sharing, sharing files works now; moved the identification of file owner and the owner path in the keymanager functions so that other functions doesn't have to deal with it
Björn Schießle [Thu, 18 Apr 2013 13:44:57 +0000 (15:44 +0200)]
remove ToDo, every time the file key gets encrypted new share keys are generated and a new encrypted filekey. We always need to use the latest share-keys and encrypted keyfiles
Björn Schießle [Thu, 18 Apr 2013 13:42:28 +0000 (15:42 +0200)]
always save key file, the key doesn't change but the encrypted keyfile change always the same way like the share-keys change
Björn Schießle [Thu, 18 Apr 2013 11:41:21 +0000 (13:41 +0200)]
return filename relative to users file dir and not relative to data dir
Florin Peter [Thu, 18 Apr 2013 00:03:03 +0000 (02:03 +0200)]
fix for trashbin
Sam Tuke [Wed, 17 Apr 2013 15:20:37 +0000 (17:20 +0200)]
Development snapshot
Working on stream{} write
Sam Tuke [Tue, 16 Apr 2013 16:29:22 +0000 (18:29 +0200)]
Working on stream{} writing
Development snapshot
Sam Tuke [Tue, 16 Apr 2013 12:50:20 +0000 (14:50 +0200)]
Fixed stream{} reading of encrypted files (stream_read())
Sam Tuke [Tue, 16 Apr 2013 11:25:59 +0000 (04:25 -0700)]
Merge pull request #2885 from FlorinPeter/files_encryption
fix performance issues
Sam Tuke [Wed, 10 Apr 2013 15:37:03 +0000 (17:37 +0200)]
Fixed proxy class handing of read / write files
Various work on other classes
Björn Schießle [Fri, 12 Apr 2013 13:18:19 +0000 (15:18 +0200)]
fix some more paths
Björn Schießle [Fri, 12 Apr 2013 12:30:02 +0000 (14:30 +0200)]
fix some confusion about paths relative to the files dir and to the data dir
Björn Schießle [Fri, 12 Apr 2013 12:13:38 +0000 (14:13 +0200)]
fix stream wrapper to make initial encryption work
Florin Peter [Thu, 11 Apr 2013 20:55:48 +0000 (22:55 +0200)]
fix performance issues
Björn Schießle [Wed, 10 Apr 2013 14:46:02 +0000 (16:46 +0200)]
make sure that public-keys dir exists
Björn Schießle [Wed, 10 Apr 2013 13:31:19 +0000 (15:31 +0200)]
Session expect OC_FilesystemView()
Björn Schießle [Wed, 10 Apr 2013 13:14:44 +0000 (15:14 +0200)]
add $view as parameter for getFileKey() call
Björn Schießle [Wed, 10 Apr 2013 13:08:28 +0000 (15:08 +0200)]
add $view as parameter for session constructor
Sam Tuke [Tue, 9 Apr 2013 17:19:27 +0000 (19:19 +0200)]
Added info about filesystem method access conventions
Sam Tuke [Tue, 9 Apr 2013 17:11:38 +0000 (19:11 +0200)]
Fixed naming bug of public owncloud key dir, which caused new keypair to be generated on each pageload
Sam Tuke [Fri, 29 Mar 2013 20:11:29 +0000 (21:11 +0100)]
Development snapshot;
Fixed errors from Hooks::login();
Work on enable/disable recoveryAdmin for lost passwords in settings page (template, ajax, js);
Work on fixing sharing files to users (still broken);
Sam Tuke [Fri, 29 Mar 2013 14:59:54 +0000 (15:59 +0100)]
Merge branch 'master' into files_encryption
Bernhard Posselt [Fri, 29 Mar 2013 14:28:09 +0000 (07:28 -0700)]
Merge pull request #2516 from kabum/master
share autocomplete - improve group appearance - issue #173
Bernhard Posselt [Fri, 29 Mar 2013 14:26:07 +0000 (07:26 -0700)]
Merge pull request #2584 from mrtorrent/fix_instanceid_format
Fix instanceid format to prevent session loop
Bernhard Posselt [Fri, 29 Mar 2013 14:22:43 +0000 (07:22 -0700)]
Merge pull request #2597 from kabum/lesslog
Make it possible to show less log entries again
Bernhard Posselt [Fri, 29 Mar 2013 14:19:09 +0000 (07:19 -0700)]
Merge pull request #2448 from owncloud/userlist_available_groups
User list: Keep array of available groups. Should fix #873
Bart Visscher [Fri, 29 Mar 2013 12:38:58 +0000 (05:38 -0700)]
Merge pull request #2585 from mrtorrent/fix_install_app_version_check
Fix install app version check
Sam Tuke [Thu, 28 Mar 2013 17:39:12 +0000 (18:39 +0100)]
Merge branch 'master' into files_encryption
Conflicts:
apps/files_encryption/hooks/hooks.php
apps/files_encryption/lib/crypt.php
apps/files_encryption/lib/keymanager.php
Sam Tuke [Thu, 28 Mar 2013 17:29:18 +0000 (18:29 +0100)]
Added ajax scripts for setting pwd recovery preferences
Jörn Friedrich Dreyer [Thu, 28 Mar 2013 17:01:39 +0000 (10:01 -0700)]
Merge pull request #2575 from owncloud/fixing-1461-master
Fix upload progressbar in IE8 and IE9
Morris Jobke [Thu, 28 Mar 2013 15:11:46 +0000 (16:11 +0100)]
fix typo and remove animation
Morris Jobke [Thu, 28 Mar 2013 14:43:14 +0000 (15:43 +0100)]
convert js call to css rule
Morris Jobke [Thu, 28 Mar 2013 14:02:31 +0000 (15:02 +0100)]
apply code review hints
Jenkins for ownCloud [Wed, 27 Mar 2013 23:03:44 +0000 (00:03 +0100)]
[tx-robot] updated from transifex
Arthur Schiwon [Wed, 27 Mar 2013 20:18:19 +0000 (21:18 +0100)]
Whitespaces
Arthur Schiwon [Wed, 27 Mar 2013 20:17:58 +0000 (21:17 +0100)]
Share Dialog: show Displayname instead of internal name
Arthur Schiwon [Tue, 26 Mar 2013 22:42:00 +0000 (23:42 +0100)]
Cache: on equal mtime also for equal size before keeping ETag, at least makes Unit Test happy
Arthur Schiwon [Tue, 26 Mar 2013 15:03:40 +0000 (16:03 +0100)]
Cache: Do not overwrite ETag when file did not change
Arthur Schiwon [Mon, 25 Mar 2013 20:46:50 +0000 (21:46 +0100)]
Only prepare an SQL statement once.
Arthur Schiwon [Mon, 25 Mar 2013 20:45:55 +0000 (21:45 +0100)]
Add PHPDoc
Arthur Schiwon [Mon, 25 Mar 2013 20:45:10 +0000 (21:45 +0100)]
Adjust to Icewind's fix
Robin Appelman [Sun, 24 Mar 2013 16:01:04 +0000 (17:01 +0100)]
Cache: fix property path for getting legacy etag
Robin Appelman [Sun, 24 Mar 2013 15:20:59 +0000 (16:20 +0100)]
Port Icewind's fix I
Arthur Schiwon [Mon, 25 Mar 2013 16:54:45 +0000 (17:54 +0100)]
Port OC_Property Table Index
Arthur Schiwon [Mon, 25 Mar 2013 16:54:10 +0000 (17:54 +0100)]
Change LIMIT in DB query respectively remove where not necessary
Arthur Schiwon [Mon, 25 Mar 2013 13:23:46 +0000 (14:23 +0100)]
Remove Debug output
Arthur Schiwon [Fri, 22 Mar 2013 22:33:40 +0000 (23:33 +0100)]
Upgrade FileCache on ownCloud upgrade for all users with files
Arthur Schiwon [Fri, 22 Mar 2013 12:36:31 +0000 (13:36 +0100)]
Performance: prepare queries only once
Arthur Schiwon [Fri, 22 Mar 2013 12:23:43 +0000 (13:23 +0100)]
Fix lost ETag on Cache Upgrade
Arthur Schiwon [Wed, 27 Mar 2013 13:33:35 +0000 (14:33 +0100)]
Files External: show display names instead of internal user names in Settings UI
blizzz [Wed, 27 Mar 2013 17:57:35 +0000 (10:57 -0700)]
Merge pull request #2598 from ceri/master
Use displayName in the From field of outbound email about new shares.
Arthur Schiwon [Wed, 27 Mar 2013 13:05:00 +0000 (14:05 +0100)]
Users: use DisplayName in the Display Name col when appending users
Morris Jobke [Wed, 27 Mar 2013 15:53:51 +0000 (16:53 +0100)]
add copyright note
Ceri Davies [Wed, 27 Mar 2013 15:43:56 +0000 (15:43 +0000)]
Use displayName in the From field of outbound email about new shares.
This is important in the Active Directory case where users are
currently getting a GUID in the From field, making emails look quite a
lot like spam.
Morris Jobke [Wed, 27 Mar 2013 14:19:28 +0000 (15:19 +0100)]
remove animation
Morris Jobke [Wed, 27 Mar 2013 13:51:30 +0000 (14:51 +0100)]
Make it possible to show less log entries again - fix owncloud/core#1593
* show "less" button only if there are more than 3 entries
* only "remove" logs till last 3 entries
Use isAppVersionCompatible in app installer
Jenkins for ownCloud [Tue, 26 Mar 2013 23:11:05 +0000 (00:11 +0100)]
[tx-robot] updated from transifex
Ensure instanceid contains a letter
instanceid is generated by uniqid() and then used as the
session_name. Because session_name requires at least one letter
and uniqid() does not guarantee to provide that, in the case that
uniqid() generates a string of only digits, the user will be stuck
in an infinite login loop because every request will generate a
new PHP session.
Thomas Müller [Tue, 26 Mar 2013 21:49:04 +0000 (14:49 -0700)]
Merge pull request #2578 from owncloud/fixing-2577-master
prevent to fire delete ajax a second time.
Minor typo, coding style fixes for OC_Util::getInstanceId
Thomas Mueller [Tue, 26 Mar 2013 20:28:01 +0000 (21:28 +0100)]
fixes #1463 - file size is now displayed correctly in IE8
Thomas Tanghus [Tue, 26 Mar 2013 15:59:10 +0000 (08:59 -0700)]
Merge pull request #2567 from owncloud/fix_insertIfNotExist
Properly prepare insertIfNotExist queries.
Björn Schießle [Tue, 26 Mar 2013 15:52:58 +0000 (16:52 +0100)]
check for dir in deleteFileKey() and delShareKey(), to always handle all share keys and file keys on delete
Thomas Mueller [Tue, 26 Mar 2013 15:27:56 +0000 (16:27 +0100)]
prevent to fire delete ajax a second time.
Before the click on a single file delete icon fired two different handlers - one of them is for multiple deletion only
Björn Schießle [Tue, 26 Mar 2013 15:22:26 +0000 (16:22 +0100)]
reuse function provided in util.php
Björn Schießle [Tue, 26 Mar 2013 15:17:26 +0000 (16:17 +0100)]
also delete share keys if a different user than the owner deletes a shared file
Björn Schießle [Tue, 26 Mar 2013 13:22:18 +0000 (14:22 +0100)]
delete share keys if file gets deleted
Thomas Mueller [Tue, 26 Mar 2013 13:14:30 +0000 (14:14 +0100)]
fixes #1461
Björn Schießle [Tue, 26 Mar 2013 11:40:31 +0000 (12:40 +0100)]
get the correct paths and owner to access shared files
Björn Schießle [Tue, 26 Mar 2013 11:39:55 +0000 (12:39 +0100)]
move getUidAndFilename() tu util.php
Björn Schießle [Tue, 26 Mar 2013 11:24:04 +0000 (12:24 +0100)]
get shared keys from new location
Björn Schießle [Tue, 26 Mar 2013 11:23:28 +0000 (12:23 +0100)]
always call stripUserFilesPath(), we need to keep the Shared/ to find the correct owner of the file later
Björn Schießle [Tue, 26 Mar 2013 10:58:54 +0000 (11:58 +0100)]
new file structure for share keys; sub-folder need to be generated each by one (we don't have a recursive mkdir)
Bernhard Posselt [Tue, 26 Mar 2013 09:50:11 +0000 (02:50 -0700)]
Merge pull request #2568 from itheiss/master
Implement setting custom domainname for getDefaultEmailAddress