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
2b521327c0
more elegant style for Personal and Admin settings
2013-10-05 11:23:49 +02:00
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
5b7f76e702
Merge pull request #4691 from owncloud/encryption_improved_error_messages_4617
...
Encryption improved error messages
2013-10-04 02:28:18 -07:00
b7c3af11bf
fix hidden fieled name
2013-10-04 10:46:55 +02:00
9c23c3449b
Merge branch 'master' into sharing_mail_notification_master
...
Conflicts:
core/css/share.css
2013-10-02 23:33:50 +02:00
f8093699f7
Merge pull request #5093 from owncloud/file-actions
...
File Selected on Click instead of download.
2013-10-02 09:56:08 -07:00
0d5653c6b1
Takes nametext inside the anchor tag to fix the issue completely.
2013-10-02 22:11:03 +05:30
4a5f3442b5
Closes Label inside the a tag for not hiding the fileactions.
2013-10-02 21:40:34 +05:30
81b4904c78
File Selected on Click instead of download.
2013-10-02 21:13:07 +05:30
5feaa55779
simplify From Link icon in New menu
2013-10-02 18:27:39 +03:00
9be6114a52
trash bin button needs to be an input field
2013-10-02 16:13:08 +02:00
8b08b1b455
Merge branch 'master' into sharing_mail_notification_master
...
Conflicts:
lib/private/util.php
2013-10-02 10:11:18 +02:00
4d79e7e673
Merge branch 'master' into encryption_improved_error_messages_4617
2013-09-30 15:08:53 +02:00
d7409547aa
Fix not displaying "Upload something!" message
...
Fix #4940
2013-09-23 16:39:42 +02:00
fc76a13c52
Merge branch 'master' into sharing_mail_notification_master
...
Conflicts:
lib/public/share.php
2013-09-23 11:18:00 +02:00
f6e8a388a9
Merge branch 'master' into encryption_improved_error_messages_4617
...
Conflicts:
settings/ajax/changepassword.php
2013-09-23 10:39:12 +02:00
7bd5e89f8c
simplify conflict template handling, fix reopen after ESC
2013-09-18 17:22:29 +02:00
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
82cbbb8ab8
Merge branch 'master' into encryption_improved_error_messages_4617
...
Conflicts:
apps/files/index.php
2013-09-16 10:42:37 +02:00
534d93d2d3
Merge branch 'master' into sharing_mail_notification_master
...
Conflicts:
apps/files/index.php
2013-09-16 10:40:06 +02:00
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
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
364e7991a4
Fixed ajax support to also update the current dir permissions
2013-09-13 19:59:15 +02:00
4e751cbb47
fixing breadcrumbs on ajax loading of files
2013-09-13 19:59:15 +02:00
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
7854cf04ee
refactor upload js & html to always use only js to fill form data
2013-09-13 17:07:52 +02:00
3066b44928
remove unused $relativePath
2013-09-12 00:39:03 +02:00
b49f43c3ae
move icon generation logic out of the template
2013-09-12 00:13:19 +02:00
fb462e83cc
no longer enforce log out, but provide useful errors/warnings instead
2013-09-06 12:27:40 +02:00
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
49fd7e9f1e
refactor dialog creation
2013-09-04 16:42:18 +02:00
85758f3d7d
Merge pull request #4473 from owncloud/texteditor_polishing
...
Texteditor polishing
2013-09-03 05:38:59 -07:00
449fe8c75e
Revert "remove editor div in filelist", add "is deprecated" comment
...
This reverts commit 64d09452f5
2013-09-03 13:20:20 +02:00
b918c06be6
Merge branch 'master' into sharing_mail_notification_master
...
Conflicts:
lib/util.php
2013-09-02 14:41:46 +02:00
4b32d84314
text centered horizontally and vertically in emptycontent div
2013-08-31 11:12:07 -04:00
77adaee645
enable user to inform recipients about a shared file by mail
2013-08-30 13:53:49 +02:00
b7758d0f8d
Merge master into oc_preview
2013-08-29 10:50:55 +02:00
6bd0f3cba7
Reimplement filesummary in JS
...
Fix #993
2013-08-28 15:10:17 +02:00
224b80f906
move isMimeSupported out of template files
2013-08-21 15:55:59 +02:00
48f0c54261
style fixes for preview lib
2013-08-19 12:16:55 +02:00
f2702ff1ca
Merge master into oc_preview
2013-08-19 11:24:17 +02:00
cabe92ef12
Merge branch 'master' into decrypt_files_again
...
Conflicts:
apps/files_encryption/tests/keymanager.php
2013-08-17 13:15:22 +02:00
64d09452f5
remove editor div in filelist
2013-08-16 17:19:48 +02:00
e7c0693570
checkstyle double quotes in HTML
2013-08-15 19:40:39 +02:00
137d644963
Merge branch 'oc_preview' of github.com:owncloud/core into oc_preview
2013-08-14 20:41:49 +02:00
cba0f69622
increase row height to 50px, properly position everything, checkboxes, actions etc
2013-08-14 20:41:20 +02:00
a255cc6007
fix adding preview-icon to clss attribute
2013-08-14 18:52:53 +02:00
320bf0e8c1
fix breaking error due to ... a wrong icon link. Seriously?
2013-08-14 16:19:02 +02:00
e704c8e4dc
use web.svg instead of web.png
2013-08-14 11:51:54 +02:00
3cbbe395eb
don't use hardcoded size for preview
2013-08-14 11:38:52 +02:00
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
ac6a3133ec
style fixes
2013-07-30 12:33:54 +02:00
7425efade7
Merge branch 'master' into oc_preview
...
Conflicts:
3rdparty
lib/template.php
2013-07-30 00:34:36 +02:00
1e4ec2ac27
add class='preview-icon' to rows in file app that make use of previews
2013-07-29 15:47:17 +02:00
3354249691
fix typo
2013-07-26 11:51:18 +02:00
a00cff7c05
disable "deleted files" button if trash bin is empty
2013-07-26 11:14:29 +02:00
934f2e94a3
Merge branch 'master' into disable-anon-upload-master
2013-07-22 11:36:52 +02:00
48948ccf5f
finally remove the file size obfuscation as it had more disadvantages. I was wrong, sorry.
2013-07-18 22:15:26 +02:00
fc2d538311
new admin setting added which allows to turn off anonymous uploads
2013-07-12 17:03:51 +02:00
53830f2f75
implement use of previews in sharing app
2013-07-11 11:58:52 +02:00
3fb3a7baa8
add MB indicator to size heading, fix #3987
2013-07-10 13:52:55 +02:00
a357e5b284
merge conflicts ...
2013-07-10 12:41:53 +02:00
8eefaba719
some style adjustments
2013-07-10 12:30:11 +02:00
582631323a
Migrate to encodePath
2013-07-09 17:46:11 +03:00
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
063b0a2d17
Don't escape filesize (can contain a '<')
2013-07-02 13:09:07 +02:00
b1d0de95a9
Show a summary as the last filelist entry
...
Fix #993
2013-07-02 04:28:52 +02:00
39c387eed4
implement server side use of previews
2013-06-26 18:04:22 +02:00
ddb0ff346d
Public upload feature
2013-06-25 12:24:14 +02:00
0872f641dd
darker low threshold color for file size and age fading, better contrast
2013-06-11 14:30:13 +02:00
ec475cbcfa
Add data-dir attribute to home breadcrumb
2013-05-20 10:21:13 -04:00
003e6adb3f
Remove uneeded onclick handler
2013-04-28 23:26:07 +02:00
6cf6103ed2
Move onclick handler
2013-04-28 23:25:58 +02:00
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
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
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
3817922c93
fixes #2125 - the warning is now displayed with a disabled button
2013-03-26 15:44:35 +01:00
319e3f162c
Don't block uploads if the max upload size is unknown
2013-03-15 16:40:36 +01:00
ab7dc76ff1
add type=text to ZIP size field, fix second part of #2097
2013-03-06 12:39:36 +01:00
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
52919fa94b
use p() for the output and not for the comparison
2013-03-04 12:01:45 +01:00
d3ddf03687
Datepicker height fixed.
...
New id defined for files table for positioning.
2013-03-04 09:21:38 +05:30
4b9863fa7d
Merge branch 'master' into from-insane-autoescape-to-p
...
Conflicts:
apps/files/templates/index.php
2013-03-01 23:09:20 +01:00
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
5f8bd07927
[Files] Use p() instead of echo
2013-02-27 23:40:30 +01:00
b93ebe1860
Merge master
2013-02-27 23:36:52 +01:00
ab5e20a2c1
Just use rawurlencode in files list template
2013-02-27 21:53:46 +01:00
c9415e6529
[files] Unescape file size
2013-02-27 21:40:06 +01:00
85209287bb
[Files] Use htmlspecialchars()
2013-02-27 21:19:11 +01:00
4860d03270
[Files] Use p() instead of echo
2013-02-27 21:14:15 +01:00
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
9058d398a7
Merge pull request #1662 from owncloud/style-cleanup
...
Style cleanup
2013-02-14 12:54:36 -08:00
bd22e948ca
call 'Trash bin' 'Deleted files'
2013-02-14 12:32:14 +01:00
cd35d257bb
Fix NoSpaceAfterComma and SpaceBeforeComma
2013-02-14 08:36:26 +01:00
9c8f5de6c6
svg replacement for breadcrumb home icon, fix #1620
2013-02-11 16:19:22 +01:00
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
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
6e9f434bda
rename trash to trash bin
2013-02-09 12:01:49 +01:00
3879e5d9c5
Merge pull request #1428 from owncloud/content_positioning
...
Fix leftcontent positioning. Ref #1255
2013-02-06 08:13:45 -08:00
65bd7af8df
Remove undefined crumb variable from home breadcrumb
2013-02-04 20:40:16 -05:00
b06ac67e07
Add 'hascontrols' class for content with fixed topbar.
2013-02-04 18:30:49 +01:00
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
9060c3bd83
Files: fix positioning of Trash button and upload progress bar
2013-02-04 01:05:59 +01:00
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
ad044eb888
Merge branch 'master' into navigation
2013-01-31 15:35:20 +01:00
54eeb8b8fc
fix merge conflict
2013-01-31 10:55:59 +01:00
74f6f85628
merge master into filesystem
2013-01-28 19:37:58 +01:00
3bafa87a12
merge styles
2013-01-28 19:36:21 +01:00
8067a1394e
fix merge conflicts
2013-01-28 11:18:04 +01:00
03a1a20316
fixing href for folders
2013-01-28 09:46:52 +01:00
930b9b9cd0
merge master into filesystem
2013-01-26 18:49:45 +01:00
2e42c6f54f
Use HTML5 data attribute + fix undefined variable
2013-01-26 14:07:35 +01:00
276d98b9dd
Merge pull request #1059 from owncloud/fixing-998-master
...
Fixing 998 master
2013-01-26 04:15:40 -08:00
a86da16a10
More Style Fixes
...
Remove Repeating Background behind folder names in files app
part.breadcrumb.php
2013-01-25 20:50:55 +05:30
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
9d77317de8
add trash button to web interface
2013-01-22 15:32:57 +01:00
0d02caa684
No inline JS in apps
2013-01-21 20:34:28 +01:00
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
94068e5d08
Cache: show upgrade progress
2013-01-15 18:13:50 +01:00
9bf367e7f8
merge master into filesystem
2013-01-15 14:57:23 +01:00
6182b1353b
merge master into navigation
2013-01-15 20:40:38 +07:00
2a7e5faa37
Remove ugly indentation
2013-01-13 01:02:11 +01:00
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
364b1cd391
Merge branch 'master' into fixing-998-master
...
Conflicts:
apps/files/js/files.js
2013-01-11 10:00:12 +01:00
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
9671ace32e
Merge branch 'master' into fix_minor_files_annoyances
...
Conflicts:
apps/files/js/files.js
2013-01-06 22:46:40 +01:00
6806484c16
Merge branch 'master' into fixing-998-master
2013-01-06 10:36:14 +01:00
de496ed16d
remove initial iframe, is added automatically by jquery upload mechanism
2013-01-04 13:47:47 +01:00
e40be93e87
merge master into filesystem
2013-01-03 15:59:17 +01:00
e0e7c98100
Merge pull request #1041 from owncloud/fixing-856-master
...
Fixing #856 master
2013-01-02 14:58:54 -08:00
48c7bed59b
make usedSpacePercent available in the files app
2013-01-02 15:06:49 +01:00
b5b48428ab
Replace %2F with / in breadcrumbs
2012-12-28 19:41:37 -05:00
a3206b4e97
only show the max possible upload of 2GB on a 32 bit system.
...
for a 64 bit system we have no such limitation
refs #856
Conflicts:
apps/files/templates/admin.php
2012-12-28 22:17:38 +01:00
7e36f730ec
merge master into filesystem
2012-12-25 14:29:29 +01:00
bdc8d0098a
Merge pull request #869 from owncloud/files-styles
...
Files styles
2012-12-20 05:39:09 -08:00
586cc9a83b
merge master into navigation
2012-12-18 15:41:58 +01:00
30b0e8b70c
cleaning up the settings. standardize the format, add missing I10N and other small things. Yes. This is not perfect. But way better than before ;-)
2012-12-15 20:02:16 +01:00
316a29f7ac
fix new button popup looking blurry
2012-12-13 19:04:27 +01:00
7969d6e646
Merge branch 'master' into filesystem
2012-12-11 23:57:59 +01:00
80d8ca24ec
fix svg -> png replacement for android, cleanup and remove obsolete css
2012-12-07 17:21:26 +01:00
8cf1e560bb
add IE9 CSS checkbox fixes
2012-12-07 17:21:26 +01:00
810e02099e
upload button HTML, CSS & JS cleanup
2012-12-07 15:32:24 +01:00
76395057d4
fix_new_and_upload_button_html_css
2012-12-07 15:32:24 +01:00
72b6faa69d
merge master into filesystem
2012-12-02 03:03:48 +01:00
3b83fe1530
fix checkstyle for files app
2012-11-29 18:33:15 +01:00
555dec2d92
merge master into filesystem
2012-11-23 16:20:56 +01:00
20c24f234f
Do the url encoding once, only in breadcrumbs template
...
fixes issue #438
2012-11-16 16:12:28 +01:00
bf2ac9f113
merge master into filesystem
2012-11-15 00:37:54 +01:00
56239df2e7
Update all to use OCP\PERMISSION_* instead of OCP\Share::PERMISSION_*
2012-11-11 23:10:23 +01:00
Morris Jobke
Jan-Christoph Borchardt
Bjoern Schiessle
Björn Schießle
Thomas Müller
raghunayyar
kondou
Jörn Friedrich Dreyer
Vincent Petry
Vincent Petry
Alessandro Cosentino
Georg Ehrke
Victor Dubiniuk
Georg Ehrke
Roman Geber
Michael Gapczynski
Lukas Reschke
Bart Visscher
Robin Appelman
j-ed
Thomas Tanghus
Frank Karlitschek