Commit Graph

4662 Commits

Author SHA1 Message Date
Thomas Tanghus ddf321d534 Merge branch 'stable4' of git://gitorious.org/owncloud/owncloud into stable4 2012-06-25 16:22:19 +02:00
Thomas Tanghus 56ed8ba70b Select which address book to add a contact to. Fixes oc-1071. 2012-06-25 16:21:29 +02:00
Arthur Schiwon 594e19bddc LDAP: always sanitize DN and DN-containing attributes 2012-06-25 13:22:49 +02:00
Bjoern Schiessle 85ac75b4f4 xss vulnerability fixed 2012-06-25 12:38:11 +02:00
Bjoern Schiessle 0083dbb3ce Only delete existing thumbnails (bug #1100) 2012-06-25 10:11:06 +02:00
Brice Maron 6da926f1c3 Resolve scanning issue case comparison of songs 2012-06-24 15:58:51 +00:00
Brice Maron 5b908209de Correct seq name in media songs fix oc-589 2012-06-24 15:12:05 +00:00
Frank Karlitschek ac358ed1b3 4.0.3a
Two important fixes after 4.0.3
2012-06-24 11:38:54 +02:00
Georg Ehrke a12557ca4d another fix for oc-1044 2012-06-24 09:42:14 +02:00
Robin Appelman 44e36ecf49 fix 'files' entries showing up in Files before the users files are scanned properly 2012-06-23 23:42:54 +02:00
Robin Appelman f1e4c845ce fix duplicates showing up in the filecache 2012-06-23 23:32:44 +02:00
Tom Needham 1c0e72cd5a Text editor: Waste less space for line numbers 2012-06-23 14:43:52 +00:00
Frank Karlitschek a8868fa007 work with non existing apps directory. thanks toAntonio for the hint 2012-06-23 16:20:31 +02:00
Tom Needham b591c83008 Text Editor: fix editor positioning 2012-06-22 16:20:09 +00:00
Bart Visscher 60f558cdbb Fix initialization of OC_Filesystem setup from DAV 2012-06-22 17:20:10 +02:00
Bjoern Schiessle e943f6c0c8 log messages are looking nicer if they are not escaped. (xss prevention happens on another place) 2012-06-22 16:53:45 +02:00
Bjoern Schiessle b6c862b32f use sanitizeHTML() function
Conflicts:

	apps/gallery/lib/tiles.php
2012-06-22 14:03:05 +02:00
Arthur Schiwon e5171da300 remove unnecessary closing PHP tag 2012-06-22 12:50:49 +02:00
Arthur Schiwon 0d9534eb4b LDAP: cheaper userExists() implementation 2012-06-22 12:43:09 +02:00
Bjoern Schiessle 65c14e21ce date don't change correctly in the view list (bug #973) fixed 2012-06-22 11:32:57 +02:00
Brice Maron e5d458c068 Correct File cache error with postgresql 2012-06-22 10:46:49 +02:00
Frank Karlitschek ca6339c480 4.0.3 2012-06-22 09:25:41 +02:00
Thomas Tanghus d72b85684f Only search for VEVENTs. 2012-06-21 20:53:50 +02:00
Bart Visscher 9045557258 Tasks: Add delete action 2012-06-21 20:18:12 +02:00
Bart Visscher d75b5cfdd2 Tasks: Use list label for ordering by list 2012-06-21 20:18:08 +02:00
Bart Visscher dda56c5e3d Tasks: Fix position of the summary input 2012-06-21 20:17:49 +02:00
Bart Visscher bae592d69b Prefer requested app before redirecting to default page 2012-06-21 20:15:23 +02:00
Bart Visscher a7e427a3cc Remember result of OC_User::isLoggedIn, can be very expensive to check 2012-06-21 20:14:53 +02:00
Bart Visscher 8aa7ed39a5 Only check for apps owncloud version requirment when there is a new owncloud version 2012-06-21 20:13:30 +02:00
Robin Appelman 46ad51cbe2 dont change the encryption key during the test case 2012-06-21 18:53:52 +02:00
Robin Appelman bd8b921de4 only use 1 fsview when initializing encryption 2012-06-21 18:36:16 +02:00
Robin Appelman da9107fe69 fix saved file size for uploaded files 2012-06-21 18:07:56 +02:00
Robin Appelman 7b4cb44af8 truncate decrypted files based on size 2012-06-21 17:51:54 +02:00
Georg Ehrke 096f5598b4 fix calendar 2012-06-21 16:23:13 +02:00
Georg Ehrke 288c5e7581 fix a PHP Notice 2012-06-21 15:20:53 +02:00
Frank Karlitschek 5212fa3fa7 check if the data directory is accessible via http. Show a big security warning if yes 2012-06-21 14:18:43 +02:00
Bjoern Schiessle 3b4d2a971a check if user is allowed to edit bookmarks 2012-06-21 12:29:50 +02:00
Georg Ehrke 37ed3b5bd2 make edit event form work with DateTime Property UTC 2012-06-21 11:35:58 +02:00
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