Commit Graph

11452 Commits

Author SHA1 Message Date
Björn Schießle cb79169cf5 Merge branch 'master' into files_encryption 2013-05-23 11:11:57 +02:00
Jenkins for ownCloud 698862519d [tx-robot] updated from transifex 2013-05-23 02:00:27 +02:00
Michael Gapczynski 1cfc9d269e Merge pull request #3457 from owncloud/fix-share-links
Fix public links
2013-05-22 15:20:15 -07:00
Florin Peter 46c784ccdf added trash bin tests 2013-05-22 23:51:35 +02:00
Florin Peter 842d0608f1 added static function registerHooks() for better unit tests handling 2013-05-22 23:50:45 +02:00
Michael Gapczynski 9b622bdeed RUNTIME_NOSETUPFS no longer exists, using tearDownFS() in public links instead 2013-05-22 15:02:11 -04:00
Björn Schießle b2aa97f166 revert changes to .gitmodules, they were applied by accident 2013-05-22 18:30:29 +02:00
Björn Schießle 1bd42762ae revert submodule changes 2013-05-22 18:28:44 +02:00
Björn Schießle 80dea1a8c5 settings clean-up; There is no blacklist in the new encryption app 2013-05-22 18:05:12 +02:00
Björn Schießle 15a3ae6db1 improved error messages 2013-05-22 18:01:18 +02:00
Björn Schießle ee53bd1aa3 Merge branch 'master' into files_encryption
Conflicts:
	lib/files/cache/cache.php
2013-05-22 15:29:22 +02:00
Thomas Müller 26732ecaa6 Merge pull request #3337 from owncloud/oracle_fixes
Oracle fixes
2013-05-22 05:20:04 -07:00
Jörn Friedrich Dreyer 1f1abe595d cleanup codestyle 2013-05-22 13:59:08 +02:00
Jörn Friedrich Dreyer cbd5eb9a1a use to_char only for oracle, whitespace 2013-05-22 13:59:07 +02:00
Jörn Friedrich Dreyer eceb3c8ed5 add debug output 2013-05-22 13:59:07 +02:00
Jörn Friedrich Dreyer 1b68c0c0cd allow install when only oracle is available 2013-05-22 13:56:57 +02:00
Morris Jobke 9fd2be0757 Merge pull request #3406 from owncloud/oc_dialogs_oc_template
Use js templates in OC.dialogs etc.
2013-05-22 03:00:04 -07:00
Roland Hager 5c112657b2 New tests to assure that a move will not affect another users cache entries
Added a second storage and cache Object to simulate a second user.
2013-05-22 08:19:15 +02:00
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