wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
5065 commits 157 branches 562 tags 714 MiB
Commit graph

1334 commits

Author SHA1 Message Date
Georg Ehrke
4e53db3d9c Merge branch 'master' into oc_error 2012-06-26 14:17:32 +02:00
Thomas Tanghus
ac4e19218e All is good ;-) 2012-06-26 02:47:59 +02:00
Bart Visscher
c6b9f613bb Cache: try to set the fast cache in the Broker 2012-06-25 21:05:10 +02:00
Bart Visscher
fe0f281b4f Fix setting ETag header on cache miss 2012-06-25 21:05:10 +02:00
Bart Visscher
531c1c509c Cache: Add APC and XCache to global cache handler 2012-06-25 21:05:10 +02:00
Bart Visscher
4e4a1a4274 Cache: Use getUserCache cache in OC_Cache 2012-06-25 21:05:10 +02:00
Bart Visscher
cae089df91 Cache: Create global cache in OC_Cache 2012-06-25 21:05:10 +02:00
Brice Maron
09a9f5400e Trim url and path of appsroot to have and standart type of path fix oc-1107 2012-06-25 15:50:27 +02:00
Frank Karlitschek
a4c47c674d write sql errors into the error log for better debugging 2012-06-25 11:55:51 +02:00
Brice Maron
564cd82599 Fix the fix about filecache and postgres 2012-06-24 20:49:48 +00:00
Brice Maron
2a6a155e23 Correct File cache error with postgresql 2012-06-24 19:52:30 +00:00
Thomas Tanghus
b182e6c86a Trim trailing whitespace from version. 2012-06-24 15:07:44 +02:00
Georg Ehrke
51c5e7035e Merge branch 'master' into oc_error 2012-06-23 19:54:20 +02:00
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
Georg Ehrke
243f910ae4 Merge branch 'master' into oc_error 2012-06-22 21:37:03 +02: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
Georg Ehrke
4d312f7849 Merge branch 'master' into oc_error 2012-06-21 09:08: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
Georg Ehrke
7d0d1ebd4f Merge branch 'master' into oc_error 2012-06-20 20:14:15 +02: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