Florian Hülsmann
d450560b39
remove trailing slash in %appswebroot% placeholder
2012-06-23 16:59:55 +02:00
Frank Karlitschek
2c1c1ba88c
close only if exist
2012-06-23 16:21:47 +02:00
Frank Karlitschek
7c5ff900d0
work with non existing apps directory. thanks to Antonio for the hint
2012-06-23 16:17:59 +02:00
Brice Maron
d39d7fb9ff
Remove references to /apps/ and correct inclusion of settings
2012-06-22 22:05:39 +00:00
Brice Maron
33165e3915
Do not close php tag on config file
2012-06-22 21:01:12 +00:00
Brice Maron
b5e3e150eb
Correction of path looking for apps and css
2012-06-22 20:58:52 +00:00
Bart Visscher
ebfc5b2762
Add compatability function for APC cache
2012-06-22 17:21:57 +02:00
Bart Visscher
f655981baf
Fix initialization of OC_Filesystem setup from DAV
2012-06-22 17:21:56 +02:00
Bart Visscher
50667dcb82
Convert OC_L10N_String to a string in OC_JSON::encodedPrint
2012-06-22 17:21:56 +02:00
Bart Visscher
432aa58bab
Spelling fixes
2012-06-22 17:21:56 +02:00
Brice Maron
2d2366bb57
Avoid fetch ocs info if the appstore is disabled
2012-06-22 16:06:46 +02:00
Brice Maron
06e20fe4b8
Correct css inclusion with minimizer
2012-06-22 15:21:44 +02:00
Brice Maron
115c30bdb4
Enhance hint about writable app directory
2012-06-22 13:57:54 +02:00
Brice Maron
8c2803a7c1
Correct image path and apps path replacement
2012-06-22 13:12:03 +02:00
Brice Maron
72fe463f7f
Correct OC_Config writer. Use var_export (has support for array,...)
2012-06-22 12:46:21 +02:00
Brice Maron
df60d6d5d2
Fixes for multi app dir :
...
Url should be given as relative path (to webroot)
Correct link construction from js
2012-06-22 12:24:56 +02:00
Thomas Mueller
ba2d203a54
some path fixes for multi-dir app
2012-06-22 09:56:54 +02:00
Brice Maron
b5953e7a83
Provide solution for smoother migration for apps to multi-app dir
2012-06-21 22:22:36 +00:00
Brice Maron
f46623da6c
Do not search apps if oc is not yet installed
2012-06-21 21:29:18 +00:00
Brice Maron
a5938e4e37
Merge branch 'master' into multi_app_dir
2012-06-21 20:19:31 +00:00
Brice Maron
84b9ac2678
Correct writable check for app dir
2012-06-21 19:35:34 +00:00
Brice Maron
d22f805b63
Correct inclusion paths
2012-06-21 19:19:39 +00:00
Brice Maron
e5c56b2433
Merge branch 'master' into multi_app_dir
...
Conflicts:
lib/app.php
lib/base.php
lib/minimizer/css.php
lib/minimizer/js.php
lib/template.php
lib/util.php
2012-06-21 17:15:35 +00:00
Sam Tuke
a9a913c273
Implemented deleteAll() method in OC_FilesystemView (interface) and OC_Filestorage_Common (logic)
...
Made OC_Filestorage_Local and OC_Filestorage_Shared extend OC_Filestorage_Common
Set searchInDir() to protected instead of private in OC_Filestorage_Local and OC_Filestorage_Shared
Added class documentation to OC_Filestorage_Common
Cleaned up OCA_Versions::expireAll()
2012-06-21 18:15:22 +01:00
Robin Appelman
56de98ed8c
fix saved file size for uploaded files
2012-06-21 18:22:18 +02:00
Robin Appelman
d0455c5819
truncate decrypted files based on filelength
2012-06-21 17:38:00 +02:00
Frank Karlitschek
e95055b2bd
check if the data directory is accessible via http. Show a big security warning if yes
2012-06-21 14:07:04 +02:00
Georg Ehrke
96d0b9834a
fix mimetype for cdr files - bugfix for oc 559
2012-06-21 09:58:38 +02:00
Michael Gapczynski
cc3835d657
Only call OC_FileCache::get('/Shared') if it exists in the file cache, prevents premature addition of the Shared folder to the file cache
...
Conflicts:
lib/fileproxy/quota.php
2012-06-20 19:39:17 -04:00
Sam Tuke
72215a818d
added new user settings interface for deleting old file versions
...
fixed OCA_VersionsexpireAll() to use native PHP readdir()
removed local storage implementation of readdir()
2012-06-20 18:25:12 +01:00
Sam Tuke
d6bf62ea4e
Merge branch 'master' of gitorious.org:owncloud/owncloud
2012-06-20 16:26:02 +01:00
Sam Tuke
c244daac89
removed readdir to fix bug oc-1054
2012-06-20 16:24:49 +01:00
Bart Visscher
0086639891
Merge branch 'audit'
2012-06-20 17:20:39 +02:00
Bart Visscher
7a3d606cac
Prefer requested app before redirecting to default page
2012-06-20 17:10:49 +02:00
Bart Visscher
6404476bec
Delay setup of FS until OC_Filesystem is used
2012-06-20 17:10:49 +02:00
Bart Visscher
5c8e774cea
Small code reorder
2012-06-20 17:10:48 +02:00
Bjoern Schiessle
6644511124
remove unnecessary comment
2012-06-20 16:29:19 +02:00
Robin Appelman
13a9ef36fb
don't show other users file if the filesystem is not index already
2012-06-20 11:34:17 +02:00
Bart Visscher
f54ef5a464
Remove OC::$CONFIG_DATADIRECTORY, not used
2012-06-19 22:54:14 +02:00
Bart Visscher
d8b32c2f0e
Move check code from setupFS to checkServer
2012-06-19 22:54:13 +02:00
Sam Tuke
28a72e0e3c
Fixed deleteAll function for deleting all old versions of files (expireAll)
...
Added new readdir() method to all storage classes and handlers (only working implementation in local.php)
2012-06-19 19:42:40 +01:00
Bjoern Schiessle
f11e4d7cd6
removing sanitizeHTML() function from template.php since I moved it to util.php
...
to make it more generic.
2012-06-19 19:29:43 +02:00
Bart Visscher
4b6f6291c5
Remember result of OC_User::isLoggedIn, can be very expensive to check
2012-06-19 17:54:19 +02:00
Bjoern Schiessle
089ae980c4
use new sanitize HTML function
2012-06-19 17:24:55 +02:00
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