Commit Graph

49 Commits

Author SHA1 Message Date
Georg Ehrke b7758d0f8d Merge master into oc_preview 2013-08-29 10:50:55 +02:00
kondou 6bd0f3cba7 Reimplement filesummary in JS
Fix #993
2013-08-28 15:10:17 +02:00
Georg Ehrke 224b80f906 move isMimeSupported out of template files 2013-08-21 15:55:59 +02:00
Georg Ehrke 48f0c54261 style fixes for preview lib 2013-08-19 12:16:55 +02:00
Jan-Christoph Borchardt e7c0693570 checkstyle double quotes in HTML 2013-08-15 19:40:39 +02:00
Jan-Christoph Borchardt 137d644963 Merge branch 'oc_preview' of github.com:owncloud/core into oc_preview 2013-08-14 20:41:49 +02:00
Jan-Christoph Borchardt cba0f69622 increase row height to 50px, properly position everything, checkboxes, actions etc 2013-08-14 20:41:20 +02:00
Georg Ehrke a255cc6007 fix adding preview-icon to clss attribute 2013-08-14 18:52:53 +02:00
Georg Ehrke ac6a3133ec style fixes 2013-07-30 12:33:54 +02:00
Thomas Müller 7425efade7 Merge branch 'master' into oc_preview
Conflicts:
	3rdparty
	lib/template.php
2013-07-30 00:34:36 +02:00
Georg Ehrke 1e4ec2ac27 add class='preview-icon' to rows in file app that make use of previews 2013-07-29 15:47:17 +02:00
Jan-Christoph Borchardt 48948ccf5f finally remove the file size obfuscation as it had more disadvantages. I was wrong, sorry. 2013-07-18 22:15:26 +02:00
Georg Ehrke 53830f2f75 implement use of previews in sharing app 2013-07-11 11:58:52 +02:00
Georg Ehrke a357e5b284 merge conflicts ... 2013-07-10 12:41:53 +02:00
Victor Dubiniuk 582631323a Migrate to encodePath 2013-07-09 17:46:11 +03:00
kondou 063b0a2d17 Don't escape filesize (can contain a '<') 2013-07-02 13:09:07 +02:00
kondou b1d0de95a9 Show a summary as the last filelist entry
Fix #993
2013-07-02 04:28:52 +02:00
Georg Ehrke 39c387eed4 implement server side use of previews 2013-06-26 18:04:22 +02:00
Jan-Christoph Borchardt 0872f641dd darker low threshold color for file size and age fading, better contrast 2013-06-11 14:30:13 +02:00
Bart Visscher 248e097f3c Merge pull request #1974 from owncloud/use-rawurlencode
OC6- Just use rawurlencode in files list template
2013-04-06 11:55:44 -07:00
Björn Schießle 52919fa94b use p() for the output and not for the comparison 2013-03-04 12:01:45 +01:00
Lukas Reschke 5f8bd07927 [Files] Use p() instead of echo 2013-02-27 23:40:30 +01:00
Lukas Reschke b93ebe1860 Merge master 2013-02-27 23:36:52 +01:00
Bart Visscher ab5e20a2c1 Just use rawurlencode in files list template 2013-02-27 21:53:46 +01:00
Lukas Reschke c9415e6529 [files] Unescape file size 2013-02-27 21:40:06 +01:00
Lukas Reschke 85209287bb [Files] Use htmlspecialchars() 2013-02-27 21:19:11 +01:00
Lukas Reschke 4860d03270 [Files] Use p() instead of echo 2013-02-27 21:14:15 +01:00
j-ed 1f9551a382 Update apps/files/templates/part.list.php
prevent multiple slashes in a row when building URLs.
2013-02-27 19:09:37 +01:00
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 74f6f85628 merge master into filesystem 2013-01-28 19:37:58 +01:00
Thomas Mueller 03a1a20316 fixing href for folders 2013-01-28 09:46:52 +01:00
Robin Appelman 930b9b9cd0 merge master into filesystem 2013-01-26 18:49:45 +01:00
Lukas Reschke 2e42c6f54f Use HTML5 data attribute + fix undefined variable 2013-01-26 14:07:35 +01:00
Lukas Reschke 0d02caa684 No inline JS in apps 2013-01-21 20:34:28 +01:00
Robin Appelman 9bf367e7f8 merge master into filesystem 2013-01-15 14:57:23 +01:00
Lukas Reschke 2a7e5faa37 Remove ugly indentation 2013-01-13 01:02:11 +01:00
Robin Appelman 72b6faa69d merge master into filesystem 2012-12-02 03:03:48 +01:00
Jörn Friedrich Dreyer 3b83fe1530 fix checkstyle for files app 2012-11-29 18:33:15 +01:00
Robin Appelman 41a61bc637 fix undefined index when loading files app 2012-11-08 21:36:13 +01:00
Felix Moeller 30d7993e01 Checkstyle fixes: NoSpaceAfterComma 2012-11-04 11:10:46 +01:00
Felix Moeller e73b817a38 Checkstyle: NoSpaceAfterComma 2012-10-23 22:53:54 +02:00
Bart Visscher 4af5b016cc Whitespace cleanup 2012-10-14 21:04:08 +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
Michael Gapczynski 36487246ed Switch to using file cache ids instead of paths for file sharing 2012-08-24 10:05:37 -04:00
Michael Gapczynski 4d17ed2f71 Make file actions permissions aware 2012-07-25 16:33:08 -04:00
Thomas Mueller 583dce5276 removing executable bit - again 2012-05-15 00:52:00 +02:00
Frank Karlitschek 1945cd6946 ported the oc_template class 2012-05-06 23:00:36 +02:00
Georg Ehrke 2b10371bde fix merge conflicts 2012-04-26 18:08:49 +02:00
Georg Ehrke 45de7ad221 move files to app folder 2012-04-18 17:27:34 +02:00