Thomas Müller
408e0022dd
Merge pull request #5249 from owncloud/activities-api
...
[OC6] Activities api
2013-10-21 13:21:17 -07:00
Morris Jobke
1f1fcc6129
Remove "link" shares right after disabling the "allow_link_share" setting
2013-10-18 11:37:13 +02:00
Michael Gapczynski
4cf328e3b9
Don't return links for shared files if disabled
2013-10-18 10:34:30 +02:00
Morris Jobke
30f4d91d01
Public API documentation fixes
...
refs #4883
* http/response.php
* config.php
* response.php
* files.php
* idbconnection.php
* app.php
* user.php
* template.php
* share.php
* db.php
* icache.php & il10n.php
2013-10-17 00:49:15 +02:00
Thomas Müller
852a50aa89
remove test code
2013-10-16 15:38:56 +02:00
Thomas Müller
8c2b0b1394
Merge branch 'master' into activities-api
2013-10-16 15:36:35 +02:00
Thomas Müller
926b3c9b7b
Merge branch 'master' into activities-api
2013-10-09 17:53:57 +02:00
Bjoern Schiessle
7fe493fdb8
make sure that we only find file/folder shares
2013-10-09 17:25:58 +02:00
Bjoern Schiessle
8b08b1b455
Merge branch 'master' into sharing_mail_notification_master
...
Conflicts:
lib/private/util.php
2013-10-02 10:11:18 +02:00
Thomas Müller
48b5c1d5f9
initial implementation of activity manager
2013-09-29 20:31:12 +02:00
Thomas Müller
735608f513
Merge pull request #4207 from owncloud/search_shared_files
...
add initial search in shared files
2013-09-27 05:18:12 -07:00
Bjoern Schiessle
acd3c11e47
use OC_DB::executeAudited
2013-09-25 12:18:29 +02:00
Bjoern Schiessle
5a9e473a79
use OC_DB::executeAudited
2013-09-25 12:15:46 +02:00
Bjoern Schiessle
ca47fc5f18
fix PHPDoc
2013-09-24 19:37:24 +02:00
Bjoern Schiessle
0637dad0b3
some small fixes
2013-09-24 18:52:20 +02:00
Thomas Müller
cd2421c7ee
adding PHPDoc comments to getBackend
...
ensure getChildren() is called on an instance of Share_Backend_Collection
2013-09-24 10:37:58 +02:00
Andreas Fischer
437858852c
Merge pull request #4856 from owncloud/fix-link-expiration
...
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.
2013-09-23 15:12:38 +02:00
Bjoern Schiessle
fc76a13c52
Merge branch 'master' into sharing_mail_notification_master
...
Conflicts:
lib/public/share.php
2013-09-23 11:18:00 +02:00
Bjoern Schiessle
944e9b8c69
make sure that both $permissions and $oldPermissions have the same type
2013-09-20 12:40:21 +02:00
Jörn Friedrich Dreyer
e8bf576184
add initial search in shared files
2013-09-19 21:08:32 +03:00
Bjoern Schiessle
1a60aa2b6a
only remember password if the user changes the permissions, otherwise the user disabled the password protection
2013-09-18 11:49:02 +02:00
Andreas Fischer
a92d4c2c09
Perform expiration date checking before returning share data for token.
2013-09-16 21:24:17 +02:00
Bjoern Schiessle
534d93d2d3
Merge branch 'master' into sharing_mail_notification_master
...
Conflicts:
apps/files/index.php
2013-09-16 10:40:06 +02:00
Bjoern Schiessle
b8241aa79d
remove some more debug output
2013-09-06 16:07:54 +02:00
Bjoern Schiessle
edb78c917c
remove some error_logs
2013-09-06 16:07:45 +02:00
Bjoern Schiessle
d33fabd02d
remove error logs
2013-09-06 16:07:25 +02:00
Bjoern Schiessle
627b6164c4
if the files doesn't exist yet we start with the parent to search for shares
2013-09-06 16:07:07 +02:00
Bjoern Schiessle
f8563ec583
Merge branch 'master' into sharing_mail_notification_master
...
increased version number to trigger db update
Conflicts:
lib/util.php
2013-09-05 13:39:45 +02:00
Bjoern Schiessle
931e90634e
fix db queries
2013-09-02 17:03:35 +02:00
Bjoern Schiessle
983da0d78f
fix db queries
2013-09-02 17:01:10 +02:00
kondou
e5fc7b9dbe
Merge branch 'master' into clean_up_util
...
Conflicts:
lib/base.php
2013-09-02 07:58:06 +02:00
Bjoern Schiessle
10cf1b3a4e
return mailSend status in getItems()
2013-08-30 15:39:43 +02:00
Bjoern Schiessle
77adaee645
enable user to inform recipients about a shared file by mail
2013-08-30 13:53:49 +02:00
Arthur Schiwon
958130e8fe
Sharing: only determine path root if owner is available
2013-08-22 00:00:40 +02:00
kondou
9c5416fe4a
Clean up \OC\Util
...
- Use camelCase
- Add some phpdoc
- Fix some indents
- Use some more spacing
2013-08-15 15:57:32 +02:00
Bjoern Schiessle
9253627327
cancel sharing if some users doesn't have a working encryption set-up.
2013-08-01 13:04:55 +02:00
Thomas Müller
17c36b5074
fixes #4026
2013-07-30 10:26:42 +02:00
Michael Gapczynski
4feff3456b
Only emit permissions hook for files and and include path
2013-07-08 17:28:18 -04:00
Michael Gapczynski
5c2a0325ba
Add update permissions hook to sharing
2013-07-08 11:40:10 -04:00
Thomas Müller
98da4bf704
removing unused getSharedItem()
2013-07-06 00:04:01 +02:00
Thomas Müller
dad91c156f
Merge branch 'master' into fixing-3942-master
...
Conflicts:
apps/files/ajax/upload.php
2013-07-06 00:02:11 +02:00
Thomas Müller
e159cbf527
on reshares we now recursively move to the root of all reshares - therefore some code has been refactured and added as a new public function
2013-07-05 17:39:41 +02:00
Thomas Müller
352c1415be
proper fix for getting the shared item if no user is logged in
2013-07-05 13:45:21 +02:00
Jörn Friedrich Dreyer
f3c4a37a78
Merge pull request #3832 from owncloud/oracle_sql_fixes
...
for oracle use BITAND() instead of & in sharing permissions sql
2013-06-28 10:22:59 -07:00
Bart Visscher
6ad7a0336f
Oracle doesn't know & as bitwise AND
...
Conflicts:
lib/public/share.php
2013-06-28 15:48:49 +02:00
Jörn Friedrich Dreyer
5d51118cb2
fix type of numeric columns
2013-06-26 20:03:24 +02:00
Jörn Friedrich Dreyer
bf49edde6b
check item id is set
2013-06-26 19:57:28 +02:00
Jörn Friedrich Dreyer
b32d6d8487
for oracle use BITAND() instead of & in sharing permissions sql
2013-06-24 22:52:01 +02:00
Jörn Friedrich Dreyer
961a001af3
add missing backticks, use executeAudited in post_deleteGroup and post_removeFromGroup
2013-06-14 12:18:20 +02:00
Jörn Friedrich Dreyer
124f34422c
add missing backticks all over the place
2013-06-10 09:53:29 +02:00
