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
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
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
4b32d84314
text centered horizontally and vertically in emptycontent div
2013-08-31 11:12:07 -04: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
Jörn Friedrich Dreyer
Thomas Müller
Vincent Petry
Vincent Petry
Alessandro Cosentino
Georg Ehrke
kondou
Bjoern Schiessle
Jan-Christoph Borchardt
Victor Dubiniuk
Georg Ehrke
Roman Geber
Michael Gapczynski
Lukas Reschke