]>
source.dussan.org Git - nextcloud-server.git/log
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
Robin Appelman [Thu, 25 Apr 2013 22:00:18 +0000 (00:00 +0200)]
Cache: seperate handing of numeric storage id's to it's own class
Florin Peter [Thu, 25 Apr 2013 21:24:07 +0000 (23:24 +0200)]
fix share for renamed or moved files
Morris Jobke [Thu, 25 Apr 2013 21:10:16 +0000 (14:10 -0700)]
Merge pull request #3098 from jerrac/displaynamesaveontimeout
Florin Peter [Thu, 25 Apr 2013 20:49:47 +0000 (22:49 +0200)]
implement postRename
Florin Peter [Thu, 25 Apr 2013 20:43:15 +0000 (22:43 +0200)]
added post rename proxy
Florin Peter [Thu, 25 Apr 2013 18:23:54 +0000 (20:23 +0200)]
webdav fix for file chunking
icewind1991 [Thu, 25 Apr 2013 15:07:07 +0000 (08:07 -0700)]
Merge pull request #3132 from owncloud/mount-setupfs
Robin Appelman [Thu, 25 Apr 2013 14:56:48 +0000 (16:56 +0200)]
Have the filecache updater testcase clean the filesystem properly
Robin Appelman [Thu, 25 Apr 2013 14:11:48 +0000 (16:11 +0200)]
Make sure the filesystem is initialized when searching for mounts
Florin Peter [Thu, 25 Apr 2013 13:21:11 +0000 (15:21 +0200)]
fixed webdav errors, now webdav up - and downloads are full working
Florin Peter [Thu, 25 Apr 2013 13:20:06 +0000 (15:20 +0200)]
added unencrypted file size to file cache
Florin Peter [Thu, 25 Apr 2013 12:56:11 +0000 (14:56 +0200)]
fixed file_proxy handling
Lukas Reschke [Thu, 25 Apr 2013 11:27:08 +0000 (14:27 +0300)]
Correct the parameter description
Lukas Reschke [Thu, 25 Apr 2013 11:20:32 +0000 (14:20 +0300)]
Correct function description
Thomas Tanghus [Thu, 25 Apr 2013 10:18:52 +0000 (03:18 -0700)]
Merge pull request #3126 from owncloud/json-utf8
Bernhard Posselt [Thu, 25 Apr 2013 09:36:41 +0000 (11:36 +0200)]
use utf-8 encoding for json
Bart Visscher [Thu, 25 Apr 2013 08:21:59 +0000 (01:21 -0700)]
Merge pull request #3094 from owncloud/log-ajax
Tom Needham [Thu, 25 Apr 2013 00:08:11 +0000 (01:08 +0100)]
Correct the api response when both a shipped app and/or a third party app fail
Jenkins for ownCloud [Wed, 24 Apr 2013 23:55:56 +0000 (01:55 +0200)]
[tx-robot] updated from transifex
Thomas Tanghus [Wed, 24 Apr 2013 20:33:05 +0000 (13:33 -0700)]
Merge pull request #2993 from owncloud/resolve_apps_lib_path
Lukas Reschke [Wed, 24 Apr 2013 19:39:04 +0000 (22:39 +0300)]
Remove uneeded link
raghunayyar [Wed, 24 Apr 2013 18:17:39 +0000 (23:47 +0530)]
Clubbing Exact styles together.
Lukas Reschke [Wed, 24 Apr 2013 17:55:38 +0000 (10:55 -0700)]
Merge pull request #3108 from owncloud/fileactions-order
Lukas Reschke [Wed, 24 Apr 2013 16:47:38 +0000 (18:47 +0200)]
Add an update notification on every page for admin users
Raghu Nayyar [Wed, 24 Apr 2013 16:33:37 +0000 (09:33 -0700)]
Merge pull request #3096 from owncloud/add_missing_space_for_new_groups
Jenkins for ownCloud [Wed, 24 Apr 2013 16:31:36 +0000 (18:31 +0200)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Wed, 24 Apr 2013 15:46:20 +0000 (17:46 +0200)]
[tx-robot] updated from transifex
icewind1991 [Wed, 24 Apr 2013 15:18:10 +0000 (08:18 -0700)]
Merge pull request #3112 from owncloud/markdown-mimetype
icewind1991 [Wed, 24 Apr 2013 15:17:42 +0000 (08:17 -0700)]
Merge pull request #3111 from owncloud/csp-audio
Lukas Reschke [Wed, 24 Apr 2013 15:02:12 +0000 (08:02 -0700)]
Merge pull request #3106 from IMM0rtalis/xframe_restriction_config
Robin Appelman [Wed, 24 Apr 2013 14:54:34 +0000 (16:54 +0200)]
Add markdown to mimetype list
Morris Jobke [Wed, 24 Apr 2013 14:47:14 +0000 (07:47 -0700)]
Merge pull request #3109 from owncloud/fix-2928
projects / nextcloud-server.git / log