Robin Appelman
|
946d58eaa8
|
merge master into filesystem
|
2012-12-15 02:21:26 +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 |
|
Robin Appelman
|
d33f697a5f
|
merge master into filesystem
|
2012-11-30 00:18:42 +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 |
|
Robin Appelman
|
97380f3485
|
merge master into filesystem
|
2012-11-21 22:37:14 +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 |
|
Robin Appelman
|
bf2ac9f113
|
merge master into filesystem
|
2012-11-15 00:37:54 +01: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 |
|
Robin Appelman
|
961ff01a93
|
merge master into filesystem
|
2012-11-07 17:18:56 +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 |
|
Robin Appelman
|
4b940955dd
|
merge master into filesystem
|
2012-11-04 21:12:18 +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 |
|
Robin Appelman
|
38371d1275
|
Merge branch 'master' into filesystem
|
2012-10-27 14:28:24 +02:00 |
|
Robin Appelman
|
5bfff6c56e
|
use absolute paths when resolving mount points
|
2012-10-27 12:17:35 +02:00 |
Jakob Sack
|
d0bbd9416b
|
Add BackgroundJob::setExecutionType() to public API
|
2012-10-27 10:15:39 +02:00 |
|
Robin Appelman
|
cbc71784c0
|
Merge branch 'master' into filesystem
|
2012-10-27 10:02:26 +02:00 |
Florian Hülsmann
|
a48734bcb5
|
fixed user/group sharing hooks
|
2012-10-26 23:15:37 +02:00 |
|
Robin Appelman
|
6db81afab9
|
move some stuff to the new api
|
2012-10-26 23:05:02 +02:00 |
|
Robin Appelman
|
4b616764e8
|
Merge branch 'master' into filesystem
|
2012-10-26 22:32:44 +02:00 |
|
Florian Hülsmann
|
b7bf28d1c7
|
Hook emission on sharing stuff
|
2012-10-26 20:53:32 +02:00 |
|
Robin Appelman
|
77cef5f514
|
merge master into filesystem
|
2012-10-17 13:14:17 +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 |