Commit graph

1234 commits

Author SHA1 Message Date
Bjoern Schiessle
d2936bd90c introducing a sanitize HTML function for the internal and the public API. This
allows to easily convert strings to HTML before displaying them on the web page
to reduce the risk of xss vulnerabilities.
2012-06-19 17:20:19 +02:00
Bjoern Schiessle
0469f529fa quota calculation fixed 2012-06-19 09:35:13 +02:00
Thomas Mueller
c1df0539a0 fixes oc-668 2012-06-18 23:33:02 +02:00
Bart Visscher
d4044d0283 Delay loading of translations until they are used 2012-06-18 23:07:32 +02:00
Brice Maron
cfb3b633f5 Force sanitize function to use UTF8 (for php lower than 5.4) 2012-06-18 19:52:05 +00:00
Bjoern Schiessle
e6384251eb Merge branch 'master' of gitorious.org:owncloud/owncloud 2012-06-18 17:25:00 +02:00
Bjoern Schiessle
d496a5e19f ignore "Shared"-directory when calculating free space 2012-06-18 17:23:54 +02:00
Bart Visscher
2f00384b51 Use TemplateLayout functions for finding js and css files in minimizer 2012-06-18 15:40:48 +02:00
Bart Visscher
3000e8f9d5 Prepare template js and css functions for use in the js and css minimizers 2012-06-18 15:40:48 +02:00
Bart Visscher
180243d92a Move page layout handling to its own class 2012-06-18 15:40:48 +02:00
Bart Visscher
332603a263 Move formfactor code to OC_Template 2012-06-18 15:40:48 +02:00
Bart Visscher
977cd0df6b Fix errors for minimizer 2012-06-18 11:33:24 +02:00
Bart Visscher
a5a1a9fd4a Forgot a file 2012-06-18 11:12:53 +02:00
Bart Visscher
617de811f7 Cache the minimized output also on the server 2012-06-18 11:11:46 +02:00
Robin Appelman
549541215e get the correct metadate from updated folders to put in the cache 2012-06-17 02:15:11 +02:00
Michael Gapczynski
e8dd86ce0d Revert "Set default charset to utf-8."
This reverts commit 709dbd82a6.
2012-06-16 19:48:03 -04:00
Robin Appelman
b38e46276f when checking if the content of a folder has been updated, exlicitly state that we are checking a folder
solves some issues with external storages not updating correctly
2012-06-17 01:31:57 +02:00
Bart Visscher
6f93176a4b Be smarter when checking single app language availability 2012-06-16 20:52:10 +02:00
Bart Visscher
6e9cd63fa1 Only check for apps owncloud version requirment when there is a new owncloud version 2012-06-16 20:52:10 +02:00
Thomas Tanghus
709dbd82a6 Set default charset to utf-8. 2012-06-16 17:01:12 +02:00
Tom Needham
8484e16516 Merge branch 'master' of gitorious.org:owncloud/owncloud 2012-06-15 23:14:48 +00:00
Tom Needham
e37ef6dd47 Move user import to personal settings. Fix user migration between servers. 2012-06-15 23:14:40 +00:00
Bart Visscher
6d3ae575b6 Remove $DOCUMENTROOT, not used 2012-06-16 00:11:36 +02:00
Bart Visscher
e11c5a23d5 Optimize WebDav access by preloading dav custom properties 2012-06-15 21:21:42 +02:00
Bart Visscher
e905b14758 Spelling fix 2012-06-15 21:21:42 +02:00
Bart Visscher
463a506fcb Fix webdav property name compare 2012-06-15 21:21:42 +02:00
Bart Visscher
27efdbd58f Use setter for FileinfoCache 2012-06-15 21:21:42 +02:00
Robin Appelman
f06c08a637 cleanup oc_filecache, splitting it in several parts and using the new hasUpdated 2012-06-15 19:56:15 +02:00
Robin Appelman
a9a424a519 also add hasUpdated to oc_filesystem and oc_filesystemview 2012-06-15 17:42:39 +02:00
Robin Appelman
449760f665 add hasUpdated to oc_filestorage 2012-06-15 16:43:24 +02:00
Bart Visscher
400769ab40 Optimize WebDav access using OC_FileCache 2012-06-15 16:04:07 +02:00
Bart Visscher
2b228fba34 Load app before running update script 2012-06-15 11:18:44 +02:00
Bart Visscher
0d3f5f736f Disable minizing when DEBUG is true 2012-06-15 11:18:44 +02:00
Thomas Tanghus
8fd9cbcc54 White-space fix. 2012-06-14 13:23:12 +02:00
Thomas Tanghus
a34db3fbe0 Don't add slash if it's there already. 2012-06-14 13:23:12 +02:00
Bart Visscher
12b34d2dda Whitespace fix 2012-06-13 21:39:12 +02:00
Michael Gapczynski
b5889d6ffe Merge commit 'refs/merge-requests/127' of git://gitorious.org/owncloud/owncloud into merge-requests/127
Conflicts:
	apps/files_external/templates/settings.php
	lib/template.php
2012-06-13 15:17:46 -04:00
Thomas Tanghus
89464721c7 Added JSON methods for CSRF prevention. Make request token accessible from template and add js var. 2012-06-13 17:33:19 +02:00
Frank Karlitschek
9e9c40eabd fix time call 2012-06-13 17:27:49 +02:00
Bartek Przybylski
db1353655b check for view before trying to invoke method on object 2012-06-13 00:32:44 +02:00
Thomas Mueller
521294d0bf fixes http://bugs.owncloud.org/thebuggenie/owncloud/issues/oc-987 2012-06-12 23:16:26 +02:00
Michael Gapczynski
790ae70e32 Create directory for mount point if it doesn't already exist 2012-06-12 15:25:34 -04:00
Lukas Reschke
2b22c538c8 Make some apps compatible 2012-06-11 19:07:51 +02:00
Lukas Reschke
6d68b7620c Check for string 2012-06-11 18:12:46 +02:00
Thomas Tanghus
2ee809fd86 Allow same host redirects (/somepath). 2012-06-11 15:21:37 +02:00
Lukas Reschke
18e44ba2f3 Some updates... 2012-06-11 15:03:45 +02:00
Lukas Reschke
b63795ccb8 Handling arrays 2012-06-11 14:36:11 +02:00
Lukas Reschke
c009bc4b87 Revert 2012-06-11 13:27:32 +02:00
Lukas Reschke
6817a6b102 First try of implementing assignHTML 2012-06-11 12:45:07 +02:00
Frank Karlitschek
cd16c5e479 implement a simple request token session garbage collector 2012-06-11 12:13:08 +02:00