Commit graph

11433 commits

Author SHA1 Message Date
Roland Hager
2ea2abf11e Fixing UPDATE error in filecache table when renaming files by calling move(). Add storage id to the where clause to avoid updating entries of other users. 2013-05-22 08:18:57 +02:00
Jenkins for ownCloud
d590064fdf [tx-robot] updated from transifex 2013-05-22 02:19:52 +02:00
Florin Peter
c6722581f9 fix pgsql error 2013-05-22 02:02:42 +02:00
Florin Peter
28d72b822d Merge branch 'master' into files_encryption
Conflicts:
	lib/files/cache/cache.php
2013-05-22 01:26:35 +02:00
Florin Peter
afbfa742d7 improved tests 2013-05-22 01:11:55 +02:00
Florin Peter
9ca9a22c6a fixed finding encrypted files in subfolders and removed unused code 2013-05-22 00:54:47 +02:00
Thomas Müller
e2444ec9c5 Merge pull request #3266 from owncloud/hooks
New hook system
2013-05-21 15:21:25 -07:00
Thomas Müller
4bb6ac3aa7 Merge pull request #1586 from owncloud/filecache_mtime
Emulate touch() for backends that don't support it
2013-05-21 15:17:08 -07:00
Robin Appelman
81fd1badc3 merge master into filecache_mtime 2013-05-21 23:35:19 +02:00
Florin Peter
095fc790ac added webdav test 2013-05-21 21:09:39 +02:00
Florin Peter
1deeec93b7 fixed postFileSize 2013-05-21 21:09:25 +02:00
Jörn Friedrich Dreyer
fb4d8ddf0a Merge pull request #3335 from owncloud/prevent-scan-loop
Prevent backgroundScan() from looping
2013-05-21 09:15:22 -07:00
Björn Schießle
5cd14425f9 Merge branch 'master' into files_encryption
Conflicts:
	apps/files_trashbin/l10n/nn_NO.php
2013-05-21 15:30:19 +02:00
Björn Schießle
9d324db054 fix path to 3rdparty apps 2013-05-21 12:33:32 +02:00
Björn Schießle
4c27c7e199 fix path, needs to be relative to data/ 2013-05-21 12:22:03 +02:00
Björn Schießle
64591cf754 move 3rdparty dependencies to app 2013-05-21 10:30:24 +02:00
Florin Peter
c9e862ccba fix broken tests 2013-05-21 07:19:23 +02:00
Jenkins for ownCloud
afdad5c74d [tx-robot] updated from transifex 2013-05-21 02:04:52 +02:00
Florin Peter
4bf840e2ca cleanup unused code optimize tests 2013-05-21 00:00:55 +02:00
Florin Peter
f2b1158add improved tests 2013-05-20 23:44:10 +02:00
Florin Peter
1c8e5d6873 added test for failed sharing 2013-05-20 21:46:28 +02:00
Florin Peter
1fa2f19ee4 removed dead code for delShareKey 2013-05-20 21:24:39 +02:00
Florin Peter
8e0540d0e4 key creation should never override a private or public key 2013-05-20 21:22:03 +02:00
Florin Peter
171b9a4702 added legacy encryption test 2013-05-20 21:19:28 +02:00
Thomas Müller
54d3b381a8 Merge pull request #3430 from owncloud/vcategory_rename
Add rename() method to OC_VCategories.
2013-05-20 08:08:15 -07:00
Michael Gapczynski
09ff46eda2 Remove user name addition to paths in deleteAll 2013-05-20 10:21:55 -04:00
Michael Gapczynski
ec475cbcfa Add data-dir attribute to home breadcrumb 2013-05-20 10:21:13 -04:00
Thomas Tanghus
946740a71f Add test for renaming non-existing category. 2013-05-20 13:57:18 +02:00
Thomas Tanghus
c38dc36665 Remove debug output 2013-05-20 13:56:57 +02:00
Thomas Tanghus
b1bb899867 Add rename() method to OC_VCategories. 2013-05-20 10:16:07 +02:00
Thomas Tanghus
38b2d0a822 Remove more obsolete code. 2013-05-20 09:54:43 +02:00
Thomas Tanghus
27a5132b46 Don't set image path in template. 2013-05-20 09:44:31 +02:00
Florin Peter
31037241e1 Merge branch 'master' into files_encryption 2013-05-20 02:25:56 +02:00
Jenkins for ownCloud
6609de28d8 [tx-robot] updated from transifex 2013-05-20 02:10:11 +02:00
Florin Peter
58a8d67a9b fix for webdav because initMounts() is triggered twice so we lost the root path 2013-05-20 01:57:16 +02:00
Florin Peter
b3b6738d59 Revert "fix for webdav and wrong reference for findByStorageId"
This reverts commit 079f918d5c.
2013-05-20 01:47:35 +02:00
Florin Peter
3b850a2524 reformat code added and changed phpdoc 2013-05-20 01:24:36 +02:00
Florin Peter
b1d0e8f40b removed /l10n/.tx/ from .gitignore 2013-05-20 00:47:00 +02:00
Florin Peter
dc39ef378e changed recovery_enabled and migration_status columns to integer and fix tests 2013-05-20 00:38:23 +02:00
Florin Peter
5d572c3449 update phpdoc 2013-05-19 22:31:00 +02:00
Florin Peter
079f918d5c fix for webdav and wrong reference for findByStorageId 2013-05-19 22:30:03 +02:00
Florin Peter
bdd2127f19 cleanup tests 2013-05-19 22:28:48 +02:00
Michael Gapczynski
fc5bce1f76 Fix undefined variable for copying empty folders 2013-05-19 15:04:41 -04:00
Bernhard Posselt
71668cf08a Merge pull request #3399 from owncloud/fix_js_for_ie
cleanup after people who don't test in ie
2013-05-19 11:25:39 -07:00
Michael Gapczynski
e9b71eed69 Add tests for copying/moving between storages 2013-05-19 14:20:46 -04:00
Michael Gapczynski
41e2d64c86 Add support for copying/moving folders between storages, move isIgnoredDir() to Filesystem 2013-05-19 14:15:49 -04:00
Michael Gapczynski
67729f5f9f Merge pull request #3421 from owncloud/pre_login_password
Add password to pre_login
2013-05-19 10:09:24 -07:00
Lukas Reschke
7ec36c5bbb Add password to pre_login
I need this to intercept passwords for my WIP multi-factor
authentication app.
2013-05-19 13:33:33 +02:00
Florin Peter
ddda2a1f79 changed database column 'recovery' to 'recovery_enabled' because recovery is a pgsql keyword
more info about pgsql keywords http://www.postgresql.org/docs/9.1/static/sql-keywords-appendix.html
2013-05-19 07:04:31 +02:00
Jenkins for ownCloud
694f42dfd5 [tx-robot] updated from transifex 2013-05-19 02:01:55 +02:00