Commit Graph

256 Commits

Author SHA1 Message Date
Vincent Petry d1c27e08e5 Fixed empty content logic
- Remove obsolete code that used another approach for hiding emptycontent
- Fixed logic for the showing of the empty content message
2013-10-21 22:18:10 +02:00
kondou 732e7db319 Fix mind-boggling emptycontent logic 2013-10-21 19:49:27 +02:00
Vincent Petry f8717bc260 Fixed share with link checkbox missing as regular user
Instead of loading the app config setting "shareapi_allow_links" using a
synchronous ajax call that fails when the user is not an admin, this fix
puts the flag directly in the template so it doesn't need to be loaded
afterwards.

Fixes #5440
2013-10-21 11:29:40 +02:00
Jan-Christoph Borchardt cbb42aae11 improve wording of permission notice 2013-10-20 23:46:01 +03:00
Jan-Christoph Borchardt dbcfb1b830 beautify 'you dont have write permissions' notice, fix #2770 2013-10-20 23:15:58 +03:00
kondou f828b51ede Hide files list header, when theres no files to see 2013-10-12 17:28:20 +02:00
Vincent Petry 39b150921d Moved IE8 inline styles in files.css 2013-10-11 14:10:00 +02:00
Vincent Petry 75629a1f00 Fixed delete icon alignment in IE8
Removed old inline CSS that forced every td to have position:static in
the files app. (#5056)
2013-10-11 00:16:41 +02:00
Vincent Petry bf00ccd1d6 Fixed files view regular file actions in IE8
Fixes #5256

A missing closing span broken the container in IE8 which prevented the
file actions to be appended properly.
2013-10-10 12:21:02 +02:00
Vincent Petry cddb85c588 Added filesApp flag as input field for files app detection
Since the files app can be reached under multiple URLs, either root,
files.php or public.php, a flag has been added to the DOM to help apps
(like file viewers) to detect whether they are currently in the files
app.
2013-10-08 17:19:58 +02:00
Jörn Friedrich Dreyer 3be8e3f8d3 remove obsolete comment 2013-10-07 11:14:11 +02:00
Morris Jobke e1e16ec3b0 Merge pull request #5088 from owncloud/fix_trashbin_button
trash bin button needs to be an input field
2013-10-06 14:51:08 -07:00
Jan-Christoph Borchardt 2b521327c0 more elegant style for Personal and Admin settings 2013-10-05 11:23:49 +02:00
Bjoern Schiessle 51295e9a6b Merge branch 'master' into sharing_mail_notification_master
Conflicts:
	apps/files/index.php
	apps/files/templates/index.php
2013-10-04 12:30:49 +02:00
Björn Schießle 5b7f76e702 Merge pull request #4691 from owncloud/encryption_improved_error_messages_4617
Encryption improved error messages
2013-10-04 02:28:18 -07:00
Bjoern Schiessle b7c3af11bf fix hidden fieled name 2013-10-04 10:46:55 +02:00
Thomas Müller 9c23c3449b Merge branch 'master' into sharing_mail_notification_master
Conflicts:
	core/css/share.css
2013-10-02 23:33:50 +02:00
Jan-Christoph Borchardt f8093699f7 Merge pull request #5093 from owncloud/file-actions
File Selected on Click instead of download.
2013-10-02 09:56:08 -07:00
raghunayyar 0d5653c6b1 Takes nametext inside the anchor tag to fix the issue completely. 2013-10-02 22:11:03 +05:30
raghunayyar 4a5f3442b5 Closes Label inside the a tag for not hiding the fileactions. 2013-10-02 21:40:34 +05:30
raghunayyar 81b4904c78 File Selected on Click instead of download. 2013-10-02 21:13:07 +05:30
Jan-Christoph Borchardt 5feaa55779 simplify From Link icon in New menu 2013-10-02 18:27:39 +03:00
Bjoern Schiessle 9be6114a52 trash bin button needs to be an input field 2013-10-02 16:13:08 +02:00
Bjoern Schiessle 8b08b1b455 Merge branch 'master' into sharing_mail_notification_master
Conflicts:
	lib/private/util.php
2013-10-02 10:11:18 +02:00
Bjoern Schiessle 4d79e7e673 Merge branch 'master' into encryption_improved_error_messages_4617 2013-09-30 15:08:53 +02:00
kondou d7409547aa Fix not displaying "Upload something!" message
Fix #4940
2013-09-23 16:39:42 +02:00
Bjoern Schiessle fc76a13c52 Merge branch 'master' into sharing_mail_notification_master
Conflicts:
	lib/public/share.php
2013-09-23 11:18:00 +02:00
Bjoern Schiessle f6e8a388a9 Merge branch 'master' into encryption_improved_error_messages_4617
Conflicts:
	settings/ajax/changepassword.php
2013-09-23 10:39:12 +02:00
Jörn Friedrich Dreyer 7bd5e89f8c simplify conflict template handling, fix reopen after ESC 2013-09-18 17:22:29 +02:00
Jörn Friedrich Dreyer b59ce403d8 Merge branch 'master' into fix_3728_with_file_exists_dialog
Conflicts:
	apps/files/css/files.css
	apps/files/js/file-upload.js
	apps/files/js/filelist.js
	apps/files/js/files.js
	apps/files_sharing/js/public.js
	core/js/jquery.ocdialog.js
	core/js/oc-dialogs.js
2013-09-17 19:10:46 +02:00
Bjoern Schiessle 82cbbb8ab8 Merge branch 'master' into encryption_improved_error_messages_4617
Conflicts:
	apps/files/index.php
2013-09-16 10:42:37 +02:00
Bjoern Schiessle 534d93d2d3 Merge branch 'master' into sharing_mail_notification_master
Conflicts:
	apps/files/index.php
2013-09-16 10:40:06 +02:00
Thomas Müller 46f59b165e Merge pull request #4838 from owncloud/refactor_upload_js
refactor upload js & html to always use only js to fill form data
2013-09-16 01:06:24 -07:00
Vincent Petry 30a2f2f352 Use hash part of URL for IE8 in files app
Before this fix, the URL wasn't updated in IE8 when navigating into
folders.

This fix makes use of the hash part of URLs to make this work in IE8,
since IE8 doesn't support the history API nor changing the URL without
redirecting.

From now, both the regular query URL "?dir=somedir" and "#?dir=somedir"
will work in both IE8 and non-IE8 browsers.

In IE8, query based URLs are automatically converted to hash URLs upon
page load. The conversion is done on the server side by redirecting the
user to the updated URL.

When loading a page directly using a hash URL in the form
"#?dir=somedir" in IE8, the server doesn't get the hash, so it will not
return any results in that case and rely on ajax to load the first page.
2013-09-13 20:48:35 +02:00
Vincent Petry 364e7991a4 Fixed ajax support to also update the current dir permissions 2013-09-13 19:59:15 +02:00
Thomas Müller 4e751cbb47 fixing breadcrumbs on ajax loading of files 2013-09-13 19:59:15 +02:00
Vincent Petry 1304b511e9 Ajax calls for "files" and "files_trashbin" apps
Frontend:
- The files app list now uses ajax calls to refresh the list.
- Added support the browser back button (history API).
- Added mask + spinner while loading file list

Backend:
- Added utility function in core JS for parsing query strings.
- Moved file list + breadcrumb template data code to helper
  functions
- Fixed some file paths in trashbin app to be similar to the files app
2013-09-13 19:59:14 +02:00
Jörn Friedrich Dreyer 7854cf04ee refactor upload js & html to always use only js to fill form data 2013-09-13 17:07:52 +02:00
Thomas Müller 3066b44928 remove unused $relativePath 2013-09-12 00:39:03 +02:00
Thomas Müller b49f43c3ae move icon generation logic out of the template 2013-09-12 00:13:19 +02:00
Bjoern Schiessle fb462e83cc no longer enforce log out, but provide useful errors/warnings instead 2013-09-06 12:27:40 +02:00
Bjoern Schiessle f8563ec583 Merge branch 'master' into sharing_mail_notification_master
increased version number to trigger db update

Conflicts:
	lib/util.php
2013-09-05 13:39:45 +02:00
Jörn Friedrich Dreyer 49fd7e9f1e refactor dialog creation 2013-09-04 16:42:18 +02:00
Jörn Friedrich Dreyer 85758f3d7d Merge pull request #4473 from owncloud/texteditor_polishing
Texteditor polishing
2013-09-03 05:38:59 -07:00
Jörn Friedrich Dreyer 449fe8c75e Revert "remove editor div in filelist", add "is deprecated" comment
This reverts commit 64d09452f5.
2013-09-03 13:20:20 +02:00
Bjoern Schiessle b918c06be6 Merge branch 'master' into sharing_mail_notification_master
Conflicts:
	lib/util.php
2013-09-02 14:41:46 +02:00
Alessandro Cosentino 4b32d84314 text centered horizontally and vertically in emptycontent div 2013-08-31 11:12:07 -04:00
Bjoern Schiessle 77adaee645 enable user to inform recipients about a shared file by mail 2013-08-30 13:53:49 +02:00
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
Georg Ehrke f2702ff1ca Merge master into oc_preview 2013-08-19 11:24:17 +02:00
Bjoern Schiessle cabe92ef12 Merge branch 'master' into decrypt_files_again
Conflicts:
	apps/files_encryption/tests/keymanager.php
2013-08-17 13:15:22 +02:00
Jörn Friedrich Dreyer 64d09452f5 remove editor div in filelist 2013-08-16 17:19:48 +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
Jan-Christoph Borchardt 320bf0e8c1 fix breaking error due to ... a wrong icon link. Seriously? 2013-08-14 16:19:02 +02:00
Georg Ehrke e704c8e4dc use web.svg instead of web.png 2013-08-14 11:51:54 +02:00
Georg Ehrke 3cbbe395eb don't use hardcoded size for preview 2013-08-14 11:38:52 +02:00
Bjoern Schiessle 53bb89824d check if some encrypted files are left after the app was disabled and warn the user 2013-08-12 17:25:27 +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
Björn Schießle 3354249691 fix typo 2013-07-26 11:51:18 +02:00
Björn Schießle a00cff7c05 disable "deleted files" button if trash bin is empty 2013-07-26 11:14:29 +02:00
Thomas Müller 934f2e94a3 Merge branch 'master' into disable-anon-upload-master 2013-07-22 11:36:52 +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
Thomas Müller fc2d538311 new admin setting added which allows to turn off anonymous uploads 2013-07-12 17:03:51 +02:00
Georg Ehrke 53830f2f75 implement use of previews in sharing app 2013-07-11 11:58:52 +02:00
Jan-Christoph Borchardt 3fb3a7baa8 add MB indicator to size heading, fix #3987 2013-07-10 13:52:55 +02:00
Georg Ehrke a357e5b284 merge conflicts ... 2013-07-10 12:41:53 +02:00
Georg Ehrke 8eefaba719 some style adjustments 2013-07-10 12:30:11 +02:00
Victor Dubiniuk 582631323a Migrate to encodePath 2013-07-09 17:46:11 +03:00
Georg Ehrke 6e864e6599 fix size of icons in 'new' dropdown menu - I hope @jancborchardt knows a better solution coz this won't work in most IE versions ... 2013-07-02 16:30:58 +02: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
Roman Geber ddb0ff346d Public upload feature 2013-06-25 12:24:14 +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
Michael Gapczynski ec475cbcfa Add data-dir attribute to home breadcrumb 2013-05-20 10:21:13 -04: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