Commit Graph

105 Commits

Author SHA1 Message Date
Thomas Mueller 2af6d74bc1 Merge branch 'master' into fixing-js-errors-public-link-master
Conflicts:
	apps/files/js/files.js
	apps/files/templates/part.list.php
2013-01-31 23:23:10 +01:00
Robin Appelman 207aa22d12 merge master into filesystem 2013-01-30 19:24:24 +01:00
Lukas Reschke 250c565d2b Merge pull request #1360 from owncloud/display_name
introduction of display names
2013-01-29 14:05:54 -08:00
Thomas Mueller 47ce3c2160 include keyboardshortcuts.js 2013-01-28 09:47:21 +01:00
Robin Appelman 930b9b9cd0 merge master into filesystem 2013-01-26 18:49:45 +01:00
Björn Schießle 839f4bd949 show display name instead of uid in the public shared files view 2013-01-25 13:01:53 +01:00
Thomas Mueller 5fadd53088 missing renames of publicListView to disableSharing 2013-01-23 09:18:26 +01:00
Robin Appelman 5445b94416 merge master into filesystem 2013-01-16 19:04:50 +01:00
Bart Visscher 5bfe4adbaa Whitespace cleanup 2013-01-16 18:09:16 +01:00
Robin Appelman 9bf367e7f8 merge master into filesystem 2013-01-15 14:57:23 +01:00
Jörn Friedrich Dreyer 42e3eaf45a add more linebreaks, replace SQL LIMIT with param 2013-01-09 13:57:51 +01:00
Robin Appelman e8d08d4930 merge master into filesystem 2013-01-07 00:16:10 +01:00
Robin Appelman 946d58eaa8 merge master into filesystem 2012-12-15 02:21:26 +01:00
Bart Visscher 2ef2dc4dda Fix "There must be a single space between the closing parenthesis and the opening brace" 2012-12-15 00:43:46 +01:00
Robin Appelman 98f42d314c merge master into filesystem 2012-12-06 17:47:28 +01:00
Björn Schießle bf0f39f5b4 make sure that all expected array keys are available 2012-12-06 15:57:53 +01:00
Thomas Mueller 18663100d9 fixing syntax error + reformat the code 2012-12-02 12:12:20 +01:00
Robin Appelman d33f697a5f merge master into filesystem 2012-11-30 00:18:42 +01:00
Jörn Friedrich Dreyer 995b5c0739 readd fallback code for pre token links 2012-11-23 15:51:57 +01:00
Jörn Friedrich Dreyer d8a171df26 implement share via link token 2012-11-20 15:03:12 +01:00
Robin Appelman bf2ac9f113 merge master into filesystem 2012-11-15 00:37:54 +01:00
Thomas Tanghus 56239df2e7 Update all to use OCP\PERMISSION_* instead of OCP\Share::PERMISSION_* 2012-11-11 23:10:23 +01:00
Robin Appelman 961ff01a93 merge master into filesystem 2012-11-07 17:18:56 +01:00
Björn Schießle 12983cf0b0 urlencode file/dir to allow special characters in filename/path (issue #95) 2012-11-07 10:47:19 +01:00
Felix Moeller a4b2ea586d Style: Remove all the dangling white spaces 2012-11-04 22:16:04 +01:00
Felix Moeller 9795bc19bf Checkstyle: Fix the last two InvalidEOLChar 2012-11-04 18:42:18 +01:00
Robin Appelman 0fb707d2c9 some more porting of the sharing 2012-10-27 14:25:15 +02:00
Robin Appelman 86be7e8872 remove last uses of depricated OC_Filesystem 2012-10-27 12:23:13 +02:00
Robin Appelman dea0d20a9a fix delete and sort files 2012-10-27 12:18:01 +02:00
Lukas Reschke 7454186806 Forget to urlencode the path 2012-10-24 18:00:19 +02:00
Lukas Reschke ff6d2f16c4 urlencode 2012-10-24 17:58:52 +02:00
Thomas Müller 41898a473e Apply coding style guide 2012-10-24 14:43:34 +03:00
Björn Schießle a9a27306de fix copy&paste bug from previous commit 2012-10-24 13:11:29 +02:00
Björn Schießle 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
Thomas Müller 4c234bd666 Apply coding style guide
http://owncloud.org/dev/coding-style-guide/
2012-10-24 12:12:16 +03:00
Björn Schießle 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
Björn Schießle b08a1696f5 normalize path to avoid problems with trailing slashes, double-slashes, etc. 2012-10-16 12:48:56 +02:00
Bart Visscher 4af5b016cc Whitespace cleanup 2012-10-14 21:04:08 +02:00
Björn Schießle 77d91d5a03 generate correct link for shared files and shared directories 2012-10-11 13:45:16 +02:00
Björn Schießle 41640b4b91 don't show the share action in the file view for publically shared files. 2012-10-10 17:44:21 +02:00
Björn Schießle 5e2bce24b4 enable user to download selected files from publically shared directory 2012-10-05 16:12:04 +02:00
Björn Schießle c99f62891a breadcrumbs fixed for public share view 2012-10-05 15:06:59 +02:00
Björn Schießle 99f4d949c1 fix download link for single files in publicly shared directory 2012-10-05 14:28:23 +02:00
Björn Schießle 72a48ca35e fix download of single publically shared files. 2012-10-05 12:01:18 +02:00
Björn Schießle dcad7aec82 fixed download of complete publically shared folder 2012-10-05 11:38:00 +02:00
Björn Schießle 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
Michael Gapczynski 51321526e2 Prevent displaying errors if public link url parameters are incorrect 2012-10-03 16:14:54 -04:00
Arthur Schiwon b23ad579dc Sharing: backward compatibility to links from OC 4.0. 2012-10-01 14:39:53 +02:00
Lukas Reschke b4de89e6b4 Sanitize download URL
@MTGap Can you please check if this break something?
2012-09-22 11:20:17 +02:00
scambra 22c6b48d2f translate files_sharing app 2012-09-21 11:48:20 +02:00
Michael Gapczynski 749b5b52ca Show preview for public folder links 2012-09-18 23:56:14 -04:00
Michael Gapczynski 756b514fee Check if file source exists before searching for link 2012-08-29 21:12:23 -04:00
Bart Visscher c958d5ba80 Fix filesystem setup for shared public link with logged in user 2012-08-29 21:35:55 +02:00
Michael Gapczynski 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
Michael Gapczynski 0a9d1ed3a6 Initial previewer for public links 2012-08-27 20:37:38 -04:00