]>
source.dussan.org Git - nextcloud-server.git/log
Björn Schießle [Wed, 15 May 2013 09:42:41 +0000 (11:42 +0200)]
Merge branch 'files_encryption' of github.com:owncloud/core into files_encryption
Björn Schießle [Wed, 15 May 2013 09:42:22 +0000 (11:42 +0200)]
only let the user change the recovery admin settings if a key passwords was entered.
Florin Peter [Wed, 15 May 2013 08:52:23 +0000 (10:52 +0200)]
workaround for blank page need an other solution
Florin Peter [Wed, 15 May 2013 08:21:56 +0000 (10:21 +0200)]
improved files_encryption tests
Florin Peter [Wed, 15 May 2013 08:20:52 +0000 (10:20 +0200)]
removed FileProxy from test
Florin Peter [Wed, 15 May 2013 08:20:19 +0000 (10:20 +0200)]
merge changes for files_encryption
Florin Peter [Wed, 15 May 2013 08:19:38 +0000 (10:19 +0200)]
fix for losing mount point "/"
Florin Peter [Wed, 15 May 2013 08:18:25 +0000 (10:18 +0200)]
Merge branch 'files_encryption' of https://github.com/owncloud/core into files_encryption
Florin Peter [Wed, 15 May 2013 01:22:06 +0000 (03:22 +0200)]
Merge branch 'master' into files_encryption
Florin Peter [Wed, 15 May 2013 00:38:08 +0000 (02:38 +0200)]
improved tests and added new tests for file rename and move
Florin Peter [Wed, 15 May 2013 00:36:23 +0000 (02:36 +0200)]
disabled FileProxy in Keymanager::getPrivateKey
Florin Peter [Wed, 15 May 2013 00:34:36 +0000 (02:34 +0200)]
prevent of infinite loop with FileProxy
Florin Peter [Wed, 15 May 2013 00:32:27 +0000 (02:32 +0200)]
added setter for filesystem view
Jenkins for ownCloud [Wed, 15 May 2013 00:02:45 +0000 (02:02 +0200)]
[tx-robot] updated from transifex
Florin Peter [Tue, 14 May 2013 21:19:16 +0000 (23:19 +0200)]
fix for move file to an empty folder
Florin Peter [Tue, 14 May 2013 20:32:39 +0000 (22:32 +0200)]
fix for Allowed memory size of xx bytes exhausted while reading big files
Thomas Müller [Tue, 14 May 2013 20:13:16 +0000 (13:13 -0700)]
Merge pull request #2821 from owncloud/fix-2159-rename-to-shared
Florin Peter [Tue, 14 May 2013 19:29:24 +0000 (21:29 +0200)]
fix for zero size files
Björn Schießle [Tue, 14 May 2013 18:06:53 +0000 (20:06 +0200)]
fix history template, print_unescaped() needs to include closing tags
Florin Peter [Tue, 14 May 2013 18:11:07 +0000 (20:11 +0200)]
fix for public link share
Raghu Nayyar [Tue, 14 May 2013 16:52:54 +0000 (09:52 -0700)]
Merge pull request #3338 from owncloud/button_color_fix
Morris Jobke [Tue, 14 May 2013 13:16:30 +0000 (06:16 -0700)]
Merge pull request #3330 from owncloud/preselect_filename_on_rename
Morris Jobke [Tue, 14 May 2013 10:49:23 +0000 (12:49 +0200)]
[files] add private declaration of $view
raghunayyar [Tue, 14 May 2013 05:37:12 +0000 (11:07 +0530)]
color change to crumb elements as well.
Jenkins for ownCloud [Tue, 14 May 2013 00:04:01 +0000 (02:04 +0200)]
[tx-robot] updated from transifex
Florin Peter [Mon, 13 May 2013 22:00:20 +0000 (00:00 +0200)]
added test for public shared file via link
Florin Peter [Mon, 13 May 2013 20:49:27 +0000 (22:49 +0200)]
added post_deleteUser hook for cleanup public key
Florin Peter [Mon, 13 May 2013 20:34:11 +0000 (22:34 +0200)]
added post_createUser hook
Florin Peter [Mon, 13 May 2013 19:24:59 +0000 (21:24 +0200)]
added handling for public file access via files_sharing link
Florin Peter [Mon, 13 May 2013 19:22:59 +0000 (21:22 +0200)]
removed var_dump
raghunayyar [Mon, 13 May 2013 17:42:05 +0000 (23:12 +0530)]
Keeping Font Colors Consistant on the headers.
Björn Schießle [Mon, 13 May 2013 15:40:57 +0000 (17:40 +0200)]
don't handle public share keys in lib/public/share.php but in apps/files_encryption/lib/util.php instead
Björn Schießle [Mon, 13 May 2013 15:26:21 +0000 (17:26 +0200)]
don't create a recovery user, only generate recovery key similar to the public link share key
Morris Jobke [Mon, 13 May 2013 15:12:57 +0000 (08:12 -0700)]
Merge pull request #3303 from owncloud/update_etags_on_restore
Bernhard Posselt [Mon, 13 May 2013 13:56:07 +0000 (06:56 -0700)]
Merge pull request #3329 from owncloud/increase_lock_timeout
Jörn Friedrich Dreyer [Mon, 13 May 2013 13:54:45 +0000 (15:54 +0200)]
peselect filename without extension on rename
Björn Schießle [Mon, 13 May 2013 13:45:30 +0000 (15:45 +0200)]
if file was shared to user than userIds is just the users Id
Björn Schießle [Mon, 13 May 2013 13:15:35 +0000 (15:15 +0200)]
generate random key name for share key to avoid name conflicts
Lukas Reschke [Mon, 13 May 2013 12:45:38 +0000 (05:45 -0700)]
Merge pull request #3326 from owncloud/fix-3321
Björn Schießle [Mon, 13 May 2013 12:28:45 +0000 (14:28 +0200)]
use preShare hook only to check if all pub keys are available and the postShare hook to finaly update the shareKeys if the file was shared successfully
Lukas Reschke [Mon, 13 May 2013 12:23:56 +0000 (14:23 +0200)]
Add requesttoken to guest view
Björn Schießle [Mon, 13 May 2013 08:48:06 +0000 (10:48 +0200)]
Merge branch 'master' into update_etags_on_restore
Morris Jobke [Mon, 13 May 2013 07:42:13 +0000 (00:42 -0700)]
Merge pull request #3235 from NCTU-NBA/pr-langcode
Frank Karlitschek [Mon, 13 May 2013 00:42:18 +0000 (02:42 +0200)]
Set the SQLite database lock timeout to 60 seconds which is the default in PHP anyways. I don't know why the MDB2 driver has this hardcoded to 0.1 seconds. This potentially fixes a lot of SQLite database lock problems and stuck in maintainance mode during upgrade issues.
Jenkins for ownCloud [Mon, 13 May 2013 00:10:20 +0000 (02:10 +0200)]
[tx-robot] updated from transifex
Pellaeon Lin [Sun, 12 May 2013 14:32:22 +0000 (22:32 +0800)]
Merge remote-tracking branch 'upstream/master' into pr-langcode
Morris Jobke [Sun, 12 May 2013 11:02:01 +0000 (13:02 +0200)]
[files] fix mock creation and remove hardcoded 'require' statement
Morris Jobke [Sun, 12 May 2013 10:28:18 +0000 (03:28 -0700)]
Merge pull request #3311 from owncloud/disable_mbstring.func_overload
Morris Jobke [Wed, 8 May 2013 09:56:59 +0000 (11:56 +0200)]
[files] rename lib to "App"
Morris Jobke [Tue, 7 May 2013 14:04:12 +0000 (16:04 +0200)]
[files] ownCloud typo
Morris Jobke [Tue, 7 May 2013 13:24:26 +0000 (15:24 +0200)]
[files] rename test class and add rename test
Morris Jobke [Tue, 7 May 2013 13:21:43 +0000 (15:21 +0200)]
[files] remove realpath in test
Morris Jobke [Tue, 7 May 2013 11:37:20 +0000 (13:37 +0200)]
[files] rename tests
Morris Jobke [Tue, 7 May 2013 11:36:29 +0000 (13:36 +0200)]
[files] remove normalizePath on rename and dependency injection
Morris Jobke [Mon, 6 May 2013 18:59:26 +0000 (20:59 +0200)]
[files] kill stripslashes
Morris Jobke [Mon, 6 May 2013 18:53:41 +0000 (20:53 +0200)]
[files] fix typos
Morris Jobke [Mon, 6 May 2013 18:45:04 +0000 (20:45 +0200)]
[files] refactoring
Morris Jobke [Tue, 9 Apr 2013 11:54:01 +0000 (13:54 +0200)]
string comparision
Morris Jobke [Tue, 9 Apr 2013 11:44:54 +0000 (13:44 +0200)]
wrong root dir name
Morris Jobke [Tue, 9 Apr 2013 11:31:12 +0000 (13:31 +0200)]
fix allowed rename of folder in root directory to reserved name "Shared"
Lukas Reschke [Sun, 12 May 2013 09:40:30 +0000 (02:40 -0700)]
Merge pull request #3290 from owncloud/config-data
Thomas Tanghus [Sun, 12 May 2013 08:56:32 +0000 (10:56 +0200)]
disable mbstring.func_overload in setup
Lukas Reschke [Sat, 11 May 2013 19:08:26 +0000 (21:08 +0200)]
Typo
Lukas Reschke [Sat, 11 May 2013 19:07:05 +0000 (21:07 +0200)]
Get config from template
Jenkins for ownCloud [Sun, 12 May 2013 00:05:29 +0000 (02:05 +0200)]
[tx-robot] updated from transifex
icewind1991 [Sat, 11 May 2013 21:22:08 +0000 (14:22 -0700)]
Merge pull request #3309 from owncloud/no_explicit_autoload
Thomas Tanghus [Sat, 11 May 2013 20:44:45 +0000 (22:44 +0200)]
Use new autoloader class
Morris Jobke [Sat, 11 May 2013 09:01:19 +0000 (02:01 -0700)]
Merge pull request #3296 from owncloud/disable_mbstring.func_overload
Florin Peter [Fri, 10 May 2013 23:03:43 +0000 (01:03 +0200)]
added handling for sharing with link
Florin Peter [Fri, 10 May 2013 22:25:32 +0000 (00:25 +0200)]
sharing with group should work now
Florin Peter [Fri, 10 May 2013 22:23:30 +0000 (00:23 +0200)]
fix for webdav
Florin Peter [Fri, 10 May 2013 22:22:58 +0000 (00:22 +0200)]
fix for accessing non object
Jan-Christoph Borchardt [Fri, 10 May 2013 15:41:27 +0000 (08:41 -0700)]
Merge pull request #3257 from owncloud/fix_3251
Morris Jobke [Fri, 10 May 2013 14:53:04 +0000 (07:53 -0700)]
Merge pull request #3283 from owncloud/move-legacy-fs
icewind1991 [Fri, 10 May 2013 13:15:34 +0000 (06:15 -0700)]
Merge pull request #3304 from owncloud/fix_bypass_fo_file_blacklist
Björn Schießle [Fri, 10 May 2013 10:05:11 +0000 (12:05 +0200)]
touch() needs to be performed relative to user/files otherwise ownCloud doesn't execute the hooks which means that etags aren't updated properly
Jörn Friedrich Dreyer [Fri, 10 May 2013 10:01:50 +0000 (12:01 +0200)]
don't emit rename hooks on partial file renames
Jörn Friedrich Dreyer [Fri, 10 May 2013 10:00:13 +0000 (12:00 +0200)]
rename isIgnoredFile to isPartialFile, remove check of blacklisted files in isPartialFile, correct usage of isPartialFile and isFileBlacklisted
Thomas Tanghus [Thu, 9 May 2013 23:13:59 +0000 (02:13 +0300)]
disable mbstring.func_overload
Florin Peter [Thu, 9 May 2013 23:00:24 +0000 (01:00 +0200)]
added test for re-share folder
Florin Peter [Thu, 9 May 2013 21:22:46 +0000 (23:22 +0200)]
fix for autotest.sh
Florin Peter [Thu, 9 May 2013 21:22:22 +0000 (23:22 +0200)]
added helper
Florin Peter [Thu, 9 May 2013 21:21:39 +0000 (23:21 +0200)]
fix for accessing non object
kondou [Tue, 7 May 2013 04:27:52 +0000 (06:27 +0200)]
Fix #3251
Michael Gapczynski [Thu, 9 May 2013 20:06:40 +0000 (13:06 -0700)]
Merge pull request #3277 from owncloud/fix-change-password
Florin Peter [Thu, 9 May 2013 17:37:26 +0000 (19:37 +0200)]
improved tests and include helper
Florin Peter [Thu, 9 May 2013 17:36:18 +0000 (19:36 +0200)]
added helper class and moved hook registration to it
Sam Tuke [Thu, 9 May 2013 16:24:07 +0000 (18:24 +0200)]
Fixes to code formatting and indentation
Sam Tuke [Thu, 9 May 2013 16:16:59 +0000 (18:16 +0200)]
Improvements to code formatting & indentation
Sam Tuke [Thu, 9 May 2013 16:09:20 +0000 (18:09 +0200)]
Implemented initial recoveryAdmin functionality in crypto file proxy
Sam Tuke [Thu, 9 May 2013 12:43:06 +0000 (14:43 +0200)]
Fixed bugs with pre_share hook usage
Björn Schießle [Wed, 8 May 2013 20:57:08 +0000 (22:57 +0200)]
don't call correctFolder() in touchHook, it will be called later in the writeUpdate()
Björn Schießle [Wed, 8 May 2013 14:32:29 +0000 (16:32 +0200)]
rename a file if it gets restored so that it no longer exists as a version. Otherwise it can happen that the expire() function removes all other versions so that we end up with only one version which is exactly the same as the original file
Björn Schießle [Wed, 8 May 2013 13:49:45 +0000 (15:49 +0200)]
update etag for for the touched file
Björn Schießle [Wed, 8 May 2013 13:05:03 +0000 (15:05 +0200)]
touch file relative to users file folder, otherwise the hooks will be ignored
Robin Appelman [Wed, 8 May 2013 14:48:47 +0000 (16:48 +0200)]
Move legacy filesystem classes
Sam Tuke [Wed, 8 May 2013 14:22:08 +0000 (16:22 +0200)]
Added pre_share hook
FlorinPeter [Wed, 8 May 2013 12:43:54 +0000 (05:43 -0700)]
Merge pull request #3271 from owncloud/fix_for_util_tearDownFS
Björn Schießle [Wed, 8 May 2013 10:38:09 +0000 (12:38 +0200)]
fix inconsistent post parameters in change password operation
Bart Visscher [Wed, 8 May 2013 07:08:31 +0000 (00:08 -0700)]
Merge pull request #3272 from owncloud/legacy-autoloader
projects / nextcloud-server.git / log