Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix data for shared root folder | Michael Gapczynski | 2012-12-29 | 1 | -1/+1 |
* | Fix shared statuses inside folders | Michael Gapczynski | 2012-12-26 | 1 | -1/+2 |
* | merge master into filesystem | Robin Appelman | 2012-12-25 | 1 | -0/+36 |
|\ | |||||
| * | fixing variable name | Thomas Müller | 2012-12-21 | 1 | -2/+2 |
| * | fixes default email sender address | Randolph Carter | 2012-12-19 | 1 | -0/+36 |
* | | Initial support for file sharing with filesystem branch | Michael Gapczynski | 2012-12-15 | 1 | -4/+4 |
* | | merge master into filesystem | Robin Appelman | 2012-12-15 | 3 | -65/+223 |
|\| | |||||
| * | More whitespace fixes | Bart Visscher | 2012-12-15 | 1 | -16/+17 |
| * | Merge pull request #584 from wardragon/ldap_access_userExists_fix | blizzz | 2012-12-12 | 1 | -3/+3 |
| |\ | |||||
| | * | Add an $excludingBackend optional parameter | Lorenzo M. Catucci | 2012-12-07 | 1 | -3/+3 |
| * | | [contacts_api] IAddressBook moved to OCP as it's used by apps to provide acce... | Thomas Mueller | 2012-12-11 | 2 | -5/+79 |
| * | | [contacts_api] move addressbook to it's own file | Thomas Mueller | 2012-12-08 | 1 | -51/+0 |
| * | | [contacts_api] update documentation | Thomas Mueller | 2012-12-06 | 1 | -8/+8 |
| * | | [Contacts API] example for searching added | Thomas Mueller | 2012-12-02 | 1 | -0/+32 |
| * | | test for search and unregister added | Thomas Mueller | 2012-11-28 | 1 | -2/+2 |
| * | | first unit tests implemented | Thomas Mueller | 2012-11-28 | 1 | -4/+11 |
| * | | change name to IAddressBook | Thomas Mueller | 2012-11-28 | 1 | -6/+6 |
| * | | plugin mechanism implemented | Thomas Mueller | 2012-11-28 | 1 | -63/+158 |
* | | | merge master into filesystem | Robin Appelman | 2012-11-30 | 1 | -25/+48 |
|\| | | |||||
| * | | Merge pull request #401 from owncloud/share_hooks | Jörn Friedrich Dreyer | 2012-11-28 | 1 | -5/+0 |
| |\ \ | |||||
| | * | | Create functions to install standard hooks | Bart Visscher | 2012-11-13 | 1 | -5/+0 |
| * | | | readd fallback code for pre token links | Jörn Friedrich Dreyer | 2012-11-23 | 1 | -1/+1 |
| * | | | implement share via link token | Jörn Friedrich Dreyer | 2012-11-20 | 1 | -19/+47 |
| | |/ | |/| | |||||
* | | | merge master into filesystem | Robin Appelman | 2012-11-21 | 1 | -0/+103 |
|\| | | |||||
| * | | Merge pull request #383 from owncloud/contacts_api | Thomas Müller | 2012-11-19 | 1 | -0/+103 |
| |\ \ | |||||
| | * | | function isEnabled() added | Thomas Mueller | 2012-11-13 | 1 | -3/+13 |
| | * | | public contacts api as discussed here https://github.com/owncloud/apps/issues... | Thomas Mueller | 2012-11-12 | 1 | -0/+93 |
* | | | | merge master into filesystem | Robin Appelman | 2012-11-15 | 3 | -11/+69 |
|\| | | | |||||
| * | | | Merge branch 'master' of github.com:owncloud/core into vcategories_db | Thomas Tanghus | 2012-11-12 | 1 | -2/+5 |
| |\ \ \ | | | |/ | | |/| | |||||
| | * | | Merge pull request #371 from butonic/sql_and_error_log_fixes | blizzz | 2012-11-12 | 1 | -2/+5 |
| | |\ \ | |||||
| | | * | | add missing sql backticks, check sharing for error and add log | Jörn Friedrich Dreyer | 2012-11-12 | 1 | -2/+5 |
| | | |/ | |||||
| * | | | Merge branch 'master' of github.com:owncloud/core into vcategories_db | Thomas Tanghus | 2012-11-12 | 2 | -9/+43 |
| |\| | | |||||
| | * | | Update all to use OCP\PERMISSION_* instead of OCP\Share::PERMISSION_* | Thomas Tanghus | 2012-11-11 | 1 | -9/+5 |
| | * | | Added CRUDS permissions to the OCP namespace. Implements issue #345 | Thomas Tanghus | 2012-11-11 | 1 | -0/+38 |
| | |/ | |||||
| * | | Merge branch 'master' of github.com:owncloud/core into vcategories_db | Thomas Tanghus | 2012-11-05 | 3 | -3/+3 |
| |\| | |||||
| * | | Merge branch 'master' of github.com:owncloud/core into vcategories_db | Thomas Tanghus | 2012-11-04 | 2 | -3/+3 |
| |\ \ | |||||
| * \ \ | Merge branch 'master' of github.com:owncloud/core into vcategories_db | Thomas Tanghus | 2012-10-30 | 2 | -1/+53 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'master' of github.com:owncloud/core into vcategories_db | Thomas Tanghus | 2012-10-17 | 1 | -0/+16 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'master' of github.com:owncloud/core into vcategories_db | Thomas Tanghus | 2012-10-15 | 1 | -1251/+1251 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'master' of github.com:owncloud/core into vcategories_db | Thomas Tanghus | 2012-10-10 | 1 | -5/+12 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'master' of github.com:owncloud/core into vcategories_db | Thomas Tanghus | 2012-10-02 | 1 | -1233/+1244 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge branch 'master' of github.com:owncloud/core into vcategories_db | Thomas Tanghus | 2012-09-30 | 3 | -33/+44 |
| |\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Added methods OC_DB::insertIfNotExist() and OCP\DB::insertIfNotExist(). | Thomas Tanghus | 2012-09-17 | 1 | -0/+21 |
* | | | | | | | | | | merge master into filesystem | Robin Appelman | 2012-11-07 | 3 | -3/+3 |
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | |||||
| * | | | | | | | | | Style: Remove all the dangling white spaces | Felix Moeller | 2012-11-04 | 2 | -2/+2 |
| * | | | | | | | | | Checkstyle: fix the last NoSpaceAfterEquals | Felix Moeller | 2012-11-04 | 1 | -1/+1 |
| | |_|_|_|_|_|_|/ | |/| | | | | | | | |||||
* | | | | | | | | | merge master into filesystem | Robin Appelman | 2012-11-04 | 2 | -3/+3 |
|\| | | | | | | | | |||||
| * | | | | | | | | Checkstyle: many fixes | Felix Moeller | 2012-11-02 | 2 | -3/+3 |
| | |_|_|_|_|_|/ | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'master' into filesystem | Robin Appelman | 2012-10-27 | 1 | -0/+23 |
|\| | | | | | | | |||||
| * | | | | | | | Add BackgroundJob::setExecutionType() to public API | Jakob Sack | 2012-10-27 | 1 | -0/+23 |