6db81afab9
move some stuff to the new api
2012-10-26 23:05:02 +02:00
7bc49d2a57
merge master into filesystem
2012-10-25 18:26:08 +02:00
7454186806
Forget to urlencode the path
2012-10-24 18:00:19 +02:00
ff6d2f16c4
urlencode
2012-10-24 17:58:52 +02:00
7b150dfa96
merge master into filesystem
2012-10-24 15:32:29 +02:00
41898a473e
Apply coding style guide
2012-10-24 14:43:34 +03:00
a9a27306de
fix copy&paste bug from previous commit
2012-10-24 13:11:29 +02:00
1d200c554f
Shared files are not stored in the file cache. Therefore we need to
...
use the share table from the db to find the item source if the public
link re-shares a already shared file.
2012-10-24 13:11:29 +02:00
916e0fc343
Place the brackets in the first line
2012-10-24 13:09:09 +02:00
4c234bd666
Apply coding style guide
...
http://owncloud.org/dev/coding-style-guide/
2012-10-24 12:12:16 +03:00
070fe02448
calling OC_Filesystem at this point will initialize file system with wrong user (for public shared links if another user is logged in). Therefore remove trailing slashes without the help of OC_Filesystem.
2012-10-24 10:06:00 +02:00
a7eb56c799
Merge pull request #76 from fmms/master
...
checkstyle: some more cleanups
2012-10-23 23:48:27 -07:00
dfecdb9700
Remove uneeded vendor prefixes
2012-10-24 00:00:33 +02:00
f363bde121
Format the CSS in a readable way
2012-10-23 23:57:55 +02:00
7424f3aef6
merge master into filesystem
2012-10-23 16:16:46 +02:00
ab944094e2
Merge pull request #12 from scambra/fixes
...
check free space using folder's owner
2012-10-23 07:02:21 -07:00
36d0d75901
Codestyle: FunctionCallArgumentSpacing
2012-10-23 08:35:54 +02:00
bc2a648f2d
[tx-robot] updated from transifex
2012-10-23 02:06:03 +02:00
5217ca219a
Merge branch 'master' into filesystem
2012-10-21 15:16:23 +02:00
16c4eb66d7
[tx-robot] updated from transifex
2012-10-21 02:06:44 +02:00
6f1fbf97f7
some namespaces fixed for the shared backend
2012-10-21 00:27:55 +02:00
cfa036eaa9
drop filectime from the filesystem api's
2012-10-20 23:58:07 +02:00
f7722abcb0
Merge branch 'master' into filesystem
2012-10-20 23:50:14 +02:00
cfbd310d34
[tx-robot] updated from transifex
2012-10-20 02:03:53 +02:00
9712a78559
merge master into filesystem
2012-10-18 23:24:28 +02:00
81cf726b18
unset UserID after Update
2012-10-18 18:45:03 +02:00
77cef5f514
merge master into filesystem
2012-10-17 13:14:17 +02:00
fd6adc7d08
[tx-robot] updated from transifex
2012-10-16 23:39:13 +02:00
b08a1696f5
normalize path to avoid problems with trailing slashes, double-slashes, etc.
2012-10-16 12:48:56 +02:00
4af5b016cc
Whitespace cleanup
2012-10-14 21:04:08 +02:00
c88cf5cae5
[tx-robot] updated from transifex
2012-10-14 02:08:47 +02:00
11e9ce25e6
merge master into filesystem
2012-10-13 04:29:20 +02:00
b761143047
[tx-robot] updated from transifex
2012-10-12 02:07:10 +02:00
fb2d2bc201
merge master into filesystem
2012-10-11 22:54:39 +02:00
77d91d5a03
generate correct link for shared files and shared directories
2012-10-11 13:45:16 +02:00
5c6e9518ed
drop Filesystem::getInternalPath and Filesystem::getStorage in favor of Filesystem::resolvePath
2012-10-10 17:46:29 +02:00
41640b4b91
don't show the share action in the file view for publically shared files.
2012-10-10 17:44:21 +02:00
aaa1b73364
don't use depricated OC_Filesystem
2012-10-10 13:18:36 +02:00
13e7e82d19
merge master into filesystem
2012-10-10 11:30:44 +02:00
fce6ce9bc6
[tx-robot] updated from transifex
2012-10-10 02:09:28 +02:00
4e6f720f14
Fix closing the sharing dropdown by clicking on the share button
2012-10-09 19:23:44 +02:00
e7899e17de
merge phpunit into filesystem
2012-10-08 13:53:53 +02:00
995b8bf12a
Remove old Shared folders from the file cache, fixes bug oc-1911
2012-10-07 17:34:21 -04:00
e36317c21a
[tx-robot] updated from transifex
2012-10-07 02:08:12 +02:00
5e2bce24b4
enable user to download selected files from publically shared directory
2012-10-05 16:12:04 +02:00
c99f62891a
breadcrumbs fixed for public share view
2012-10-05 15:06:59 +02:00
0d081ac5ac
register download action for directories
2012-10-05 14:28:23 +02:00
ef8a4a1629
register download action for files
2012-10-05 14:28:23 +02:00
99f4d949c1
fix download link for single files in publicly shared directory
2012-10-05 14:28:23 +02:00
72a48ca35e
fix download of single publically shared files.
2012-10-05 12:01:18 +02:00
dcad7aec82
fixed download of complete publically shared folder
2012-10-05 11:38:00 +02:00
a611ce4f33
baseDir has to be the whole path to work with shared directories below the root directory.
2012-10-05 10:32:38 +02:00
b88a61c633
no content area, it overlaps the file list
2012-10-05 10:32:38 +02:00
51321526e2
Prevent displaying errors if public link url parameters are incorrect
2012-10-03 16:14:54 -04:00
ac44506b40
Merge branch 'master' into filesystem
2012-10-02 23:29:13 +02:00
32a6b3b862
[tx-robot] updated from transifex
2012-10-02 23:18:26 +02:00
3fdebaa5dc
automatically remove and prevent installation of apps with a require version less than the current one. We check now the first ad second part of the version number.
...
Also increase the require tags of the core apps to 4.9 Please note that 4.9 is the internal versionnumber of the upcoming 4.5 release.
You have to pu a <require>4.9</require> into the info.xml of your app to make it as compatible with 4.5
2012-10-02 12:10:45 +02:00
550813ce41
don't use the complete path but the basename if the file/foder has no extension. Otherwise
...
we can end up with different items in the shared directory with the same name (Also folder names can contain dots)
2012-10-02 11:41:26 +02:00
f0c4356392
[tx-robot] updated from transifex
2012-10-02 02:06:08 +02:00
b23ad579dc
Sharing: backward compatibility to links from OC 4.0.
2012-10-01 14:39:53 +02:00
b7eb3f3dff
merge master into filesystem
2012-10-01 14:21:49 +02:00
377fb19818
[tx-robot] updated from transifex
2012-10-01 02:08:31 +02:00
27bd9df027
[tx-robot] updated from transifex
2012-09-28 23:36:09 +02:00
5144d26088
[tx-robot] updated from transifex
2012-09-28 02:06:03 +02:00
09aa95586a
[tx-robot] updated from transifex
2012-09-27 02:03:09 +02:00
88bca9bc49
Merge branch 'master' into filesystem
2012-09-26 17:52:28 +02:00
2c00f8c850
[tx-robot] updated from transifex
2012-09-26 13:22:37 +02:00
0192d920f0
Sharing: write update errors to logfile; do not die on errors
2012-09-26 12:27:43 +02:00
5855355faa
[tx-robot] updated from transifex
2012-09-26 02:06:37 +02:00
7b8c7aaf0d
Add missing Sharing permission
2012-09-25 18:01:56 +02:00
80fde2d8d1
Sharing update: take over reshares and thus don't fail
2012-09-25 12:14:20 +02:00
15e02726d7
Fix files_sharing update script, by making filesystem and users available
2012-09-25 11:47:53 +02:00
e5487376da
[tx-robot] updated from transifex
2012-09-25 02:05:18 +02:00
ecb90d72f3
[tx-robot] updated from transifex
2012-09-24 02:04:10 +02:00
eed1ccd164
Merge branch 'master' into filesystem
2012-09-23 02:41:31 +02:00
81ecabb19c
[tx-robot] updated from transifex
2012-09-23 02:04:41 +02:00
f360d7c736
add getId to shared storage backend
2012-09-23 01:51:00 +02:00
93292516d9
Merge branch 'master' into filesystem
2012-09-22 14:28:14 +02:00
b4de89e6b4
Sanitize download URL
...
@MTGap Can you please check if this break something?
2012-09-22 11:20:17 +02:00
08132587d1
[tx-robot] updated from transifex
2012-09-22 02:01:19 +02:00
ac69974d73
Merge pull request #17 from scambra/4.5-l10n-fixes
...
Fix some untranslated strings
2012-09-21 16:09:30 -07:00
8cfa618df5
Catch exceptions in upgrading files_sharing, skip the errors for now
2012-09-21 23:31:44 +02:00
11bdc8baa8
Fix the mimetype filter in OC_Share_Backend_File
2012-09-21 23:17:12 +02:00
ee77ef86d3
Check mimetype filter in file share backend
2012-09-21 21:32:09 +02:00
22c6b48d2f
translate files_sharing app
2012-09-21 11:48:20 +02:00
7c42e88676
[tx-robot] updated from transifex
2012-09-20 02:09:31 +02:00
f9127192da
Fix styling of public shared files download button
2012-09-19 19:51:52 +00:00
d7b878b303
Dynamicly resize public shared images
2012-09-19 19:46:49 +00:00
2b5133a1c4
check free space using folder's owner
2012-09-19 21:31:29 +02:00
01ce2babd1
Fix sharing of single files, target name was not correct
2012-09-19 21:29:16 +02:00
39e587b52c
Remove the content and table to prevent covering the download link
2012-09-19 00:27:53 -04:00
749b5b52ca
Show preview for public folder links
2012-09-18 23:56:14 -04:00
b0e645fe13
[tx-robot] updated from transifex
2012-09-19 02:07:26 +02:00
06e963c54f
[tx-robot] updated from transifex
2012-09-18 02:04:26 +02:00
e41ccd4344
[tx-robot] updated from transifex
2012-09-14 02:03:18 +02:00
8c9c095d48
[tx-robot] updated from transifex
2012-09-12 02:02:58 +02:00
ff6141b1e9
Change version number update occurs on to prevent problem with betas, users using the 4.5 betas will have to manually trigger the update if they want to get their old shared files back again
2012-09-10 21:57:13 -04:00
6a29bbda7a
[tx-robot] updated from transifex
2012-09-11 02:03:53 +02:00
deb1fbf9a1
Provide update script for files sharing
2012-09-09 18:29:47 -04:00
5c5955b31f
Disable link sharing for folders temporarily - next release
2012-09-09 14:52:03 -04:00
b163bd514f
Fix fetching shared children items, fixes problem with displaying owner of a shared file inside a shared folder
2012-09-08 23:09:57 -04:00
5e790368bc
[tx-robot] updated from transifex
2012-09-09 02:03:35 +02:00
d5d2e89622
[tx-robot] updated from transifex
2012-09-08 02:05:41 +02:00
bd83422095
put filestorages in a namespace
2012-09-07 18:30:48 +02:00
3829460ab8
adding space between) and {
2012-09-07 15:22:01 +02:00
73d726d1b2
Support for unshare from self, with a bunch of temporary fixes to overcome configuration problems with file actions
2012-09-07 00:02:22 -04:00
a94b56b57b
[tx-robot] updated from transifex
2012-09-07 02:07:22 +02:00
af3e767489
[tx-robot] updated from transifex
2012-09-06 02:06:37 +02:00
e8fcc71129
[tx-robot] updated from transifex
2012-09-05 02:05:39 +02:00
b867b738e8
[tx-robot] updated from transifex
2012-09-04 02:03:21 +02:00
c6858fb5ca
Add additional html tags to public links template for previewers
2012-09-03 13:14:23 -04:00
29d1e8087d
Implement generateTarget for file sharing backend
2012-09-01 13:46:57 -04:00
c0c48cb3ee
[tx-robot] updated from transifex
2012-09-01 13:37:28 +02:00
ab090d5277
[tx-robot] updated from transifex
2012-09-01 02:04:00 +02:00
75cd7eacf8
[tx-robot] updated from transifex
2012-08-31 02:07:19 +02:00
3ba27e624f
unify permissions (2/3): change apps to use OC::PERMISSION_X
2012-08-31 01:11:10 +02:00
f2534e7428
Show notification that no preview is available if no previewer is found for a public link to a file
2012-08-29 21:12:23 -04:00
756b514fee
Check if file source exists before searching for link
2012-08-29 21:12:23 -04:00
898ca364a2
[tx-robot] updated from transifex
2012-08-30 02:06:45 +02:00
c958d5ba80
Fix filesystem setup for shared public link with logged in user
2012-08-29 21:35:55 +02:00
8d490b9880
Fix shared storage working with user backend defined data directories
2012-08-29 14:39:13 -04:00
0e58800016
Whitespace fixes in apps
2012-08-29 20:29:43 +02:00
e5cbc532c3
Fix password authentication for links and fix template problems for links by creating a new base layout
2012-08-29 11:54:49 -04:00
da44e5405a
Fix typo
2012-08-28 11:12:18 -04:00
c53310e49b
Remove unnecessary ajax file from files_sharing
2012-08-28 09:57:09 -04:00
1e2ba8398d
Remove old database xml file for files_sharing, bump version number
2012-08-28 09:55:24 -04:00
0a1f24142a
Change public file from get.php to public.php
2012-08-28 09:53:31 -04:00
9cd55508c3
Add Share API settings to admin page
2012-08-27 20:39:31 -04:00
0a9d1ed3a6
Initial previewer for public links
2012-08-27 20:37:38 -04:00
8374a49cc1
[tx-robot] updated from transifex
2012-08-28 02:03:56 +02:00
ead7de6bff
only mount every single homefolder when using sharing app
2012-08-27 16:10:37 +02:00
faf702b9e6
[tx-robot] updated from transifex
2012-08-26 19:47:33 +02:00
4f5eff2b6f
Merge branch 'master' of git://gitorious.org/owncloud/owncloud into oracle-support
2012-08-25 03:14:26 +02:00
dc3bec6211
OC_Share no longer exists. remove hooks that would trigger require_once / autoloading failures, so i can at least upload files
2012-08-25 03:13:59 +02:00
f57d527a7c
[tx-robot] updated from transifex
2012-08-25 02:08:36 +02:00
fd5af9aff4
Merge branch 'master' of git://gitorious.org/owncloud/owncloud into oracle-support
2012-08-25 00:06:20 +02:00
c8255a170c
Merge branch 'master' of git://gitorious.org/owncloud/owncloud into oracle-support
...
Conflicts:
3rdparty/Sabre/CardDAV/Plugin.php
3rdparty/smb4php/smb.php
apps/bookmarks/ajax/addBookmark.php
apps/bookmarks/ajax/editBookmark.php
apps/bookmarks/appinfo/migrate.php
apps/calendar/ajax/calendar/edit.form.php
apps/calendar/ajax/changeview.php
apps/calendar/ajax/import/import.php
apps/calendar/ajax/settings/guesstimezone.php
apps/calendar/ajax/settings/setfirstday.php
apps/calendar/ajax/settings/settimeformat.php
apps/calendar/ajax/share/changepermission.php
apps/calendar/ajax/share/share.php
apps/calendar/ajax/share/unshare.php
apps/calendar/appinfo/app.php
apps/calendar/appinfo/remote.php
apps/calendar/appinfo/update.php
apps/calendar/appinfo/version
apps/calendar/js/calendar.js
apps/calendar/l10n/da.php
apps/calendar/l10n/de.php
apps/calendar/l10n/fi_FI.php
apps/calendar/l10n/gl.php
apps/calendar/l10n/he.php
apps/calendar/l10n/hr.php
apps/calendar/l10n/ja_JP.php
apps/calendar/l10n/lb.php
apps/calendar/l10n/lt_LT.php
apps/calendar/l10n/nb_NO.php
apps/calendar/l10n/pl.php
apps/calendar/l10n/pt_PT.php
apps/calendar/l10n/ro.php
apps/calendar/l10n/ru.php
apps/calendar/l10n/sv.php
apps/calendar/l10n/zh_CN.php
apps/calendar/l10n/zh_TW.php
apps/calendar/lib/app.php
apps/calendar/lib/calendar.php
apps/calendar/lib/object.php
apps/calendar/lib/share.php
apps/calendar/templates/part.choosecalendar.rowfields.php
apps/calendar/templates/part.import.php
apps/calendar/templates/settings.php
apps/contacts/ajax/activation.php
apps/contacts/ajax/addressbook/delete.php
apps/contacts/ajax/contact/add.php
apps/contacts/ajax/contact/addproperty.php
apps/contacts/ajax/contact/delete.php
apps/contacts/ajax/contact/deleteproperty.php
apps/contacts/ajax/contact/saveproperty.php
apps/contacts/ajax/createaddressbook.php
apps/contacts/ajax/cropphoto.php
apps/contacts/ajax/currentphoto.php
apps/contacts/ajax/importaddressbook.php
apps/contacts/ajax/oc_photo.php
apps/contacts/ajax/savecrop.php
apps/contacts/ajax/selectaddressbook.php
apps/contacts/ajax/updateaddressbook.php
apps/contacts/ajax/uploadimport.php
apps/contacts/ajax/uploadphoto.php
apps/contacts/appinfo/migrate.php
apps/contacts/appinfo/remote.php
apps/contacts/css/contacts.css
apps/contacts/import.php
apps/contacts/index.php
apps/contacts/js/contacts.js
apps/contacts/l10n/ca.php
apps/contacts/l10n/cs_CZ.php
apps/contacts/l10n/da.php
apps/contacts/l10n/de.php
apps/contacts/l10n/el.php
apps/contacts/l10n/eo.php
apps/contacts/l10n/es.php
apps/contacts/l10n/et_EE.php
apps/contacts/l10n/eu.php
apps/contacts/l10n/fa.php
apps/contacts/l10n/fi_FI.php
apps/contacts/l10n/fr.php
apps/contacts/l10n/he.php
apps/contacts/l10n/hr.php
apps/contacts/l10n/hu_HU.php
apps/contacts/l10n/ia.php
apps/contacts/l10n/it.php
apps/contacts/l10n/ja_JP.php
apps/contacts/l10n/ko.php
apps/contacts/l10n/lb.php
apps/contacts/l10n/mk.php
apps/contacts/l10n/nb_NO.php
apps/contacts/l10n/nl.php
apps/contacts/l10n/pl.php
apps/contacts/l10n/pt_BR.php
apps/contacts/l10n/pt_PT.php
apps/contacts/l10n/ro.php
apps/contacts/l10n/ru.php
apps/contacts/l10n/sk_SK.php
apps/contacts/l10n/sl.php
apps/contacts/l10n/sv.php
apps/contacts/l10n/th_TH.php
apps/contacts/l10n/tr.php
apps/contacts/l10n/zh_CN.php
apps/contacts/l10n/zh_TW.php
apps/contacts/lib/addressbook.php
apps/contacts/lib/hooks.php
apps/contacts/lib/vcard.php
apps/contacts/photo.php
apps/contacts/templates/part.contact.php
apps/contacts/templates/part.contacts.php
apps/contacts/templates/part.cropphoto.php
apps/contacts/templates/part.importaddressbook.php
apps/contacts/templates/part.selectaddressbook.php
apps/contacts/thumbnail.php
apps/files/ajax/download.php
apps/files/ajax/newfile.php
apps/files/ajax/timezone.php
apps/files/appinfo/update.php
apps/files/appinfo/version
apps/files/index.php
apps/files/js/fileactions.js
apps/files/js/filelist.js
apps/files/js/files.js
apps/files/l10n/ar.php
apps/files/l10n/bg_BG.php
apps/files/l10n/ca.php
apps/files/l10n/cs_CZ.php
apps/files/l10n/da.php
apps/files/l10n/de.php
apps/files/l10n/el.php
apps/files/l10n/eo.php
apps/files/l10n/es.php
apps/files/l10n/et_EE.php
apps/files/l10n/eu.php
apps/files/l10n/fa.php
apps/files/l10n/fi_FI.php
apps/files/l10n/fr.php
apps/files/l10n/gl.php
apps/files/l10n/he.php
apps/files/l10n/hr.php
apps/files/l10n/hu_HU.php
apps/files/l10n/ia.php
apps/files/l10n/id.php
apps/files/l10n/it.php
apps/files/l10n/ja_JP.php
apps/files/l10n/ko.php
apps/files/l10n/lb.php
apps/files/l10n/lt_LT.php
apps/files/l10n/mk.php
apps/files/l10n/ms_MY.php
apps/files/l10n/nb_NO.php
apps/files/l10n/nl.php
apps/files/l10n/nn_NO.php
apps/files/l10n/pl.php
apps/files/l10n/pt_BR.php
apps/files/l10n/pt_PT.php
apps/files/l10n/ro.php
apps/files/l10n/ru.php
apps/files/l10n/sk_SK.php
apps/files/l10n/sl.php
apps/files/l10n/sr.php
apps/files/l10n/sr@latin.php
apps/files/l10n/sv.php
apps/files/l10n/th_TH.php
apps/files/l10n/tr.php
apps/files/l10n/uk.php
apps/files/l10n/zh_CN.php
apps/files/l10n/zh_TW.php
apps/files_archive/js/archive.js
apps/files_encryption/lib/cryptstream.php
apps/files_encryption/lib/proxy.php
apps/files_encryption/tests/proxy.php
apps/files_external/appinfo/app.php
apps/files_external/lib/smb.php
apps/files_external/lib/streamwrapper.php
apps/files_external/tests/config.php
apps/files_external/tests/smb.php
apps/files_sharing/ajax/email.php
apps/files_sharing/ajax/getitem.php
apps/files_sharing/ajax/setpermissions.php
apps/files_sharing/ajax/share.php
apps/files_sharing/ajax/toggleresharing.php
apps/files_sharing/ajax/unshare.php
apps/files_sharing/ajax/userautocomplete.php
apps/files_sharing/js/settings.js
apps/files_sharing/js/share.js
apps/files_sharing/lib_share.php
apps/files_sharing/settings.php
apps/files_sharing/sharedstorage.php
apps/files_sharing/templates/settings.php
apps/files_versions/ajax/rollbackVersion.php
apps/files_versions/versions.php
apps/gallery/ajax/thumbnail.php
apps/gallery/appinfo/app.php
apps/gallery/appinfo/update.php
apps/gallery/appinfo/version
apps/gallery/css/styles.css
apps/gallery/index.php
apps/gallery/js/pictures.js
apps/gallery/l10n/ca.php
apps/gallery/l10n/cs_CZ.php
apps/gallery/l10n/de.php
apps/gallery/l10n/el.php
apps/gallery/l10n/es.php
apps/gallery/l10n/fi_FI.php
apps/gallery/l10n/fr.php
apps/gallery/l10n/it.php
apps/gallery/l10n/pl.php
apps/gallery/l10n/pt_PT.php
apps/gallery/l10n/ru.php
apps/gallery/l10n/sl.php
apps/gallery/l10n/sv.php
apps/gallery/l10n/th_TH.php
apps/gallery/l10n/tr.php
apps/gallery/l10n/zh_CN.php
apps/gallery/lib/album.php
apps/gallery/lib/hooks_handlers.php
apps/gallery/lib/managers.php
apps/gallery/lib/photo.php
apps/gallery/lib/tiles.php
apps/gallery/lib/tiles_test.php
apps/gallery/templates/index.php
apps/media/lib_ampache.php
apps/media/lib_collection.php
apps/media/lib_media.php
apps/remoteStorage/lib_remoteStorage.php
apps/tasks/ajax/addtaskform.php
apps/tasks/ajax/edittask.php
apps/user_ldap/appinfo/update.php
apps/user_ldap/group_ldap.php
apps/user_ldap/lib_ldap.php
apps/user_ldap/settings.php
apps/user_ldap/templates/settings.php
apps/user_ldap/user_ldap.php
apps/user_migrate/appinfo/app.php
apps/user_migrate/templates/settings.php
apps/user_webfinger/host-meta.php
config/config.sample.php
core/js/js.js
core/l10n/da.php
core/l10n/de.php
core/l10n/fi_FI.php
core/l10n/gl.php
core/l10n/he.php
core/l10n/hr.php
core/l10n/id.php
core/l10n/ja_JP.php
core/l10n/lb.php
core/l10n/lt_LT.php
core/l10n/nb_NO.php
core/l10n/pl.php
core/l10n/pt_PT.php
core/l10n/ro.php
core/l10n/ru.php
core/l10n/sv.php
core/lostpassword/index.php
core/templates/layout.user.php
core/templates/login.php
db_structure.xml
index.php
l10n/af/calendar.po
l10n/af/contacts.po
l10n/af/core.po
l10n/af/files.po
l10n/af/settings.po
l10n/ar/calendar.po
l10n/ar/contacts.po
l10n/ar/core.po
l10n/ar/files.po
l10n/ar/media.po
l10n/ar/settings.po
l10n/bg_BG/calendar.po
l10n/bg_BG/contacts.po
l10n/bg_BG/core.po
l10n/bg_BG/files.po
l10n/bg_BG/media.po
l10n/bg_BG/settings.po
l10n/ca/calendar.po
l10n/ca/contacts.po
l10n/ca/core.po
l10n/ca/files.po
l10n/ca/gallery.po
l10n/ca/settings.po
l10n/cs_CZ/calendar.po
l10n/cs_CZ/contacts.po
l10n/cs_CZ/core.po
l10n/cs_CZ/files.po
l10n/cs_CZ/gallery.po
l10n/cs_CZ/settings.po
l10n/da/calendar.po
l10n/da/contacts.po
l10n/da/core.po
l10n/da/files.po
l10n/da/settings.po
l10n/de/calendar.po
l10n/de/contacts.po
l10n/de/core.po
l10n/de/files.po
l10n/de/gallery.po
l10n/de/settings.po
l10n/el/calendar.po
l10n/el/contacts.po
l10n/el/core.po
l10n/el/files.po
l10n/el/gallery.po
l10n/el/settings.po
l10n/eo/calendar.po
l10n/eo/contacts.po
l10n/eo/core.po
l10n/eo/files.po
l10n/eo/media.po
l10n/eo/settings.po
l10n/es/calendar.po
l10n/es/contacts.po
l10n/es/core.po
l10n/es/files.po
l10n/es/gallery.po
l10n/es/settings.po
l10n/et_EE/calendar.po
l10n/et_EE/contacts.po
l10n/et_EE/core.po
l10n/et_EE/files.po
l10n/et_EE/settings.po
l10n/eu/calendar.po
l10n/eu/contacts.po
l10n/eu/core.po
l10n/eu/files.po
l10n/eu/settings.po
l10n/fa/calendar.po
l10n/fa/contacts.po
l10n/fa/core.po
l10n/fa/files.po
l10n/fa/settings.po
l10n/fi_FI/calendar.po
l10n/fi_FI/contacts.po
l10n/fi_FI/core.po
l10n/fi_FI/files.po
l10n/fi_FI/gallery.po
l10n/fi_FI/settings.po
l10n/fr/calendar.po
l10n/fr/contacts.po
l10n/fr/core.po
l10n/fr/files.po
l10n/fr/gallery.po
l10n/fr/media.po
l10n/fr/settings.po
l10n/gl/calendar.po
l10n/gl/contacts.po
l10n/gl/core.po
l10n/gl/files.po
l10n/gl/settings.po
l10n/he/calendar.po
l10n/he/contacts.po
l10n/he/core.po
l10n/he/files.po
l10n/he/settings.po
l10n/hr/calendar.po
l10n/hr/contacts.po
l10n/hr/core.po
l10n/hr/files.po
l10n/hr/settings.po
l10n/hu_HU/calendar.po
l10n/hu_HU/contacts.po
l10n/hu_HU/core.po
l10n/hu_HU/files.po
l10n/hu_HU/settings.po
l10n/hy/calendar.po
l10n/hy/contacts.po
l10n/hy/core.po
l10n/hy/files.po
l10n/hy/settings.po
l10n/ia/calendar.po
l10n/ia/contacts.po
l10n/ia/core.po
l10n/ia/files.po
l10n/ia/settings.po
l10n/id/calendar.po
l10n/id/contacts.po
l10n/id/core.po
l10n/id/files.po
l10n/id/settings.po
l10n/it/calendar.po
l10n/it/contacts.po
l10n/it/core.po
l10n/it/files.po
l10n/it/gallery.po
l10n/it/settings.po
l10n/ja_JP/calendar.po
l10n/ja_JP/contacts.po
l10n/ja_JP/core.po
l10n/ja_JP/files.po
l10n/ja_JP/settings.po
l10n/ko/calendar.po
l10n/ko/contacts.po
l10n/ko/core.po
l10n/ko/files.po
l10n/ko/settings.po
l10n/lb/calendar.po
l10n/lb/contacts.po
l10n/lb/core.po
l10n/lb/files.po
l10n/lb/settings.po
l10n/lt_LT/calendar.po
l10n/lt_LT/contacts.po
l10n/lt_LT/core.po
l10n/lt_LT/files.po
l10n/lt_LT/settings.po
l10n/mk/calendar.po
l10n/mk/contacts.po
l10n/mk/core.po
l10n/mk/files.po
l10n/mk/settings.po
l10n/ms_MY/calendar.po
l10n/ms_MY/contacts.po
l10n/ms_MY/core.po
l10n/ms_MY/files.po
l10n/ms_MY/settings.po
l10n/nb_NO/calendar.po
l10n/nb_NO/contacts.po
l10n/nb_NO/core.po
l10n/nb_NO/files.po
l10n/nb_NO/settings.po
l10n/nl/calendar.po
l10n/nl/contacts.po
l10n/nl/core.po
l10n/nl/files.po
l10n/nl/settings.po
l10n/nn_NO/calendar.po
l10n/nn_NO/contacts.po
l10n/nn_NO/core.po
l10n/nn_NO/files.po
l10n/nn_NO/settings.po
l10n/pl/calendar.po
l10n/pl/contacts.po
l10n/pl/core.po
l10n/pl/files.po
l10n/pl/gallery.po
l10n/pl/settings.po
l10n/pt_BR/calendar.po
l10n/pt_BR/contacts.po
l10n/pt_BR/core.po
l10n/pt_BR/files.po
l10n/pt_BR/settings.po
l10n/pt_PT/calendar.po
l10n/pt_PT/contacts.po
l10n/pt_PT/core.po
l10n/pt_PT/files.po
l10n/pt_PT/gallery.po
l10n/pt_PT/settings.po
l10n/ro/calendar.po
l10n/ro/contacts.po
l10n/ro/core.po
l10n/ro/files.po
l10n/ro/settings.po
l10n/ru/calendar.po
l10n/ru/contacts.po
l10n/ru/core.po
l10n/ru/files.po
l10n/ru/gallery.po
l10n/ru/settings.po
l10n/sk_SK/calendar.po
l10n/sk_SK/contacts.po
l10n/sk_SK/core.po
l10n/sk_SK/files.po
l10n/sk_SK/settings.po
l10n/sl/calendar.po
l10n/sl/contacts.po
l10n/sl/core.po
l10n/sl/files.po
l10n/sl/gallery.po
l10n/sl/settings.po
l10n/sr/calendar.po
l10n/sr/contacts.po
l10n/sr/core.po
l10n/sr/files.po
l10n/sr/settings.po
l10n/sr@latin/calendar.po
l10n/sr@latin/contacts.po
l10n/sr@latin/core.po
l10n/sr@latin/files.po
l10n/sr@latin/settings.po
l10n/sv/calendar.po
l10n/sv/contacts.po
l10n/sv/core.po
l10n/sv/files.po
l10n/sv/gallery.po
l10n/sv/media.po
l10n/sv/settings.po
l10n/templates/bookmarks.pot
l10n/templates/calendar.pot
l10n/templates/contacts.pot
l10n/templates/core.pot
l10n/templates/files.pot
l10n/templates/gallery.pot
l10n/templates/media.pot
l10n/templates/settings.pot
l10n/th_TH/calendar.po
l10n/th_TH/contacts.po
l10n/th_TH/core.po
l10n/th_TH/files.po
l10n/th_TH/gallery.po
l10n/th_TH/settings.po
l10n/tr/calendar.po
l10n/tr/contacts.po
l10n/tr/core.po
l10n/tr/files.po
l10n/tr/gallery.po
l10n/tr/settings.po
l10n/uk/calendar.po
l10n/uk/contacts.po
l10n/uk/core.po
l10n/uk/files.po
l10n/uk/media.po
l10n/uk/settings.po
l10n/zh_CN/calendar.po
l10n/zh_CN/contacts.po
l10n/zh_CN/core.po
l10n/zh_CN/files.po
l10n/zh_CN/gallery.po
l10n/zh_CN/settings.po
l10n/zh_TW/calendar.po
l10n/zh_TW/contacts.po
l10n/zh_TW/core.po
l10n/zh_TW/files.po
l10n/zh_TW/settings.po
lib/app.php
lib/base.php
lib/connector/sabre/file.php
lib/connector/sabre/locks.php
lib/connector/sabre/node.php
lib/db.php
lib/filecache.php
lib/fileproxy/quota.php
lib/files.php
lib/filestorage/local.php
lib/filesystemview.php
lib/group/database.php
lib/helper.php
lib/installer.php
lib/json.php
lib/l10n.php
lib/migrate.php
lib/mimetypes.fixlist.php
lib/ocs.php
lib/preferences.php
lib/public/json.php
lib/public/util.php
lib/template.php
lib/user.php
lib/user/database.php
lib/util.php
lib/vcategories.php
ocs/providers.php
settings/admin.php
settings/ajax/lostpassword.php
settings/ajax/removeuser.php
settings/ajax/setbackgroundjobsmode.php
settings/ajax/setlanguage.php
settings/ajax/setquota.php
settings/ajax/togglegroups.php
settings/apps.php
settings/css/settings.css
settings/js/apps.js
settings/js/users.js
settings/l10n/bg_BG.php
settings/l10n/ca.php
settings/l10n/cs_CZ.php
settings/l10n/da.php
settings/l10n/de.php
settings/l10n/el.php
settings/l10n/eo.php
settings/l10n/es.php
settings/l10n/et_EE.php
settings/l10n/eu.php
settings/l10n/fa.php
settings/l10n/fi_FI.php
settings/l10n/fr.php
settings/l10n/gl.php
settings/l10n/he.php
settings/l10n/hr.php
settings/l10n/hu_HU.php
settings/l10n/it.php
settings/l10n/ja_JP.php
settings/l10n/ko.php
settings/l10n/lt_LT.php
settings/l10n/mk.php
settings/l10n/ms_MY.php
settings/l10n/nb_NO.php
settings/l10n/nl.php
settings/l10n/nn_NO.php
settings/l10n/pl.php
settings/l10n/pt_BR.php
settings/l10n/pt_PT.php
settings/l10n/ru.php
settings/l10n/sk_SK.php
settings/l10n/sl.php
settings/l10n/sv.php
settings/l10n/th_TH.php
settings/l10n/tr.php
settings/l10n/zh_CN.php
settings/personal.php
settings/templates/admin.php
settings/templates/users.php
2012-08-25 00:05:07 +02:00
36487246ed
Switch to using file cache ids instead of paths for file sharing
2012-08-24 10:05:37 -04:00
cfec290ad9
Prevent resharing in UI if share permission not granted
2012-08-24 10:05:37 -04:00
3148edbdef
Fix shared storage rename. Note: You can only rename shared files/folders that are inside a shared folder, not individual shared files/folders.
2012-08-24 10:01:46 -04:00
ffb55d5a17
Don't return file handle if the mode supports writing and the file is not writable
...
Conflicts:
apps/files_sharing/sharedstorage.php
2012-08-24 14:58:48 +02:00
07a889631e
[tx-robot] updated from transifex
2012-08-24 02:07:18 +02:00
082ed4ab71
[tx-robot] updated from transifex
2012-08-23 02:07:35 +02:00
885b8c481b
Check if files_sharing app is enabled, move file specific javascript to files_sharing app
2012-08-22 12:32:07 -04:00
3debb67458
Move share CSS to core, add script and style from inside Share API
2012-08-22 11:57:58 -04:00
25d474579a
Removing most of files_sharing, the Share API implemented the majority of it
2012-08-22 11:57:58 -04:00
e6d87b2c4b
[tx-robot] updated from transifex
2012-08-22 02:08:16 +02:00
b819aa33f7
[tx-robot] updated from transifex
2012-08-21 02:09:12 +02:00
82d81e8d39
Merge branch 'share_api'
...
Conflicts:
apps/contacts/lib/vcard.php
apps/files/index.php
lib/files.php
2012-08-19 22:29:01 -04:00
36474e5681
[tx-robot] updated from transifex
2012-08-20 02:01:32 +02:00
70e8a7e25c
[tx-robot] updated from transifex
2012-08-17 00:45:46 +02:00
df8a2e5361
File sharing cleanup, works perfectly I think :)
2012-08-16 12:20:14 -04:00
1e6dc67517
[tx-robot] updated from transifex
2012-08-16 02:09:15 +02:00
da3896808a
[tx-robot] updated from transifex
2012-08-15 02:07:20 +02:00
4c7fd8cd01
Merge branch 'master' into share_api
...
Conflicts:
lib/group.php
lib/group/backend.php
lib/group/database.php
lib/group/interface.php
lib/public/user.php
lib/user.php
lib/user/backend.php
lib/user/database.php
lib/user/interface.php
2012-08-14 10:22:13 -04:00
19446fb22f
[tx-robot] updated from transifex
2012-08-13 23:19:31 +02:00
53f117c01a
l10n directories have been missing
2012-08-13 23:10:10 +02:00
78cd1153f0
Merge branch 'master' into share_api
...
Conflicts:
apps/contacts/lib/vcard.php
apps/files_sharing/sharedstorage.php
2012-08-09 11:38:22 -04:00
7522a23693
Remove unused RUNTIME_NOSETUPFS var
2012-08-08 22:42:50 +02:00
05648dac61
Don't return file handle if the mode supports writing and the file is not writable
2012-08-08 11:25:24 -04:00
03d65af5dc
Add share action back into addressbook settings, bump up z-index of dropdown so the autocomplete list is visible
2012-08-06 15:09:01 -04:00
83117445ac
Fix offset for folder detection, no longer including '/Shared' in file target path
2012-08-06 14:33:47 -04:00
ba0cf98175
Remove extra line, caused 'headers already sent' issues
2012-08-06 13:33:53 -04:00
3b2c853916
Lots of refactoring to share API
2012-08-06 11:27:13 -04:00
09bb3bfaf8
Preparing for proper collection implementation
2012-08-03 15:05:45 -04:00
e13f381189
add limit support to OC_DB & OCP/DB
2012-08-01 14:59:08 +02:00
94ce8f2168
Merge branch 'master' into share_api
...
Conflicts:
apps/contacts/lib/app.php
apps/files_sharing/js/share.js
2012-07-31 15:00:04 -04:00
ede464f058
escape all identifiers with backticks
2012-07-31 18:53:05 +02:00
b9bd54bd98
Add additional error handling for emailing private links
2012-07-30 10:07:20 -04:00
dab708b625
Correction for 'Fix group detection for sharing in case username contains '@', fix for oc-1270'
2012-07-30 10:07:20 -04:00
7d17c59a51
Fix group detection for sharing in case username contains '@', fix for oc-1270
2012-07-30 10:07:19 -04:00
f328f53ec1
Fix filesystem hash, no longer using basicOperation()
...
Conflicts:
lib/filesystemview.php
2012-07-30 10:07:19 -04:00
5262cde6a6
Add additional error handling for emailing private links
2012-07-29 18:02:09 -04:00
7ff04be091
Correction for 'Fix group detection for sharing in case username contains '@', fix for oc-1270'
2012-07-28 11:06:36 -04:00
df9f5b902a
Fix group detection for sharing in case username contains '@', fix for oc-1270
2012-07-27 15:34:51 -04:00
cb21406e18
Implement CRUDS in share dropdown, and some clean-up
2012-07-26 21:56:22 -04:00
add8f09355
No longer need hash() in shared storage, already implemented by the common file storage
2012-07-25 17:13:48 -04:00
30b58f5677
Merge branch 'master' into share_api
...
Conflicts:
apps/calendar/js/loader.js
apps/contacts/index.php
apps/contacts/js/loader.js
apps/files/js/files.js
apps/files_sharing/sharedstorage.php
lib/filesystemview.php
2012-07-25 17:08:18 -04:00
f25ccaff59
Fix filesystem hash, no longer using basicOperation()
2012-07-25 16:55:01 -04:00
4d17ed2f71
Make file actions permissions aware
2012-07-25 16:33:08 -04:00
fc72d4b10f
Add root directory checks for CRUDS permissions in shared storage
2012-07-24 21:16:47 -04:00
f7b89f0475
Add CRUDS permissions calls to filesystem, deprecate is_readable() and is_writable()
2012-07-24 20:10:28 -04:00
c60c6024a7
Remove toTmpFile() from shared storage, no longer needed
2012-07-24 14:50:43 -04:00
eac297e8c4
Improve file source caching for shared folders
2012-07-24 14:41:19 -04:00
e8675586af
Fix permission check for rmdir(), implement unlink(), rename(), and copy()
2012-07-24 14:22:07 -04:00
e6678bd454
Permission check should be made on parent folder when creating a new folder
2012-07-23 22:39:29 -04:00
7b01e3285e
Include a few CRUDS permissions checks in shared storage, plus a little clean-up in shared storage
2012-07-23 22:05:53 -04:00
48ec78299e
cleanup some obsolete foldersize code from the shared storage backend
2012-07-21 00:20:27 +02:00
38271ded75
Added CSRF checks
2012-07-20 20:12:36 +02:00
7152b8b4ee
remove unused and depricated getFolderSize
2012-07-20 18:32:40 +02:00
0bd7d14b7a
Sharing: offer an option to allow sharing with everyone, i.e. do not check group memberships
2012-07-17 14:09:01 +02:00
225726c8d9
latin1 => utf8. I thought I did this a month ago?
2012-07-16 01:41:45 +02:00
b45d3ced79
fix remote and public.php
2012-07-13 22:44:35 +02:00
50eef9a71c
update script to fix fscache
2012-07-13 15:17:36 +02:00
4bf13adff2
Merge branch 'master' into share_api
...
Conflicts:
apps/contacts/lib/addressbook.php
apps/files_sharing/js/share.js
apps/files_sharing/sharedstorage.php
2012-07-11 20:25:59 -04:00
7b2ec41477
Revert santizing toaddress, because PHPMailer now throws exceptions
...
Conflicts:
apps/files_sharing/ajax/email.php
2012-07-11 19:38:57 -04:00
ebcf5bce3c
Sanitize toaddress for emailing private links
...
Conflicts:
apps/files_sharing/ajax/email.php
2012-07-11 19:38:56 -04:00
91a15bae76
Revert santizing toaddress, because PHPMailer now throws exceptions
2012-07-11 16:02:43 -04:00
7077678f7f
Sanitize toaddress for emailing private links
2012-07-11 15:26:22 -04:00
7c908a0016
Sharing files working using share API
2012-07-10 18:56:22 -04:00
e59a1806cf
remove superfluous ?> at the end of .php files (left out apps/*/templates)
2012-07-09 16:51:16 +02:00
04a0755fd3
CSRF checks
2012-07-07 16:03:21 +02:00
5e8ef33190
Clean up in the dropdown for unsharing
2012-07-03 14:00:09 -04:00
eca2e073f8
Don't reload the page after sending private link to email address
2012-07-01 11:54:32 -04:00
bf93dd4661
Don't reload the page after sending private link to email address
2012-07-01 11:53:29 -04:00
2418d9a1a9
Change registerBackend calls class argument to strings
2012-06-30 17:33:30 -04:00
895d5707ee
Don't overwrite fake directory stream for Shared storage
2012-06-27 12:09:11 -04:00
2c773d549d
Don't overwrite fake directory stream for Shared storage
2012-06-27 12:07:42 -04:00
28b7793d5b
Fixes and change database table from sharing to share
2012-06-27 01:05:36 +02:00
bc68f14c4b
Prepare drop down UI for share API
2012-06-27 01:05:36 +02:00
8198114615
Some more changes to getItems() and fixes in shared storage
2012-06-27 01:05:36 +02:00
71350bc618
I'm having trouble making up my mind... translateItem -> getItems() -> formatItems(). It may change again. Preparing shared storage for new api.
2012-06-27 01:05:36 +02:00
945565f420
Move ajax and js files to core
2012-06-27 01:05:36 +02:00
380f41136c
Added placeholder msg to share with menu to clarify user list restricted to security context
2012-06-25 16:57:41 +01:00
bf6abdde2d
Add missing ')'
2012-06-21 12:26:06 -04:00
a9a913c273
Implemented deleteAll() method in OC_FilesystemView (interface) and OC_Filestorage_Common (logic)
...
Made OC_Filestorage_Local and OC_Filestorage_Shared extend OC_Filestorage_Common
Set searchInDir() to protected instead of private in OC_Filestorage_Local and OC_Filestorage_Shared
Added class documentation to OC_Filestorage_Common
Cleaned up OCA_Versions::expireAll()
2012-06-21 18:15:22 +01:00
d6bf62ea4e
Merge branch 'master' of gitorious.org:owncloud/owncloud
2012-06-20 16:26:02 +01:00
c244daac89
removed readdir to fix bug oc-1054
2012-06-20 16:24:49 +01:00
6308ca6b8a
Merge branch 'shared_log'
2012-06-20 17:20:46 +02:00
0086639891
Merge branch 'audit'
2012-06-20 17:20:39 +02:00
6404476bec
Delay setup of FS until OC_Filesystem is used
2012-06-20 17:10:49 +02:00
28a72e0e3c
Fixed deleteAll function for deleting all old versions of files (expireAll)
...
Added new readdir() method to all storage classes and handlers (only working implementation in local.php)
2012-06-19 19:42:40 +01:00
a1364c9726
fixes oc-1026
2012-06-18 22:48:52 +02:00
ec3033a5dd
Check for '\' as well when searching for parent folders, because Windows returns '\' for dirname()
2012-06-15 19:34:25 -04:00
449760f665
add hasUpdated to oc_filestorage
2012-06-15 16:43:24 +02:00
f3b30e4658
Forgot $ sign for variable
2012-06-14 15:14:01 -04:00
f7e686d4f1
Revert "Fix a counting mistake"
...
This reverts commit c20abfef38
2012-06-14 15:05:20 -04:00
b025ff8de3
reverting 8c7fa15aaf, differs between OC3 and 4
2012-06-14 18:33:00 +02:00
12bfc551fb
reverting 8c7fa15aaf, differs between OC3 and 4
2012-06-14 18:31:38 +02:00
6e15b231b0
Check for '\' as well when searching for parent folders, because Windows returns '\' for dirname()
2012-06-14 12:27:30 -04:00
4510571aa1
Add app for logging access to shared files
2012-06-14 17:44:41 +02:00
7868b25dcc
Fix incorrect creation of filesystem for user@group in data folder during shares
2012-06-12 21:34:35 -04:00
6f55a52858
Fix incorrect creation of filesystem for user@group in data folder during shares
2012-06-12 21:33:05 -04:00
3be5e2af26
utf8 in der DB config
2012-06-11 23:04:28 +02:00
8c7fa15aaf
Sharing, fix: connect to hooks from the correct classes
2012-06-08 11:58:00 +02:00
4d3b7574f3
Sharing, fix: connect to hooks from the correct classes
2012-06-08 11:55:16 +02:00
d4ea853fcf
use our own serverHost call so that ownCloud works with reverse proxy servers
2012-05-31 20:26:09 +02:00
5d425a9f79
use our own serverHost call so that ownCloud works with reverse proxy servers
2012-05-31 20:16:44 +02:00
c79a529edd
remove not needed includes
2012-05-28 13:57:45 +02:00
d8ca4f78cf
Fix private link sharing via email, fix for bug oc-750
2012-05-23 19:36:39 -04:00
970124a90b
Fix private link sharing via email, fix for bug oc-750
2012-05-23 19:35:29 -04:00
9e73524168
mark the apps as part of the shipped package and increase the requirement to ownCloud 4
2012-05-18 16:06:57 +02:00
b7aee58ef9
Hooks aren't working across different users' filesystems, so update the mtime of the Shared folder for all shared item events
2012-05-17 21:26:55 -04:00
fbe0d0d4fd
Fix private links inside folders
2012-05-17 16:12:33 -04:00
cf181e88bb
Try to setup a user's filesystem if the user hasn't logged in before and is shared a file
2012-05-17 09:24:54 -04:00
c04074692e
Fix incorrect toaddress being passed for emailing private links
2012-05-15 19:05:26 -04:00
b619821f4a
Create a new OC_Share object instead of manually inserting rows when adding a user to a group share, prevents a couple of potential bugs
2012-05-15 12:03:20 -04:00
7b92c27777
Check if a file is encrypted before sharing (encrypted files cannot be shared)
2012-05-15 11:29:02 -04:00
a3b06e9658
Check if a private link points to a folder or file and change text accordingly
2012-05-14 20:21:31 -04:00
cda9dcc7aa
Fix private link emailing and clean up file name displayed in email
2012-05-14 20:21:31 -04:00
Robin Appelman
Lukas Reschke
Thomas Müller
Björn Schießle
icewind1991
Felix Moeller
Arthur Schiwon
Bart Visscher
Michael Gapczynski
Frank Karlitschek
scambra
Tom Needham
Jörn Friedrich Dreyer
Georg Ehrke
jfd
jfd
Thomas Tanghus
Michael Gapczynski
Sam Tuke
Marco B