Commit Graph

1808 Commits

Author SHA1 Message Date
Michael Gapczynski 30b58f5677 Merge branch 'master' into share_api
Conflicts:
	apps/calendar/js/loader.js
	apps/contacts/index.php
	apps/contacts/js/loader.js
	apps/files/js/files.js
	apps/files_sharing/sharedstorage.php
	lib/filesystemview.php
2012-07-25 17:08:18 -04:00
Michael Gapczynski f25ccaff59 Fix filesystem hash, no longer using basicOperation() 2012-07-25 16:55:01 -04:00
Michael Gapczynski 4d17ed2f71 Make file actions permissions aware 2012-07-25 16:33:08 -04:00
Arthur Schiwon eefe6882f9 method not used externally, thus not needed in interface 2012-07-25 12:56:09 +02:00
Arthur Schiwon 6b320a2604 provide recursiveArraySearch as Helper function and make available through API 2012-07-25 12:56:08 +02:00
Arthur Schiwon 57c375ea24 Support for OCA namespace 2012-07-25 12:56:08 +02:00
Arthur Schiwon 81c0ca4ffb remove only internally used function from interface 2012-07-25 12:56:08 +02:00
Arthur Schiwon 0196e6eada Offer User and Group interfaces in public API 2012-07-25 12:56:08 +02:00
Arthur Schiwon e499bc37c8 define an interface for the Group Backend 2012-07-25 12:56:08 +02:00
Arthur Schiwon fdcbc23ed6 define an interface for the User Backend 2012-07-25 12:56:07 +02:00
Michael Gapczynski ede2b8a55f Missed a is_readable() call in local filestorage 2012-07-24 21:17:43 -04:00
Michael Gapczynski f7b89f0475 Add CRUDS permissions calls to filesystem, deprecate is_readable() and is_writable() 2012-07-24 20:10:28 -04:00
Frank Karlitschek d28be8de64 add the calls for the new keyserver. Still not connectect to the encryption system 2012-07-24 15:18:52 +02:00
Robin Appelman 856d9c0b54 some indention fixes 2012-07-24 00:39:59 +02:00
Robin Appelman e49666d36b add option to clear user backends 2012-07-23 22:31:48 +02:00
Frank Karlitschek 21631be2ff make it generic and implement a dummy call for quota set 2012-07-23 19:43:28 +02:00
Frank Karlitschek e7e1f234dd first part of the new new OCS CLOUD module. So far only quota is implemented.
The specification is developed here:
http://www.freedesktop.org/wiki/Specifications/open-collaboration-services-1.7#CLOUD
will be moved to
http://www.freedesktop.org/wiki/Specifications/open-collaboration-services
as soon as everything is done.
2012-07-23 18:34:21 +02:00
Bjoern Schiessle 73734c98e0 - remove namespace from file property name (webdav)
- update script to fix broken properties in the database
2012-07-23 11:00:37 +02:00
Bjoern Schiessle bd63fddbf4 fix broken properties in the database 2012-07-23 10:34:01 +02:00
Bjoern Schiessle c0e37c7d69 quick fix for broken properties 2012-07-23 10:25:35 +02:00
Bart Visscher 9e70f64d44 Fix oc-1163: gzdecode function not always defined
This function is only found in newer php versions
2012-07-22 17:27:30 +02:00
Robin Appelman b1010160b3 CSRF protection for eventsource 2012-07-22 16:37:49 +02:00
Robin Appelman 59ab8b14c7 cache fileid's in oc_cache 2012-07-22 03:24:34 +02:00
Robin Appelman 6843beeae9 add option to only get fast cache 2012-07-22 03:21:20 +02:00
Robin Appelman 51566e87c7 add prefix option to OC_Cache::clear 2012-07-22 02:31:48 +02:00
Robin Appelman 2b74778958 add method to OC_Cache to check whether a fast cache (apc/xdebug/etc) is available 2012-07-22 02:23:24 +02:00
Robin Appelman 2a73678fef use file extension for determining mimetypes on default
should be more reliable for files that "look like" other types based on their magic numbers such as odf and docx files
also a lot faster then the old way
2012-07-22 01:53:20 +02:00
Thomas Tanghus 0eade1b0d5 Code style. One down... 2012-07-21 22:00:27 +02:00
Georg Ehrke f9d3388854 Merge branch 'master' into calendar_import 2012-07-21 17:37:10 +02:00
Georg Ehrke 11725efd7e add some hooks for subadmins 2012-07-21 16:43:39 +02:00
Georg Ehrke 5508a95065 Merge branch 'master' into subadmin 2012-07-21 13:14:52 +02:00
Bart Visscher 5381cc7418 Fix missing parameter decleration, thanks Jenkins :-) 2012-07-21 01:18:51 +02:00
Robin Appelman 8a19e134df fix ununsed variables 2012-07-21 00:20:27 +02:00
Robin Appelman aa118a4c64 remove obsolete oc_filesystem::mountall 2012-07-21 00:20:26 +02:00
Bart Visscher 0b338a7a41 Add missing public to function definition 2012-07-21 00:13:30 +02:00
Bart Visscher 14af503374 Fix parameter order in OC_Filestorage_Common->hash 2012-07-21 00:13:30 +02:00
Bart Visscher cdd9ffc8a5 Add ETag support to the Sabre file connector.
This is based on the md5 of the file, can be changed later
2012-07-21 00:13:30 +02:00
Bjoern Schiessle 53bdb049cb adapted to new SabreDav version 2012-07-20 23:31:08 +02:00
Thomas Tanghus 0af454a23b Trying to get documentation to "Do The Right Thing" (TM) 2012-07-20 23:11:06 +02:00
Tom Needham 29d16f61fa Fix strict standards warnings 2012-07-20 19:27:51 +00:00
Thomas Tanghus de8ed98541 Added some more documentation to OCP\JSON. 2012-07-20 21:20:51 +02:00
Thomas Tanghus 10337c059c Added some documentation for OCP\JSON::callCheck() 2012-07-20 20:15:39 +02:00
Robin Appelman d393638cc8 forgot to make one function abstract 2012-07-20 19:03:33 +02:00
Robin Appelman c9be9ab251 remove unused variables 2012-07-20 18:56:18 +02:00
Robin Appelman 7152b8b4ee remove unused and depricated getFolderSize 2012-07-20 18:32:40 +02:00
Robin Appelman 39086ef63e dont try to create mountpoints automatically 2012-07-20 17:58:06 +02:00
Robin Appelman 48306a3c4f fix unused variables 2012-07-20 17:58:05 +02:00
Robin Appelman 0e111e1a17 fix increasing folder sizes in filecache for custom roots 2012-07-20 17:58:05 +02:00
Robin Appelman 57ed83f266 fix eventsource fallback when more then one eventsource is active 2012-07-20 17:58:05 +02:00
Georg Ehrke fdb167a046 Merge branch 'master' into subadmin 2012-07-20 17:20:14 +02:00
Robin Appelman 445f52ef8b dont check for filecache updates when getting quota info over webdav 2012-07-20 16:35:51 +02:00
Georg Ehrke ea79ff191c Merge branch 'master' into subadmin 2012-07-20 15:22:12 +02:00
Robin Appelman 98e769d269 dont use the mtimes stored in zip archives since they dont update correctly 2012-07-20 00:52:10 +02:00
Georg Ehrke abb9f52dd7 add isGroupAccessible in OC_SubAdmin 2012-07-19 19:17:01 +02:00
Robin Appelman e52ab59b40 Revert "use readfile() instead iof fopen() for file download over webdav."
This reverts commit 9af74a9c80.
2012-07-19 18:13:10 +02:00
Georg Ehrke 05bc541276 add some doc for lib/subadmin.php 2012-07-19 16:43:46 +02:00
Robin Appelman 33b8de91ea allow a more flexible way of using user backends 2012-07-19 16:31:55 +02:00
Georg Ehrke 6e139f16e4 add isUserAccessible method to OC_SubAdmin class 2012-07-19 16:30:58 +02:00
Frank Karlitschek 10bf36a6ae 4.0.5 2012-07-19 09:10:18 +02:00
Georg Ehrke a5bebb86a5 add checkSubAdminUser method to OC_JSON class 2012-07-18 17:11:09 +02:00
Georg Ehrke f0c82686fd Merge branch 'master' into subadmin 2012-07-18 00:04:17 +02:00
Robin Appelman f047fdbfaa revert to using fopen for webdav instead of readfile 2012-07-16 19:58:05 +02:00
Georg Ehrke ccb1c57745 add warning in log if OC_L10N::tA was called 2012-07-16 19:35:40 +02:00
Michael Gapczynski 72ebc2a32a Delete old session files, suggested by Torben Nehmer, see bug oc-736 2012-07-15 15:22:31 -04:00
Michael Gapczynski b1a7826d56 Check if user is already logged in for DAV auth, instead of logging in and creating new sessions for every request 2012-07-15 15:17:27 -04:00
Georg Ehrke d49b789348 Merge branch 'master' into calendar_import 2012-07-15 16:56:38 +02:00
Georg Ehrke 4700222ea9 Merge branch 'master' into subadmin 2012-07-15 16:33:17 +02:00
Georg Ehrke e707e94857 subadmins can now add users 2012-07-15 16:31:28 +02:00
Michael Gapczynski 1ff2dd8f63 Listen to post_deleteUser, post_addToGroup, and post_removeFromGroup hooks 2012-07-14 14:06:57 -04:00
Michael Gapczynski cc6c940b9a Implement post_removeFromGroup() 2012-07-14 11:55:22 -04:00
Michael Gapczynski 82dea705d4 Add option to delete() to check the owner of the first search of reshares 2012-07-14 11:53:02 -04:00
Michael Gapczynski 0e9ab5cf2a Fix post_deleteUser(), column name changed and item_source is no longer needed 2012-07-14 11:02:16 -04:00
Michael Gapczynski 459bcd8d5e Update documentation 2012-07-14 10:55:34 -04:00
Michael Gapczynski bbbfc2c565 Fix delete(), it was going in an infinite loop 2012-07-14 10:52:31 -04:00
Michael Gapczynski 8de69fcb18 Update documentation 2012-07-14 10:19:18 -04:00
Michael Gapczynski 51a4518396 Add support for CRUDS permissions 2012-07-14 09:35:39 -04:00
Robin Appelman b45d3ced79 fix remote and public.php 2012-07-13 22:44:35 +02:00
Thomas Mueller 967c6d7d3c allow command line based installation/setup 2012-07-13 13:25:43 +02:00
Bjoern Schiessle 80ed5412f1 if the '/Shared' was the modified directory, than scan it. 2012-07-13 11:57:14 +02:00
Michael Gapczynski f638340d1f Add check for folder item type as well 2012-07-12 14:29:51 -04:00
Michael Gapczynski 63b6f20e05 Move already shared with check out of user and group cases, and add check for already shared with inside a collection 2012-07-12 12:11:04 -04:00
Michael Gapczynski ecae3ea430 Rename parents to collectionTypes, getCollectionItemTypes() shouldn't include the original item type 2012-07-12 12:10:50 -04:00
Michael Gapczynski bdcfa4bb63 Add check if file is found in file cache 2012-07-11 20:43:48 -04:00
Michael Gapczynski 4bf13adff2 Merge branch 'master' into share_api
Conflicts:
	apps/contacts/lib/addressbook.php
	apps/files_sharing/js/share.js
	apps/files_sharing/sharedstorage.php
2012-07-11 20:25:59 -04:00
Michael Gapczynski 632fc6ec61 Fix log write() parameters in wrong order 2012-07-11 19:38:57 -04:00
Lukas Reschke ac5abc5603 Handling exceptions 2012-07-11 19:38:57 -04:00
Michael Gapczynski e887fd7ba8 Catch exceptions from PHPMailer 2012-07-11 19:38:57 -04:00
Michael Gapczynski 71491612e3 Move line counter so we only count lines towards the offset that are equal or above the log level 2012-07-11 19:38:56 -04:00
Michael Gapczynski bc3462f022 Improvements and bug fix for log reading, fixes bug oc-982 2012-07-11 19:38:56 -04:00
Michael Gapczynski 281bf62af9 Fix log write() parameters in wrong order 2012-07-11 15:56:18 -04:00
Lukas Reschke 8afcddf44f Handling exceptions 2012-07-11 21:52:51 +02:00
Michael Gapczynski 66da0a2151 Catch exceptions from PHPMailer 2012-07-11 15:36:27 -04:00
Michael Gapczynski ccb5e99395 Generate random token for private links (more entropy than past private links) 2012-07-11 12:18:59 -04:00
Bjoern Schiessle 9af74a9c80 use readfile() instead iof fopen() for file download over webdav.
fopen() didn't work for large files on some servers while readfile()
seems to work for all files on all configurations.
2012-07-11 12:04:20 +02:00
Georg Ehrke 0cb9f5e159 fix merge conflicts 2012-07-11 10:50:18 +02:00
Georg Ehrke 5575493900 Merge branch 'master' into calendar_import 2012-07-11 10:47:30 +02:00
Michael Gapczynski a7416b1cd8 Add back returning only the item if the limit is 1 and now check that the format is set to none 2012-07-10 21:30:16 -04:00
Michael Gapczynski c21ff29a53 Fix getItems() calls 2012-07-10 21:29:34 -04:00
Michael Gapczynski 7c908a0016 Sharing files working using share API 2012-07-10 18:56:22 -04:00
Bjoern Schiessle e7a0c4f0bb use readfile() instead iof fopen() for file download over webdav.
fopen() didn't work for large files on some servers while readfile()
seems to work for all files on all configurations.
2012-07-10 19:22:06 +02:00
Johannes Willnecker 570ea787f1 fixed typo 2012-07-10 16:58:37 +02:00
Johannes Willnecker 3e53bf4a86 Fix for oc-972, oc-1144 and oc-1191 2012-07-10 16:58:37 +02:00
Robin Appelman b470869114 when checking for updates in the filecache, explicitly state that we are querying a folder 2012-07-10 14:42:15 +02:00
Georg Ehrke d0b625352c some work on subadmins 2012-07-09 21:51:19 +02:00
Jörn Friedrich Dreyer e59a1806cf remove superfluous ?> at the end of .php files (left out apps/*/templates) 2012-07-09 16:51:16 +02:00
Bjoern Schiessle 82a57f0ce3 revert performance improvements in userExists() because it breaks new user creation 2012-07-09 10:31:50 +02:00
Bjoern Schiessle 7d41d3aba8 webdav ssl cleanup 2012-07-09 09:40:33 +02:00
Thomas Tanghus 6116dc6b65 Added default parameter $reset to allow for incremental rescan. 2012-07-09 00:14:42 +02:00
Bart Visscher e8010209bb Custom chunking support 2012-07-08 22:11:36 +02:00
Lukas Reschke b46d3019ca Uninitialized variable 2012-07-07 15:52:49 +02:00
Lukas Reschke ec7bb86b28 Fixes a problem with the user creation ("User already existed" even if the user don't exists.) Thanks to Phil Reinhardt for pointing this out. 2012-07-07 15:00:02 +02:00
Michael Gapczynski f955e5e9b2 Move line counter so we only count lines towards the offset that are equal or above the log level 2012-07-06 17:29:45 -04:00
Michael Gapczynski 466d7c0d99 Improvements and bug fix for log reading, fixes bug oc-982 2012-07-06 15:51:01 -04:00
Bjoern Schiessle e91b4bc2ac allow user to upload his own root certificate for secure webdav mount 2012-07-06 15:58:38 +02:00
Bjoern Schiessle ba8dee0520 introduce subclassed client.php and revert changes to 3rdparty 2012-07-06 12:26:54 +02:00
Georg Ehrke 9a10efd80f Merge branch 'master' into calendar_import 2012-07-06 11:01:12 +02:00
Bjoern Schiessle 5bf050b13b moved performance improvement from isLoggedIn() to userExists() to avoid webdav problems 2012-07-05 15:55:46 +02:00
Georg Ehrke c067930856 Merge branch 'master' into subadmin 2012-07-05 11:32:59 +02:00
Georg Ehrke aa95cf2c98 Merge branch 'master' into calendar_import 2012-07-05 11:30:37 +02:00
Bart Visscher 280c59e914 More helpfull debug msg for redirectToDefaultPage 2012-07-04 17:51:07 +02:00
Bart Visscher 621b83df72 Remove referer check, this is unreliable. The header doesnt need te exist, or can be wrong 2012-07-04 17:51:07 +02:00
Georg Ehrke 657eef354a Merge branch 'master' into calendar_import 2012-07-04 13:03:30 +02:00
Brice Maron 3b09aa8578 Correct Postgresql connection with space in password. Work around php bug 2012-07-04 10:13:00 +00:00
Georg Ehrke f98bd1ad66 Merge branch 'master' into calendar_import 2012-07-03 22:35:46 +02:00
Michael Gapczynski 96dea9507a Return false for single item checks and an empty array for multiple item checks 2012-07-03 14:03:04 -04:00
Michael Gapczynski 5e8ef33190 Clean up in the dropdown for unsharing 2012-07-03 14:00:09 -04:00
Bjoern Schiessle aec6eea235 use filesystem abstraction layer to copy file versions 2012-07-03 18:25:49 +02:00
Michael Gapczynski 4185bd6292 Load shared addressbooks inside OC_Contacts_Addressbook instead of the index, add public functions getItemShared(With)BySource() for contacts app 2012-07-03 11:11:01 -04:00
Georg Ehrke 641e77327e Merge branch 'master' into calendar_import 2012-07-03 16:48:30 +02:00
Bjoern Schiessle 4bc9e4e012 wrong var name fixed 2012-07-03 16:43:57 +02:00
Georg Ehrke cfcfdd674e Merge branch 'master' into calendar_import 2012-07-03 13:43:52 +02:00
Brice Maron 8a1c279183 Escape pg connection string on setup 2012-07-03 09:20:42 +02:00
Michael Gapczynski 77b582e4e6 Change getItems() return to a 3-dimensional array to handle multiple shares of the same item 2012-07-02 15:29:34 -04:00
Arthur Schiwon 52822652bc provide multibyte aware helper functions mb_str_replace, mb_substr_replace and mb_array_change_key_case for handling with UTF 8 2012-07-02 20:31:19 +02:00
Michael Gapczynski dd56416a39 Remove the method getItemsSharedStatuses, it is easy enough to just pass the format instead 2012-07-02 14:23:13 -04:00
Lukas Reschke 90331a3fa1 Remove forced download 2012-07-02 12:20:43 +02:00
Lukas Reschke 0465129eba Remove the forced download§ 2012-07-02 12:19:48 +02:00
Lukas Reschke 47bad20132 Restoring stable4... 2012-07-02 10:47:45 +02:00
Lukas Reschke e29681e233 Applying the fix 2012-07-02 10:29:04 +02:00
Lukas Reschke 5223724809 Wrong file - Sorry! 2012-07-02 10:28:11 +02:00
Lukas Reschke f8cebed348 Don't display error messages 2012-07-02 10:24:22 +02:00
Georg Ehrke e4960c3bb4 fix a small PHP fail 2012-07-02 10:23:32 +02:00
Lukas Reschke 4235ce0b63 Merge branch 'stable4' of gitorious.org:owncloud/owncloud into stable4 2012-07-02 10:22:33 +02:00
Lukas Reschke 134d5d93c8 Don't display error messages 2012-07-02 10:21:38 +02:00
Georg Ehrke 8b5cae3c6c fix a small PHP fail 2012-07-01 21:50:53 +02:00
Lukas Reschke fa7d4c2b39 Disable mimesniffing 2012-07-01 13:53:06 +02:00
Lukas Reschke 4e63981da9 Disable mimesniffing 2012-07-01 13:45:20 +02:00
Michael Gapczynski 3e8a34f906 Don't select all columns for FORMAT_STATUSES 2012-06-30 21:15:10 -04:00
Michael Gapczynski c073216d8d Don't overwrite the item variable when checking if the item is already shared 2012-06-30 20:57:31 -04:00
Tom Needham b2cb7d54d1 Fixed app path 2012-06-30 22:56:47 +00:00
Tom Needham cfc78d44bb Return correct json response, fix syntax 2012-06-30 22:56:47 +00:00
Michael Gapczynski 75c111a33b Have getItems() return an empty array instead of false, so apps only need to do an array_merge() 2012-06-30 18:00:01 -04:00
Michael Gapczynski 7a649fc65a Switch back to registering just the class and not the object, better for performance 2012-06-30 17:25:21 -04:00
Georg Ehrke 4890bbb30d Merge branch 'master' into calendar_import 2012-06-30 22:08:36 +02:00
Florian Hülsmann 4ed55315e7 fixed linkTo() 2012-06-30 16:53:41 +02:00
Georg Ehrke 246894243a Merge branch 'master' into calendar_import 2012-06-29 21:46:09 +02:00
Bjoern Schiessle 94add1c000 typo fixed 2012-06-29 16:49:22 +02:00
Bjoern Schiessle b95996c02c - when creating a new text file or directory which name already exist use the same pattern as for file uploads in such a case (add a (N) to the name)
- don't allow renaming if a file/directory with the name already exists
2012-06-29 15:23:04 +02:00
Bart Visscher 1ccbbfad53 Spelling fix 2012-06-28 22:11:04 +02:00
Bart Visscher bf09edcbf1 Remember the app root information. 2012-06-28 22:11:04 +02:00
Bart Visscher 19bb4e83c9 Remove redundant code from OC_Helper::linkTo 2012-06-28 22:11:04 +02:00
Brice Maron b2cbf1199d Pg setup enhancement
do not create a db if already existing .. and reset the user password instead of creating if the user already exists
2012-06-28 19:38:03 +00:00
Michael Gapczynski 45e964c7aa Return login errors for PostgreSQL setup 2012-06-27 20:25:46 -04:00
Michael Gapczynski 81953e7bb5 Return login errors for PostgreSQL setup 2012-06-27 20:24:06 -04:00
Tom Needham 7284e57c91 Migration: fix app paths 2012-06-27 20:43:33 +00:00
Brice Maron 2706988225 Set table prefix if not set in postgresql install 2012-06-27 16:08:46 -04:00
Bart Visscher 2d8a380a21 Fix recursion when running an update script 2012-06-27 14:56:34 +02:00
Georg Ehrke 726bec73f0 Merge branch 'master' into oc_error 2012-06-27 14:06:31 +02:00
Georg Ehrke 153ce2f9ab Merge branch 'master' into calendar_import 2012-06-27 14:02:05 +02:00
Robin Appelman 12f7cb8767 fix running tests from cli 2012-06-27 13:21:45 +02:00
Robin Appelman 420d23a875 fix webdav errors for empty folders 2012-06-27 13:08:16 +02:00
Michael Gapczynski cb19fdd55b Show users and groups shared with in dropdown 2012-06-27 01:05:37 +02:00
Michael Gapczynski d95d738723 Fix FORMAT_STATUSES 2012-06-27 01:05:36 +02:00
Michael Gapczynski 9fdfcc29fe Fix group sharing 2012-06-27 01:05:36 +02:00
Bart Visscher d332e1e9c1 Documentation fix 2012-06-27 01:05:36 +02:00
Michael Gapczynski c41cb192c9 Fix which line needs '' wrapped around the array values 2012-06-27 01:05:36 +02:00
Michael Gapczynski 243faf6334 Fix searching for parent item types, search for file source instead of item source for the file item type in case the item was converted 2012-06-27 01:05:36 +02:00
Michael Gapczynski 32f9901bcd Fix retrieving supported file extensions from backend and remove the dependsOn and supportedFileExtensions parameters from registerBackend() 2012-06-27 01:05:36 +02:00
Michael Gapczynski 28b7793d5b Fixes and change database table from sharing to share 2012-06-27 01:05:36 +02:00
Michael Gapczynski f21fdf14f9 Forgot I got rid of the class field backendTypes, use the array keys of the backends field instead 2012-06-27 01:05:36 +02:00
Michael Gapczynski bc68f14c4b Prepare drop down UI for share API 2012-06-27 01:05:36 +02:00
Michael Gapczynski 8198114615 Some more changes to getItems() and fixes in shared storage 2012-06-27 01:05:36 +02:00
Michael Gapczynski 5f1aa1b92e Fix additional getItems calls due to parameter change 2012-06-27 01:05:36 +02:00
Michael Gapczynski 71350bc618 I'm having trouble making up my mind... translateItem -> getItems() -> formatItems(). It may change again. Preparing shared storage for new api. 2012-06-27 01:05:36 +02:00
Michael Gapczynski 10986f00dc Use share type and share with in db instead of separate columns for user and group 2012-06-27 01:05:36 +02:00
Michael Gapczynski bd8769a7c5 Fixes for registering and fetching backends 2012-06-27 01:05:36 +02:00
Michael Gapczynski c7e0449a75 Finish parent folder implementation, change recursive delete process 2012-06-27 01:05:36 +02:00
Michael Gapczynski 0cc7ae904d Initial work on a share API 2012-06-27 01:05:36 +02:00
Bart Visscher dab58f3464 Cache result of OC_App::getAppVersions 2012-06-27 01:05:12 +02:00
Bart Visscher 2f0b4983e9 Move app upgrade check to loading of apps 2012-06-27 01:05:12 +02:00
Thomas Tanghus a25ae4b4b6 Make Categories a bit quieter. 2012-06-27 01:03:53 +02:00
Frank Karlitschek d163fe02cd 4.0.4 2012-06-26 21:51:32 +02:00
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
Thomas Tanghus b1f3364eee Maybe fix out of memory..? 2012-06-25 19:42:38 +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
Frank Karlitschek ac358ed1b3 4.0.3a
Two important fixes after 4.0.3
2012-06-24 11:38:54 +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
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 a8868fa007 work with non existing apps directory. thanks toAntonio for the hint 2012-06-23 16:20:31 +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
Bart Visscher 60f558cdbb Fix initialization of OC_Filesystem setup from DAV 2012-06-22 17:20:10 +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
Brice Maron e5d458c068 Correct File cache error with postgresql 2012-06-22 10:46:49 +02:00
Thomas Mueller ba2d203a54 some path fixes for multi-dir app 2012-06-22 09:56:54 +02:00
Frank Karlitschek ca6339c480 4.0.3 2012-06-22 09:25:41 +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
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
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 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
Robin Appelman d0455c5819 truncate decrypted files based on filelength 2012-06-21 17:38:00 +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
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 43674b1759 fix mimetype for cdr files - bugfix for oc 559 2012-06-21 09:58:04 +02:00
Georg Ehrke 4d312f7849 Merge branch 'master' into oc_error 2012-06-21 09:08:38 +02:00