]> source.dussan.org Git - nextcloud-server.git/log
nextcloud-server.git
11 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Sun, 12 May 2013 00:05:29 +0000 (02:05 +0200)]
[tx-robot] updated from transifex

11 years agoMerge pull request #3309 from owncloud/no_explicit_autoload
icewind1991 [Sat, 11 May 2013 21:22:08 +0000 (14:22 -0700)]
Merge pull request #3309 from owncloud/no_explicit_autoload

Use new autoloader class in tests

11 years agoUse new autoloader class
Thomas Tanghus [Sat, 11 May 2013 20:44:45 +0000 (22:44 +0200)]
Use new autoloader class

11 years agoMerge pull request #3296 from owncloud/disable_mbstring.func_overload
Morris Jobke [Sat, 11 May 2013 09:01:19 +0000 (02:01 -0700)]
Merge pull request #3296 from owncloud/disable_mbstring.func_overload

disable mbstring.func_overload

11 years agoMerge pull request #3257 from owncloud/fix_3251
Jan-Christoph Borchardt [Fri, 10 May 2013 15:41:27 +0000 (08:41 -0700)]
Merge pull request #3257 from owncloud/fix_3251

Fix 3251

11 years agoMerge pull request #3283 from owncloud/move-legacy-fs
Morris Jobke [Fri, 10 May 2013 14:53:04 +0000 (07:53 -0700)]
Merge pull request #3283 from owncloud/move-legacy-fs

Move legacy filesystem classes

11 years agoMerge pull request #3304 from owncloud/fix_bypass_fo_file_blacklist
icewind1991 [Fri, 10 May 2013 13:15:34 +0000 (06:15 -0700)]
Merge pull request #3304 from owncloud/fix_bypass_fo_file_blacklist

Properly check file blacklist

11 years agodon't emit rename hooks on partial file renames
Jörn Friedrich Dreyer [Fri, 10 May 2013 10:01:50 +0000 (12:01 +0200)]
don't emit rename hooks on partial file renames

11 years agorename isIgnoredFile to isPartialFile, remove check of blacklisted files in isPartial...
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

11 years agodisable mbstring.func_overload
Thomas Tanghus [Thu, 9 May 2013 23:13:59 +0000 (02:13 +0300)]
disable mbstring.func_overload

11 years agoFix #3251
kondou [Tue, 7 May 2013 04:27:52 +0000 (06:27 +0200)]
Fix #3251

Using ksort now, instead of prefilling the commonlanguages array.

11 years agoMerge pull request #3277 from owncloud/fix-change-password
Michael Gapczynski [Thu, 9 May 2013 20:06:40 +0000 (13:06 -0700)]
Merge pull request #3277 from owncloud/fix-change-password

fix inconsistent post parameters in change password operation

11 years agodon't call correctFolder() in touchHook, it will be called later in the writeUpdate()
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()

11 years agorename a file if it gets restored so that it no longer exists as a version. Otherwise...
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

11 years agoupdate etag for for the touched file
Björn Schießle [Wed, 8 May 2013 13:49:45 +0000 (15:49 +0200)]
update etag for for the touched file

11 years agotouch file relative to users file folder, otherwise the hooks will be ignored
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

11 years agoMove legacy filesystem classes
Robin Appelman [Wed, 8 May 2013 14:48:47 +0000 (16:48 +0200)]
Move legacy filesystem classes

11 years agoMerge pull request #3271 from owncloud/fix_for_util_tearDownFS
FlorinPeter [Wed, 8 May 2013 12:43:54 +0000 (05:43 -0700)]
Merge pull request #3271 from owncloud/fix_for_util_tearDownFS

fix for tearDownFS, after filesystem::tearDown() in Util

11 years agofix inconsistent post parameters in change password operation
Björn Schießle [Wed, 8 May 2013 10:38:09 +0000 (12:38 +0200)]
fix inconsistent post parameters in change password operation

11 years agoMerge pull request #3272 from owncloud/legacy-autoloader
Bart Visscher [Wed, 8 May 2013 07:08:31 +0000 (00:08 -0700)]
Merge pull request #3272 from owncloud/legacy-autoloader

Move autoloader to it's own class

11 years agoAutoloader: fix loading app clases located in lib/
Robin Appelman [Tue, 7 May 2013 22:50:33 +0000 (00:50 +0200)]
Autoloader: fix loading app clases located in lib/

11 years agoAutoloader: test cases
Robin Appelman [Tue, 7 May 2013 21:08:36 +0000 (23:08 +0200)]
Autoloader: test cases

11 years agoAutoloader: load the 3rdparty libraries using prefixes
Robin Appelman [Tue, 7 May 2013 21:07:47 +0000 (23:07 +0200)]
Autoloader: load the 3rdparty libraries using prefixes

11 years agocheck for setlocale after setting up the paths to prevent autoloader confusion
Robin Appelman [Tue, 7 May 2013 20:53:07 +0000 (22:53 +0200)]
check for setlocale after setting up the paths to prevent autoloader confusion

11 years agoAutoloader: add support for custom namespace paths
Robin Appelman [Tue, 7 May 2013 20:39:35 +0000 (22:39 +0200)]
Autoloader: add support for custom namespace paths

11 years agoAutoloader: split getting the class paths and loading the class
Robin Appelman [Tue, 7 May 2013 20:26:55 +0000 (22:26 +0200)]
Autoloader: split getting the class paths and loading the class

11 years agofix for tearDownFS, after filesystem::tearDown() the root is not mounted
Florin Peter [Tue, 7 May 2013 20:19:48 +0000 (22:19 +0200)]
fix for tearDownFS, after filesystem::tearDown() the root is not mounted

11 years agoAllow disabling the global classpath in an autoloader
Robin Appelman [Tue, 7 May 2013 20:24:47 +0000 (22:24 +0200)]
Allow disabling the global classpath in an autoloader

11 years agoAllow the autoloader to try mutliple possible paths for each path
Robin Appelman [Tue, 7 May 2013 20:21:59 +0000 (22:21 +0200)]
Allow the autoloader to try mutliple possible paths for each path

11 years agoAdd per-autoloader classPath
Robin Appelman [Tue, 7 May 2013 20:19:00 +0000 (22:19 +0200)]
Add per-autoloader classPath

11 years agoMove autoloader to it's own class
Robin Appelman [Tue, 7 May 2013 20:16:02 +0000 (22:16 +0200)]
Move autoloader to it's own class

11 years agoMerge pull request #3050 from owncloud/===_and_!==_in_user_ldap-app
Bart Visscher [Tue, 7 May 2013 19:45:43 +0000 (12:45 -0700)]
Merge pull request #3050 from owncloud/===_and_!==_in_user_ldap-app

Use === and !== in user_ldap app

11 years agoMerge pull request #3044 from owncloud/backgroundwatcher
icewind1991 [Tue, 7 May 2013 17:00:00 +0000 (10:00 -0700)]
Merge pull request #3044 from owncloud/backgroundwatcher

Add a background job to watch for external filesystem changes

11 years agoMerge pull request #3025 from owncloud/move-file
Michael Gapczynski [Tue, 7 May 2013 14:52:57 +0000 (07:52 -0700)]
Merge pull request #3025 from owncloud/move-file

Cache: only look for child entires when doing a move operation when moving a folder

11 years agoMerge pull request #2813 from owncloud/improve-lib-check
Bart Visscher [Tue, 7 May 2013 13:12:40 +0000 (06:12 -0700)]
Merge pull request #2813 from owncloud/improve-lib-check

added correct check for gd and check for php-intl

11 years agoremove hard php-intl requirement
Morris Jobke [Tue, 7 May 2013 11:51:30 +0000 (13:51 +0200)]
remove hard php-intl requirement

11 years agoMerge pull request #3246 from owncloud/newfile-mimetype
Morris Jobke [Tue, 7 May 2013 08:53:43 +0000 (01:53 -0700)]
Merge pull request #3246 from owncloud/newfile-mimetype

Files: set the proper mimetype when creating a new text file

11 years agoallow to set quota to zero, issue #2696
Björn Schießle [Mon, 6 May 2013 09:43:50 +0000 (11:43 +0200)]
allow to set quota to zero, issue #2696

11 years agoMerge pull request #3245 from owncloud/use-$view
Lukas Reschke [Mon, 6 May 2013 16:20:18 +0000 (09:20 -0700)]
Merge pull request #3245 from owncloud/use-$view

Use the internal ownCloud view

11 years agoFiles: set the proper mimetype when creating a new text file
Robin Appelman [Mon, 6 May 2013 15:55:22 +0000 (17:55 +0200)]
Files: set the proper mimetype when creating a new text file

11 years agoUse $dir instead of $fullpath
Lukas Reschke [Mon, 6 May 2013 11:28:01 +0000 (14:28 +0300)]
Use $dir instead of $fullpath

11 years agoUse the internal ownCloud view
Lukas Reschke [Mon, 6 May 2013 10:43:23 +0000 (13:43 +0300)]
Use the internal ownCloud view

11 years agoLDAP: do not reset UUID attribute setting when guid is detected
Arthur Schiwon [Fri, 26 Apr 2013 13:02:05 +0000 (15:02 +0200)]
LDAP: do not reset UUID attribute setting when guid is detected

11 years agoMerge pull request #3120 from owncloud/ocs_properties
Bart Visscher [Mon, 6 May 2013 06:20:25 +0000 (23:20 -0700)]
Merge pull request #3120 from owncloud/ocs_properties

Allow subclassing of OC_OCS_Result class by changing properties from 'private' to 'protected'

11 years agoMerge pull request #3177 from owncloud/outerHTML_compatibility
Thomas Tanghus [Sat, 4 May 2013 19:27:24 +0000 (12:27 -0700)]
Merge pull request #3177 from owncloud/outerHTML_compatibility

Add compatibility function for outerHTML

11 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Sat, 4 May 2013 00:00:54 +0000 (02:00 +0200)]
[tx-robot] updated from transifex

11 years agoMerge pull request #3230 from owncloud/fix_ldap_cachekey
Bart Visscher [Fri, 3 May 2013 13:58:24 +0000 (06:58 -0700)]
Merge pull request #3230 from owncloud/fix_ldap_cachekey

LDAP: cachekey in set method needs to match with that one from get

11 years agoLDAP: cachekey in set method needs to match with that one from get
Arthur Schiwon [Fri, 3 May 2013 13:13:37 +0000 (15:13 +0200)]
LDAP: cachekey in set method needs to match with that one from get

11 years agoMerge pull request #3229 from owncloud/fix_3210
Bart Visscher [Fri, 3 May 2013 13:04:24 +0000 (06:04 -0700)]
Merge pull request #3229 from owncloud/fix_3210

LDAP: remove restriction from group names to be in line with core behavi...

11 years agoMerge pull request #3222 from owncloud/fix-3218
Bart Visscher [Fri, 3 May 2013 13:02:33 +0000 (06:02 -0700)]
Merge pull request #3222 from owncloud/fix-3218

Fix retrieving of mount points for shared storage, fix #3218

11 years agoMerge pull request #3201 from owncloud/own_sorting_for_priorized_languages
Bart Visscher [Fri, 3 May 2013 12:56:56 +0000 (05:56 -0700)]
Merge pull request #3201 from owncloud/own_sorting_for_priorized_languages

Sort priorized languages as defined in the array

11 years agoMerge pull request #2972 from AndreasErgenzinger/master
Bart Visscher [Fri, 3 May 2013 12:41:28 +0000 (05:41 -0700)]
Merge pull request #2972 from AndreasErgenzinger/master

Translations for themes

11 years agoMerge pull request #2491 from riso/xsendfile_fix_zip
Bart Visscher [Fri, 3 May 2013 12:37:01 +0000 (05:37 -0700)]
Merge pull request #2491 from riso/xsendfile_fix_zip

improved handling of xsendfile zip generation race condition

11 years agoLDAP: remove restriction from group names to be in line with core behaviour again
Arthur Schiwon [Fri, 3 May 2013 12:11:06 +0000 (14:11 +0200)]
LDAP: remove restriction from group names to be in line with core behaviour again

11 years agoFix retrieval of users with multiple backends
Arthur Schiwon [Tue, 30 Apr 2013 17:51:28 +0000 (19:51 +0200)]
Fix retrieval of users with multiple backends

11 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Fri, 3 May 2013 00:05:10 +0000 (02:05 +0200)]
[tx-robot] updated from transifex

11 years agoMerge pull request #3216 from owncloud/fix-api-3rdparty
Tom Needham [Thu, 2 May 2013 22:40:10 +0000 (15:40 -0700)]
Merge pull request #3216 from owncloud/fix-api-3rdparty

fix bug that would only return error responses for 3rdparty apps

11 years agoMerge pull request #3183 from miicha/patch-1
Thomas Müller [Thu, 2 May 2013 22:39:10 +0000 (15:39 -0700)]
Merge pull request #3183 from miicha/patch-1

fixing mimetype for "new" ms office formats

11 years agoMerge pull request #3212 from owncloud/stop-links
Morris Jobke [Thu, 2 May 2013 22:29:00 +0000 (15:29 -0700)]
Merge pull request #3212 from owncloud/stop-links

Don't display shared links if disabled

11 years agoOne more mount point fix
Michael Gapczynski [Thu, 2 May 2013 22:22:43 +0000 (18:22 -0400)]
One more mount point fix

11 years agoFix retrieving of mount points for shared storage, fix #3218
Michael Gapczynski [Thu, 2 May 2013 21:47:11 +0000 (17:47 -0400)]
Fix retrieving of mount points for shared storage, fix #3218

11 years agoMerge pull request #3220 from owncloud/gitignore-themes
Frank Karlitschek [Thu, 2 May 2013 16:14:33 +0000 (09:14 -0700)]
Merge pull request #3220 from owncloud/gitignore-themes

ignore themes

11 years agodon't ignore themes README
Jan-Christoph Borchardt [Thu, 2 May 2013 15:51:29 +0000 (11:51 -0400)]
don't ignore themes README

11 years agoignore themes
Jan-Christoph Borchardt [Thu, 2 May 2013 15:47:38 +0000 (11:47 -0400)]
ignore themes

11 years agorespect format output
Bernhard Posselt [Thu, 2 May 2013 12:51:53 +0000 (14:51 +0200)]
respect format output

11 years agologout before output to not run into header already sent problems
Bernhard Posselt [Thu, 2 May 2013 12:49:05 +0000 (14:49 +0200)]
logout before output to not run into header already sent problems

11 years agofix bug that would only return error responses for 3rdparty apps
Bernhard Posselt [Thu, 2 May 2013 12:36:16 +0000 (14:36 +0200)]
fix bug that would only return error responses for 3rdparty apps

11 years agoMerge pull request #3211 from owncloud/fix-2816
Frank Karlitschek [Thu, 2 May 2013 07:54:09 +0000 (00:54 -0700)]
Merge pull request #3211 from owncloud/fix-2816

Fix #2816 renaming shared files

11 years agoDon't display shared links if disabled
Michael Gapczynski [Thu, 2 May 2013 00:39:02 +0000 (20:39 -0400)]
Don't display shared links if disabled

11 years agoFix #2816 renaming shared files
Michael Gapczynski [Thu, 2 May 2013 00:29:07 +0000 (20:29 -0400)]
Fix #2816 renaming shared files

11 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Thu, 2 May 2013 00:19:04 +0000 (02:19 +0200)]
[tx-robot] updated from transifex

11 years agoMerge pull request #3147 from owncloud/storage-mkdir-root
Michael Gapczynski [Wed, 1 May 2013 23:35:44 +0000 (16:35 -0700)]
Merge pull request #3147 from owncloud/storage-mkdir-root

Dont task external storages with creating their own root

11 years agoMerge pull request #3202 from owncloud/swift_id
Frank Karlitschek [Wed, 1 May 2013 12:28:37 +0000 (05:28 -0700)]
Merge pull request #3202 from owncloud/swift_id

Set storage id for openstack swift backend

11 years agoMerge pull request #3203 from qzio/patch-1
Morris Jobke [Wed, 1 May 2013 11:47:19 +0000 (04:47 -0700)]
Merge pull request #3203 from qzio/patch-1

typo fix in a comment.

11 years agotypo fix in a comment.
joel hansson [Wed, 1 May 2013 09:29:15 +0000 (12:29 +0300)]
typo fix in a comment.

11 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Wed, 1 May 2013 00:02:59 +0000 (02:02 +0200)]
[tx-robot] updated from transifex

11 years agoSort priorized languages as defined in the array
kondou [Tue, 30 Apr 2013 22:34:13 +0000 (00:34 +0200)]
Sort priorized languages as defined in the array

Also add russian and arabic to the common languages.

11 years agoSet storage id for openstack swift backend
Robin Appelman [Tue, 30 Apr 2013 22:24:34 +0000 (00:24 +0200)]
Set storage id for openstack swift backend

11 years agoMerge pull request #3156 from owncloud/trashbin_for_encryption_keys_against_master
FlorinPeter [Tue, 30 Apr 2013 18:39:21 +0000 (11:39 -0700)]
Merge pull request #3156 from owncloud/trashbin_for_encryption_keys_against_master

Trashbin for encryption keys now against master

11 years agoMerge pull request #3169 from owncloud/fix_infinite_loop_for_file_cache
FlorinPeter [Tue, 30 Apr 2013 00:05:41 +0000 (17:05 -0700)]
Merge pull request #3169 from owncloud/fix_infinite_loop_for_file_cache

fix for infinite loop causing on files_encryption branch when testing

11 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Mon, 29 Apr 2013 23:59:18 +0000 (01:59 +0200)]
[tx-robot] updated from transifex

11 years agofixing mimetype for "new" ms office formats
miicha [Mon, 29 Apr 2013 23:38:05 +0000 (02:38 +0300)]
fixing mimetype for "new" ms office formats

right mime types for docx, pptx and xlsx
with the old mimetype I got a warning message from office everytime I opend such a file (it was downloaded as "filename.docx.doc")

11 years agoAdd compatibility function for outerHTML
Thomas Tanghus [Mon, 29 Apr 2013 20:35:37 +0000 (22:35 +0200)]
Add compatibility function for outerHTML

11 years agofix for infinite loop causing on files_encryption branch when testing "apps/files_enc...
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

11 years agoMerge pull request #3159 from owncloud/reword
Jan-Christoph Borchardt [Mon, 29 Apr 2013 11:39:51 +0000 (04:39 -0700)]
Merge pull request #3159 from owncloud/reword

Reword sentence and move HTML out of translation

11 years agoMerge pull request #3160 from owncloud/remove-onclick
Morris Jobke [Mon, 29 Apr 2013 10:58:44 +0000 (03:58 -0700)]
Merge pull request #3160 from owncloud/remove-onclick

Remove onclick

11 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Mon, 29 Apr 2013 00:00:26 +0000 (02:00 +0200)]
[tx-robot] updated from transifex

11 years agoIt's a class
Lukas Reschke [Sun, 28 Apr 2013 21:28:41 +0000 (23:28 +0200)]
It's a class

11 years agoRemove uneeded onclick handler
Lukas Reschke [Sun, 28 Apr 2013 21:26:07 +0000 (23:26 +0200)]
Remove uneeded onclick handler

11 years agoMove onclick handler
Lukas Reschke [Sun, 28 Apr 2013 21:25:58 +0000 (23:25 +0200)]
Move onclick handler

11 years agoReword sentence and move HTML out of translation
Lukas Reschke [Sun, 28 Apr 2013 21:13:23 +0000 (00:13 +0300)]
Reword sentence and move HTML out of translation

11 years agodelete and restore of versions and share-keys now works
Florin Peter [Sat, 27 Apr 2013 21:51:26 +0000 (23:51 +0200)]
delete and restore of versions and share-keys now works
fix restore of the same file name

11 years agoadded handling for share-keys
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

11 years agorestore fixed
Florin Peter [Mon, 22 Apr 2013 01:37:55 +0000 (03:37 +0200)]
restore fixed

11 years agofixed some problems and broken code
Florin Peter [Fri, 19 Apr 2013 21:21:06 +0000 (23:21 +0200)]
fixed some problems and broken code

11 years agorestore encryption keys from trash bin (development snapshot)
Björn Schießle [Fri, 19 Apr 2013 08:35:32 +0000 (10:35 +0200)]
restore encryption keys from trash bin (development snapshot)

11 years agomove encryption keys to trash bin
Björn Schießle [Fri, 19 Apr 2013 08:31:42 +0000 (10:31 +0200)]
move encryption keys to trash bin

11 years agoMerge pull request #3154 from owncloud/fix_3153
Frank Karlitschek [Sun, 28 Apr 2013 10:51:21 +0000 (03:51 -0700)]
Merge pull request #3154 from owncloud/fix_3153

Change app identifier for core api routes

11 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Sun, 28 Apr 2013 00:01:38 +0000 (02:01 +0200)]
[tx-robot] updated from transifex

11 years agoMerge pull request #3121 from owncloud/ocs_fix_api_response
Lukas Reschke [Sat, 27 Apr 2013 17:05:06 +0000 (10:05 -0700)]
Merge pull request #3121 from owncloud/ocs_fix_api_response

Fix the api response when a shipped and third party app both fail.