summaryrefslogtreecommitdiffstats
path: root/lib/public
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #401 from owncloud/share_hooksJörn Friedrich Dreyer2012-11-281-5/+0
|\ | | | | Create functions to install standard hooks
| * Create functions to install standard hooksBart Visscher2012-11-131-5/+0
| | | | | | | | | | Also use these in tests that needs them Fix #151
* | 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 pull request #383 from owncloud/contacts_apiThomas Müller2012-11-191-0/+103
|\ \ | | | | | | Proposal for a public contacts api
| * | function isEnabled() addedThomas Mueller2012-11-131-3/+13
| | |
| * | public contacts api as discussed here ↵Thomas Mueller2012-11-121-0/+93
| | | | | | | | | | | | https://github.com/owncloud/apps/issues/113
* | | 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 log
| | * | 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
|\| | | | | | | | | Conflicts: lib/vcategories.php
| * Style: Remove all the dangling white spacesFelix Moeller2012-11-042-2/+2
| |
| * Checkstyle: fix the last NoSpaceAfterEqualsFelix Moeller2012-11-041-1/+1
| |
* | Merge branch 'master' of github.com:owncloud/core into vcategories_dbThomas Tanghus2012-11-042-3/+3
|\| | | | | | | | | Conflicts: lib/vcategories.php
| * Checkstyle: many fixesFelix Moeller2012-11-022-3/+3
| |
* | Merge branch 'master' of github.com:owncloud/core into vcategories_dbThomas Tanghus2012-10-302-1/+53
|\| | | | | | | | | | | Fix conflicts: core/ajax/vcategories/add.php core/ajax/vcategories/delete.php
| * Add BackgroundJob::setExecutionType() to public APIJakob Sack2012-10-271-0/+23
| |
| * fixed user/group sharing hooksFlorian Hülsmann2012-10-261-13/+13
| |
| * Hook emission on sharing stuffFlorian Hülsmann2012-10-261-1/+30
| |
* | Merge branch 'master' of github.com:owncloud/core into vcategories_dbThomas Tanghus2012-10-171-0/+16
|\|
| * Fix unshareAll()Michael Gapczynski2012-10-161-2/+4
| |
| * Add unshareAll() function to Share APIMichael Gapczynski2012-10-161-0/+14
| |
* | Merge branch 'master' of github.com:owncloud/core into vcategories_dbThomas Tanghus2012-10-151-1251/+1251
|\|
| * Whitespace cleanupBart Visscher2012-10-141-1251/+1251
| |
* | Merge branch 'master' of github.com:owncloud/core into vcategories_dbThomas Tanghus2012-10-101-5/+12
|\|
| * fix for bug #1942: Allow user to share with every group if "allow users to ↵Björn Schießle2012-10-091-2/+3
| | | | | | | | share with anyone" is set
| * added "uid_owner" to select statementBjörn Schießle2012-10-081-1/+1
| |
| * Fix - "Correct checking item source for share from same owner when ↵Michael Gapczynski2012-10-061-2/+8
| | | | | | | | generating item target"
* | Merge branch 'master' of github.com:owncloud/core into vcategories_dbThomas Tanghus2012-10-021-1233/+1244
|\|
| * Correct checking item source for share from same owner when generating item ↵Michael Gapczynski2012-10-021-1241/+1242
| | | | | | | | target
| * we are sharing the same file again if item_source of the already shared file ↵Björn Schießle2012-10-021-0/+3
| | | | | | | | and the newly shared file is the same. Therefore we can use the same target name
| * remove unnecessary code and add missing items to select statementBjörn Schießle2012-10-021-14/+2
| |
| * merge all possible conflicts into on arrayBjörn Schießle2012-10-021-10/+9
| |
| * We can't rely on the assumption that if the matching target is from the same ↵Björn Schießle2012-10-021-10/+30
| | | | | | | | | | | | | | | | | | 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
* | Merge branch 'master' of github.com:owncloud/core into vcategories_dbThomas Tanghus2012-09-303-33/+44
|\|
| * Do urlencoding in linkTo functionsBart Visscher2012-09-281-0/+2
| |
| * Fix unsetting share expiration dateMichael Gapczynski2012-09-261-2/+6
| |
| * Properly format the share expiration time for the database, fixes bug oc-1779Michael Gapczynski2012-09-251-5/+10
| |
| * fix some more phpdocRobin Appelman2012-09-231-28/+28
| |
* | Added methods OC_DB::insertIfNotExist() and OCP\DB::insertIfNotExist().Thomas Tanghus2012-09-171-0/+21
|/
* Merge branch 'master' into share_expirationMichael Gapczynski2012-09-1211-422/+437
|\ | | | | | | | | | | Conflicts: core/js/share.js lib/util.php
| * Temporarily disable sharing with contacts and emails, will come in next releaseMichael Gapczynski2012-09-121-20/+20
| |
| * Fix problem with non share collection item types being treated as collectionsMichael Gapczynski2012-09-111-6/+14
| |
| * Don't display actions for children in shared collections, show the parent ↵Michael Gapczynski2012-09-091-1/+6
| | | | | | | | collection the child is shared in
| * Fix shared collection item searchingMichael Gapczynski2012-09-091-29/+38
| |
| * Normalize the file path for shared children as a precautionMichael Gapczynski2012-09-081-1/+2
| |
| * Insert id for unique user group share rowsMichael Gapczynski2012-09-081-0/+1
| |
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-04 01:03:20 +0000