summaryrefslogtreecommitdiffstats
path: root/lib/public
Commit message (Expand)AuthorAgeFilesLines
* Fix data for shared root folderMichael Gapczynski2012-12-291-1/+1
* Fix shared statuses inside foldersMichael Gapczynski2012-12-261-1/+2
* merge master into filesystemRobin Appelman2012-12-251-0/+36
|\
| * fixing variable nameThomas Müller2012-12-211-2/+2
| * fixes default email sender addressRandolph Carter2012-12-191-0/+36
* | Initial support for file sharing with filesystem branchMichael Gapczynski2012-12-151-4/+4
* | merge master into filesystemRobin Appelman2012-12-153-65/+223
|\|
| * More whitespace fixesBart Visscher2012-12-151-16/+17
| * Merge pull request #584 from wardragon/ldap_access_userExists_fixblizzz2012-12-121-3/+3
| |\
| | * Add an $excludingBackend optional parameterLorenzo M. Catucci2012-12-071-3/+3
| * | [contacts_api] IAddressBook moved to OCP as it's used by apps to provide acce...Thomas Mueller2012-12-112-5/+79
| * | [contacts_api] move addressbook to it's own fileThomas Mueller2012-12-081-51/+0
| * | [contacts_api] update documentationThomas Mueller2012-12-061-8/+8
| * | [Contacts API] example for searching addedThomas Mueller2012-12-021-0/+32
| * | test for search and unregister addedThomas Mueller2012-11-281-2/+2
| * | first unit tests implementedThomas Mueller2012-11-281-4/+11
| * | change name to IAddressBookThomas Mueller2012-11-281-6/+6
| * | plugin mechanism implementedThomas Mueller2012-11-281-63/+158
* | | merge master into filesystemRobin Appelman2012-11-301-25/+48
|\| |
| * | Merge pull request #401 from owncloud/share_hooksJörn Friedrich Dreyer2012-11-281-5/+0
| |\ \
| | * | Create functions to install standard hooksBart Visscher2012-11-131-5/+0
| * | | readd fallback code for pre token linksJörn Friedrich Dreyer2012-11-231-1/+1
| * | | implement share via link tokenJörn Friedrich Dreyer2012-11-201-19/+47
| | |/ | |/|
* | | merge master into filesystemRobin Appelman2012-11-211-0/+103
|\| |
| * | Merge pull request #383 from owncloud/contacts_apiThomas Müller2012-11-191-0/+103
| |\ \
| | * | function isEnabled() addedThomas Mueller2012-11-131-3/+13
| | * | public contacts api as discussed here https://github.com/owncloud/apps/issues...Thomas Mueller2012-11-121-0/+93
* | | | merge master into filesystemRobin Appelman2012-11-153-11/+69
|\| | |
| * | | Merge branch 'master' of github.com:owncloud/core into vcategories_dbThomas Tanghus2012-11-121-2/+5
| |\ \ \ | | | |/ | | |/|
| | * | Merge pull request #371 from butonic/sql_and_error_log_fixesblizzz2012-11-121-2/+5
| | |\ \
| | | * | add missing sql backticks, check sharing for error and add logJörn Friedrich Dreyer2012-11-121-2/+5
| | | |/
| * | | Merge branch 'master' of github.com:owncloud/core into vcategories_dbThomas Tanghus2012-11-122-9/+43
| |\| |
| | * | Update all to use OCP\PERMISSION_* instead of OCP\Share::PERMISSION_*Thomas Tanghus2012-11-111-9/+5
| | * | Added CRUDS permissions to the OCP namespace. Implements issue #345Thomas Tanghus2012-11-111-0/+38
| | |/
| * | Merge branch 'master' of github.com:owncloud/core into vcategories_dbThomas Tanghus2012-11-053-3/+3
| |\|
| * | Merge branch 'master' of github.com:owncloud/core into vcategories_dbThomas Tanghus2012-11-042-3/+3
| |\ \
| * \ \ Merge branch 'master' of github.com:owncloud/core into vcategories_dbThomas Tanghus2012-10-302-1/+53
| |\ \ \
| * \ \ \ Merge branch 'master' of github.com:owncloud/core into vcategories_dbThomas Tanghus2012-10-171-0/+16
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' of github.com:owncloud/core into vcategories_dbThomas Tanghus2012-10-151-1251/+1251
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' of github.com:owncloud/core into vcategories_dbThomas Tanghus2012-10-101-5/+12
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' of github.com:owncloud/core into vcategories_dbThomas Tanghus2012-10-021-1233/+1244
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' of github.com:owncloud/core into vcategories_dbThomas Tanghus2012-09-303-33/+44
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Added methods OC_DB::insertIfNotExist() and OCP\DB::insertIfNotExist().Thomas Tanghus2012-09-171-0/+21
* | | | | | | | | | merge master into filesystemRobin Appelman2012-11-073-3/+3
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
| * | | | | | | | | Style: Remove all the dangling white spacesFelix Moeller2012-11-042-2/+2
| * | | | | | | | | Checkstyle: fix the last NoSpaceAfterEqualsFelix Moeller2012-11-041-1/+1
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | merge master into filesystemRobin Appelman2012-11-042-3/+3
|\| | | | | | | |
| * | | | | | | | Checkstyle: many fixesFelix Moeller2012-11-022-3/+3
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge branch 'master' into filesystemRobin Appelman2012-10-271-0/+23
|\| | | | | | |
| * | | | | | | Add BackgroundJob::setExecutionType() to public APIJakob Sack2012-10-271-0/+23