]>
source.dussan.org Git - nextcloud-server.git/log
Michael Gapczynski [Wed, 22 May 2013 00:21:19 +0000 (20:21 -0400)]
Fix undefined index for share mount point retrieval
Thomas Müller [Tue, 21 May 2013 22:21:25 +0000 (15:21 -0700)]
Merge pull request #3266 from owncloud/hooks
New hook system
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
Robin Appelman [Tue, 21 May 2013 21:35:19 +0000 (23:35 +0200)]
merge master into filecache_mtime
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
Jenkins for ownCloud [Tue, 21 May 2013 00:04:52 +0000 (02:04 +0200)]
[tx-robot] updated from transifex
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.
Thomas Tanghus [Mon, 20 May 2013 11:57:18 +0000 (13:57 +0200)]
Add test for renaming non-existing category.
Thomas Tanghus [Mon, 20 May 2013 11:56:57 +0000 (13:56 +0200)]
Remove debug output
Thomas Tanghus [Mon, 20 May 2013 08:16:07 +0000 (10:16 +0200)]
Add rename() method to OC_VCategories.
Jenkins for ownCloud [Mon, 20 May 2013 00:10:11 +0000 (02:10 +0200)]
[tx-robot] updated from transifex
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
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
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.
Jenkins for ownCloud [Sun, 19 May 2013 00:01:55 +0000 (02:01 +0200)]
[tx-robot] updated from transifex
Jenkins for ownCloud [Sat, 18 May 2013 00:03:28 +0000 (02:03 +0200)]
[tx-robot] updated from transifex
Jörn Friedrich Dreyer [Fri, 17 May 2013 10:47:32 +0000 (12:47 +0200)]
cleanup after people who don't test in ie
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
Jenkins for ownCloud [Fri, 17 May 2013 00:07:36 +0000 (02:07 +0200)]
[tx-robot] updated from transifex
Florin Peter [Thu, 16 May 2013 23:20:02 +0000 (01:20 +0200)]
only connect share hooks if installation OC is installed
Florin Peter [Thu, 16 May 2013 23:17:55 +0000 (01:17 +0200)]
revert changes
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
Jenkins for ownCloud [Thu, 16 May 2013 00:01:37 +0000 (02:01 +0200)]
[tx-robot] updated from transifex
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
Thomas Mueller [Wed, 15 May 2013 21:49:41 +0000 (23:49 +0200)]
Merge branch 'master' into hooks
Thomas Mueller [Wed, 15 May 2013 21:43:46 +0000 (23:43 +0200)]
Merge branch 'master' into fix-3353
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.
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.
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
Florin Peter [Wed, 15 May 2013 08:19:38 +0000 (10:19 +0200)]
fix for losing mount point "/"
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
Thomas Tanghus [Wed, 15 May 2013 16:56:54 +0000 (18:56 +0200)]
Add Compound property to avoid double escaping values.
Michael Gapczynski [Wed, 15 May 2013 13:33:38 +0000 (09:33 -0400)]
Fix finding mount in background watcher, fixes #3353
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
Thomas Tanghus [Wed, 15 May 2013 11:53:15 +0000 (13:53 +0200)]
Add Contacts repo to CONTRIBUTING.md
Jenkins for ownCloud [Wed, 15 May 2013 00:02:45 +0000 (02:02 +0200)]
[tx-robot] updated from transifex
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"
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
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.
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
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
raghunayyar [Mon, 13 May 2013 17:42:05 +0000 (23:12 +0530)]
Keeping Font Colors Consistant on the headers.
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
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
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 ...
Jörn Friedrich Dreyer [Mon, 13 May 2013 13:54:45 +0000 (15:54 +0200)]
peselect filename without extension on rename
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
Lukas Reschke [Mon, 13 May 2013 12:23:56 +0000 (14:23 +0200)]
Add requesttoken to guest view
Should fix #3321
Arthur Schiwon [Mon, 13 May 2013 10:41:22 +0000 (12:41 +0200)]
Merge branch 'master' into ldap_configurable_username_n_uuid
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
Modify zh_* language codes
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
disable mbstring.func_overload in setup v.3
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"
refs #2159
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
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
Use new autoloader class in tests
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
disable mbstring.func_overload
Jan-Christoph Borchardt [Fri, 10 May 2013 15:41:27 +0000 (08:41 -0700)]
Merge pull request #3257 from owncloud/fix_3251
Fix 3251
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
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
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
kondou [Tue, 7 May 2013 04:27:52 +0000 (06:27 +0200)]
Fix #3251
Using ksort now, instead of prefilling the commonlanguages array.
Robin Appelman [Thu, 9 May 2013 20:52:44 +0000 (22:52 +0200)]
fix typo
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
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
Arthur Schiwon [Wed, 8 May 2013 15:54:38 +0000 (17:54 +0200)]
LDAP: fix display of numerical display names
Arthur Schiwon [Wed, 8 May 2013 15:47:07 +0000 (17:47 +0200)]
LDAP: Implement clear mappings functionality
Robin Appelman [Wed, 8 May 2013 14:48:47 +0000 (16:48 +0200)]
Move legacy filesystem classes
Arthur Schiwon [Wed, 8 May 2013 12:56:52 +0000 (14:56 +0200)]
LDAP: implement UUID and internal username override
Arthur Schiwon [Wed, 8 May 2013 12:55:56 +0000 (14:55 +0200)]
LDAP: better variable name
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
Arthur Schiwon [Wed, 8 May 2013 12:05:08 +0000 (14:05 +0200)]
LDAP: implement r+w for new settings
Arthur Schiwon [Wed, 8 May 2013 11:57:21 +0000 (13:57 +0200)]
LDAP: add settings for UUID override