Jörn Friedrich Dreyer
6408125edc
rely only on php DateTime to parse the db datetime string
2013-12-13 16:38:05 +01:00
Bjoern Schiessle
3f7aac1a79
add a optional parameter to skip check for expired files, this is necessary to find out to whom a file was shared after it was expired.
2013-12-05 17:29:15 +01:00
Thomas Müller
832be7c908
Merge pull request #6052 from owncloud/datetime-doctrine
...
Get rid of date strings for DB. Completely use Doctrine and DateTime.
2013-12-01 01:29:35 -08:00
Morris Jobke
b910524acb
add comment from @DeepDiver
2013-11-27 10:32:48 +01:00
Morris Jobke
7c88736292
API doc for contacts manager, server container and share
2013-11-27 00:35:36 +01:00
Andreas Fischer
3bbaba1eca
Use the Doctrine to convert date string to DateTime object.
2013-11-26 12:21:31 +01:00
Andreas Fischer
a330b2ef9b
Use DateTime object instead of fixed format date string.
...
Use a DateTime object and have conversion handled by Doctrine instead of using
a date string with a fixed format.
2013-11-26 12:00:31 +01:00
Andreas Fischer
9fb1da2811
Use bindValue() instead of passing parameters in execute().
2013-11-26 11:50:14 +01:00
Owen Winkler
844b4785f1
Merge pull request #6034 from owncloud/fix-api-documentation
...
Fix api documentation
2013-11-25 11:17:16 -08:00
Morris Jobke
b3e7e54c8d
fix some capital letters
2013-11-25 16:42:28 +01:00
Robin Appelman
abc428916c
Fix fatal error when trying to open a non existing public link
2013-11-12 15:38:00 +01:00
Morris Jobke
d2a48d58ce
fix "No page-level DocBlock"
2013-11-03 13:38:25 +01:00
Andreas Fischer
7c1f0da0fe
Always select item_source.
2013-11-03 12:34:40 +01:00
Andreas Fischer
fa56aec4b8
Deduplicate expiration date check into a method.
2013-11-03 12:34:38 +01:00
Andreas Fischer
779b87d46a
Use unshareItem() when unsharing expired shares.
2013-11-03 12:33:34 +01:00
Andreas Fischer
ebf1694795
Use unshareItem() in unshareAll().
2013-11-03 12:33:34 +01:00
Andreas Fischer
1d1f5b288e
Extract unshare() code into unshareItem().
2013-11-03 12:33:34 +01:00
Andreas Fischer
329299e34c
OCP\Share::unshareAll(): Deduplicate hook parameters.
2013-11-03 12:33:31 +01:00
Morris Jobke
0dbe90cc9a
fix documentation stuff
2013-10-31 19:00:53 +01:00
Thomas Müller
1317b7c03d
pass the name of the item source from the browser to the server - no need to get the data via complicated db queries
2013-10-23 18:39:37 +02:00
Thomas Müller
1909288fcb
Merge branch 'master' into fix-sharing-code
2013-10-23 17:16:16 +02:00
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
f9bbfad3e5
Fix sharing error message - id -> file name
...
fixe #2827
2013-10-17 16:45:11 +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