66b1ad0a9b
Merge branch 'master' into type-hinting-sharing
...
Conflicts:
apps/files_sharing/lib/share/file.php
apps/files_sharing/tests/api.php
lib/private/share/share.php
2014-04-28 17:59:41 +02:00
ac9e07c589
$RUNTIME_APPTYPES is no longer used - left over from pre OC4
2014-04-28 17:56:20 +02:00
688f6162da
Add sorting to files list, trashbin and public files
2014-04-28 17:42:04 +02:00
9f62059efa
Fix file summary to use the whole file list
...
- moved the summary code into a new class FileSummary
- FileSummary is calculated only once, then updated with add/remove
- added new OC.Util namespace for JS utility functions
2014-04-28 14:49:39 +02:00
7ac7546b71
Merge pull request #8353 from owncloud/publicshare-webdav
...
Expose public shares over webdav
2014-04-26 15:55:37 +02:00
b176708505
Expose public shares over webdav
2014-04-25 14:45:18 +02:00
b42418246f
Also fixed the returned internal path when getting the root shared item by id
2014-04-25 14:04:22 +02:00
c53c4b9791
fix search by mime for shared single files
2014-04-25 12:28:10 +02:00
77e3d067f0
Better handle return values from Filesystem::getMountBy*
...
getMountByStorageId and getMountByNumericId return an empty array on error,
which should be detected to avoid possible errors. This commit also adds in
some new logging points and throws to aid debugging
2014-04-25 09:50:34 +01:00
3fc809dfd8
[tx-robot] updated from transifex
2014-04-25 01:56:28 -04:00
7ef8f6d352
always allow to rename the share mount point
2014-04-23 12:54:26 +02:00
b102222fed
split-up the update script and add unit tests for it
2014-04-23 12:54:26 +02:00
93469ca468
make it possible to move files out of a shared mount point
2014-04-23 12:54:26 +02:00
dd1e47b3b8
typos, use, unused and return fixed
2014-04-23 12:54:26 +02:00
2049bedcaf
Dont throw an error when a storage isn't found for shared cache
2014-04-23 12:54:26 +02:00
fb88aba8f4
some fixes to make the gallery work, this made it necessary to adjust some tests and the encryption code
2014-04-23 12:54:26 +02:00
d468cdacf2
add unit tests which got lost during rebase
2014-04-23 12:54:26 +02:00
652d417a58
we don't allow to share a folder if it contains a share mount point
2014-04-23 12:54:26 +02:00
b712393e72
fix etag propagation
2014-04-23 12:54:26 +02:00
aae22b2d6a
update script, create Shared folder and adjust target path for the shares
2014-04-23 12:54:26 +02:00
bffcbac7a7
allow to rename group share mount points
2014-04-23 12:54:25 +02:00
3f6e9e0102
cleanup the shared storage, always keep the whole share resource
2014-04-23 12:54:25 +02:00
c9bd2f7a6c
also fetch the etag from file cache
2014-04-23 12:54:25 +02:00
d4085d8148
make sure that path is not 'false'
2014-04-23 12:54:25 +02:00
33cdd93890
fix deleting of shared files
2014-04-23 12:54:25 +02:00
bfabd247f4
fix updating of shared files
2014-04-23 12:54:25 +02:00
a86d97295e
fix encryption tests after the removal of the shared folder
2014-04-23 12:54:25 +02:00
ed981294f1
fix share api tests
2014-04-23 12:54:25 +02:00
4967435237
show "shared by ..." for share mount point
2014-04-23 12:54:25 +02:00
6b19482f3e
generate unique target name
2014-04-23 12:54:25 +02:00
6d87dacad4
fix getMimeType call, we always need to check the source path
2014-04-23 12:54:24 +02:00
a02fb3722b
user should be able to rename/delete shared files if the owner allowed it
2014-04-23 12:54:24 +02:00
b02b6d3c23
no exception for the root of the mount point (formerly Shared/), just get the file cache information from the cache
2014-04-23 12:54:24 +02:00
c377893f0e
make sure that we have the right permissions for the mount points
2014-04-23 12:54:24 +02:00
a27db9e4ca
first steps to remove the shared folder:
...
- mount shares to the root folder instead of "Shared/"
- navigate in shared folder and sub-folders
- show previews
- show correct file permissions
- download/edit files
2014-04-23 12:54:24 +02:00
d56072cf2e
Merge pull request #8255 from owncloud/fix-public-download-button
...
keep long file names in one line to not overflow download button on mobile
2014-04-22 15:44:29 +05:30
5049664285
Merge pull request #8239 from owncloud/directlink-overflow
...
add max-width to directLink input to prevent overflow
2014-04-22 11:23:10 +02:00
d82a31d121
keep long file names in one line to not overflow download button on mobile
2014-04-17 17:11:28 +02:00
9434ed44f8
add max-width to directLink input to prevent overflow
2014-04-16 16:43:35 +02:00
9c6f8e59ae
fix header code duplication, code style fixes
2014-04-16 16:26:41 +02:00
547ddf7775
remove duplication of 'header-right' element, also make it overflow when too wide
2014-04-16 15:53:38 +02:00
8bc7174bdc
Merge pull request #8104 from owncloud/lukepolo-master
...
Added the ability to Drag and Drop folders [chrome]
2014-04-15 21:39:32 +02:00
999e74e834
Fix PHPdoc in apps/files_sharing
...
using scrutinizer patch
2014-04-15 21:05:44 +02:00
2dbb2db7e0
Merge pull request #7780 from owncloud/share-file-exists
...
Verify that a file exists before we share it
2014-04-15 11:23:17 +02:00
07ea57465b
drop folder support on public shared folders
2014-04-11 14:54:13 +02:00
9b0f289143
remove obsolete code
2014-04-09 12:09:28 +02:00
796f719548
[tx-robot] updated from transifex
2014-04-09 01:56:49 -04:00
e295d48fd4
[tx-robot] updated from transifex
2014-04-07 01:56:11 -04:00
bf7624fb25
Merge pull request #6968 from owncloud/files-ajaxload
...
Ajaxify files list for files + trashbin + public page
2014-04-03 22:02:05 +02:00
3101663129
Removed redundant free space and upload limit in public page
2014-04-03 16:50:21 +02:00
7dafdfbe88
add tests for sharing files the users doesn't have access to
2014-04-03 13:14:34 +02:00
0be9de5df5
Files, trashbin, public apps use ajax/JSON for the file list
...
Files app:
- removed file list template, now rendering list from JSON response
- FileList.addFile/addDir is now FileList.add() and takes a JS map with all required
arguments instead of having a long number of function arguments
- added unit tests for many FileList operations
- fixed newfile.php, newfolder.php and rename.php to return the file's
full JSON on success
- removed obsolete/unused undo code
- removed download_url / loading options, now using
Files.getDownloadUrl() for that
- server side now uses Helper::getFileInfo() to prepare file JSON response
- previews are now client-side only
Breadcrumbs are now JS only:
- Added BreadCrumb class to handle breadcrumb rendering and events
- Added unit test for BreadCrumb class
- Moved all relevant JS functions to the BreadCrumb class
Public page now uses ajax to load the file list:
- Added Helper class in sharing app to make it easier to authenticate
and retrieve the file's real path
- Added ajax/list.php to retrieve the file list
- Fixed FileActions and FileList to work with the ajax list
Core:
- Fixed file picker dialog to use the same list format as files app
2014-04-02 15:33:47 +02:00
73dd5ff26c
[tx-robot] updated from transifex
2014-04-02 01:56:39 -04:00
d811026ec9
Merge pull request #7935 from owncloud/getpath-shared
...
Make getPath work for shared files
2014-04-01 21:59:09 +02:00
27eff1ac30
Merge pull request #7293 from owncloud/update-shares-postgres
...
fix update to remove shares where file doesn't exist on postgres
2014-04-01 14:56:37 +02:00
7a4a836abe
[tx-robot] updated from transifex
2014-04-01 01:56:15 -04:00
0c2585f3ac
Improve phpdoc
2014-03-31 14:29:55 +02:00
fe78d963d9
Implement getPath for shared files
2014-03-28 15:26:15 +01:00
d0012e729a
Merge pull request #7879 from owncloud/sharing_cleanup_public_api
...
sharing api cleanup, first step
2014-03-28 12:23:11 +01:00
e3b951f412
Merge pull request #7724 from owncloud/mobile
...
[WIP] Mobile optimization for base layout and Files app
2014-03-28 10:27:15 +01:00
eeaefd84c3
change mobile breakpoint for shared view to 768px as well
2014-03-26 16:32:09 +01:00
cbfd16089b
Fixed share upgrade cleanup tests to use the correct ids
2014-03-26 09:29:28 +01:00
8958b9147b
adding ellipsis on file names to public file list as well
2014-03-26 00:14:38 +01:00
bbc2e37259
Merge pull request #7477 from owncloud/foldersize-reuse
...
Allow re-using already known fileinfo when calculating folder sizes
2014-03-25 22:33:24 +01:00
ec9260647a
Fixed share updater unit test
...
Now using \OC_DB::insertId() to retrieve the generated ids because
Oracle ignores the passed values.
2014-03-25 20:18:58 +01:00
31681a3a27
finally fix the paths for the OCS Share API
2014-03-25 17:52:45 +01:00
3653a51af2
fix path creation for re-shares, issue #7662
2014-03-25 17:48:50 +01:00
abdc823bb6
[tx-robot] updated from transifex
2014-03-24 01:55:51 -04:00
7b1d52f5b9
[tx-robot] updated from transifex
2014-03-19 01:55:39 -04:00
756bbe8786
Merge pull request #7649 from owncloud/routing-public
...
Move routing classes to an interface and expose it in the public api
2014-03-17 21:07:05 +01:00
7ffaf0d70a
Merge pull request #7734 from owncloud/icon-class-remove
...
remove unneeded icon class
2014-03-16 10:24:57 +01:00
c89aa6d5fe
[tx-robot] updated from transifex
2014-03-16 03:13:21 -04:00
b2e929d580
[tx-robot] updated from transifex
2014-03-15 02:14:22 -04:00
55c630ea7d
remove unneeded icon class
2014-03-14 14:47:40 +01:00
4b802aa7cb
[tx-robot] updated from transifex
2014-03-13 17:12:37 -04:00
9d32475260
finally fix the paths for the OCS Share API
2014-03-13 15:16:59 +01:00
206364cd1c
remove invalid shares with one SQL statement
2014-03-13 13:09:32 +01:00
02be15ce2f
Added backticks for Oracle in sharing updater unit test
2014-03-13 13:09:32 +01:00
4bb303cbd6
Clean up database before setup the database for testing
2014-03-13 13:09:32 +01:00
ec54bc7709
Refactor update script to class and add unit test
2014-03-13 13:09:32 +01:00
d58fda7ff3
fix update to remove shares where file doesn't exist on postgres
...
Without patch, breaks with: Failed to upgrade "files_sharing".
Exception="SQLSTATE[22P02]: Invalid text representation: 7 ERROR:
invalid input syntax for integer: "5,179""
See: https://github.com/owncloud/core/issues/5758
removing unnecessary cruft - no parameter is set, none to pass.
https://github.com/owncloud/core/issues/5758
removing subquery, making more readable
See: https://github.com/owncloud/core/pull/6016#issuecomment-29510979
parameters to sql calls should be arrays
https://github.com/owncloud/core/pull/6016
boosting version to ensure fix gets executed
properly escaping the sql select statement
removing extraneous closing paren.
2014-03-13 13:09:31 +01:00
1295e54173
[tx-robot] updated from transifex
2014-03-13 01:55:50 -04:00
8320b8eb7a
[tx-robot] updated from transifex
2014-03-12 01:57:17 -04:00
03f40116e1
Merge pull request #7665 from owncloud/fix_ocs_share_api_paths
...
Fix ocs share api paths
2014-03-11 16:55:52 +01:00
d55c7223a9
Merge branch 'master' into foldersize-reuse
...
Conflicts:
lib/private/files/cache/homecache.php
2014-03-11 13:04:20 +01:00
a09df0083e
add 'received_from' info to the share, so that every share can have a different value
2014-03-11 12:59:37 +01:00
36885dc64c
fix path creation for re-shares, issue #7662
2014-03-11 12:58:46 +01:00
b0ec38e202
[tx-robot] updated from transifex
2014-03-11 01:59:39 -04:00
8ab7d18a6a
Move the router classes to a namespace and expose it with a public interface
2014-03-10 14:04:58 +01:00
9548670da7
we need the file_source to delete a share successfully
2014-03-10 11:35:54 +01:00
32b29c9d73
Merge branch 'master' into fix-7307
...
Conflicts:
core/js/router.js
settings/js/admin.js
2014-03-06 00:15:08 +01:00
1291303c5a
Replace OC.Router.generate() with OC.generateUrl()
2014-03-02 22:30:24 +01:00
15d1df055b
Merge branch 'master' into display-share-owner-master
...
Conflicts:
apps/files_sharing/lib/cache.php
2014-02-28 14:54:10 +01:00
da386aad59
Allow re-using already known fileinfo when calculating folder sizes
2014-02-28 14:23:07 +01:00
9e59e64c79
Merge pull request #7421 from owncloud/password-input
...
disable autocomplete for shared link password input, fix #7419
2014-02-26 22:21:00 +01:00
b7385986ae
Merge pull request #7393 from owncloud/fix_path_in_sharing_results
...
fix path in sharing results if it is a file in the Shared folder
2014-02-26 15:19:30 +01:00
6c5cc46380
disable autocomplete for shared link password input, fix #7419
2014-02-26 14:48:15 +01:00
3be5e48b0c
only add "received_from" if a share was found
2014-02-26 12:52:35 +01:00
e3f676e009
fix path in sharing results if it is a file in the Shared folder
2014-02-25 17:27:23 +01:00
5fb1374b0f
Merge pull request #7285 from owncloud/mimeicons-svg
...
Show svg mime icons when no preview is available
2014-02-24 14:12:10 +01:00
Bart Visscher
Thomas Müller
Vincent Petry
icewind1991
Robin Appelman
Robin McCorkell
Jenkins for ownCloud
Bjoern Schiessle
Raghu Nayyar
Jan-Christoph Borchardt
Jörn Friedrich Dreyer
Morris Jobke
Morris Jobke
Jamie McClelland