Commit Graph

241 Commits

Author SHA1 Message Date
Thomas Müller 986f5d9f3e fixing variable name 2012-12-21 00:04:58 +01:00
Randolph Carter d2828bab07 fixes default email sender address 2012-12-19 01:09:14 +01:00
Bart Visscher 68562dafb4 More whitespace fixes 2012-12-15 00:43:46 +01:00
blizzz 680ff3a51b Merge pull request #584 from wardragon/ldap_access_userExists_fix
Really fix OCP\Share::shareItem with LDAP users
2012-12-12 16:59:43 -08:00
Thomas Mueller 8ed0ce7801 [contacts_api] IAddressBook moved to OCP as it's used by apps to provide access to their contact data 2012-12-11 17:42:09 +01:00
Thomas Mueller 4cc895aa0a [contacts_api] move addressbook to it's own file 2012-12-08 16:42:54 +01:00
Lorenzo M. Catucci 15afbfd198 Add an $excludingBackend optional parameter
to the userExists method both in OCP\User and in OC_User.
2012-12-07 17:19:26 +01:00
Thomas Mueller 889e55fdac [contacts_api] update documentation 2012-12-06 23:51:35 +01:00
Thomas Mueller 35e55214e2 [Contacts API] example for searching added 2012-12-02 11:54:30 +01:00
Thomas Mueller f99497a05a test for search and unregister added 2012-11-28 23:10:30 +01:00
Thomas Mueller 2d597c2238 first unit tests implemented 2012-11-28 23:10:00 +01:00
Thomas Mueller 5b1dea56e5 change name to IAddressBook 2012-11-28 23:08:15 +01:00
Thomas Mueller fba8c776e1 plugin mechanism implemented 2012-11-28 23:07:09 +01:00
Jörn Friedrich Dreyer eaa625c9bc Merge pull request #401 from owncloud/share_hooks
Create functions to install standard hooks
2012-11-28 04:35:52 -08:00
Jörn Friedrich Dreyer 995b5c0739 readd fallback code for pre token links 2012-11-23 15:51:57 +01:00
Jörn Friedrich Dreyer d8a171df26 implement share via link token 2012-11-20 15:03:12 +01:00
Thomas Müller d91c841f73 Merge pull request #383 from owncloud/contacts_api
Proposal for a public contacts api
2012-11-19 05:42:01 -08:00
Bart Visscher 530f3f8be9 Create functions to install standard hooks
Also use these in tests that needs them
Fix #151
2012-11-13 23:45:17 +01:00
Thomas Mueller 33a4dfa087 function isEnabled() added 2012-11-13 20:59:47 +01:00
Thomas Tanghus 268a48479d Merge branch 'master' of github.com:owncloud/core into vcategories_db 2012-11-12 23:36:59 +01:00
Thomas Mueller c3825112a0 public contacts api as discussed here https://github.com/owncloud/apps/issues/113 2012-11-12 23:25:32 +01:00
blizzz e0fdb8272b Merge pull request #371 from butonic/sql_and_error_log_fixes
add missing sql backticks, check sharing for error and add log
2012-11-12 03:37:43 -08:00
Jörn Friedrich Dreyer ba91f9a237 add missing sql backticks, check sharing for error and add log 2012-11-12 12:04:46 +01:00
Thomas Tanghus 82e010c51c Merge branch 'master' of github.com:owncloud/core into vcategories_db 2012-11-12 00:37:40 +01:00
Thomas Tanghus 56239df2e7 Update all to use OCP\PERMISSION_* instead of OCP\Share::PERMISSION_* 2012-11-11 23:10:23 +01:00
Thomas Tanghus 7f0c69eb0e Added CRUDS permissions to the OCP namespace. Implements issue #345 2012-11-11 23:09:54 +01:00
Thomas Tanghus 1147dc9774 Merge branch 'master' of github.com:owncloud/core into vcategories_db
Conflicts:
	lib/vcategories.php
2012-11-05 12:06:59 +01:00
Felix Moeller a4b2ea586d Style: Remove all the dangling white spaces 2012-11-04 22:16:04 +01:00
Felix Moeller bc4382c5c5 Checkstyle: fix the last NoSpaceAfterEquals 2012-11-04 18:31:44 +01:00
Thomas Tanghus e6a7bba095 Merge branch 'master' of github.com:owncloud/core into vcategories_db
Conflicts:
	lib/vcategories.php
2012-11-04 12:31:06 +01:00
Felix Moeller afadf93d31 Checkstyle: many fixes 2012-11-02 19:53:02 +01:00
Thomas Tanghus 5550cde03b Merge branch 'master' of github.com:owncloud/core into vcategories_db
Fix conflicts:
	core/ajax/vcategories/add.php
	core/ajax/vcategories/delete.php
2012-10-30 06:53:49 +01:00
Jakob Sack d0bbd9416b Add BackgroundJob::setExecutionType() to public API 2012-10-27 10:15:39 +02:00
Florian Hülsmann a48734bcb5 fixed user/group sharing hooks 2012-10-26 23:15:37 +02:00
Florian Hülsmann b7bf28d1c7 Hook emission on sharing stuff 2012-10-26 20:53:32 +02:00
Thomas Tanghus 8cd268fc82 Merge branch 'master' of github.com:owncloud/core into vcategories_db 2012-10-17 00:16:37 +02:00
Michael Gapczynski c00f5d164f Fix unshareAll() 2012-10-16 16:27:23 -04:00
Michael Gapczynski 012ea1ed83 Add unshareAll() function to Share API 2012-10-16 15:38:52 -04:00
Thomas Tanghus 9c9f5ef2d6 Merge branch 'master' of github.com:owncloud/core into vcategories_db 2012-10-15 21:41:38 +02:00
Bart Visscher 4af5b016cc Whitespace cleanup 2012-10-14 21:04:08 +02:00
Thomas Tanghus 7a30f46543 Merge branch 'master' of github.com:owncloud/core into vcategories_db 2012-10-10 23:00:46 +02:00
Björn Schießle 003241e847 fix for bug #1942: Allow user to share with every group if "allow users to share with anyone" is set 2012-10-09 10:36:24 +02:00
Björn Schießle 8357754ff1 added "uid_owner" to select statement 2012-10-08 13:22:08 +02:00
Michael Gapczynski 5f462ec6f7 Fix - "Correct checking item source for share from same owner when generating item target" 2012-10-06 18:13:11 -04:00
Thomas Tanghus 2c1c7eadaf Merge branch 'master' of github.com:owncloud/core into vcategories_db 2012-10-02 23:24:54 +02:00
Michael Gapczynski 68c8faf39c Correct checking item source for share from same owner when generating item target 2012-10-02 16:37:39 -04:00
Björn Schießle 431d92e7b2 we are sharing the same file again if item_source of the already shared file and the newly shared file is the same. Therefore we can use the same target name 2012-10-02 21:37:10 +02:00
Björn Schießle db954f5aba remove unnecessary code and add missing items to select statement 2012-10-02 18:59:20 +02:00
Björn Schießle 3e3038cafc merge all possible conflicts into on array 2012-10-02 13:10:46 +02:00
Björn Schießle c6c0fcc7c8 We can't rely on the assumption that if the matching target is from the same owner that the share type will be different.
Files in different folders can have the same name. Therefore also a unique name has to be generated if the matching
target it from the same user. Also for folders and files with the same name a unique target name has to be generated

If matching target is from the same owner, use the same target. The share type will be different so this isn't the sa
2012-10-02 11:41:26 +02:00