Commit Graph

14811 Commits

Author SHA1 Message Date
Jörn Friedrich Dreyer 68e88b6e40 count correct array, then using 1000 as MAX_SQL_CHUNK_SIZE works as expected 2013-10-30 15:48:38 +01:00
Morris Jobke b65b7965ae fix failing preview test on master 2013-10-30 15:39:55 +01:00
Thomas Müller 3059d7d92e Merge pull request #5602 from owncloud/update-parent-storage-mtime
Prevent rescans of folders by updating the parent's storage_mtime
2013-10-30 07:03:38 -07:00
Robin Appelman c9f3f2874f Merge branch 'master' into update-parent-storage-mtime
Conflicts:
	lib/private/files/cache/updater.php
2013-10-30 13:41:10 +01:00
Björn Schießle 4c964cbbbe Merge pull request #5618 from owncloud/set_default_value_for_recovery_mode
[encryption] add defaut value to getValue() call
2013-10-30 04:42:21 -07:00
Bjoern Schiessle abbacbacb4 remove unused variable 2013-10-30 11:39:30 +01:00
Bjoern Schiessle 6e77fa46f2 if the database doesn't contain any information about the recovery mode than we assume that it is disabled 2013-10-30 11:28:36 +01:00
Vincent Petry 4c7ef85252 Merge pull request #5616 from owncloud/fixing-l10n-master
Fixing l10n master
2013-10-30 02:44:54 -07:00
Vincent Petry de342a5ac7 Merge pull request #5603 from owncloud/fix_file_cache_updater_master
Fix file cache updater (backport to master of #5513)
2013-10-30 02:31:08 -07:00
Jenkins for ownCloud 54ae799cd9 [tx-robot] updated from transifex 2013-10-30 03:33:25 -04:00
Thomas Müller ffb0e14d7b replacing ownCloud by theme-able name or avoid it's usage 2013-10-29 23:29:16 +01:00
Thomas Müller 3d42e402c5 http header OCS-ApiRequest: true is required in case of session based OCS API calls 2013-10-29 23:07:27 +01:00
Lukas Reschke de57e36b6b Fix typo
Whooah! - I'm even committing this total important change without peer review ;-)
2013-10-29 22:11:49 +01:00
Bjoern Schiessle e1e4c7c214 Merge branch 'master' into fix_file_cache_updater_master 2013-10-29 17:47:33 +01:00
Björn Schießle e08f38f99b Merge pull request #5605 from owncloud/fix_delete_user
remove user from cache if he was deleted successfully
2013-10-29 09:46:21 -07:00
Thomas Müller e0bc89c87f Merge pull request #5577 from owncloud/fix_urlgenerator_imagepath
use SERVERROOT instead of WEBROOT in all file_exists checks, whitespace
2013-10-29 09:29:29 -07:00
Thomas Müller 2534c3bc78 Merge pull request #5606 from owncloud/files-uploaderrorparsingfix
Added fix to correctly parse non-array error messages
2013-10-29 09:23:19 -07:00
Jan-Christoph Borchardt f5e0d59dbf Merge pull request #5607 from owncloud/public-share-style
fix style of public share page
2013-10-29 08:47:37 -07:00
Bjoern Schiessle 0d7d396d80 make sure that also the storage etag gets changed 2013-10-29 16:30:47 +01:00
Morris Jobke 404e9c0053 fix style of public share page 2013-10-29 16:08:11 +01:00
Vincent Petry 71cf83b314 Added fix to correctly parse non-array error messages
Some apps like the antivirus app return messages in a non-array format.
2013-10-29 16:00:34 +01:00
Bjoern Schiessle f021dad204 remove user from cache if he was deleted successfully 2013-10-29 15:50:33 +01:00
Morris Jobke 34c1512466 Merge pull request #5601 from owncloud/fix-mimetype-detection
Fix mimetype detection
2013-10-29 07:47:20 -07:00
Morris Jobke 7223b5acce Merge pull request #5396 from owncloud/fix-sharing-code
Fix sharing error message - id -> file name
2013-10-29 07:33:23 -07:00
Bjoern Schiessle a80ac9c492 make getUidAndFilename() private 2013-10-29 15:10:02 +01:00
Bjoern Schiessle fcfac51aa1 backport of https://github.com/owncloud/core/pull/5513 2013-10-29 15:08:12 +01:00
Morris Jobke b56c936212 also add new parameter to function calls 2013-10-29 14:22:24 +01:00
Robin Appelman 654b0daf01 update touch tests for updated behaviour 2013-10-29 14:22:13 +01:00
Robin Appelman b3626f34cd Update the parent folders storage_mtime on write and delete to prevent rescans 2013-10-29 14:18:57 +01:00
Andreas Fischer b3e39dd3d9 Map empty mimetypes to octet-stream for Oracle DBMS. 2013-10-29 14:18:42 +01:00
Andreas Fischer fa6ae81149 Return early if fileinfo is there. 2013-10-29 13:48:30 +01:00
Andreas Fischer 68d13210bd Reset mimetype to application/octet-stream on empty reply from file command. 2013-10-29 13:29:35 +01:00
Robin Appelman 0e92a4896d dont use the home storage for non-existing users 2013-10-29 13:12:28 +01:00
Andreas Fischer a04a01d51f Do not calculate $isWrapped if not needed. 2013-10-29 12:54:30 +01:00
Jenkins for ownCloud b0b76fe064 [tx-robot] updated from transifex 2013-10-29 07:31:51 -04:00
Thomas Müller aaefb64306 Merge pull request #5493 from owncloud/fix-language-detection
Fix HTTP language detection
2013-10-28 16:37:12 -07:00
Robin Appelman e273c14540 use the new home storage backend when no existing local storage backend exists for the user's home 2013-10-29 00:26:35 +01:00
Robin Appelman f1e6e80eb1 add specialized storage backend for home folders 2013-10-29 00:14:23 +01:00
Andreas Fischer 70111ea299 Add some color to the occ upgrade output. 2013-10-28 22:26:44 +01:00
Andreas Fischer b8dbec0da4 Use "else if" to remove one level of indentation. 2013-10-28 22:22:59 +01:00
Julian Müller 6716c9f00a Merge pull request #5587 from owncloud/trashbin-homecrumb
Fixed clicking on the "Home" breadcrumb in the trash app
2013-10-28 14:18:50 -07:00
ringmaster f130caa4a2 Missed one write()->writeln(). Fixed. 2013-10-28 17:06:36 -04:00
ringmaster bca1e12597 Use writeln() instead of write() 2013-10-28 16:53:36 -04:00
ringmaster d1c5e5d777 Use the OutputInterface for output and return error codes. 2013-10-28 16:50:28 -04:00
Thomas Müller a90cefcea2 avoid usage of brand name 'ownCloud' 2013-10-28 21:42:48 +01:00
Vincent Petry e41ea20ce4 Fixed clicking on the "Home" breadcrumb in the trash app
Clicking on the "home" breadcrumb now correctly brings the user back to
the files app.
2013-10-28 20:24:06 +01:00
Frank Karlitschek be9a5dc316 Merge branch 'master' of https://github.com/owncloud/core 2013-10-28 19:15:36 +01:00
Thomas Müller ffc3bc1914 Merge pull request #5468 from berendt/reworking_OC_Files_Storage_Swift
Reworking \OC\Files\Storage\Swift
2013-10-29 13:49:24 -07:00
Thomas Müller 2e731e845b Merge pull request #5609 from owncloud/fix_delete_user2
use getHome() to delete users data
2013-10-29 13:46:42 -07:00
Bjoern Schiessle db0fa6c529 use getHome() to delete users data 2013-10-29 18:01:37 +01:00