Commit Graph

4674 Commits

Author SHA1 Message Date
Georg Ehrke 43674b1759 fix mimetype for cdr files - bugfix for oc 559 2012-06-21 09:58:04 +02:00
Michael Gapczynski 6524f6ad30 Only call OC_FileCache::get('/Shared') if it exists in the file cache, prevents premature addition of the Shared folder to the file cache 2012-06-20 19:24:45 -04:00
Robin Appelman e43d02fadb fix encrypted flags not being saved correctly 2012-06-20 20:18:42 +02:00
Robin Appelman 9ba467d629 fix encryption for binary files 2012-06-20 20:18:42 +02:00
Robin Appelman 0f2600e9ea add binary test case for encryption 2012-06-20 20:18:41 +02:00
Robin Appelman e3f1507374 use absolute path for file proxies 2012-06-20 20:18:41 +02:00
Arthur Schiwon d0dbc8beab make bookmarks bookmarklet work again, kudos to Victor Dubiniuk 2012-06-20 20:04:41 +02:00
Bjoern Schiessle 5cc75ad818 Merge branch 'stable4' of gitorious.org:owncloud/owncloud into stable4 2012-06-20 17:08:48 +02:00
Bjoern Schiessle e71dffcdf0 no need to escape the title 2012-06-20 17:01:07 +02:00
Bjoern Schiessle 8e427d80d3 use sanitizeHTML() function 2012-06-20 17:00:55 +02:00
Bjoern Schiessle 0e61b5457b use new sanitizeHTML() function 2012-06-20 17:00:33 +02:00
Bjoern Schiessle 902c649dad use new sanitize HTML function backported
Conflicts:

	lib/template.php
2012-06-20 16:59:51 +02:00
Bjoern Schiessle d9607df26f backport of sanitizeHTML() function 2012-06-20 16:43:31 +02:00
Arthur Schiwon a7f0811829 bookmarks: make read later-button draggable again, fixes oc-944 2012-06-20 16:31:22 +02:00
Arthur Schiwon 0289f442a8 forgotten $, incorrect subtract 2012-06-20 12:41:30 +02:00
Robin Appelman c4d1363419 don't show other users file if the filesystem is not index already 2012-06-20 11:35:45 +02:00
Bart Visscher 311c2bc0d3 Calendar: Write-close session to enable parallel events.php requests 2012-06-19 23:18:26 +02:00
Bart Visscher 0524f6fd3c Fix webdav property name compare 2012-06-19 23:18:07 +02:00
Bart Visscher 2d4e1b45ce Load app before running update script 2012-06-19 23:17:40 +02:00
Bart Visscher c260db0e9a Tasks: Fix resizing of the content part 2012-06-19 23:17:14 +02:00
Bart Visscher 0d43d6402d Tasks: Use POST for ajax calls that change data 2012-06-19 23:17:00 +02:00
Bart Visscher cff1b6e699 Don't use substr to get first char of string 2012-06-19 23:16:17 +02:00
Bart Visscher bb649dd0d5 Smarter code for OC_FileProxy
Conflicts:

	lib/fileproxy.php
2012-06-19 23:15:33 +02:00
Bart Visscher 598a090db4 Add cache for getStorage and getInternalPath functions.
These are called for almost every file operation.
2012-06-19 23:13:24 +02:00
Bart Visscher e728635c8a Add stat cache to OC_Connector_Sabre_Node and OC_Connector_Sabre_File
Speeds up access of directories with large number of files.
2012-06-19 23:13:21 +02:00
Bart Visscher 4d627d66a1 Add help texts to config options in config.sample.php 2012-06-19 23:11:54 +02:00
Bart Visscher 98bc916016 Make check for writable apps dir configurable
Conflicts:

	config/config.sample.php
2012-06-19 23:11:14 +02:00
Thomas Mueller 637f8398ba fixes oc-668 2012-06-19 22:37:25 +02:00
Bjoern Schiessle 1b142a1155 quota calculation fixed 2012-06-19 09:36:50 +02:00
Arthur Schiwon 244920aeb0 LDAP: only map users within the User Base Tree 2012-06-19 01:15:58 +02:00
Victor Dubiniuk db7542b640 Reverting 249190c89b. Fixed in master 2012-06-19 00:56:48 +03:00
Victor Dubiniuk 249190c89b Fix mime-type detection 2012-06-19 00:20:33 +03:00
Brice Maron b31962fdc2 Hide image with no source (avoid placeholder img) 2012-06-18 20:15:20 +00:00
Bjoern Schiessle 92bb59c95d fixed broken function call 2012-06-18 17:30:21 +02:00
Bjoern Schiessle 814cab97cf ignore "Shared"-directory when calculating free space
Conflicts:

	lib/fileproxy/quota.php
2012-06-18 17:27:42 +02:00
Bjoern Schiessle ca41f2e96a don't add the "Shared"-directory size to users quota 2012-06-18 15:38:38 +02:00
Bjoern Schiessle 9d0cfacd67 escape log messages to avoid possible js execution 2012-06-18 09:43:56 +02:00
Thomas Tanghus d8048414aa Removed erroneous value attributes. Partial fix for oc-1029. 2012-06-18 00:39:38 +02:00
Tom Needham 8d67ca09b5 user_migrate: remove old code 2012-06-17 12:07:16 +00:00
Thomas Tanghus 33ab91710f PDF Viewer: Double encode link. 2012-06-16 19:49:57 +02:00
Thomas Tanghus 707660b35f files_imageviewer: Double encode paths. Fixes oc-1016. 2012-06-16 18:57:51 +02:00
Georg Ehrke fc632b5795 fix merge conflicts 2012-06-16 09:48:07 +02:00
Georg Ehrke cbe5449f47 remove a closing php tag in calendar 2012-06-16 09:40:32 +02:00
Michael Gapczynski ec3033a5dd Check for '\' as well when searching for parent folders, because Windows returns '\' for dirname() 2012-06-15 19:34:25 -04:00
Tom Needham c1744d2eb6 Move user import to personal settings. Fix user migration between servers. 2012-06-15 23:17:31 +00:00
Bjoern Schiessle 0074062b53 fixed xss vulnerability 2012-06-15 16:16:00 +02:00
Thomas Tanghus 5c6a7172ca Files: Double encode download links. Fix for oc-1016. 2012-06-15 15:58:10 +02:00
Bjoern Schiessle f9c34942e1 applied merge request #128: fixed some sorting and display issues with gallery app.
This also fix bug #872 for the new gallery
2012-06-15 10:46:29 +02:00
Arthur Schiwon b025ff8de3 reverting 8c7fa15aaf, differs between OC3 and 4 2012-06-14 18:33:00 +02:00
Thomas Tanghus 3b58c7a407 Remove debug statements. 2012-06-14 18:03:50 +02:00