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

176 commits

Author SHA1 Message Date
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
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
088b3ea0bc Add public interface to background jobs 2012-08-09 00:01:06 +02:00
Bart Visscher
b287b11ff2 adjust the query generation in getItems, to use placeholders 2012-08-07 21:49:31 +02:00
Bart Visscher
99ce7ba1df Move serverHost and serverProtocol functions to OC_Request 2012-08-07 20:43:00 +02: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
Michael Gapczynski
3b2c853916 Lots of refactoring to share API 2012-08-06 11:27:13 -04:00
Michael Gapczynski
09bb3bfaf8 Preparing for proper collection implementation 2012-08-03 15:05:45 -04: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
e13f381189 add limit support to OC_DB & OCP/DB 2012-08-01 14:59:08 +02:00
Michael Gapczynski
b6aa5d2875 Include contacts in share with search 2012-07-31 21:05:00 -04: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
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
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
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
Arthur Schiwon
6b320a2604 provide recursiveArraySearch as Helper function and make available through API 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
Thomas Tanghus
0af454a23b Trying to get documentation to "Do The Right Thing" (TM) 2012-07-20 23:11:06 +02: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
c9be9ab251 remove unused variables 2012-07-20 18:56:18 +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
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
ccb5e99395 Generate random token for private links (more entropy than past private links) 2012-07-11 12:18:59 -04: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
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
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
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
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
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
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
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
Bjoern Schiessle
d9607df26f backport of sanitizeHTML() function 2012-06-20 16:43:31 +02:00
Bjoern Schiessle
6644511124 remove unnecessary comment 2012-06-20 16:29:19 +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
Thomas Tanghus
625cd822c3 Backport CSRF prevention. 2012-06-14 13:52:22 +02:00
Thomas Tanghus
8fd9cbcc54 White-space fix. 2012-06-14 13:23:12 +02: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
344299a074 add two csrf check calls. Review and lot´s of porting needed. 2012-06-09 15:05:14 +02:00
Frank Karlitschek
64fe06710a add deprecated warning 2012-06-04 12:49:33 +02:00
Frank Karlitschek
1e6802e567 add deprecated warning 2012-06-04 12:45:45 +02:00
Frank Karlitschek
0d2d613f59 added a serverProtocol function that correctly returns the used protocol even if the ssl connection is terminated at a reverse_proxy or at a load balancer 2012-06-01 11:06:49 +02:00
Frank Karlitschek
24d14783d7 added a serverProtocol function that correctly returns the used protocol even if the ssl connection is terminated at a reverse_proxy or at a load balancer 2012-06-01 10:38:44 +02:00
Bart Visscher
a33f580db1 Remove OC_App::register function 
The data supplied is never used in OwnCloud. Removed the call from all the apps, and made the public API function empty.
 2012-05-31 13:01:30 +02:00
Frank Karlitschek
a945fa10a6 update copyright 2012-05-26 19:14:24 +02:00
Frank Karlitschek
7e49a33d64 getStorage belongs to files not to apps. 2012-05-19 10:44:08 +02:00
Frank Karlitschek
08f7d4c552 document the public classes a bit more 2012-05-19 10:36:57 +02:00
Sam Tuke
b055ebc1fc added documentation to OCP namespace 2012-05-10 14:19:17 +01:00
Michael Gapczynski
798e6aa40b Merge commit 'refs/merge-requests/100' of git://gitorious.org/owncloud/owncloud into merge-requests/100 2012-05-09 17:50:14 -04:00
Georg Ehrke
bc60b8d87a fix bug in public api 2012-05-09 18:33:40 +02:00