]> source.dussan.org Git - nextcloud-server.git/log
nextcloud-server.git
11 years agoMerge pull request #1586 from owncloud/filecache_mtime
Thomas Müller [Tue, 21 May 2013 22:17:08 +0000 (15:17 -0700)]
Merge pull request #1586 from owncloud/filecache_mtime

Emulate touch() for backends that don't support it

11 years agomerge master into filecache_mtime
Robin Appelman [Tue, 21 May 2013 21:35:19 +0000 (23:35 +0200)]
merge master into filecache_mtime

11 years agoMerge pull request #3335 from owncloud/prevent-scan-loop
Jörn Friedrich Dreyer [Tue, 21 May 2013 16:15:22 +0000 (09:15 -0700)]
Merge pull request #3335 from owncloud/prevent-scan-loop

Prevent backgroundScan() from looping

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

11 years agoMerge pull request #3430 from owncloud/vcategory_rename
Thomas Müller [Mon, 20 May 2013 15:08:15 +0000 (08:08 -0700)]
Merge pull request #3430 from owncloud/vcategory_rename

Add rename() method to OC_VCategories.

11 years agoAdd test for renaming non-existing category.
Thomas Tanghus [Mon, 20 May 2013 11:57:18 +0000 (13:57 +0200)]
Add test for renaming non-existing category.

11 years agoRemove debug output
Thomas Tanghus [Mon, 20 May 2013 11:56:57 +0000 (13:56 +0200)]
Remove debug output

11 years agoAdd rename() method to OC_VCategories.
Thomas Tanghus [Mon, 20 May 2013 08:16:07 +0000 (10:16 +0200)]
Add rename() method to OC_VCategories.

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

11 years agoMerge pull request #3399 from owncloud/fix_js_for_ie
Bernhard Posselt [Sun, 19 May 2013 18:25:39 +0000 (11:25 -0700)]
Merge pull request #3399 from owncloud/fix_js_for_ie

cleanup after people who don't test in ie

11 years agoMerge pull request #3421 from owncloud/pre_login_password
Michael Gapczynski [Sun, 19 May 2013 17:09:24 +0000 (10:09 -0700)]
Merge pull request #3421 from owncloud/pre_login_password

Add password to pre_login

11 years agoAdd password to pre_login
Lukas Reschke [Sun, 19 May 2013 11:33:33 +0000 (13:33 +0200)]
Add password to pre_login

I need this to intercept passwords for my WIP multi-factor
authentication app.

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

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

11 years agocleanup after people who don't test in ie
Jörn Friedrich Dreyer [Fri, 17 May 2013 10:47:32 +0000 (12:47 +0200)]
cleanup after people who don't test in ie

11 years agoMerge pull request #3375 from owncloud/fix_for_SQLite3Result_object_in_post_addToGroup
FlorinPeter [Fri, 17 May 2013 08:55:28 +0000 (01:55 -0700)]
Merge pull request #3375 from owncloud/fix_for_SQLite3Result_object_in_post_addToGroup

fix for SQLite3Result::fetchArray() on setup

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

11 years agoonly connect share hooks if installation OC is installed
Florin Peter [Thu, 16 May 2013 23:20:02 +0000 (01:20 +0200)]
only connect share hooks if installation OC is installed

11 years agorevert changes
Florin Peter [Thu, 16 May 2013 23:17:55 +0000 (01:17 +0200)]
revert changes

11 years agoMerge pull request #3302 from owncloud/ldap_configurable_username_n_uuid
blizzz [Thu, 16 May 2013 12:40:31 +0000 (05:40 -0700)]
Merge pull request #3302 from owncloud/ldap_configurable_username_n_uuid

Ldap configurable username n uuid

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

11 years agoMerge pull request #3371 from owncloud/fix-3353
Thomas Müller [Wed, 15 May 2013 22:02:01 +0000 (15:02 -0700)]
Merge pull request #3371 from owncloud/fix-3353

Fix finding mount in background watcher, fixes #3353

11 years agoMerge branch 'master' into fix-3353
Thomas Mueller [Wed, 15 May 2013 21:43:46 +0000 (23:43 +0200)]
Merge branch 'master' into fix-3353

11 years agoMerge pull request #3374 from owncloud/vobject_compound_property
Thomas Müller [Wed, 15 May 2013 21:34:16 +0000 (14:34 -0700)]
Merge pull request #3374 from owncloud/vobject_compound_property

Add Compound property to avoid double escaping values.

11 years agoNo unit test coverage reports for pgsql - this causes issues on Jenkins.
Thomas Mueller [Wed, 15 May 2013 20:44:15 +0000 (22:44 +0200)]
No unit test coverage reports for pgsql - this causes issues on Jenkins.

11 years agoMerge pull request #3376 from owncloud/fix_for_disappearing_root_mount_point
Thomas Müller [Wed, 15 May 2013 19:34:32 +0000 (12:34 -0700)]
Merge pull request #3376 from owncloud/fix_for_disappearing_root_mount_point

fix for disappearing root mount point on lib/files/filesystem.php

11 years agofix for losing mount point "/"
Florin Peter [Wed, 15 May 2013 08:19:38 +0000 (10:19 +0200)]
fix for losing mount point "/"

11 years agofix for SQLite3Result::fetchArray(): The SQLite3Result object has not been correctly...
Florin Peter [Wed, 15 May 2013 15:00:01 +0000 (17:00 +0200)]
fix for  SQLite3Result::fetchArray(): The SQLite3Result object has not been correctly initialised in post_addToGroup

11 years agoAdd Compound property to avoid double escaping values.
Thomas Tanghus [Wed, 15 May 2013 16:56:54 +0000 (18:56 +0200)]
Add Compound property to avoid double escaping values.

11 years agoFix finding mount in background watcher, fixes #3353
Michael Gapczynski [Wed, 15 May 2013 13:33:38 +0000 (09:33 -0400)]
Fix finding mount in background watcher, fixes #3353

11 years agoMerge pull request #3366 from owncloud/contributing_add_contacts
Michael Gapczynski [Wed, 15 May 2013 13:24:21 +0000 (06:24 -0700)]
Merge pull request #3366 from owncloud/contributing_add_contacts

Add Contacts repo to CONTRIBUTING.md

11 years agoAdd Contacts repo to CONTRIBUTING.md
Thomas Tanghus [Wed, 15 May 2013 11:53:15 +0000 (13:53 +0200)]
Add Contacts repo to CONTRIBUTING.md

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

11 years agoMerge pull request #2821 from owncloud/fix-2159-rename-to-shared
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

fix allowed rename of folder in root directory to reserved name "Shared"

11 years agofix history template, print_unescaped() needs to include closing tags
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

11 years agoMerge pull request #3338 from owncloud/button_color_fix
Raghu Nayyar [Tue, 14 May 2013 16:52:54 +0000 (09:52 -0700)]
Merge pull request #3338 from owncloud/button_color_fix

Keeping Font Colors Consistant on the headers.

11 years agoMerge pull request #3330 from owncloud/preselect_filename_on_rename
Morris Jobke [Tue, 14 May 2013 13:16:30 +0000 (06:16 -0700)]
Merge pull request #3330 from owncloud/preselect_filename_on_rename

peselect filename without extension on rename

11 years ago[files] add private declaration of $view
Morris Jobke [Tue, 14 May 2013 10:49:23 +0000 (12:49 +0200)]
[files] add private declaration of $view

11 years agocolor change to crumb elements as well.
raghunayyar [Tue, 14 May 2013 05:37:12 +0000 (11:07 +0530)]
color change to crumb elements as well.

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

11 years agoKeeping Font Colors Consistant on the headers.
raghunayyar [Mon, 13 May 2013 17:42:05 +0000 (23:12 +0530)]
Keeping Font Colors Consistant on the headers.

11 years agoPrevent backgroundScan() from looping if opendir() is failing for the same path
Michael Gapczynski [Mon, 13 May 2013 15:17:08 +0000 (11:17 -0400)]
Prevent backgroundScan() from looping if opendir() is failing for the same path

11 years agoMerge pull request #3303 from owncloud/update_etags_on_restore
Morris Jobke [Mon, 13 May 2013 15:12:57 +0000 (08:12 -0700)]
Merge pull request #3303 from owncloud/update_etags_on_restore

Make sure that etags get updated once a file gets retored from the trash bin

11 years agoMerge pull request #3329 from owncloud/increase_lock_timeout
Bernhard Posselt [Mon, 13 May 2013 13:56:07 +0000 (06:56 -0700)]
Merge pull request #3329 from owncloud/increase_lock_timeout

Set the SQLite database lock timeout to 60 seconds which is the default ...

11 years agopeselect filename without extension on rename
Jörn Friedrich Dreyer [Mon, 13 May 2013 13:54:45 +0000 (15:54 +0200)]
peselect filename without extension on rename

11 years agoMerge pull request #3326 from owncloud/fix-3321
Lukas Reschke [Mon, 13 May 2013 12:45:38 +0000 (05:45 -0700)]
Merge pull request #3326 from owncloud/fix-3321

Add requesttoken to guest view

11 years agoAdd requesttoken to guest view
Lukas Reschke [Mon, 13 May 2013 12:23:56 +0000 (14:23 +0200)]
Add requesttoken to guest view

Should fix #3321

11 years agoMerge branch 'master' into ldap_configurable_username_n_uuid
Arthur Schiwon [Mon, 13 May 2013 10:41:22 +0000 (12:41 +0200)]
Merge branch 'master' into ldap_configurable_username_n_uuid

11 years agoMerge branch 'master' into update_etags_on_restore
Björn Schießle [Mon, 13 May 2013 08:48:06 +0000 (10:48 +0200)]
Merge branch 'master' into update_etags_on_restore

11 years agoMerge pull request #3235 from NCTU-NBA/pr-langcode
Morris Jobke [Mon, 13 May 2013 07:42:13 +0000 (00:42 -0700)]
Merge pull request #3235 from NCTU-NBA/pr-langcode

Modify zh_* language codes

11 years agoSet the SQLite database lock timeout to 60 seconds which is the default in PHP anyway...
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.

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

11 years agoMerge remote-tracking branch 'upstream/master' into pr-langcode
Pellaeon Lin [Sun, 12 May 2013 14:32:22 +0000 (22:32 +0800)]
Merge remote-tracking branch 'upstream/master' into pr-langcode

11 years ago[files] fix mock creation and remove hardcoded 'require' statement
Morris Jobke [Sun, 12 May 2013 11:02:01 +0000 (13:02 +0200)]
[files] fix mock creation and remove hardcoded 'require' statement

11 years agoMerge pull request #3311 from owncloud/disable_mbstring.func_overload
Morris Jobke [Sun, 12 May 2013 10:28:18 +0000 (03:28 -0700)]
Merge pull request #3311 from owncloud/disable_mbstring.func_overload

disable mbstring.func_overload in setup v.3

11 years ago[files] rename lib to "App"
Morris Jobke [Wed, 8 May 2013 09:56:59 +0000 (11:56 +0200)]
[files] rename lib to "App"

11 years ago[files] ownCloud typo
Morris Jobke [Tue, 7 May 2013 14:04:12 +0000 (16:04 +0200)]
[files] ownCloud typo

11 years ago[files] rename test class and add rename test
Morris Jobke [Tue, 7 May 2013 13:24:26 +0000 (15:24 +0200)]
[files] rename test class and add rename test

11 years ago[files] remove realpath in test
Morris Jobke [Tue, 7 May 2013 13:21:43 +0000 (15:21 +0200)]
[files] remove realpath in test

11 years ago[files] rename tests
Morris Jobke [Tue, 7 May 2013 11:37:20 +0000 (13:37 +0200)]
[files] rename tests

11 years ago[files] remove normalizePath on rename and dependency injection
Morris Jobke [Tue, 7 May 2013 11:36:29 +0000 (13:36 +0200)]
[files] remove normalizePath on rename and dependency injection

11 years ago[files] kill stripslashes
Morris Jobke [Mon, 6 May 2013 18:59:26 +0000 (20:59 +0200)]
[files] kill stripslashes

11 years ago[files] fix typos
Morris Jobke [Mon, 6 May 2013 18:53:41 +0000 (20:53 +0200)]
[files] fix typos

11 years ago[files] refactoring
Morris Jobke [Mon, 6 May 2013 18:45:04 +0000 (20:45 +0200)]
[files] refactoring

11 years agostring comparision
Morris Jobke [Tue, 9 Apr 2013 11:54:01 +0000 (13:54 +0200)]
string comparision

11 years agowrong root dir name
Morris Jobke [Tue, 9 Apr 2013 11:44:54 +0000 (13:44 +0200)]
wrong root dir name

11 years agofix allowed rename of folder in root directory to reserved name "Shared"
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"

refs #2159

11 years agoMerge pull request #3290 from owncloud/config-data
Lukas Reschke [Sun, 12 May 2013 09:40:30 +0000 (02:40 -0700)]
Merge pull request #3290 from owncloud/config-data

Move config data to template

11 years agodisable mbstring.func_overload in setup
Thomas Tanghus [Sun, 12 May 2013 08:56:32 +0000 (10:56 +0200)]
disable mbstring.func_overload in setup

11 years agoTypo
Lukas Reschke [Sat, 11 May 2013 19:08:26 +0000 (21:08 +0200)]
Typo

11 years agoGet config from template
Lukas Reschke [Sat, 11 May 2013 19:07:05 +0000 (21:07 +0200)]
Get config from template

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 agotouch() needs to be performed relative to user/files otherwise ownCloud doesn't execu...
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

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 agoLDAP: fix display of numerical display names
Arthur Schiwon [Wed, 8 May 2013 15:54:38 +0000 (17:54 +0200)]
LDAP: fix display of numerical display names

11 years agoLDAP: Implement clear mappings functionality
Arthur Schiwon [Wed, 8 May 2013 15:47:07 +0000 (17:47 +0200)]
LDAP: Implement clear mappings functionality

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 agoLDAP: implement UUID and internal username override
Arthur Schiwon [Wed, 8 May 2013 12:56:52 +0000 (14:56 +0200)]
LDAP: implement UUID and internal username override

11 years agoLDAP: better variable name
Arthur Schiwon [Wed, 8 May 2013 12:55:56 +0000 (14:55 +0200)]
LDAP: better variable name

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 agoLDAP: implement r+w for new settings
Arthur Schiwon [Wed, 8 May 2013 12:05:08 +0000 (14:05 +0200)]
LDAP: implement r+w for new settings

11 years agoLDAP: add settings for UUID override
Arthur Schiwon [Wed, 8 May 2013 11:57:21 +0000 (13:57 +0200)]
LDAP: add settings for UUID override

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