]>
source.dussan.org Git - nextcloud-server.git/log
Florin Peter [Thu, 25 Apr 2013 12:56:11 +0000 (14:56 +0200)]
fixed file_proxy handling
Florin Peter [Tue, 23 Apr 2013 20:20:31 +0000 (22:20 +0200)]
Added post proxy for getFileInfo.
This is needed for WebDAV and FileSize
@samtuke and @schiesbn you guys know a better solution?
Florin Peter [Tue, 23 Apr 2013 17:09:01 +0000 (19:09 +0200)]
Merge branch 'files_encryption' of https://github.com/owncloud/core into files_encryption
Florin Peter [Tue, 23 Apr 2013 17:08:52 +0000 (19:08 +0200)]
improved file size handling
Sam Tuke [Tue, 23 Apr 2013 16:41:01 +0000 (18:41 +0200)]
Development snapshot
working on stream handling (large files) in Util->encryptAll()
Sam Tuke [Tue, 23 Apr 2013 15:36:35 +0000 (17:36 +0200)]
Stream writing improved: working with dolphin + kate, gedit & nautilus give errors, suspect those issues are clientside
.part file paths fixed in stream{}
Sam Tuke [Tue, 23 Apr 2013 12:13:40 +0000 (14:13 +0200)]
Merge branch 'master' into files_encryption
Sam Tuke [Tue, 23 Apr 2013 12:12:28 +0000 (14:12 +0200)]
Updated buglist
Jenkins for ownCloud [Tue, 23 Apr 2013 00:00:31 +0000 (02:00 +0200)]
[tx-robot] updated from transifex
Bernhard Posselt [Mon, 22 Apr 2013 21:34:09 +0000 (14:34 -0700)]
Merge pull request #3074 from owncloud/sqlite3-raiseerror
Fix raiseError call in the MDB2 sqlite3 driver
Bernhard Posselt [Mon, 22 Apr 2013 20:28:18 +0000 (13:28 -0700)]
Merge pull request #3073 from owncloud/setup-error-message
Improve error message if user creation fails during setup
Bernhard Posselt [Mon, 22 Apr 2013 20:16:35 +0000 (13:16 -0700)]
Merge pull request #3078 from owncloud/files-dnd
Files: Fix XSS when creating dropshadow
Robin Appelman [Mon, 22 Apr 2013 19:54:25 +0000 (21:54 +0200)]
Files: Fix XSS when creating dropshadow
Bart Visscher [Mon, 22 Apr 2013 18:45:09 +0000 (11:45 -0700)]
Merge pull request #3019 from owncloud/fix-3004
Test if we want a 3rdparty style/script before checking the 3rdparty root
Robin Appelman [Mon, 22 Apr 2013 18:34:00 +0000 (20:34 +0200)]
Fix raiseError call in the MDB2 sqlite3 driver
Robin Appelman [Mon, 22 Apr 2013 18:32:40 +0000 (20:32 +0200)]
Improve error message if user creation fails during setup
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
Jan-Christoph Borchardt [Mon, 22 Apr 2013 14:12:19 +0000 (07:12 -0700)]
Merge pull request #2983 from owncloud/style-details
Style details
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
Jenkins for ownCloud [Mon, 22 Apr 2013 00:00:20 +0000 (02:00 +0200)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Sun, 21 Apr 2013 00:04:42 +0000 (02:04 +0200)]
[tx-robot] updated from transifex
FlorinPeter [Sat, 20 Apr 2013 12:35:29 +0000 (05:35 -0700)]
Merge pull request #2992 from FlorinPeter/files_encryption
fix for trashbin
Jenkins for ownCloud [Sat, 20 Apr 2013 00:02:09 +0000 (02:02 +0200)]
[tx-robot] updated from transifex
Bart Visscher [Fri, 19 Apr 2013 14:56:41 +0000 (07:56 -0700)]
Merge pull request #3020 from owncloud/cleaner-webdav-reason
Cleaner isWebDAVWorking reason, otherwise people overlook the reason
Bart Visscher [Fri, 19 Apr 2013 14:04:33 +0000 (16:04 +0200)]
Test if we want a 3rdparty style/script before checking the 3rdparty root
Bart Visscher [Fri, 19 Apr 2013 13:08:09 +0000 (06:08 -0700)]
Merge pull request #3024 from owncloud/file-delete-action
Fix #1164 and fix showing spinner on delete
Bart Visscher [Fri, 19 Apr 2013 11:46:11 +0000 (13:46 +0200)]
Fix displaying spinner on delete
Bart Visscher [Fri, 19 Apr 2013 11:45:40 +0000 (13:45 +0200)]
No need to strip slashes, json_decode handles that for us
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
Bart Visscher [Fri, 19 Apr 2013 10:44:54 +0000 (12:44 +0200)]
Cleaner isWebDAVWorking reason, otherwise people overlook the reason
Thomas Tanghus [Fri, 19 Apr 2013 08:17:35 +0000 (01:17 -0700)]
Merge pull request #3010 from owncloud/fix-cookie_path
Don't use empty session.cookie_path, otherwise we get multiple cookies
Jenkins for ownCloud [Thu, 18 Apr 2013 23:57:39 +0000 (01:57 +0200)]
[tx-robot] updated from transifex
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
Bart Visscher [Thu, 18 Apr 2013 19:11:55 +0000 (21:11 +0200)]
Don't use empty session.cookie_path, otherwise we get multiple cookies
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
Jenkins for ownCloud [Thu, 18 Apr 2013 00:09:28 +0000 (02:09 +0200)]
[tx-robot] updated from transifex
Florin Peter [Thu, 18 Apr 2013 00:03:03 +0000 (02:03 +0200)]
fix for trashbin
Bernhard Posselt [Wed, 17 Apr 2013 19:43:15 +0000 (12:43 -0700)]
Merge pull request #2986 from eMerzh/upgrade_warn
Warn when we do an upgrade
Brice Maron [Wed, 17 Apr 2013 19:29:14 +0000 (21:29 +0200)]
Warn when we do an upgrade
Raghu Nayyar [Wed, 17 Apr 2013 17:20:36 +0000 (10:20 -0700)]
Merge pull request #2925 from owncloud/navigation-icon-fix
fix navigation hover effect, documentation
Jan-Christoph Borchardt [Wed, 17 Apr 2013 15:36:30 +0000 (17:36 +0200)]
remove unnecessary border from navigation, looked strange with scrollbar and pushed the text over 1px
Jan-Christoph Borchardt [Wed, 17 Apr 2013 15:23:12 +0000 (17:23 +0200)]
apply navigation hover effect directly to img and span, cleaner code
Sam Tuke [Wed, 17 Apr 2013 15:20:37 +0000 (17:20 +0200)]
Development snapshot
Working on stream{} write
Jan-Christoph Borchardt [Wed, 17 Apr 2013 15:16:15 +0000 (17:16 +0200)]
move password warning more relevant below password field, un-nest log in warning
Jan-Christoph Borchardt [Wed, 17 Apr 2013 15:15:34 +0000 (17:15 +0200)]
move warning and error states together in CSS, to be cleaned up
Bernhard Posselt [Wed, 17 Apr 2013 14:47:17 +0000 (07:47 -0700)]
Merge pull request #2978 from owncloud/displayname_can_be_null
Remove not null constraint. Fix #2976
Jan-Christoph Borchardt [Wed, 17 Apr 2013 14:30:42 +0000 (16:30 +0200)]
make textarea inherit ownCloud font instead of using monospace
Morris Jobke [Wed, 17 Apr 2013 13:49:46 +0000 (06:49 -0700)]
Merge pull request #2975 from owncloud/log-date
use date and time instead of timestamp in log
Bernhard Posselt [Wed, 17 Apr 2013 13:31:05 +0000 (15:31 +0200)]
also adjust template properly for log date fix
Thomas Tanghus [Wed, 17 Apr 2013 12:08:45 +0000 (14:08 +0200)]
Remove not null constraint. Fix #2976
Bernhard Posselt [Wed, 17 Apr 2013 12:05:51 +0000 (14:05 +0200)]
fix admin log display and use a more readable format
Bernhard Posselt [Wed, 17 Apr 2013 10:24:18 +0000 (12:24 +0200)]
use date and time instead of timestamp
Thomas Tanghus [Wed, 17 Apr 2013 10:06:50 +0000 (03:06 -0700)]
Merge pull request #2746 from owncloud/use-count-userexists
Use count SQL to check for user existance
Jan-Christoph Borchardt [Wed, 17 Apr 2013 09:53:38 +0000 (11:53 +0200)]
correct primary color to #1d2d44 where slightly wrong
Björn Schießle [Tue, 16 Apr 2013 11:52:46 +0000 (13:52 +0200)]
adapt free space calculation to the way it is done for the trash bin
Björn Schießle [Tue, 16 Apr 2013 11:51:53 +0000 (13:51 +0200)]
improved free space calculation if no quota is set, discussed in #2936
Bart Visscher [Wed, 17 Apr 2013 07:44:14 +0000 (00:44 -0700)]
Merge pull request #2915 from Kondou-ger/handle_empty_datafolder_better
Handle empty datafolder better.
Jenkins for ownCloud [Wed, 17 Apr 2013 00:29:17 +0000 (02:29 +0200)]
[tx-robot] updated from transifex
icewind1991 [Tue, 16 Apr 2013 22:43:20 +0000 (15:43 -0700)]
Merge pull request #2951 from owncloud/no_personal_variables
No personal prefixes for variables.
Bernhard Posselt [Tue, 16 Apr 2013 20:56:14 +0000 (13:56 -0700)]
Merge pull request #2953 from jerrac/emailsavetimeout
Modified how the #lostpassword or #email fields save email addresses on ...
David Reagan [Tue, 16 Apr 2013 20:22:04 +0000 (13:22 -0700)]
Removed extra id from jquery selectors. Remove console.log call. Removed commented code.
David Reagan [Tue, 16 Apr 2013 20:03:41 +0000 (13:03 -0700)]
Modified how the #lostpassword or #email fields save email addresses on the Personal settings page. It now saves one second after the last keyup event, instead of after a blur event.
Michael Gapczynski [Tue, 16 Apr 2013 19:21:09 +0000 (12:21 -0700)]
Merge pull request #2943 from owncloud/always_load_cache_hooks_first
always connect file cache updater hooks first
kondou [Tue, 16 Apr 2013 17:16:48 +0000 (19:16 +0200)]
No personal prefixes for variables.
Sam Tuke [Tue, 16 Apr 2013 16:29:22 +0000 (18:29 +0200)]
Working on stream{} writing
Development snapshot
Bart Visscher [Tue, 16 Apr 2013 16:11:33 +0000 (09:11 -0700)]
Merge pull request #2887 from owncloud/l10n-caching
L10N: cache the result of findLanguage
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
Jörn Friedrich Dreyer [Tue, 16 Apr 2013 11:07:55 +0000 (13:07 +0200)]
always connect file cache updater hooks first
Björn Schießle [Mon, 15 Apr 2013 09:42:50 +0000 (11:42 +0200)]
add explenation of the expire function to the apps description
Björn Schießle [Mon, 15 Apr 2013 08:34:38 +0000 (10:34 +0200)]
write a info message to the log if a file gets removed from the trash bin automatically
kondou [Tue, 16 Apr 2013 07:54:34 +0000 (09:54 +0200)]
Hint to default data directory
not to before submitted data directory.
Thanks to bartv2 for the heads up.
Jenkins for ownCloud [Tue, 16 Apr 2013 00:17:30 +0000 (02:17 +0200)]
[tx-robot] updated from transifex
Bernhard Posselt [Mon, 15 Apr 2013 21:46:51 +0000 (14:46 -0700)]
Merge pull request #2934 from owncloud/shorten_css_colorcodes
Shorten CSS colorcodes
Thomas Tanghus [Mon, 15 Apr 2013 20:42:35 +0000 (13:42 -0700)]
Merge pull request #2769 from owncloud/octemplate
Add octemplate jQuery plugin
Thomas Tanghus [Mon, 15 Apr 2013 20:10:29 +0000 (22:10 +0200)]
Updated docs.
kondou [Mon, 15 Apr 2013 19:07:45 +0000 (21:07 +0200)]
Shorten CSS colorcodes
Only need to be three digits.