36b0c599f5
[tx-robot] updated from transifex
2014-06-01 01:55:19 -04:00
cff9440a37
[tx-robot] updated from transifex
2014-05-31 01:55:46 -04:00
5dd3e34f57
Merge pull request #8444 from owncloud/cleanup-list-code
...
Cleanup code of files_sharing/ajax/ a little bit
2014-05-30 22:40:28 +02:00
2ba5701b1a
Merge pull request #8778 from owncloud/storage-instanceof
...
Add storage->instanceOfStorage() to handle instanceof with storage wrappers
2014-05-30 14:58:59 +02:00
7fac2b62e9
Fixed warning when file_target is not set
...
In some cases (like in the unit tests) "file_target" is not set yet
whenever the target file system hasn't been mounted yet.
2014-05-30 12:35:04 +02:00
5e4e773446
Removed "Share with" column
2014-05-30 10:06:30 +02:00
e084183d1e
Added owner display name in action
2014-05-30 10:06:29 +02:00
1d9129eac3
Sharing overview fixes and unit tests
...
- Fixed renaming and fileActionsReady event
- Added unit tests for shares list
- Fixed public page with defer
- Fixed file actions in sharing overview
- Fixed sharing counterpart list (10 entries max)
- Fixed file path attribute to be used in download action
- Fix sharing list headers
- OC.Share icons now operate on fileList instance
- Fix OC.Share.updateIcon when more than one list in DOM
2014-05-30 10:06:29 +02:00
0879a63320
Mimetype for sharing overview
2014-05-30 10:06:29 +02:00
ef59c69dc8
Distinguish legacy file actions from regular file actions
...
Legacy file actions are registered by legacy apps through
window.FileActions.register(). These actions can only be used by the
main file list ("all files") because legacy apps can only deal with a
single list / container.
New file actions of compatible apps must be registered through
OCA.Files.fileActions. These will be used for other lists like the
sharing overview.
Fixed versions and sharing actions to use OCA.Files.fileActions, which
makes them available in the sharing overview list.
2014-05-30 10:06:29 +02:00
fa32243d84
Small fixes to sharing overview
...
- Removed file size from file summary in sharing overview
- Fixed document title
- Fixed empty content text for shared overview
2014-05-30 10:06:29 +02:00
d21b8108c8
Fixed navigation order
2014-05-30 10:06:29 +02:00
0f105ec747
Removed selection checkboxes
2014-05-30 10:06:29 +02:00
85648def56
Fixed sharing permissions
2014-05-30 10:06:29 +02:00
60bcdc550e
Fixed file actions for sharing views
...
FileActions can now be clone to be use for separate file list views
without having the side-effect of affecting the main file list view.
Added "Open" action in sharing overview file lists to redirect to the
regular file list when clicking on a folder.
2014-05-30 10:06:29 +02:00
9baf47c2b4
Group shares by type
2014-05-30 10:06:29 +02:00
6ebc436505
Added sharing overview page (WIP)
...
- added sharing overview entries in the sidebar
- use OCS Share API to get the list of files
2014-05-30 10:06:29 +02:00
dbbb6c5945
extend OCS Share API to allow the user to ask for files shared with him
2014-05-30 10:06:28 +02:00
99d46af0b4
Use instanceOfStorage instead of instanceof
2014-05-29 13:52:58 +02:00
a9661962fe
Merge pull request #8736 from owncloud/appinfo-newrequirefields
...
App info new fields "requiremin" and "requiremax"
2014-05-27 14:28:47 +02:00
d38f867055
Merge pull request #8721 from owncloud/sharing_don_lose_filesize
...
don't lose file size during rename
2014-05-27 12:25:55 +02:00
c64e920b4d
Adjust core apps to use "requiremin" instead of "require"
...
Also added a few missing authors.
2014-05-27 11:54:44 +02:00
36f63ea990
allow resharing of files with only share permissions
2014-05-26 20:32:24 +02:00
95bd7fee9c
don't lose file size during rename
2014-05-26 14:11:33 +02:00
1b215b0131
Merge pull request #8688 from owncloud/public-image-positioning
...
Show less whitespace above publicly shared images
2014-05-24 12:49:12 +02:00
864cd2455c
Merge pull request #8699 from owncloud/sharing_improvements
...
fix share label creation
2014-05-23 20:53:32 +02:00
ff4bb3a9e6
fix share label creation
2014-05-23 16:21:15 +02:00
7be0ce6ada
remove noise texture from interface (not necessary, and blurry on high-res)
2014-05-23 14:15:36 +02:00
10c1fc8d24
Show less whitespace above publicly shared images
2014-05-23 13:36:16 +02:00
71e1d919de
Merge pull request #8675 from owncloud/sharing-improvements
...
Sharing improvements
2014-05-23 06:41:34 -04:00
3b279c9056
prevent default action when clicking on the share notification
2014-05-23 11:17:13 +02:00
157b139b57
Dont scale up the preview for publicly shared images
2014-05-22 16:45:51 +02:00
11aa2cf74b
always check for unique filename, if a file gets added from outside the mount
...
point should be adjusted to ne unique again
2014-05-22 14:31:22 +02:00
1166d62d9b
fileList needs be be declared before the if-statement
2014-05-22 14:31:16 +02:00
12338e0ef0
allow admin to disable sharing for specific groups of users
2014-05-22 10:43:44 +02:00
5f403f3e92
move the mount point up if a share is mounted to a subfolder and the subfolder no longer exists
2014-05-21 13:19:17 +02:00
7d98bcf9a2
Fixed JS issues in public page
...
- fixed subdir detection when uploading into subdir
- add class detection before overriding to avoid JS errors
2014-05-20 13:37:58 +02:00
51a6764f31
Merge branch 'master' into cleanup-list-code
...
Conflicts:
apps/files_sharing/ajax/list.php
2014-05-19 20:52:25 +02:00
dc36d30953
Remove all occurences of @brief and @returns from PHPDoc
...
* test case added to avoid adding them later
2014-05-19 17:50:53 +02:00
e7aebc5c32
Fix whitespace issues
2014-05-16 22:23:36 +01:00
6930ae22e4
Fix more missing or broken PHPDoc
2014-05-16 22:21:57 +01:00
c4f1de63a8
Fix PHPDoc in /apps
2014-05-16 22:21:57 +01:00
42b99b6d0f
Merge pull request #8555 from owncloud/sharing_default_expire_only_public_links
...
use default expire date only for link shares
2014-05-16 14:57:11 -04:00
b52cb8f557
Merge pull request #8604 from owncloud/sharing_encforce_password
...
allow admin to enforce passwords for public link shares
2014-05-16 12:23:01 -04:00
7a48f24459
use default expire date only for link shares
2014-05-16 18:12:13 +02:00
b6e14af861
allow admin to enforce passwords for public link shares
2014-05-16 17:41:09 +02:00
1fb0d5412c
Merge pull request #6260 from owncloud/jan-navigation-filesidebar
...
Files app navigation sidebar
2014-05-16 13:00:35 +02:00
43d6650d19
[tx-robot] updated from transifex
2014-05-16 01:55:55 -04:00
6fd084243b
Fixed many issues, clean up
...
- fixed upload and storage statistics
- fixed infinite scroll to use the correct contain for scroll detection
- fixed unit test that sometimes fail for rename case
- controls are now sticky again
- fixed selection overlay to be aligned with the table
- fixed "select all" checkbox that had id conflicts
- fixed public page
- fixed global actions permissions detection
- fix when URL contains an invalid view id
- viewer mode now hides the sidebar (ex: text editor)
- added unit tests for trashbin
- clean up storage info in template (most is retrieved via ajax call now)
2014-05-15 17:51:04 +02:00
9d38e3602b
Namespacing for FileList, FileActions and trashbin app
...
- FileList is now an instantiable class
- FileActions is now in namespace
- added App class for trashbin app
- moved trashbin overrides into classes extending FileList
- replaced many static calls with "this." or "self." to make the classes
reusable/extendable
- new URL parameter "view" to specify which view is shown, for example
"files" or "trashbin"
- added OC.Util.History utility class in core for handling history
- moved URL handling/routing to OCA.Files.App
- popstate will correctly update the current view and notify the view of
the URL change so it can update the current dir
- added JS unitt tests for the trashbin app
- fixed public app to work with the new namespaces
2014-05-15 17:51:04 +02:00
55fc693750
@breif -> @brief
2014-05-13 19:09:15 +01:00
e0dd69e4e6
remove legacy aka deprecated code: OC_FilesystemView
2014-05-12 16:30:39 +02:00
9a9665f361
Merge pull request #8041 from owncloud/files-sortcolumns
...
File list sorting by clicking on column headers
2014-05-12 12:50:27 +02:00
b6d76e9985
[tx-robot] updated from transifex
2014-05-11 01:57:00 -04:00
9919ec48df
[tx-robot] updated from transifex
2014-05-09 01:55:42 -04:00
6e7c274d2e
Merge pull request #8499 from owncloud/shareextstoragemountpointfix
...
Fix sharing of ext storage mount points
2014-05-08 22:35:01 +02:00
f73a168694
Added unit test for sharing ext storage mount points
2014-05-08 11:00:19 +02:00
28f0e6307f
Fix sharing of ext storage mount points
...
When sharing an ext storage mount point, it will now use the name of the
mount point instead of an empty string for the target path.
2014-05-08 10:03:07 +02:00
390549c286
Merge pull request #8221 from owncloud/type-hinting-sharing
...
Type hinting fixes for sharing
2014-05-08 09:30:50 +02:00
f85e968883
Merge branch 'sharing_cleanup' of github.com:owncloud/core into sharing_cleanup
2014-05-07 17:57:32 +02:00
d3f957c21e
remove error_log output
2014-05-07 17:56:52 +02:00
dbb93074b3
Fix endless loop on windows servers
...
Directory seperator is \ on windows
However we can just check for path != dirname(path) because that is
the same for '' (empty string), '.' and DIRECTORY_SEPARATOR on all OS
2014-05-07 17:38:29 +02:00
31bf2d4b33
we can take the permission directly from the share, no need to call the share api first
2014-05-07 16:49:07 +02:00
799d8ca381
check if we have a fileinfo
2014-05-07 11:47:52 +02:00
bee48f851e
ignore part files
2014-05-07 11:47:27 +02:00
283b483100
[tx-robot] updated from transifex
2014-05-07 01:55:48 -04:00
341fcdc37a
Merge pull request #8407 from owncloud/scale-pics-on-public-sharing-master
...
Images on public sharing get downscaled to increase use experience - thi...
2014-05-05 10:12:40 +02:00
2c483fdca2
Add missing \
2014-05-04 15:52:25 +02:00
0b7d9e2668
Cleanup code a little bit
...
- Use OCP\Response constants instead of the HTTP error code
- Use checkAppEnabled() instead of OC_App::isEnabled with an if statement
- Remove uneeded variable $baseURL
- Rename $isvalid to $isValid
2014-05-04 15:51:08 +02:00
9385b97b5f
[tx-robot] updated from transifex
2014-05-04 01:56:15 -04:00
cf20de185c
[tx-robot] updated from transifex
2014-05-03 01:56:11 -04:00
d163441f3e
load image via javascript and use $(document).width() to determine the proper side of the image to be returned
2014-05-02 18:36:58 +02:00
20893cc3b3
Images on public sharing get downscaled to increase use experience - this will speed up loading time
...
- adding keep aspect to core/ajax/preview.php
- remove duplicate method Preview::show()
- no more hard coded mimetype of preview
- remove .png from the preview urls
- keep old route preview.png for backwards compatibility
- aspect preserving previews are now cached
2014-05-02 17:02:57 +02:00
49d9631eee
Merge pull request #8400 from owncloud/download-button-public-folder
...
reintroduce download button on public shares
2014-05-02 16:59:09 +02:00
6e75b37d04
disable download button if zip download is disabled
2014-05-02 15:53:46 +02:00
899c7c0443
fix position and look of public download button
2014-05-02 15:26:21 +02:00
bf681713c8
Merge pull request #8415 from owncloud/sharing_fix_rename
...
[sharing] return the new name if a mount point was renamed
2014-05-01 14:58:29 -04:00
33883a46f5
return the new name if a mount point was renamed
2014-04-30 20:29:21 +02:00
20e4ad382b
get the correct owner path for part files
2014-04-30 12:49:16 +02:00
003049e8a6
remove file name from upper right button
2014-04-29 17:16:14 +02:00
df32254133
reintroduce download button on public shares
2014-04-29 15:28:35 +02:00
b95aa43a5d
Merge pull request #8285 from owncloud/better_getmountby_handling
...
Handle return values better from Filesystem::getMountBy*
2014-04-29 11:22:11 +02:00
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
0c0e4fced5
fix test so that it doesn't depend on the array order
2014-02-21 13:37:47 +01:00
6ca4d3bfde
fix usersPath and add unit tests
2014-02-21 13:37:46 +01:00
65843e2459
Improve jQuery element selector
...
see https://github.com/owncloud/core/pull/7012/files#r9337198
http://24ways.org/2011/your-jquery-now-with-less-suck/
2014-02-20 18:24:43 +01:00
d0c8b310b9
uppercase text and fix dialog popup
2014-02-20 18:24:42 +01:00
179fbada32
show share owner within shared folders as well
2014-02-20 18:24:42 +01:00
2b84f5e0b9
remove duplicate selectors and declaration
2014-02-20 18:24:42 +01:00
271684dcfe
update share owner
2014-02-20 18:24:42 +01:00
7c68025010
adding share owner information to the file list
2014-02-20 18:24:42 +01:00
0624476aa1
Merge branch 'master' into mimeicons-svg
2014-02-20 16:55:18 +01:00
f33d35cd07
Fix svg icons for public shares and external/shared files
2014-02-19 15:08:05 +01:00
952584e9c7
Merge pull request #7195 from owncloud/files-selectall
...
Do not send file list for select all on Download/delete
2014-02-19 14:33:24 +01:00
adaee6a5a1
Scrutinizer Auto-Fixes
...
This patch was automatically generated as part of the following inspection:
https://scrutinizer-ci.com/g/owncloud/core/inspections/cdfecc4e-a37e-4233-8025-f0d7252a8720
Enabled analysis tools:
- PHP Analyzer
- JSHint
- PHP Copy/Paste Detector
- PHP PDepend
2014-02-19 09:31:54 +01:00
c6f4f85e27
Merge branch 'master' into scrutinizer_documentation_patches
...
Conflicts:
lib/private/migration/content.php
2014-02-18 18:31:33 +01:00
1e84d6b14b
Merge pull request #7190 from owncloud/appconfig-legacy-apps
...
Remove usage of legacy OC_Appconfig
2014-02-18 18:10:22 +01:00
aa1a50f5b3
Consolidate two sections, per code review. Issue #1648
2014-02-17 12:57:54 -05:00
9fac95c2ab
Merge branch 'master' into scrutinizer_documentation_patches
...
Conflicts:
lib/private/appconfig.php
2014-02-14 23:03:27 +01:00
2887fb1f48
Fit shared videos to viewer, just like images. Issue #1648
2014-02-14 16:09:51 -05:00
d7f4547717
Merge pull request #6726 from owncloud/fix_6630
...
don't urldecode get var, php does this automatically
2014-02-14 14:34:20 +01:00
d5397d813c
Do not send file list for select all on Download/delete
...
- When all files are selected, do not send the whole file list
- Download will trigger download for the parent folder, also works
with root
- Delete will send "allfiles" to the server that will find the file
list or the passed directory by itself
2014-02-13 20:28:52 +01:00
181bbd4325
Remove usage of legacy OC_Appconfig
2014-02-13 16:28:49 +01:00
a8943ad022
replace 'size' with 'unencrypted_size' if encryption is enabled
2014-02-07 12:53:13 +01:00
2a6a9a8cef
polish documentation based on scrutinizer patches
2014-02-06 17:02:21 +01:00
aff1cafaca
Merge pull request #7089 from owncloud/sharing-searchbymime
...
Fixed searchByMime in shared cache
2014-02-06 14:15:00 +01:00
946fccc0dd
Remove unused template variable assignment of files_sharing/template/public.php
2014-02-06 12:26:36 +08:00
8c56e21ced
Move template variable assignment to correct place
2014-02-06 12:06:16 +08:00
fa5ddc3e18
Fixed searchByMime in shared cache
...
- searchByMime now correctly returns files recursively search through
all the dirs
- added unit test for searchByMime
2014-02-05 13:29:06 +01:00
0609f30d1c
Merge pull request #6235 from NCTU-NBA/pr-exceed_upload_limit_msg
...
Change misleading message when file size exceeds upload limit
2014-02-04 08:04:19 -08:00
d49c7ad4fb
Fixed double file encoding for previews
2014-01-30 16:34:37 +01:00
c5742520e1
don't urldecode get var, php does this automatically
2014-01-30 16:32:45 +01:00
099b71c712
Merge branch 'master' into pr-exceed_upload_limit_msg
...
Conflicts:
apps/files/templates/index.php
apps/files_sharing/templates/public.php
2014-01-30 22:50:20 +08:00
f9d9a62e58
remove needless element tag
2014-01-30 13:34:41 +01:00
271088a7a2
Merge pull request #6777 from owncloud/mobile-style
...
Mobile style for public links: files, folders, picture sets
2014-01-29 09:17:02 -08:00
edea7781b7
make header scroll up for single shares, more view of content on small screens
2014-01-29 17:20:55 +01:00
7655728ddf
- adding class to header div: share-folder or share-file
...
- for supported previews are shown with a size of 500px; icons with a size of 128px
2014-01-29 16:52:30 +01:00
5a869732d1
adjust file type icon placement for when no preview can be generated
2014-01-29 15:28:57 +01:00
609d5f2458
Merge pull request #6987 from owncloud/share_api_and_encryption
...
[ocs share api] public upload is also possible with encryption enabled, since OC6
2014-01-29 02:50:25 -08:00
d310df505c
permanently show download action on mobile, only icon
2014-01-29 11:43:34 +01:00
8f81f007cd
fix horizontal scrollbar appearing when footer is too long, footer wraps now
2014-01-29 11:06:19 +01:00
13ed59c1cf
merge master into mobile-style
2014-01-29 10:55:44 +01:00
cf2c061f1f
Merge pull request #6929 from owncloud/sharing-fixfiledownloadlink
...
Sharing fixfiledownloadlink
2014-01-29 00:39:14 -08:00
cd4e044f66
public upload is also possible with encryption enabled, since OC6
2014-01-28 17:28:20 +01:00
7f83f2a8f2
use more accurate error codes
2014-01-28 13:31:43 +01:00
0a1708ba11
Merge pull request #6912 from owncloud/replace-webroot-in-css
...
Remove %webroot% from CSS
2014-01-27 04:11:15 -08:00
46745895ae
Merge pull request #5153 from owncloud/core-em-to-px
...
Cleans up Core apps for relative(em) to absolute(px) styles.
2014-01-27 02:29:47 -08:00
c6695bbd76
Fixed download URL in public page
...
- Refactored download URL building to make it overridable
- Added download URL override in public page
- Added JS unit tests for download URL
- Added OC.redirect() method to facilitate unit testing
2014-01-24 13:38:39 +01:00
617aa3cf29
Instead of 'No preview available for ...' we simple display the mieme-type icon
2014-01-23 20:15:10 +01:00
799e744ad7
remove background and width from multiselect bar, fix Download button not showing on mobile
2014-01-23 15:35:30 +01:00
f0c9e8205f
remove %webroot from files_sharing app
2014-01-23 14:04:13 +01:00
4b7dfd34f8
fix conflicts and add missing closing tag
2014-01-23 13:51:51 +01:00
ade726ad32
focus link text only on click in the input field - closes #6817
2014-01-23 01:08:42 +01:00
f950ce82ae
Merge branch 'master' into mobile-style
...
Conflicts:
apps/files/js/files.js
apps/files_sharing/css/public.css
apps/files_sharing/js/public.js
apps/files_sharing/templates/public.php
2014-01-23 00:39:11 +01:00
eaed786eed
add path relative to the files folder of the currently logged in user to the output of getFolderContent()
2014-01-22 17:11:37 +01:00
cf6e79cda8
Merge pull request #6719 from tripflex/fix_pubup_progbar
...
Fix public upload progress bar
2014-01-22 02:28:28 -08:00
9bab05fd45
Merge branch 'master' into fixing-gallery-password-protected-access-master
2014-01-21 19:36:20 +01:00
23a4d0d44e
OC_Util::setupFS($user) will create a data dir for the given string - no matter if the user really exists - OCP\JSON::checkUserExists($owner); introduces a ready to use check which will bail out with an JSON error
2014-01-21 11:32:30 +01:00
9fd4cb1b66
adding password protection check to getShareByToken()
2014-01-21 10:42:47 +01:00
4ec6debe2b
remove unused variable
2014-01-20 17:27:03 +01:00
3d6d8d1bb6
Reuse the data retrieved from the cache in checkUpdate
2014-01-20 15:21:21 +01:00
f4c198b907
Fixed isPreviewAvailable warnings in log
...
isPreviewAvailable wasn't always set as the files formatting code is
slightly different than the one from the files app.
Fixes #6423
2014-01-17 14:22:05 +01:00
4726a2021b
Add $freeSpace and $uploadLimit to files_sharing
2014-01-17 17:10:42 +08:00
12e5d0f68d
Fixes typos, adds ; wherever not present.
2014-01-16 21:06:14 +05:30
d463edaf09
on mobile, show single shared image at full width without margin
2014-01-16 15:56:18 +01:00
5cdab5fff3
show publicly shared image on full width, without margin
2014-01-16 15:32:23 +01:00
c0590676a0
fix public share download button width
2014-01-16 15:28:39 +01:00
775e08e0ee
Merge branch 'master' into core-em-to-px
...
Conflicts:
apps/files_sharing/css/public.css
apps/user_ldap/css/settings.css
core/css/multiselect.css
core/css/share.css
2014-01-16 14:42:37 +05:30
62040fe2d2
change em to px
2014-01-15 17:06:48 -05:00
3e7cf4110d
tweak color and position of username in public share
2014-01-15 15:49:42 +01:00
db837bf696
improvements to public files mobile view
2014-01-15 15:48:42 +01:00
Jenkins for ownCloud
Thomas Müller
icewind1991
Vincent Petry
Bjoern Schiessle
Robin Appelman
Lukas Reschke
Jan-Christoph Borchardt
Morris Jobke
Robin McCorkell
Joas Schilling
Bart Visscher
Raghu Nayyar
Jörn Friedrich Dreyer
Morris Jobke
Jamie McClelland
Scrutinizer Auto-Fixer
Matthew Caron
Pellaeon Lin
Georg Ehrke
Myles McNamara