aboutsummaryrefslogtreecommitdiffstats
path: root/lib/public/share.php
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into sharing_mail_notification_masterBjoern Schiessle2013-10-021-4/+15
|\ | | | | | | | | Conflicts: lib/private/util.php
| * Merge pull request #4207 from owncloud/search_shared_filesThomas Müller2013-09-271-3/+3
| |\ | | | | | | add initial search in shared files
| | * adding PHPDoc comments to getBackendThomas Müller2013-09-241-2/+2
| | | | | | | | | | | | ensure getChildren() is called on an instance of Share_Backend_Collection
| | * add initial search in shared filesJörn Friedrich Dreyer2013-09-191-1/+1
| | |
| * | Merge pull request #4856 from owncloud/fix-link-expirationAndreas Fischer2013-09-231-1/+12
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix Sharing "Expiration Date" for Shares of type Link (i.e. Token) * owncloud/fix-link-expiration: Perform expiration date checking before returning share data for token. Tests whether expired/valid link share is still accessible.
| | * | Perform expiration date checking before returning share data for token.Andreas Fischer2013-09-161-1/+12
| | |/
* | | use OC_DB::executeAuditedBjoern Schiessle2013-09-251-5/+3
| | |
* | | use OC_DB::executeAuditedBjoern Schiessle2013-09-251-5/+3
| | |
* | | fix PHPDocBjoern Schiessle2013-09-241-4/+4
| | |
* | | some small fixesBjoern Schiessle2013-09-241-8/+18
| | |
* | | Merge branch 'master' into sharing_mail_notification_masterBjoern Schiessle2013-09-231-3/+6
|\| | | | | | | | | | | | | | Conflicts: lib/public/share.php
| * | make sure that both $permissions and $oldPermissions have the same typeBjoern Schiessle2013-09-201-1/+1
| | |
| * | only remember password if the user changes the permissions, otherwise the ↵Bjoern Schiessle2013-09-181-9/+13
| |/ | | | | | | user disabled the password protection
* | Merge branch 'master' into sharing_mail_notification_masterBjoern Schiessle2013-09-161-2/+7
|\| | | | | | | | | Conflicts: apps/files/index.php
| * remove some more debug outputBjoern Schiessle2013-09-061-2/+0
| |
| * remove some error_logsBjoern Schiessle2013-09-061-1/+0
| |
| * remove error logsBjoern Schiessle2013-09-061-2/+2
| |
| * if the files doesn't exist yet we start with the parent to search for sharesBjoern Schiessle2013-09-061-4/+12
| |
* | Merge branch 'master' into sharing_mail_notification_masterBjoern Schiessle2013-09-051-1/+1
|\| | | | | | | | | | | | | increased version number to trigger db update Conflicts: lib/util.php
| * Merge branch 'master' into clean_up_utilkondou2013-09-021-6/+10
| |\ | | | | | | | | | | | | Conflicts: lib/base.php
| * | Clean up \OC\Utilkondou2013-08-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Use camelCase - Add some phpdoc - Fix some indents - Use some more spacing
* | | fix db queriesBjoern Schiessle2013-09-021-2/+2
| | |
* | | fix db queriesBjoern Schiessle2013-09-021-2/+2
| | |
* | | return mailSend status in getItems()Bjoern Schiessle2013-08-301-6/+6
| | |
* | | enable user to inform recipients about a shared file by mailBjoern Schiessle2013-08-301-7/+74
| |/ |/|
* | Sharing: only determine path root if owner is availableArthur Schiwon2013-08-221-6/+10
|/
* cancel sharing if some users doesn't have a working encryption set-up.Bjoern Schiessle2013-08-011-2/+20
|
* fixes #4026Thomas Müller2013-07-301-0/+3
|
* Only emit permissions hook for files and and include pathMichael Gapczynski2013-07-081-9/+11
|
* Add update permissions hook to sharingMichael Gapczynski2013-07-081-0/+9
|
* removing unused getSharedItem()Thomas Müller2013-07-061-11/+0
|
* Merge branch 'master' into fixing-3942-masterThomas Müller2013-07-061-1/+12
|\ | | | | | | | | Conflicts: apps/files/ajax/upload.php
| * proper fix for getting the shared item if no user is logged inThomas Müller2013-07-051-1/+12
| |
* | on reshares we now recursively move to the root of all reshares - therefore ↵Thomas Müller2013-07-051-0/+23
|/ | | | some code has been refactured and added as a new public function
* Merge pull request #3832 from owncloud/oracle_sql_fixesJörn Friedrich Dreyer2013-06-281-1/+7
|\ | | | | for oracle use BITAND() instead of & in sharing permissions sql
| * Oracle doesn't know & as bitwise ANDBart Visscher2013-06-281-6/+8
| | | | | | | | | | Conflicts: lib/public/share.php
| * for oracle use BITAND() instead of & in sharing permissions sqlJörn Friedrich Dreyer2013-06-241-3/+7
| |
* | fix type of numeric columnsJörn Friedrich Dreyer2013-06-261-0/+24
| |
* | check item id is setJörn Friedrich Dreyer2013-06-261-1/+1
|/
* add missing backticks, use executeAudited in post_deleteGroup and ↵Jörn Friedrich Dreyer2013-06-141-6/+6
| | | | post_removeFromGroup
* add missing backticks all over the placeJörn Friedrich Dreyer2013-06-101-6/+6
|
* Merge pull request #3444 from owncloud/share-fixJörn Friedrich Dreyer2013-06-031-1/+1
|\ | | | | Fix undefined index for share mount point retrieval
| * Fix undefined index for share mount point retrievalMichael Gapczynski2013-05-211-1/+1
| |
* | fixes for pgsqlFlorin Peter2013-05-291-4/+4
| |
* | changed deprecated classFlorin Peter2013-05-291-1/+1
| |
* | fixes if cache returns falseFlorin Peter2013-05-291-6/+16
| |
* | fix $parent/$source typoFlorin Peter2013-05-291-2/+1
| |
* | fix indentionBjörn Schießle2013-05-291-5/+5
| |
* | remove unnecessary variableBjörn Schießle2013-05-291-2/+1
| |
* | use public API for error handling; improved while conditionBjörn Schießle2013-05-291-23/+20
| |