]>
source.dussan.org Git - nextcloud-server.git/log
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
Sam Tuke [Wed, 8 May 2013 14:22:08 +0000 (16:22 +0200)]
Added pre_share hook
Florin Peter [Tue, 7 May 2013 20:56:59 +0000 (22:56 +0200)]
added test for share folder
Florin Peter [Tue, 7 May 2013 20:22:05 +0000 (22:22 +0200)]
added test for re-share
Florin Peter [Tue, 7 May 2013 20:19:58 +0000 (22:19 +0200)]
Merge branch 'files_encryption' of https://github.com/owncloud/core into files_encryption
Florin Peter [Tue, 7 May 2013 20:19:48 +0000 (22:19 +0200)]
fix for tearDownFS, after filesystem::tearDown() the root is not mounted
Sam Tuke [Tue, 7 May 2013 15:16:16 +0000 (17:16 +0200)]
Made code formatting of new methods more consistent
Sam Tuke [Tue, 7 May 2013 14:17:38 +0000 (16:17 +0200)]
Added facility to manually encrypt all files from personal settings
Florin Peter [Tue, 7 May 2013 11:43:34 +0000 (13:43 +0200)]
test for share is now able to run with autotest.sh
Florin Peter [Tue, 7 May 2013 11:42:49 +0000 (13:42 +0200)]
fix for wrong file infos
Florin Peter [Tue, 7 May 2013 11:42:08 +0000 (13:42 +0200)]
fix empty path
Florin Peter [Mon, 6 May 2013 19:16:42 +0000 (21:16 +0200)]
added test for share
Florin Peter [Mon, 6 May 2013 19:15:25 +0000 (21:15 +0200)]
fix file info put on stream
Florin Peter [Mon, 6 May 2013 19:14:59 +0000 (21:14 +0200)]
Florin Peter [Sun, 5 May 2013 21:41:42 +0000 (23:41 +0200)]
handling for re-share and re-unshare should work now
Florin Peter [Sun, 5 May 2013 21:41:04 +0000 (23:41 +0200)]
improved pre_unshare and post_unshare hook
Sam Tuke [Sat, 4 May 2013 14:14:38 +0000 (16:14 +0200)]
Added support for user-specified password for adminRecovery account in admin settings page
Florin Peter [Sat, 4 May 2013 01:37:22 +0000 (03:37 +0200)]
fixed re-share problems
Björn Schießle [Fri, 3 May 2013 15:14:43 +0000 (17:14 +0200)]
make sure to find the correct path for shared files
Björn Schießle [Fri, 3 May 2013 14:33:18 +0000 (16:33 +0200)]
remove encryption keys if a file gets deleted permanently
Björn Schießle [Fri, 3 May 2013 13:18:05 +0000 (15:18 +0200)]
disable proxys before copying files to the trash bin
Björn Schießle [Fri, 3 May 2013 12:03:42 +0000 (14:03 +0200)]
get original path in case of shared files when restoring file from trash bin
Björn Schießle [Fri, 3 May 2013 11:00:04 +0000 (13:00 +0200)]
get original path in case of shared files
Sam Tuke [Wed, 1 May 2013 17:18:31 +0000 (19:18 +0200)]
Fixed recoveryadmin settings in user and admin settings pages (js, templates, ajax)
Florin Peter [Wed, 1 May 2013 09:04:40 +0000 (11:04 +0200)]
fixed re-share problems
Florin Peter [Wed, 1 May 2013 07:31:26 +0000 (09:31 +0200)]
Merge branch 'master' into files_encryption
Jenkins for ownCloud [Wed, 1 May 2013 00:02:59 +0000 (02:02 +0200)]
[tx-robot] updated from transifex
Florin Peter [Wed, 1 May 2013 00:01:16 +0000 (02:01 +0200)]
fix duplicate login behavior if user not setup
Florin Peter [Tue, 30 Apr 2013 23:52:06 +0000 (01:52 +0200)]
merged files_trashbin
Florin Peter [Tue, 30 Apr 2013 23:43:56 +0000 (01:43 +0200)]
fixed some tests
Florin Peter [Tue, 30 Apr 2013 23:38:06 +0000 (01:38 +0200)]
revert changes to
fbbc76f281f50afa3072d99e4e0d413df835b3d3 because master is very unstable right now
Florin Peter [Tue, 30 Apr 2013 22:09:55 +0000 (00:09 +0200)]
fixed public-keys mount point error
Florin Peter [Tue, 30 Apr 2013 21:58:53 +0000 (23:58 +0200)]
fixed tests after merge against master
Florin Peter [Tue, 30 Apr 2013 18:53:56 +0000 (20:53 +0200)]
Merge branch 'master' into files_encryption to get the latest files_trashbin app
Florin Peter [Tue, 30 Apr 2013 18:44:42 +0000 (20:44 +0200)]
fix for sharing files
FlorinPeter [Tue, 30 Apr 2013 18:39:21 +0000 (11:39 -0700)]
Merge pull request #3156 from owncloud/trashbin_for_encryption_keys_against_master
FlorinPeter [Tue, 30 Apr 2013 00:05:41 +0000 (17:05 -0700)]
Merge pull request #3169 from owncloud/fix_infinite_loop_for_file_cache
Jenkins for ownCloud [Mon, 29 Apr 2013 23:59:18 +0000 (01:59 +0200)]
[tx-robot] updated from transifex
Florin Peter [Mon, 29 Apr 2013 23:54:19 +0000 (01:54 +0200)]
improved key length tests
Florin Peter [Mon, 29 Apr 2013 23:35:46 +0000 (01:35 +0200)]
fixed tests, now tests should work via autotest.sh
Florin Peter [Mon, 29 Apr 2013 22:34:05 +0000 (00:34 +0200)]
rename folder to tests
Florin Peter [Mon, 29 Apr 2013 21:41:49 +0000 (23:41 +0200)]
fixed test for crypt and keymanager
Florin Peter [Mon, 29 Apr 2013 21:37:08 +0000 (23:37 +0200)]
fixed missing parameter
Florin Peter [Mon, 29 Apr 2013 13:43:48 +0000 (15:43 +0200)]
fix for infinite loop causing on files_encryption branch when testing "apps/files_encryption/test/crypt.php" on Method testSymmetricStreamEncryptShortFileContent
Jan-Christoph Borchardt [Mon, 29 Apr 2013 11:39:51 +0000 (04:39 -0700)]
Merge pull request #3159 from owncloud/reword
Morris Jobke [Mon, 29 Apr 2013 10:58:44 +0000 (03:58 -0700)]
Merge pull request #3160 from owncloud/remove-onclick
Florin Peter [Mon, 29 Apr 2013 07:12:43 +0000 (09:12 +0200)]
improvements for test testSymmetricStreamEncryptShortFileContent
Jenkins for ownCloud [Mon, 29 Apr 2013 00:00:26 +0000 (02:00 +0200)]
[tx-robot] updated from transifex
Florin Peter [Sun, 28 Apr 2013 23:43:59 +0000 (01:43 +0200)]
speed improvement
Lukas Reschke [Sun, 28 Apr 2013 21:28:41 +0000 (23:28 +0200)]
It's a class
Lukas Reschke [Sun, 28 Apr 2013 21:26:07 +0000 (23:26 +0200)]
Remove uneeded onclick handler
Lukas Reschke [Sun, 28 Apr 2013 21:25:58 +0000 (23:25 +0200)]
Move onclick handler
Lukas Reschke [Sun, 28 Apr 2013 21:13:23 +0000 (00:13 +0300)]
Reword sentence and move HTML out of translation
Florin Peter [Sat, 27 Apr 2013 21:51:26 +0000 (23:51 +0200)]
delete and restore of versions and share-keys now works
Florin Peter [Fri, 26 Apr 2013 22:15:46 +0000 (00:15 +0200)]
added handling for share-keys
this works only with latest files_encryption branch up from
813641e6e86601cc73da0f00d8430da62e872180
Florin Peter [Mon, 22 Apr 2013 01:37:55 +0000 (03:37 +0200)]
restore fixed
Florin Peter [Fri, 19 Apr 2013 21:21:06 +0000 (23:21 +0200)]
fixed some problems and broken code
Björn Schießle [Fri, 19 Apr 2013 08:35:32 +0000 (10:35 +0200)]
restore encryption keys from trash bin (development snapshot)
Björn Schießle [Fri, 19 Apr 2013 08:31:42 +0000 (10:31 +0200)]
move encryption keys to trash bin
Frank Karlitschek [Sun, 28 Apr 2013 10:51:21 +0000 (03:51 -0700)]
Merge pull request #3154 from owncloud/fix_3153
Jenkins for ownCloud [Sun, 28 Apr 2013 00:01:38 +0000 (02:01 +0200)]
[tx-robot] updated from transifex
Florin Peter [Sat, 27 Apr 2013 21:34:25 +0000 (23:34 +0200)]
improved file size
Florin Peter [Sat, 27 Apr 2013 21:02:42 +0000 (23:02 +0200)]
added self healing if file get remove from file cache
Florin Peter [Sat, 27 Apr 2013 18:23:30 +0000 (20:23 +0200)]
removed previous added post rename FileProxy hook
Florin Peter [Sat, 27 Apr 2013 18:22:38 +0000 (20:22 +0200)]
check if file exists before fixing file size
Florin Peter [Sat, 27 Apr 2013 18:21:46 +0000 (20:21 +0200)]
removed preRename and moved postRename to hooks.php
Florin Peter [Sat, 27 Apr 2013 18:18:57 +0000 (20:18 +0200)]
fix reusing keys
Florin Peter [Sat, 27 Apr 2013 18:18:05 +0000 (20:18 +0200)]
added filesystem post rename hook
Lukas Reschke [Sat, 27 Apr 2013 17:05:06 +0000 (10:05 -0700)]
Merge pull request #3121 from owncloud/ocs_fix_api_response
Tom Needham [Sat, 27 Apr 2013 16:52:37 +0000 (17:52 +0100)]
Fix typo
Tom Needham [Sat, 27 Apr 2013 16:51:36 +0000 (17:51 +0100)]
Code style for ocs/routes.php
Tom Needham [Sat, 27 Apr 2013 16:45:44 +0000 (17:45 +0100)]
Change app identifier for core api routes
Tom Needham [Sat, 27 Apr 2013 16:45:23 +0000 (17:45 +0100)]
Use correct variable when checking auth
Morris Jobke [Sat, 27 Apr 2013 15:19:08 +0000 (08:19 -0700)]
Merge pull request #3146 from owncloud/restart-hint
Morris Jobke [Sat, 27 Apr 2013 15:14:40 +0000 (08:14 -0700)]
Merge pull request #3145 from owncloud/magic_quotes_gpc-check
Raghu Nayyar [Sat, 27 Apr 2013 04:12:38 +0000 (21:12 -0700)]
Merge pull request #3114 from owncloud/update-notification
Jenkins for ownCloud [Sat, 27 Apr 2013 00:24:29 +0000 (02:24 +0200)]
[tx-robot] updated from transifex
Florin Peter [Fri, 26 Apr 2013 22:05:20 +0000 (00:05 +0200)]
improved file size
Florin Peter [Fri, 26 Apr 2013 15:39:13 +0000 (17:39 +0200)]
Merge remote-tracking branch 'core/master' into files_encryption
Robin Appelman [Fri, 26 Apr 2013 15:30:55 +0000 (17:30 +0200)]
Code style
Bart Visscher [Fri, 26 Apr 2013 14:32:58 +0000 (16:32 +0200)]
Add check for Magic Quotes
Bart Visscher [Fri, 26 Apr 2013 14:21:56 +0000 (16:21 +0200)]
web_server_restart needs to be true to display the hint
icewind1991 [Fri, 26 Apr 2013 13:55:21 +0000 (06:55 -0700)]
Merge pull request #3136 from owncloud/mount-cleanup
Bart Visscher [Fri, 26 Apr 2013 13:30:59 +0000 (06:30 -0700)]
Merge pull request #3002 from owncloud/priorize_common_languages
Bart Visscher [Fri, 26 Apr 2013 13:20:39 +0000 (06:20 -0700)]
Merge pull request #3026 from owncloud/cli-no-session
Bart Visscher [Fri, 26 Apr 2013 12:56:09 +0000 (05:56 -0700)]
Merge pull request #3028 from owncloud/simplyfy-resource-locating
Robin Appelman [Fri, 19 Apr 2013 13:18:27 +0000 (15:18 +0200)]
Don't start the session when in cli mode
Bart Visscher [Fri, 26 Apr 2013 12:51:07 +0000 (05:51 -0700)]
Merge pull request #2955 from owncloud/displaynames-numeric
Bart Visscher [Fri, 26 Apr 2013 12:33:09 +0000 (05:33 -0700)]
Merge pull request #2783 from Kondou-ger/improve_passwordresetscreen
Bart Visscher [Fri, 19 Apr 2013 14:08:43 +0000 (16:08 +0200)]
Simplify app js locating for layout pages
Bart Visscher [Fri, 19 Apr 2013 09:08:26 +0000 (11:08 +0200)]
Simplify app css locating for layout pages
Bart Visscher [Fri, 26 Apr 2013 12:10:49 +0000 (05:10 -0700)]
Merge pull request #1872 from herbrechtsmeier/forcessl-with-ssl-proxy
Bart Visscher [Fri, 26 Apr 2013 08:59:20 +0000 (01:59 -0700)]
Merge pull request #2787 from owncloud/fix-password-autocomplete-2632
Jenkins for ownCloud [Fri, 26 Apr 2013 08:06:52 +0000 (10:06 +0200)]
[tx-robot] updated from transifex
Thomas Mueller [Fri, 26 Apr 2013 07:59:00 +0000 (09:59 +0200)]
adding resource type
Jenkins for ownCloud [Thu, 25 Apr 2013 23:58:21 +0000 (01:58 +0200)]
[tx-robot] updated from transifex
Robin Appelman [Thu, 25 Apr 2013 22:01:36 +0000 (00:01 +0200)]
Further seperation of mount management logic
projects / nextcloud-server.git / log