Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into sharing_mail_notification_master | Bjoern Schiessle | 2013-10-02 | 1 | -4/+15 |
|\ | | | | | | | | | Conflicts: lib/private/util.php | ||||
| * | Merge pull request #4207 from owncloud/search_shared_files | Thomas Müller | 2013-09-27 | 1 | -3/+3 |
| |\ | | | | | | | add initial search in shared files | ||||
| | * | adding PHPDoc comments to getBackend | Thomas Müller | 2013-09-24 | 1 | -2/+2 |
| | | | | | | | | | | | | ensure getChildren() is called on an instance of Share_Backend_Collection | ||||
| | * | add initial search in shared files | Jörn Friedrich Dreyer | 2013-09-19 | 1 | -1/+1 |
| | | | |||||
| * | | Merge pull request #4856 from owncloud/fix-link-expiration | Andreas Fischer | 2013-09-23 | 1 | -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 Fischer | 2013-09-16 | 1 | -1/+12 |
| | |/ | |||||
* | | | use OC_DB::executeAudited | Bjoern Schiessle | 2013-09-25 | 1 | -5/+3 |
| | | | |||||
* | | | use OC_DB::executeAudited | Bjoern Schiessle | 2013-09-25 | 1 | -5/+3 |
| | | | |||||
* | | | fix PHPDoc | Bjoern Schiessle | 2013-09-24 | 1 | -4/+4 |
| | | | |||||
* | | | some small fixes | Bjoern Schiessle | 2013-09-24 | 1 | -8/+18 |
| | | | |||||
* | | | Merge branch 'master' into sharing_mail_notification_master | Bjoern Schiessle | 2013-09-23 | 1 | -3/+6 |
|\| | | | | | | | | | | | | | | Conflicts: lib/public/share.php | ||||
| * | | make sure that both $permissions and $oldPermissions have the same type | Bjoern Schiessle | 2013-09-20 | 1 | -1/+1 |
| | | | |||||
| * | | only remember password if the user changes the permissions, otherwise the ↵ | Bjoern Schiessle | 2013-09-18 | 1 | -9/+13 |
| |/ | | | | | | | user disabled the password protection | ||||
* | | Merge branch 'master' into sharing_mail_notification_master | Bjoern Schiessle | 2013-09-16 | 1 | -2/+7 |
|\| | | | | | | | | | Conflicts: apps/files/index.php | ||||
| * | remove some more debug output | Bjoern Schiessle | 2013-09-06 | 1 | -2/+0 |
| | | |||||
| * | remove some error_logs | Bjoern Schiessle | 2013-09-06 | 1 | -1/+0 |
| | | |||||
| * | remove error logs | Bjoern Schiessle | 2013-09-06 | 1 | -2/+2 |
| | | |||||
| * | if the files doesn't exist yet we start with the parent to search for shares | Bjoern Schiessle | 2013-09-06 | 1 | -4/+12 |
| | | |||||
* | | Merge branch 'master' into sharing_mail_notification_master | Bjoern Schiessle | 2013-09-05 | 1 | -1/+1 |
|\| | | | | | | | | | | | | | increased version number to trigger db update Conflicts: lib/util.php | ||||
| * | Merge branch 'master' into clean_up_util | kondou | 2013-09-02 | 1 | -6/+10 |
| |\ | | | | | | | | | | | | | Conflicts: lib/base.php | ||||
| * | | Clean up \OC\Util | kondou | 2013-08-15 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Use camelCase - Add some phpdoc - Fix some indents - Use some more spacing | ||||
* | | | fix db queries | Bjoern Schiessle | 2013-09-02 | 1 | -2/+2 |
| | | | |||||
* | | | fix db queries | Bjoern Schiessle | 2013-09-02 | 1 | -2/+2 |
| | | | |||||
* | | | return mailSend status in getItems() | Bjoern Schiessle | 2013-08-30 | 1 | -6/+6 |
| | | | |||||
* | | | enable user to inform recipients about a shared file by mail | Bjoern Schiessle | 2013-08-30 | 1 | -7/+74 |
| |/ |/| | |||||
* | | Sharing: only determine path root if owner is available | Arthur Schiwon | 2013-08-22 | 1 | -6/+10 |
|/ | |||||
* | cancel sharing if some users doesn't have a working encryption set-up. | Bjoern Schiessle | 2013-08-01 | 1 | -2/+20 |
| | |||||
* | fixes #4026 | Thomas Müller | 2013-07-30 | 1 | -0/+3 |
| | |||||
* | Only emit permissions hook for files and and include path | Michael Gapczynski | 2013-07-08 | 1 | -9/+11 |
| | |||||
* | Add update permissions hook to sharing | Michael Gapczynski | 2013-07-08 | 1 | -0/+9 |
| | |||||
* | removing unused getSharedItem() | Thomas Müller | 2013-07-06 | 1 | -11/+0 |
| | |||||
* | Merge branch 'master' into fixing-3942-master | Thomas Müller | 2013-07-06 | 1 | -1/+12 |
|\ | | | | | | | | | Conflicts: apps/files/ajax/upload.php | ||||
| * | proper fix for getting the shared item if no user is logged in | Thomas Müller | 2013-07-05 | 1 | -1/+12 |
| | | |||||
* | | on reshares we now recursively move to the root of all reshares - therefore ↵ | Thomas Müller | 2013-07-05 | 1 | -0/+23 |
|/ | | | | some code has been refactured and added as a new public function | ||||
* | Merge pull request #3832 from owncloud/oracle_sql_fixes | Jörn Friedrich Dreyer | 2013-06-28 | 1 | -1/+7 |
|\ | | | | | for oracle use BITAND() instead of & in sharing permissions sql | ||||
| * | Oracle doesn't know & as bitwise AND | Bart Visscher | 2013-06-28 | 1 | -6/+8 |
| | | | | | | | | | | Conflicts: lib/public/share.php | ||||
| * | for oracle use BITAND() instead of & in sharing permissions sql | Jörn Friedrich Dreyer | 2013-06-24 | 1 | -3/+7 |
| | | |||||
* | | fix type of numeric columns | Jörn Friedrich Dreyer | 2013-06-26 | 1 | -0/+24 |
| | | |||||
* | | check item id is set | Jörn Friedrich Dreyer | 2013-06-26 | 1 | -1/+1 |
|/ | |||||
* | add missing backticks, use executeAudited in post_deleteGroup and ↵ | Jörn Friedrich Dreyer | 2013-06-14 | 1 | -6/+6 |
| | | | | post_removeFromGroup | ||||
* | add missing backticks all over the place | Jörn Friedrich Dreyer | 2013-06-10 | 1 | -6/+6 |
| | |||||
* | Merge pull request #3444 from owncloud/share-fix | Jörn Friedrich Dreyer | 2013-06-03 | 1 | -1/+1 |
|\ | | | | | Fix undefined index for share mount point retrieval | ||||
| * | Fix undefined index for share mount point retrieval | Michael Gapczynski | 2013-05-21 | 1 | -1/+1 |
| | | |||||
* | | fixes for pgsql | Florin Peter | 2013-05-29 | 1 | -4/+4 |
| | | |||||
* | | changed deprecated class | Florin Peter | 2013-05-29 | 1 | -1/+1 |
| | | |||||
* | | fixes if cache returns false | Florin Peter | 2013-05-29 | 1 | -6/+16 |
| | | |||||
* | | fix $parent/$source typo | Florin Peter | 2013-05-29 | 1 | -2/+1 |
| | | |||||
* | | fix indention | Björn Schießle | 2013-05-29 | 1 | -5/+5 |
| | | |||||
* | | remove unnecessary variable | Björn Schießle | 2013-05-29 | 1 | -2/+1 |
| | | |||||
* | | use public API for error handling; improved while condition | Björn Schießle | 2013-05-29 | 1 | -23/+20 |
| | |