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

1991 commits

Author SHA1 Message Date
Frank Karlitschek
850ee93711 add impress mimetype 2012-08-17 12:39:05 +02:00
Robin Appelman
53a888cc81 more path normalization 2012-08-17 01:22:54 +02:00
Michael Gapczynski
df8a2e5361 File sharing cleanup, works perfectly I think :) 2012-08-16 12:20:14 -04:00
Jenkins for ownCloud
1e6dc67517 [tx-robot] updated from transifex 2012-08-16 02:09:15 +02:00
Michael Gapczynski
9cb3113f42 Fix problems exposed by tests 2012-08-15 11:59:08 -04:00
Michael Gapczynski
137e4cb342 Add tests for Share API, all tests passing :) 2012-08-15 11:55:54 -04:00
Jenkins for ownCloud
da3896808a [tx-robot] updated from transifex 2012-08-15 02:07:20 +02:00
Michael Gapczynski
ddfa760a5e Change to correct function call getItemSharedWithBySource() 2012-08-14 17:06:41 -04:00
Michael Gapczynski
b440dfc67e Remove setTarget() function, changing target names only leads to confusion 2012-08-14 17:05:38 -04:00
Michael Gapczynski
9661a63a72 Ensure permissions can't be escalated during a reshare 2012-08-14 16:54:38 -04:00
Michael Gapczynski
028c79fc9d Use if instead of switch for detecting share type and throw exceptions when setting permissions 2012-08-14 16:30:13 -04:00
Michael Gapczynski
937d1b29d8 Retrieve all file dependent items when looking for file item type 2012-08-14 11:02:29 -04:00
Michael Gapczynski
4c7fd8cd01 Merge branch 'master' into share_api 
Conflicts:
	lib/group.php
	lib/group/backend.php
	lib/group/database.php
	lib/group/interface.php
	lib/public/user.php
	lib/user.php
	lib/user/backend.php
	lib/user/database.php
	lib/user/interface.php
 2012-08-14 10:22:13 -04:00
Robin Appelman
1522f7f211 fix some minor problems with path noramlization 2012-08-14 03:07:14 +02:00
Robin Appelman
0c8ce0bb32 some basic path normalization 2012-08-14 02:44:45 +02:00
Michael Gapczynski
863d3a43b2 Catch exceptions and write to log when creating storage object fails 2012-08-13 17:10:58 -04:00
Lukas Reschke
e72a57f595 Also check for some other files 2012-08-13 00:57:01 +02:00
Michael Gapczynski
64ef1e2181 Change name of share function to shareItem, silly PHP 5.3.1 thinking it is a constructor... 2012-08-12 14:49:41 -04:00
Jakob Sack
4d3d4522f9 Backgroundjobs: Fix wrong var names 2012-08-12 12:14:27 +02:00
Jakob Sack
deef1f73db Backgroundjobs: fix bug in QueuedTask 2012-08-12 09:02:20 +02:00
Michael Gapczynski
a1c88a3e39 Add search, limit, offset parameters to usersInGroups() 2012-08-11 16:25:28 -04:00
Michael Gapczynski
4f1b3631ba Change limit parameter in OC_User as well 2012-08-11 16:25:28 -04:00
Michael Gapczynski
874f31b8d7 Make getting all users and groups the default 2012-08-11 16:25:27 -04:00
Michael Gapczynski
8d1eb674ec Add search, limit, and offset parameters to getUsers() and getGroups() 2012-08-11 16:25:27 -04:00
Jakob Sack
1d7e3071e0 bump version to reate new tables 2012-08-11 17:32:17 +02:00
Lukas Reschke
0d8df3f55c Revert "Combine install checks in lib/base.php" 
This reverts commit aa9fbf6639.
 2012-08-11 17:07:35 +02:00
Michael Gapczynski
465767670b Check blacklist when renaming files 2012-08-11 11:04:04 -04:00
Lukas Reschke
8ec45870a3 Validate cookie properly and prevent auth bypass 
BIG (!) thanks to Julien CAYSSOL
 2012-08-10 15:28:59 +02:00
Jakob Sack
0ea4fa298c Backgroundjobs: don't try to access OC_Appconfig if ownCloud has not been installed 2012-08-10 13:53:40 +02:00
Jakob Sack
81b997b56e Merge branch 'backgroundjobs' 2012-08-10 13:00:51 +02:00
Bart Visscher
82b10954e7 Simplify loading app php script files 2012-08-10 12:27:37 +02:00
Bart Visscher
5e7086adc9 Move login handling to OC class 2012-08-10 12:17:13 +02:00
Bart Visscher
83403784d1 Always load when the requested file is css 2012-08-10 11:43:04 +02:00
Bart Visscher
da07245f59 Move OC::loadfile and OC::loadapp next to OC::handleRequest 2012-08-10 11:43:04 +02:00
Bart Visscher
e3c732040b Make OC::loadfile and OC::loadapp protected, only used in OC::handleRequest 2012-08-10 11:43:04 +02:00
Bart Visscher
0973969386 Cleanup OC::loadfile 2012-08-10 11:43:04 +02:00
Bart Visscher
667cd318fe Use OC_Util::displayLoginPage and cleanup the function 2012-08-10 11:43:04 +02:00
Bart Visscher
aa9fbf6639 Combine install checks in lib/base.php 2012-08-10 11:43:04 +02:00
Jakob Sack
f46fdfd814 Backgroundjobs: Add reset counter in worker 2012-08-09 22:30:11 +02:00
Jakob Sack
a6a1f892f0 BackgroundJobs: fix bug 2012-08-09 22:07:18 +02:00
Michael Gapczynski
be03ee29f0 Bump up version number 2012-08-09 13:55:36 -04:00
Jakob Sack
28c1ec19ea BackgroundJob: forgot to rename file 2012-08-09 19:26:49 +02:00
Jakob Sack
ceda0ae052 Backgroundjobs: rename ScheduledTask to QueuedTask 2012-08-09 19:04:04 +02:00
Michael Gapczynski
78cd1153f0 Merge branch 'master' into share_api 
Conflicts:
	apps/contacts/lib/vcard.php
	apps/files_sharing/sharedstorage.php
 2012-08-09 11:38:22 -04:00
Robin Appelman
acd8381094 fix scanning of archives in some cases 2012-08-09 16:36:16 +02:00
Georg Ehrke
10d0861872 remove unstable lib 2012-08-09 12:37:26 +02:00
Jakob Sack
889f0a1c6d rename appconfig keys for backgroundjobs 2012-08-09 10:40:39 +02:00
Michael Gapczynski
b830b3e24b Start adding permission checks for addressbooks 2012-08-08 21:43:02 -04:00
Michael Gapczynski
2c5744f16c Add back getItemSharedWithBySource(), some situtations require this ability 2012-08-08 20:56:55 -04:00
Jakob Sack
37ee88aa6d Fixed bug in OC_BackgroundJob_Worker 2012-08-09 01:29:15 +02:00
Jakob Sack
13a0818fec Be more precise regarding backgroundjobs mode 2012-08-09 01:02:05 +02:00
Jakob Sack
4107273a79 fix license text 2012-08-09 00:46:50 +02:00
Jakob Sack
088b3ea0bc Add public interface to background jobs 2012-08-09 00:01:06 +02:00
Jakob Sack
443e198224 Renaming backgroundjobs on file system as well 2012-08-09 00:00:12 +02:00
Jakob Sack
6025d2ebc3 Rename Backgroundjobs to BackgroundJob 2012-08-08 23:59:30 +02:00
Jakob Sack
4f90860001 Add initial version of backgroundjobs library 2012-08-08 23:39:30 +02:00
Bart Visscher
3387454094 Move login code from index.php to OC class 2012-08-08 22:42:51 +02:00
Bart Visscher
9156fb73fd Move handling request of index.php to OC class 2012-08-08 22:42:50 +02:00
Bart Visscher
7522a23693 Remove unused RUNTIME_NOSETUPFS var 2012-08-08 22:42:50 +02:00
Bjoern Schiessle
0bf2a3e6d6 while loop not needed because of recursive call of put() 2012-08-08 11:29:44 +02:00
Bjoern Schiessle
dc927bd346 fix for bug 879 - add parent directory to file cache if it does not exist yet. 
This can happen if the sync client is used before user created the root directory (e.g. through web login) for example.
 2012-08-08 10:51:19 +02:00
Bart Visscher
b287b11ff2 adjust the query generation in getItems, to use placeholders 2012-08-07 21:49:31 +02:00
Michael Gapczynski
3533f43d12 Implement groupExists in group database backend 2012-08-07 14:48:55 -04:00
Bart Visscher
31003b475e Decode the alternative path_info 2012-08-07 20:43:00 +02:00
Bart Visscher
7d20e98aec Move getting the path info to OC_Request 2012-08-07 20:43:00 +02:00
Bart Visscher
34c076e2a8 Add comments the other functions in OC_Request 2012-08-07 20:43:00 +02:00
Bart Visscher
99ce7ba1df Move serverHost and serverProtocol functions to OC_Request 2012-08-07 20:43:00 +02:00
Bart Visscher
c4f1a1de5b Added function to make url absolute 2012-08-07 20:43:00 +02:00
Bart Visscher
6d0390dcca Fix rewriting GET parameters with ? in REQUESTEDAPP 2012-08-07 20:43:00 +02:00
Michael Gapczynski
8d56c42fde Add search and limit to getGroups search in groupExists implementation 2012-08-07 14:42:11 -04:00
Michael Gapczynski
b6bbbb4c47 Remove undefined return variable 2012-08-07 14:38:02 -04:00
Michael Gapczynski
a96a75c263 Select the correct column when searching for similar targets 2012-08-06 16:48:20 -04:00
Michael Gapczynski
5e95e2a131 Set filePath variable 2012-08-06 16:46:44 -04:00
Michael Gapczynski
1b21cde2b3 Throw more exceptions 2012-08-06 16:37:51 -04:00
Michael Gapczynski
14d13a740f Load icons for addressbooks, fix statuses for types other than files 2012-08-06 15:24:08 -04:00
Michael Gapczynski
e954de6030 Make the file source path relative earlier 2012-08-06 14:15:37 -04:00
Michael Gapczynski
e280e3ecc9 Throw more exceptions 2012-08-06 14:09:58 -04:00
Michael Gapczynski
1db1d40414 Add additional check for post_deleteUser so we don't delete any non-user shares with the same name 2012-08-06 13:58:26 -04:00
Michael Gapczynski
ea23854328 Merge branch 'master' into share_api 
Conflicts:
	apps/contacts/lib/app.php
	apps/contacts/templates/part.chooseaddressbook.rowfields.php
 2012-08-06 13:49:54 -04:00
Bart Visscher
fe6450002d Change hardcoded urls to use linkTo function 2012-08-06 18:51:41 +02:00
Michael Gapczynski
3b2c853916 Lots of refactoring to share API 2012-08-06 11:27:13 -04:00
Thomas Tanghus
cc445e4e47 Small changes to allow updating main menu dynamically. 2012-08-05 01:42:17 +02:00
Thomas Tanghus
3b37181550 Use correct variable name. 2012-08-04 21:25:41 +02:00
Alessandro Cosentino
a6ce497dd9 OC_App::getAppVersion return blank if version is not specified 2012-08-04 13:39:36 -04:00
Jenkins for ownCloud
d7e77f6426 [tx-robot] updated from transifex 2012-08-04 02:04:21 +02:00
Michael Gapczynski
09bb3bfaf8 Preparing for proper collection implementation 2012-08-03 15:05:45 -04:00
Georg Ehrke
fc4a542dd0 add iWork mimetypes 2012-08-03 20:06:29 +02:00
Tom Needham
21f8646ffc API: Fix merging of responses. Return 400 error when no OAuth operation sent. 2012-08-03 15:20:01 +00:00
Bart Visscher
e36e00dc00 Merge branch 'chunked_upload' 2012-08-03 15:58:17 +02:00
Tom Needham
6047a5fe51 API: Check if the consumer has permissions to access the requested method 2012-08-03 11:56:11 +00:00
Tom Needham
a7906d813a Move OAuth classes into lib/oauth 2012-08-03 11:47:05 +00:00
Jenkins for ownCloud
7dc799c167 [tx-robot] updated from transifex 2012-08-03 02:04:12 +02:00
Michael Gapczynski
e3d88270cc OAuth server implementation using oauth library 2012-08-02 20:02:31 -04:00
Bart Visscher
4b9200f6f7 Routing: combine all routes into one set 2012-08-02 21:51:31 +02:00
Bart Visscher
6ba2623485 Move loading of routes to OC::getRouter function 2012-08-02 21:44:58 +02:00
Bart Visscher
37ef522b05 Quick fix for xml encoding arrays 2012-08-02 17:48:09 +02:00
Bart Visscher
7952c6a31c Change access to router object to getter function 2012-08-02 17:47:38 +02:00
Michael Gapczynski
6c7baacf89 Throw exception for items already shared in a collection 2012-08-01 20:08:18 -04:00
Michael Gapczynski
92d683587a Fix contact email share type redirection 2012-08-01 17:52:59 -04:00
Michael Gapczynski
4933128850 Throw exceptions in share API for UI to display 2012-08-01 17:52:29 -04:00
Michael Gapczynski
2201074e1f Basic setup for sharing with contacts 2012-08-01 17:17:28 -04:00
Jörn Friedrich Dreyer
14c5d08a3f reorder code for readability 2012-08-01 22:38:27 +02:00
Bart Visscher
93daa9e247 API: Complete respond function 2012-08-01 19:48:51 +02:00
Tom Needham
c11c2d0fd4 Logout the user at the end of a call to be stateless 2012-08-01 13:39:05 +00:00
Tom Needham
2afe5f9b2b API: add OC_API::checkLoggedIn() 2012-08-01 13:37:00 +00:00
Jörn Friedrich Dreyer
c7be0db853 use dbname for non privileged user 2012-08-01 15:00:54 +02:00
Jörn Friedrich Dreyer
ab976863ae fix sql 2012-08-01 15:00:07 +02:00
Jörn Friedrich Dreyer
e13f381189 add limit support to OC_DB & OCP/DB 2012-08-01 14:59:08 +02:00
Tom Needham
e315384b4d Remove unnecessary include 2012-08-01 10:40:09 +01:00
Tom Needham
e7f7693b2f Fix 3rdparty paths, initialise OAuth in correct order 2012-08-01 10:21:33 +01:00
Michael Gapczynski
b6aa5d2875 Include contacts in share with search 2012-07-31 21:05:00 -04:00
Jakob Sack
1fe9892292 Fix #476 2012-07-31 23:31:25 +02:00
Bart Visscher
7426217e76 Fix /privatedata/getattribute route 2012-07-31 23:26:15 +02:00
Jenkins for ownCloud
36ccaf51ed [tx-robot] updated from transifex 2012-07-31 22:57:24 +02:00
Bart Visscher
71918a820f API: set request method for registered urls 2012-07-31 22:34:35 +02:00
Bart Visscher
9d6a09f589 Routing: Method needs to be uppercase 2012-07-31 22:33:11 +02:00
Bart Visscher
28537037ae Fixup OCS modules 2012-07-31 22:19:11 +02:00
Bart Visscher
c2bdb5c716 Fix require 3rdpartypath 2012-07-31 22:18:16 +02:00
Michael Gapczynski
94ce8f2168 Merge branch 'master' into share_api 
Conflicts:
	apps/contacts/lib/app.php
	apps/files_sharing/js/share.js
 2012-07-31 15:00:04 -04:00
Michael Gapczynski
9e4c3b8342 Remove break, it broke the statuses :) 2012-07-31 14:21:46 -04:00
Jörn Friedrich Dreyer
795e78809f add oracle to install & setup 2012-07-31 19:34:30 +02:00
jfd
ede464f058 escape all identifiers with backticks 2012-07-31 18:53:05 +02:00
Tom Needham
fcf3dbcfc1 Require a username for OC_OAuth::registerConsumer() 2012-07-31 15:02:51 +01:00
Tom Needham
ce41f3801e Actually login the user when using OAuth 2012-07-31 14:59:07 +01:00
Tom Needham
78bbcc8aea Basic OAuth class based on oauth-php. WIP 2012-07-31 14:35:07 +01:00
Tom Needham
5922599f48 Handle function not needed in lib/ocs.php 2012-07-31 14:35:07 +01:00
Tom Needham
b05639e745 Fix error with namespacing 2012-07-31 10:10:15 +00:00
Tom Needham
cc6911e1f7 Make method static 2012-07-31 09:28:12 +00:00
Frank Karlitschek
aa60771736 4.0.6 2012-07-31 10:13:10 +02:00
Michael Gapczynski
2f1a990cad Add search, limit, and offset parameters to getUsers() and getGroups() 2012-07-30 20:20:46 -04:00
Jakob Sack
8a92cd21d6 Remove OC_App::register call in OCP\App::register 2012-07-30 21:26:14 +02:00
Bart Visscher
0a9ca42c34 Fix OC_OCS_Privatedata::privateDataGet 2012-07-30 21:19:03 +02:00
Bart Visscher
7a24f0cd8d Make calling ocs/v1.php/config work 2012-07-30 21:19:02 +02:00
Bart Visscher
180bd69dbb Fix OC_API::register 2012-07-30 21:19:02 +02:00
Bart Visscher
95d3b83a77 Create OC_Router in OC::init 2012-07-30 21:19:02 +02:00
Bart Visscher
0271bfa3b7 Move loading of routes to OC_Router 2012-07-30 21:19:02 +02:00
Tom Needham
2f84a8d746 Merge the responses recursively 2012-07-30 16:04:09 +00:00
Tom Needham
3a0e3708a5 Add public class for registering api calls 2012-07-30 14:26:15 +00:00
Michael Gapczynski
b9bd54bd98 Add additional error handling for emailing private links 2012-07-30 10:07:20 -04:00
Michael Gapczynski
6b83470c96 Fix incorrect copy/paste for file_put_contents() 2012-07-30 10:07:19 -04:00
Michael Gapczynski
93c75f46e5 Forgot data parameter for file_put_contents() streams pre proxies 2012-07-30 10:07:19 -04:00
Michael Gapczynski
ea18d70c60 Run pre and post proxies for file_put_contents() streams 
Conflicts:
	lib/filesystemview.php
 2012-07-30 10:07:19 -04:00
Michael Gapczynski
f328f53ec1 Fix filesystem hash, no longer using basicOperation() 
Conflicts:
	lib/filesystemview.php
 2012-07-30 10:07:19 -04:00
Michael Gapczynski
099b16350f Delete old session files, suggested by Torben Nehmer, see bug oc-736 2012-07-30 10:07:19 -04:00
Michael Gapczynski
89027545a0 Check if user is already logged in for DAV auth, instead of logging in and creating new sessions for every request 2012-07-30 10:07:18 -04:00
Tom Needham
c7c16ac49b Improve merging of api responses 2012-07-30 13:39:06 +00:00
Tom Needham
b0dc4383e1 Clean code slightly 2012-07-30 12:57:35 +00:00
Tom Needham
b563dff10a Record the app that is registering a call to use later with OAuth 2012-07-30 12:56:01 +00:00
Tom Needham
9ffaea480f Add the format parameter inside OC_API 2012-07-30 12:44:34 +00:00
Tom Needham
9072106048 Move OCS methods to lib/ocs/.php 2012-07-30 12:42:18 +00:00
Tom Needham
e33174f115 Add core routes and include them in OC_API::call() 2012-07-30 10:56:21 +00:00
Jenkins for ownCloud
3430dcd367 [tx-robot] updated from transifex 2012-07-30 02:05:41 +02:00
Michael Gapczynski
5262cde6a6 Add additional error handling for emailing private links 2012-07-29 18:02:09 -04:00
Tom Needham
0836366d87 Methods to disable and enable users 2012-07-29 16:07:51 +00:00
Tom Needham
038af7e636 Add method to check if an app is shipped or not 2012-07-29 15:29:26 +00:00
Jenkins for ownCloud
18f6552a08 [tx-robot] updated from transifex 2012-07-29 02:06:29 +02:00
Tom Needham
9dbe5f3703 Load routes before calling actions 2012-07-28 21:57:24 +00:00
Tom Needham
c375774fca Fix odd indentation issue 2012-07-28 21:50:40 +00:00
Tom Needham
20838bb9c2 Basic structure and functionality of api class 2012-07-28 21:40:11 +00:00
Jenkins for ownCloud
fa4052d6f1 [tx-robot] updated from transifex 2012-07-28 02:05:38 +02:00
Bart Visscher
896d27de36 Chunked upload: Support reusing local chunks 2012-07-27 19:35:33 +02:00
Bart Visscher
1ea33ff36b Chunked upload: Refactor OC_FileChunking to object 2012-07-27 19:35:28 +02:00
Bart Visscher
2d85ef0e04 Chunked upload: Refactor to static class 2012-07-27 19:32:44 +02:00
Michael Gapczynski
4c822df28d Fix incorrect copy/paste for file_put_contents() 2012-07-27 09:37:47 -04:00
Bart Visscher
a7a5433108 Merge branch 'master' into chunked_upload 
Conflicts:
	lib/connector/sabre/directory.php
 2012-07-27 11:40:51 +02:00
Michael Gapczynski
ea2e76eecc Forgot data parameter for file_put_contents() streams pre proxies 2012-07-26 23:10:21 -04:00
Michael Gapczynski
d006a551f4 Run pre and post proxies for file_put_contents() streams 2012-07-26 22:53:55 -04:00
Georg Ehrke
16928f4d59 fix spelling fail 2012-07-26 18:50:59 +02:00
Bart Visscher
d26f87e738 Smarter remove of etag properties for path 2012-07-26 17:56:32 +02:00
Bart Visscher
3725cd079b Fix oc-1362: post_rename has no path param but newpath and oldpath 2012-07-26 17:41:57 +02:00
Georg Ehrke
e1d14ab461 Merge branch 'master' into subadmin 2012-07-26 16:47:05 +02:00
Georg Ehrke
e4679770c4 declare OCP\App::register as deprecated 2012-07-26 15:16:07 +02:00
Georg Ehrke
4e62e121a6 mark OCP\App::register as deprecated 2012-07-26 15:12:57 +02:00
Michael Gapczynski
586fe8f940 Change is_writable() call to isUpdatable() 2012-07-25 17:39:28 -04:00
Bart Visscher
783d67be62 Create uniqid ETag for directories 2012-07-25 23:09:03 +02:00
Bart Visscher
381e493a8c Rename functions 
getETagPropertyForFile -> getETagPropertyForPath
removeETagPropertyForFile -> removeETagPropertyForPath
 2012-07-25 23:09:03 +02:00
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
Bart Visscher
b3848581bf Small cleanup 2012-07-25 18:00:03 +02:00
Bart Visscher
5a0d476ab1 Convert new actions 2012-07-25 17:59:50 +02:00
Bart Visscher
d579defc66 Merge branch 'master' into routing 2012-07-25 17:51:36 +02:00
Bart Visscher
ac9dbd4b83 Add functions for the common HTTP methods 2012-07-25 17:45:29 +02: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
Bart Visscher
0040b7109f Merge branch 'master' into routing 
Conflicts:
	lib/ocs.php
 2012-07-24 18:35:09 +02: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
Bart Visscher
768b44b9b6 Convert routing to ownCloud fluid interface 2012-07-23 18:58:52 +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
Bart Visscher
d0cae6a99a Very basic conversion of ocs to Symfony Routing Component 2012-07-21 19:43:50 +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