Commit Graph

154 Commits

Author SHA1 Message Date
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 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
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 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 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
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 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 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 cba0f69622 increase row height to 50px, properly position everything, checkboxes, actions etc 2013-08-14 20:41:20 +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
Thomas Müller 7425efade7 Merge branch 'master' into oc_preview
Conflicts:
	3rdparty
	lib/template.php
2013-07-30 00:34:36 +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
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
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
Roman Geber ddb0ff346d Public upload feature 2013-06-25 12:24:14 +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
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
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 4860d03270 [Files] Use p() instead of echo 2013-02-27 21:14:15 +01:00
Björn Schießle bd22e948ca call 'Trash bin' 'Deleted files' 2013-02-14 12:32:14 +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 b06ac67e07 Add 'hascontrols' class for content with fixed topbar. 2013-02-04 18:30:49 +01:00
Robin Appelman 9060c3bd83 Files: fix positioning of Trash button and upload progress bar 2013-02-04 01:05:59 +01:00
Björn Schießle 8067a1394e fix merge conflicts 2013-01-28 11:18:04 +01:00
Björn Schießle 9d77317de8 add trash button to web interface 2013-01-22 15:32:57 +01:00
Thomas Mueller 508b6a9fc7 displaying notification now centered
The notification div has been moved to the user templates.
Correct display of the notification will only work with the use of OC.Notification.show() as on fadeIn() the css needs to be changed as this style required display: inline.
2013-01-11 11:52:07 +01:00
Thomas Mueller 364b1cd391 Merge branch 'master' into fixing-998-master
Conflicts:
	apps/files/js/files.js
2013-01-11 10:00:12 +01:00
Jörn Friedrich Dreyer 3bb7ee521f attach max upload tipsy to div instead of a to fix tooltip not showing due to new z-index 2013-01-07 12:23:29 +01:00
Jörn Friedrich Dreyer de496ed16d remove initial iframe, is added automatically by jquery upload mechanism 2013-01-04 13:47:47 +01:00
Thomas Mueller 48c7bed59b make usedSpacePercent available in the files app 2013-01-02 15:06:49 +01:00
Jan-Christoph Borchardt 316a29f7ac fix new button popup looking blurry 2012-12-13 19:04:27 +01:00
Jörn Friedrich Dreyer 80d8ca24ec fix svg -> png replacement for android, cleanup and remove obsolete css 2012-12-07 17:21:26 +01:00
Jörn Friedrich Dreyer 8cf1e560bb add IE9 CSS checkbox fixes 2012-12-07 17:21:26 +01:00
Jörn Friedrich Dreyer 810e02099e upload button HTML, CSS & JS cleanup 2012-12-07 15:32:24 +01:00
Jörn Friedrich Dreyer 76395057d4 fix_new_and_upload_button_html_css 2012-12-07 15:32:24 +01:00
Jörn Friedrich Dreyer 3b83fe1530 fix checkstyle for files app 2012-11-29 18:33:15 +01:00
Thomas Tanghus 56239df2e7 Update all to use OCP\PERMISSION_* instead of OCP\Share::PERMISSION_* 2012-11-11 23:10:23 +01:00
Felix Moeller 30d7993e01 Checkstyle fixes: NoSpaceAfterComma 2012-11-04 11:10:46 +01:00
Jan-Christoph Borchardt e66482430e Files: change wording 'From url' to 'From link' 2012-11-01 18:09:16 +01:00
Lukas Reschke 116fa64294 Change IE8 to "older IE versions"
I'm not sure if IE9 is also affected, so I changed it to "older IE versions" - IE 10 should work fine.
2012-10-30 17:29:26 +01:00
Lukas Reschke ee1e4a7602 Send the requesttoken as form value
This is needed for IE < 8 because it doesn't send the CSRF token here.
So that it is impossible to upload files.

Fixes #110 and related to #122
2012-10-30 17:19:49 +01:00
Björn Schießle 4dba91838f add ID to upload form and check if ID exist to avoid loading invalid javascript code for read-only views. 2012-10-08 10:28:29 +02:00
Tom Needham bcd3d1116c Change background colour of upload button to be consistant with new button 2012-09-21 12:45:11 +00:00
Bernhard Posselt 1c643ce4bc made upload button the same height in chrome and firefox
Signed-off-by: Tom Needham <needham.thomas@gmail.com>
2012-09-19 22:10:13 +00:00
Michael Gapczynski 73d726d1b2 Support for unshare from self, with a bunch of temporary fixes to overcome configuration problems with file actions 2012-09-07 00:02:22 -04:00
Michael Gapczynski 17dadd5c8a Don't show the delete all action if delete permission is not granted 2012-09-07 00:02:22 -04:00
Michael Gapczynski a5211e31bc Add permissions to new files/folders, bug fix for oc-1649 2012-09-05 21:47:09 -04:00
Michael Gapczynski 6f58eca534 Change read only check to isCreatable 2012-07-24 21:35:03 -04:00
Lukas Reschke 6defbc7f4d Removed some unessecary sanitizations 2012-06-11 19:20:48 +02:00
Bart Visscher 4a5973662c Merge branch 'unstable'
Conflicts:
	apps/files_external/tests/config.php
	apps/files_versions/ajax/getVersions.php
	apps/files_versions/appinfo/app.php
	apps/files_versions/history.php
	apps/files_versions/js/versions.js
	apps/files_versions/templates/history.php
	apps/files_versions/versions.php
	lib/base.php
2012-06-04 23:02:05 +02:00
Michael Gapczynski cbfbbe672c Merge commit 'refs/merge-requests/115' of git://gitorious.org/owncloud/owncloud into merge-requests/115
Conflicts:
	apps/files/templates/index.php
2012-05-17 15:38:28 -04:00
Michael Gapczynski 6673375eeb No multiple file sharing in this next release, sharing UI isn't ready for it :( 2012-05-15 11:45:59 -04:00
Sam Tuke 2ad6b5048e fixed 'delete' label so it doesn't break translations 2012-05-15 16:24:06 +01:00
Thomas Mueller 583dce5276 removing executable bit - again 2012-05-15 00:52:00 +02:00
Jan-Christoph Borchardt d1e5a56bc6 fixing upload icon color 2012-05-10 21:40:22 +02:00
Vitaly Kuznetsov 6f981738bb Fix some non-utf8-friendly htmlentities (resulting in wrong display of utf8-encoded directory names for example) 2012-05-10 09:10:53 +00:00
Frank Karlitschek 1945cd6946 ported the oc_template class 2012-05-06 23:00:36 +02:00