]> source.dussan.org Git - nextcloud-server.git/log
nextcloud-server.git
11 years agoreuse function provided in util.php
Björn Schießle [Tue, 26 Mar 2013 15:22:26 +0000 (16:22 +0100)]
reuse function provided in util.php

11 years agoalso delete share keys if a different user than the owner deletes a shared file
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

11 years agodelete share keys if file gets deleted
Björn Schießle [Tue, 26 Mar 2013 13:22:18 +0000 (14:22 +0100)]
delete share keys if file gets deleted

11 years agoget the correct paths and owner to access shared files
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

11 years agomove getUidAndFilename() tu util.php
Björn Schießle [Tue, 26 Mar 2013 11:39:55 +0000 (12:39 +0100)]
move getUidAndFilename() tu util.php

11 years agoget shared keys from new location
Björn Schießle [Tue, 26 Mar 2013 11:24:04 +0000 (12:24 +0100)]
get shared keys from new location

11 years agoalways call stripUserFilesPath(), we need to keep the Shared/ to find the correct...
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

11 years agonew file structure for share keys; sub-folder need to be generated each by one (we...
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)

11 years agoAdded method for setting user keyfile recovery preference
Sam Tuke [Wed, 20 Mar 2013 18:26:59 +0000 (19:26 +0100)]
Added method for setting user keyfile recovery preference
Fixed method for checking if keyfile recovery is enabled for a user
Added unit test for above 2 methods
Made proxy{} always use sharing
Made proxy{} work regardless of sharing API enabled or not
Implemented proxy-based sharing to admin if user keyfile recovery is enabled

11 years agoImproved folder creation code
Sam Tuke [Tue, 19 Mar 2013 18:53:15 +0000 (19:53 +0100)]
Improved folder creation code
Created stub method for checking user pwd recovery preference from db
Added pwd recovery column to db
Added comments

11 years agoFixed stream wrapper bugs
Sam Tuke [Sat, 9 Mar 2013 18:18:34 +0000 (19:18 +0100)]
Fixed stream wrapper bugs
Switched encryptAll() to use stream-based instead of file-at-a-time encryption
Development snapshot

11 years agomake sure that $this->userId is initialized before using it as a parameter
Björn Schießle [Mon, 4 Mar 2013 16:58:56 +0000 (17:58 +0100)]
make sure that $this->userId is initialized before using it as a parameter

11 years agodefine key size in constructor, otherwise the key size will depend on the servers...
Björn Schießle [Mon, 4 Mar 2013 14:33:38 +0000 (15:33 +0100)]
define key size in constructor, otherwise the key size will depend on the servers openssl conf

11 years agoAdded notes where to reuse old keys instead of generating new ones
Sam Tuke [Wed, 27 Feb 2013 18:50:57 +0000 (18:50 +0000)]
Added notes where to reuse old keys instead of generating new ones

11 years agoMade proxy class reuse existing keyfiles not gen new ones;
Sam Tuke [Wed, 27 Feb 2013 18:46:44 +0000 (18:46 +0000)]
Made proxy class reuse existing keyfiles not gen new ones;
Added notes about reusing shareKeys

11 years agoDeleting encrypted files with missing keyfiles/shareKeys now succeeds
Sam Tuke [Wed, 27 Feb 2013 16:15:03 +0000 (16:15 +0000)]
Deleting encrypted files with missing keyfiles/shareKeys now succeeds

11 years agoUnsharing a single file now works
Sam Tuke [Wed, 27 Feb 2013 15:31:23 +0000 (15:31 +0000)]
Unsharing a single file now works

11 years agoStarted work on post unshare hook
Sam Tuke [Tue, 26 Feb 2013 18:33:31 +0000 (18:33 +0000)]
Started work on post unshare hook
Development snapshot

11 years agoShared encrypted files now readable by both sharer and sharee
Sam Tuke [Tue, 26 Feb 2013 18:11:29 +0000 (18:11 +0000)]
Shared encrypted files now readable by both sharer and sharee

11 years agomake sure that home folders are mounted correctly before write/read keyfile
Björn Schießle [Mon, 25 Feb 2013 11:29:07 +0000 (12:29 +0100)]
make sure that home folders are mounted correctly before write/read keyfile

11 years agothe default should be to encrypt all files if the user/admin doesn't specify a blackl...
Björn Schießle [Fri, 22 Feb 2013 15:08:08 +0000 (16:08 +0100)]
the default should be to encrypt all files if the user/admin doesn't specify a blacklist explicitely

11 years agoisSharedFile() doesn't detect all shares, just use getUsersSharingFile() directly...
Björn Schießle [Fri, 22 Feb 2013 15:02:27 +0000 (16:02 +0100)]
isSharedFile() doesn't detect all shares, just use getUsersSharingFile() directly either you get a list of users or not

11 years agoDevelopment snapshot
Sam Tuke [Wed, 20 Feb 2013 19:18:00 +0000 (19:18 +0000)]
Development snapshot
Added comments
Added methods

11 years agoMoved dependencies out of Crypt methods (encKeyfileToMultipleUsers)(DI)
Sam Tuke [Tue, 19 Feb 2013 19:16:50 +0000 (19:16 +0000)]
Moved dependencies out of Crypt methods (encKeyfileToMultipleUsers)(DI)
Fixed bug preventing sharing with users other than 'ownCloud'
Added comments
Moved functionality into filterShareReadyUsers()
Other changes

11 years agoFixed wrong array key reference
Sam Tuke [Tue, 19 Feb 2013 17:41:38 +0000 (17:41 +0000)]
Fixed wrong array key reference

11 years agoremove debug output
Björn Schießle [Tue, 19 Feb 2013 16:10:32 +0000 (17:10 +0100)]
remove debug output

11 years agoremove todo, it is already solved
Björn Schießle [Tue, 19 Feb 2013 13:47:45 +0000 (14:47 +0100)]
remove todo, it is already solved

11 years agoremove debug output, fix typo in file names
Björn Schießle [Thu, 14 Feb 2013 15:33:57 +0000 (16:33 +0100)]
remove debug output, fix typo in file names

11 years agocreate keypair for ownCloud with empty passphrase, will be used for public link shares
Björn Schießle [Wed, 13 Feb 2013 16:57:45 +0000 (17:57 +0100)]
create keypair for ownCloud with empty passphrase, will be used for public link shares

11 years agoadd post_unshareALll hook, update recursively all keyfiles if a folder was shared...
Björn Schießle [Wed, 13 Feb 2013 16:23:27 +0000 (17:23 +0100)]
add post_unshareALll hook, update recursively all keyfiles if a folder was shared/unshared

11 years agoadd post_unshare hook, also add public link shares to the list of user with access...
Björn Schießle [Wed, 13 Feb 2013 13:56:39 +0000 (14:56 +0100)]
add post_unshare hook, also add public link shares to the list of user with access to a file

11 years agoadd option to keep duplicates in the list of users with access to a file, e.g. for...
Björn Schießle [Tue, 12 Feb 2013 16:00:33 +0000 (17:00 +0100)]
add option to keep duplicates in the list of users with access to a file, e.g. for the unshare operation we need to know if access was granted more than once, for example as group share and as individual share

11 years agoalso find users with access to the file if a folder above the actual file was already...
Björn Schießle [Tue, 12 Feb 2013 15:48:04 +0000 (16:48 +0100)]
also find users with access to the file if a folder above the actual file was already shared

11 years agouse right location of the file is the source and not the target it is shared to
Björn Schießle [Tue, 12 Feb 2013 11:45:54 +0000 (12:45 +0100)]
use right location of the file is the source and not the target it is shared to

11 years agotake group shares into account if we retrieve the list a all recipients
Björn Schießle [Tue, 12 Feb 2013 11:08:34 +0000 (12:08 +0100)]
take group shares into account if we retrieve the list a all recipients

11 years agogo back to preUnshare hooks since sharing doesn't trigger post unshare hooks
Björn Schießle [Mon, 11 Feb 2013 14:13:42 +0000 (15:13 +0100)]
go back to preUnshare hooks since sharing doesn't trigger post unshare hooks

11 years agounshare all should work the same like unshare single users
Björn Schießle [Mon, 11 Feb 2013 12:50:11 +0000 (13:50 +0100)]
unshare all should work the same like unshare single users

11 years ago- moved the enrcyption of the filekey ifg file gets shared from the post shared hook to
Björn Schießle [Mon, 11 Feb 2013 12:28:37 +0000 (13:28 +0100)]
- moved the enrcyption of the filekey ifg file gets shared from the post shared hook to
  Crypt::encKeyfileToMultipleUsers() because this can be reused if files get unshared
- switch from preUnshare hook to postUnshare hook because afterward we can simply get the
  updated list of users with access to the file and call Crypt::encKeyfileToMultipleUsers()

11 years agoadded some TODOs
Björn Schießle [Mon, 11 Feb 2013 11:12:21 +0000 (12:12 +0100)]
added some TODOs

11 years agoUpdated specfile
Sam Tuke [Mon, 11 Feb 2013 10:34:23 +0000 (10:34 +0000)]
Updated specfile

11 years agoImplementing sharing support
Sam Tuke [Mon, 11 Feb 2013 10:21:23 +0000 (10:21 +0000)]
Implementing sharing support
New file-specific methods in lib/public/share
Changes to how keyfiles are stored

11 years agoWork on post_share hook for files_encryption
Sam Tuke [Sat, 9 Feb 2013 18:39:32 +0000 (18:39 +0000)]
Work on post_share hook for files_encryption
New method in OCP\Share{}:: getUsersSharingFile()
Development shapshot

11 years agoFixed bug causing nested file read over webdav to fail
Sam Tuke [Sat, 9 Feb 2013 12:42:18 +0000 (12:42 +0000)]
Fixed bug causing nested file read over webdav to fail

11 years agoMerge branch 'master' into files_encryption-style-fixes
Sam Tuke [Sat, 9 Feb 2013 11:52:11 +0000 (11:52 +0000)]
Merge branch 'master' into files_encryption-style-fixes

Conflicts:
apps/files_encryption/lib/crypt.php
apps/files_encryption/lib/util.php

11 years agoMerge pull request #1560 from owncloud/fix_replacing
Bernhard Posselt [Sat, 9 Feb 2013 11:28:40 +0000 (03:28 -0800)]
Merge pull request #1560 from owncloud/fix_replacing

remove (comment out) old code to fix replacing of files

11 years agoMerge pull request #1545 from owncloud/fix-oc_webroot
Thomas Müller [Sat, 9 Feb 2013 11:27:22 +0000 (03:27 -0800)]
Merge pull request #1545 from owncloud/fix-oc_webroot

fixup oc_webroot correctly before and after setup

11 years agoMerge pull request #1537 from owncloud/fix_sharing_dropdown_event_handlers
Thomas Müller [Sat, 9 Feb 2013 11:23:19 +0000 (03:23 -0800)]
Merge pull request #1537 from owncloud/fix_sharing_dropdown_event_handlers

attach handlers to document instead of filelist

11 years agoMerge pull request #1562 from schiesbn/fix_naming
Bernhard Posselt [Sat, 9 Feb 2013 11:21:30 +0000 (03:21 -0800)]
Merge pull request #1562 from schiesbn/fix_naming

rename trash to trash bin

11 years agoMerge pull request #1521 from schiesbn/label_fixed
Björn Schießle [Sat, 9 Feb 2013 11:14:25 +0000 (03:14 -0800)]
Merge pull request #1521 from schiesbn/label_fixed

don't call the delete button unshare, unshare operation no longer available

11 years agorename trash to trash bin
Björn Schießle [Sat, 9 Feb 2013 11:01:49 +0000 (12:01 +0100)]
rename trash to trash bin

11 years agoremove (comment out) old code to fix replacing of files
Georg Ehrke [Sat, 9 Feb 2013 10:27:03 +0000 (11:27 +0100)]
remove (comment out) old code to fix replacing of files

11 years agoMerge pull request #1550 from owncloud/fix-files-download-links
Jörn Friedrich Dreyer [Sat, 9 Feb 2013 09:28:25 +0000 (01:28 -0800)]
Merge pull request #1550 from owncloud/fix-files-download-links

Fix files router download links

11 years agoMerge pull request #1541 from owncloud/fixing-1540-master
Jörn Friedrich Dreyer [Sat, 9 Feb 2013 09:17:11 +0000 (01:17 -0800)]
Merge pull request #1541 from owncloud/fixing-1540-master

remove undefined function FileList.finishDelete

11 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Fri, 8 Feb 2013 23:14:08 +0000 (00:14 +0100)]
[tx-robot] updated from transifex

11 years agoMerge pull request #1547 from owncloud/navigation-color
Thomas Müller [Fri, 8 Feb 2013 21:30:25 +0000 (13:30 -0800)]
Merge pull request #1547 from owncloud/navigation-color

brighter grey for the navigation bar

11 years agoMerge pull request #1548 from owncloud/installation-improvements
Thomas Müller [Fri, 8 Feb 2013 21:27:15 +0000 (13:27 -0800)]
Merge pull request #1548 from owncloud/installation-improvements

Installation improvements

11 years agoFix files router download links
Bart Visscher [Fri, 8 Feb 2013 21:05:13 +0000 (22:05 +0100)]
Fix files router download links

11 years agouse proper HTML for other security warning too
Jan-Christoph Borchardt [Fri, 8 Feb 2013 18:59:42 +0000 (19:59 +0100)]
use proper HTML for other security warning too

11 years agobrighter grey for the navigation bar, hopefully solves the weird similarity to the...
Jan-Christoph Borchardt [Fri, 8 Feb 2013 18:33:22 +0000 (19:33 +0100)]
brighter grey for the navigation bar, hopefully solves the weird similarity to the header

11 years agoMerge pull request #1439 from owncloud/fix-archive-tar-on-win32-master
Thomas Müller [Fri, 8 Feb 2013 18:18:49 +0000 (10:18 -0800)]
Merge pull request #1439 from owncloud/fix-archive-tar-on-win32-master

quick fixing this require_once.

11 years agofix-oc_webroot
Bart Visscher [Fri, 8 Feb 2013 17:44:52 +0000 (18:44 +0100)]
fix-oc_webroot

11 years agoremove unused code
Thomas Müller [Fri, 8 Feb 2013 17:04:27 +0000 (18:04 +0100)]
remove unused code

11 years agoremove undefined function FileList.finishDelete
Thomas Müller [Fri, 8 Feb 2013 14:51:28 +0000 (15:51 +0100)]
remove undefined function FileList.finishDelete

11 years agoquick fixing this require_once.
Thomas Mueller [Thu, 24 Jan 2013 15:56:23 +0000 (16:56 +0100)]
quick fixing this require_once.

On windows the wrong file will be required: lib/archive/tar.php and not Archive/Tar.php.

Best would be to rename the lib/archive/tar.php or put it into a different folder

11 years agoMerge pull request #1539 from owncloud/fixing-1508-master
Bart Visscher [Fri, 8 Feb 2013 13:25:00 +0000 (05:25 -0800)]
Merge pull request #1539 from owncloud/fixing-1508-master

missing comma in sql statement

11 years agomissing comma in sql statement
Thomas Müller [Fri, 8 Feb 2013 12:49:26 +0000 (13:49 +0100)]
missing comma in sql statement

11 years agoimprove and shorten security warning, add link to docs, fix #1342
Jan-Christoph Borchardt [Fri, 8 Feb 2013 12:37:57 +0000 (13:37 +0100)]
improve and shorten security warning, add link to docs, fix #1342

11 years agoMerge pull request #1534 from owncloud/files_l10n
Thomas Müller [Fri, 8 Feb 2013 11:58:17 +0000 (03:58 -0800)]
Merge pull request #1534 from owncloud/files_l10n

Add translation support back to move/rename

11 years agoFiles: explicitly define
Robin Appelman [Fri, 8 Feb 2013 11:03:28 +0000 (12:03 +0100)]
Files: explicitly define

11 years agoattach handlers to document instead of filelist, minor whitespace cleanups
Jörn Friedrich Dreyer [Fri, 8 Feb 2013 10:05:56 +0000 (11:05 +0100)]
attach handlers to document instead of filelist, minor whitespace cleanups

11 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Thu, 7 Feb 2013 23:13:16 +0000 (00:13 +0100)]
[tx-robot] updated from transifex

11 years agoFiles: rename 'space' to 'storage' in upload.php
Robin Appelman [Thu, 7 Feb 2013 22:59:14 +0000 (23:59 +0100)]
Files: rename 'space' to 'storage' in upload.php

11 years agoFiles: add translation support back to move/rename
Robin Appelman [Thu, 7 Feb 2013 22:57:18 +0000 (23:57 +0100)]
Files: add translation support back to move/rename

11 years agoMerge pull request #1527 from owncloud/simplyfy_file_mimetype_parsing
icewind1991 [Thu, 7 Feb 2013 22:47:10 +0000 (14:47 -0800)]
Merge pull request #1527 from owncloud/simplyfy_file_mimetype_parsing

simplyfy mimetype parsing of 'file' output

11 years agoMerge pull request #1514 from owncloud/fix-setup
Lukas Reschke [Thu, 7 Feb 2013 21:48:44 +0000 (13:48 -0800)]
Merge pull request #1514 from owncloud/fix-setup

Fix setup

11 years agoMerge pull request #1529 from owncloud/installation-login-fixes
Thomas Müller [Thu, 7 Feb 2013 21:40:25 +0000 (13:40 -0800)]
Merge pull request #1529 from owncloud/installation-login-fixes

Installation login fixes

11 years agoMerge pull request #1507 from tripflex/master
Bart Visscher [Thu, 7 Feb 2013 20:49:14 +0000 (12:49 -0800)]
Merge pull request #1507 from tripflex/master

remove float left from actions div class

fixes #1504

11 years agoMerge pull request #1526 from owncloud/l10n-support-master
Lukas Reschke [Thu, 7 Feb 2013 20:38:36 +0000 (12:38 -0800)]
Merge pull request #1526 from owncloud/l10n-support-master

L10n support master

11 years agoFill oc_webroot with the expected value
Bart Visscher [Thu, 7 Feb 2013 20:13:57 +0000 (21:13 +0100)]
Fill oc_webroot with the expected value

11 years agoMerge pull request #1530 from owncloud/fix-warning-displayname-layout
blizzz [Thu, 7 Feb 2013 19:25:33 +0000 (11:25 -0800)]
Merge pull request #1530 from owncloud/fix-warning-displayname-layout

Fix warning with displayname in user layout template

11 years agoMerge pull request #1531 from owncloud/cron_no_routes
blizzz [Thu, 7 Feb 2013 19:22:58 +0000 (11:22 -0800)]
Merge pull request #1531 from owncloud/cron_no_routes

Fix router warnings when running as CLI

11 years agoFix previous commit
Robin Appelman [Thu, 7 Feb 2013 17:30:01 +0000 (18:30 +0100)]
Fix previous commit

11 years agoUse dummy request method in CLI
Robin Appelman [Thu, 7 Feb 2013 17:28:56 +0000 (18:28 +0100)]
Use dummy request method in CLI

11 years agomake show password toggle work for installation (once #1525 is fixed)
Jan-Christoph Borchardt [Thu, 7 Feb 2013 17:04:14 +0000 (18:04 +0100)]
make show password toggle work for installation (once #1525 is fixed)

11 years agoFix warning with displayname in user layout template
Bart Visscher [Thu, 7 Feb 2013 17:07:27 +0000 (18:07 +0100)]
Fix warning with displayname in user layout template

11 years agoDon't try to use routes when called from cli
Robin Appelman [Thu, 7 Feb 2013 16:53:38 +0000 (17:53 +0100)]
Don't try to use routes when called from cli

11 years agosimplyfy mimetype parsing of 'file' output
Jörn Friedrich Dreyer [Thu, 7 Feb 2013 16:42:03 +0000 (17:42 +0100)]
simplyfy mimetype parsing of 'file' output

11 years agomake show password not specific to log in
Jan-Christoph Borchardt [Thu, 7 Feb 2013 16:41:24 +0000 (17:41 +0100)]
make show password not specific to log in

11 years agoremove duplicate show password toggle code, move current one to proper location
Jan-Christoph Borchardt [Thu, 7 Feb 2013 16:04:03 +0000 (17:04 +0100)]
remove duplicate show password toggle code, move current one to proper location

11 years agosome comments for CSS documentation
Jan-Christoph Borchardt [Thu, 7 Feb 2013 16:02:43 +0000 (17:02 +0100)]
some comments for CSS documentation

11 years agofix database labels having left padding
Jan-Christoph Borchardt [Thu, 7 Feb 2013 15:57:54 +0000 (16:57 +0100)]
fix database labels having left padding

11 years agol10n support enhanced in core
Thomas Mueller [Thu, 7 Feb 2013 15:49:36 +0000 (16:49 +0100)]
l10n support enhanced in core

11 years agol10n support enhanced in files_versions
Thomas Mueller [Thu, 7 Feb 2013 15:34:57 +0000 (16:34 +0100)]
l10n support enhanced in files_versions

11 years agol10n support enhanced in files_trashbin
Thomas Mueller [Thu, 7 Feb 2013 15:31:04 +0000 (16:31 +0100)]
l10n support enhanced in files_trashbin

11 years agol10n support enhanced in files_version
Thomas Mueller [Thu, 7 Feb 2013 15:17:54 +0000 (16:17 +0100)]
l10n support enhanced in files_version

11 years agoMerge pull request #1524 from owncloud/fix_ldaps_tls_setting
blizzz [Thu, 7 Feb 2013 15:06:35 +0000 (07:06 -0800)]
Merge pull request #1524 from owncloud/fix_ldaps_tls_setting

LDAP: don't try to put TLS on top of already secure connection (will fail).

11 years agoTypo
Arthur Schiwon [Thu, 7 Feb 2013 15:05:45 +0000 (16:05 +0100)]
Typo

11 years agoMerge pull request #1451 from eMerzh/fix_1065
Thomas Müller [Thu, 7 Feb 2013 14:27:58 +0000 (06:27 -0800)]
Merge pull request #1451 from eMerzh/fix_1065

Add Redirect to getUrlContent fix #1065

11 years agoMerge pull request #1518 from schiesbn/trash_layout_fix
blizzz [Thu, 7 Feb 2013 12:40:51 +0000 (04:40 -0800)]
Merge pull request #1518 from schiesbn/trash_layout_fix

add class hascontrols to trash bin file table

11 years agoMerge pull request #1522 from schiesbn/trash_bin_fix
Björn Schießle [Thu, 7 Feb 2013 12:38:22 +0000 (04:38 -0800)]
Merge pull request #1522 from schiesbn/trash_bin_fix

OCA_Versions is now known as OCA\Files_Versions