Commit Graph

124 Commits

Author SHA1 Message Date
Florin Peter 3c100af132 revert changes to fbbc76f281 because master is very unstable right now 2013-05-01 01:38:06 +02:00
Lukas Reschke 003e6adb3f Remove uneeded onclick handler 2013-04-28 23:26:07 +02:00
Lukas Reschke 6cf6103ed2 Move onclick handler 2013-04-28 23:25:58 +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
Jan-Christoph Borchardt f8e48955b9 Merge pull request #2576 from owncloud/fixing-2125-master
fixes #2125 - the warning is now displayed with a disabled button
2013-03-31 09:53:07 -07:00
Thomas Mueller cf50e67e1b prevent to fire delete ajax a second time.
Before the click on a single file delete icon fired two different handlers - one of them is for multiple deletion only
2013-03-26 16:27:56 +01:00
Thomas Mueller 3817922c93 fixes #2125 - the warning is now displayed with a disabled button 2013-03-26 15:44:35 +01:00
Robin Appelman 319e3f162c Don't block uploads if the max upload size is unknown 2013-03-15 16:40:36 +01:00
Jan-Christoph Borchardt ab7dc76ff1 add type=text to ZIP size field, fix second part of #2097 2013-03-06 12:39:36 +01:00
Lukas Reschke 2a9c3c1660 Merge pull request #2069 from owncloud/fix_sanitize_call
use p() for the output and not for the comparison
2013-03-04 03:41:47 -08:00
Björn Schießle 52919fa94b use p() for the output and not for the comparison 2013-03-04 12:01:45 +01:00
raghunayyar d3ddf03687 Datepicker height fixed.
New id defined for files table for positioning.
2013-03-04 09:21:38 +05:30
Thomas Mueller 4b9863fa7d Merge branch 'master' into from-insane-autoescape-to-p
Conflicts:
	apps/files/templates/index.php
2013-03-01 23:09:20 +01:00
Thomas Mueller e3e4c28316 fixes #2001 - in case the user has no permissions to upload/create files/folders a clear warning is displayed 2013-03-01 21:43:34 +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
Bart Visscher 9058d398a7 Merge pull request #1662 from owncloud/style-cleanup
Style cleanup
2013-02-14 12:54:36 -08:00
Björn Schießle bd22e948ca call 'Trash bin' 'Deleted files' 2013-02-14 12:32:14 +01:00
Bart Visscher cd35d257bb Fix NoSpaceAfterComma and SpaceBeforeComma 2013-02-14 08:36:26 +01:00
Jan-Christoph Borchardt 9c8f5de6c6 svg replacement for breadcrumb home icon, fix #1620 2013-02-11 16:19:22 +01:00
Jörn Friedrich Dreyer 1c56539c01 Merge pull request #1551 from owncloud/fix_files_multiselect
Fix filelist shifting up one row on (multi)select
2013-02-10 02:54:12 -08:00
Thomas Tanghus 419eced65c Remove hascontrols - use original positioning.
I couldn't get Chromium and FF to agree, so a working hack
is better than a non-working one ;)
2013-02-09 17:54:56 +01:00
Björn Schießle 6e9f434bda rename trash to trash bin 2013-02-09 12:01:49 +01:00
Thomas Tanghus 3879e5d9c5 Merge pull request #1428 from owncloud/content_positioning
Fix leftcontent positioning. Ref #1255
2013-02-06 08:13:45 -08:00
Michael Gapczynski 65bd7af8df Remove undefined crumb variable from home breadcrumb 2013-02-04 20:40:16 -05:00
Thomas Tanghus b06ac67e07 Add 'hascontrols' class for content with fixed topbar. 2013-02-04 18:30:49 +01:00
Thomas Müller 5ceddabaa6 Merge pull request #1340 from owncloud/fixing-js-errors-public-link-master
Fixing js errors public link master
2013-02-03 21:53:02 -08:00
Robin Appelman 9060c3bd83 Files: fix positioning of Trash button and upload progress bar 2013-02-04 01:05:59 +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
Jan-Christoph Borchardt ad044eb888 Merge branch 'master' into navigation 2013-01-31 15:35:20 +01:00
Björn Schießle 54eeb8b8fc fix merge conflict 2013-01-31 10:55:59 +01:00
Robin Appelman 74f6f85628 merge master into filesystem 2013-01-28 19:37:58 +01:00
Jan-Christoph Borchardt 3bafa87a12 merge styles 2013-01-28 19:36:21 +01:00
Björn Schießle 8067a1394e fix merge conflicts 2013-01-28 11:18:04 +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
Thomas Müller 276d98b9dd Merge pull request #1059 from owncloud/fixing-998-master
Fixing 998 master
2013-01-26 04:15:40 -08:00
raghunayyar a86da16a10 More Style Fixes
Remove Repeating Background behind folder names in files app
part.breadcrumb.php
2013-01-25 20:50:55 +05:30
Björn Schießle 9bacb0e179 rename "publicListView" option to "disableSharing", this is more meaningful also because it is not only useful for the public list view 2013-01-22 15:33:53 +01:00
Björn Schießle 9d77317de8 add trash button to web interface 2013-01-22 15:32:57 +01:00
Lukas Reschke 0d02caa684 No inline JS in apps 2013-01-21 20:34:28 +01:00
Thomas Mueller afb5de955e Merge branch 'master' into fixing-998-master
Conflicts:
	apps/files/ajax/upload.php
	apps/files/js/files.js
2013-01-18 23:22:34 +01:00
Robin Appelman 94068e5d08 Cache: show upgrade progress 2013-01-15 18:13:50 +01:00
Robin Appelman 9bf367e7f8 merge master into filesystem 2013-01-15 14:57:23 +01:00