Commit Graph

1268 Commits

Author SHA1 Message Date
Jenkins for ownCloud f31d31844e [tx-robot] updated from transifex 2013-09-27 00:02:30 -04:00
Jenkins for ownCloud 2d12e52769 [tx-robot] updated from transifex 2013-09-24 12:59:48 -04:00
kondou d7409547aa Fix not displaying "Upload something!" message
Fix #4940
2013-09-23 16:39:42 +02:00
Georg Ehrke 8a1618bce5 implement previews for public upload 2013-09-23 12:27:05 +02:00
Georg Ehrke edd38e5948 fix previews in shared folders 2013-09-23 10:26:46 +02:00
Jenkins for ownCloud 28918d61d2 [tx-robot] updated from transifex 2013-09-22 12:58:42 -04:00
Thomas Müller 2a0c51a8bf Merge pull request #4927 from owncloud/fix_namespaces_and_autoloading
namespaces use upcasefirst parts
2013-09-21 11:54:06 -07:00
Jenkins for ownCloud 5b95e7aa0f [tx-robot] updated from transifex 2013-09-20 10:50:14 -04:00
Jörn Friedrich Dreyer 4b3e56bcf9 remove unneccessary lib in namespace 2013-09-20 16:46:33 +02:00
Jörn Friedrich Dreyer 9e39118b52 namespaces use upcasefirst parts
when _ is left in namespace and files are named after their classes the autoloader will also find classes in the lib folder of an app
its magic!
2013-09-20 16:37:07 +02:00
Bart Visscher 8e26f291a7 Merge pull request #4684 from owncloud/improved-console
Use more object oriented way for console commands
2013-09-19 14:22:32 -07:00
Bart Visscher a9ea99e93d Add copyright, remove starting blank line 2013-09-19 19:12:16 +02:00
Jörn Friedrich Dreyer 7e0631b3b8 Merge branch 'master' into fix_3728_with_file_exists_dialog
Conflicts:
	apps/files/js/filelist.js
2013-09-19 17:00:54 +02:00
Jörn Friedrich Dreyer bd5cb1d801 Merge pull request #4900 from owncloud/fixing-4488-master
File permissions are part of the ajax response of file upload
2013-09-19 07:46:37 -07:00
Jörn Friedrich Dreyer 9f9eb1b08f Merge pull request #4263 from owncloud/search_scrollto
initial scrollto implementation
2013-09-19 05:49:45 -07:00
Jörn Friedrich Dreyer 98ff847830 fix race condition in lazy preview loading 2013-09-19 14:46:33 +02:00
Thomas Müller 4344c62f7e Merge branch 'master' into fixing-4488-master 2013-09-19 11:43:38 +02:00
Jörn Friedrich Dreyer 1bba800e47 Merge branch 'fix_3728_with_file_exists_dialog' of github.com:owncloud/core into fix_3728_with_file_exists_dialog 2013-09-19 11:33:34 +02:00
Jörn Friedrich Dreyer ae97fad632 fix double translation of error message 2013-09-19 11:32:56 +02:00
Thomas Müller eea02cee2f Merge branch 'fix_3728_with_file_exists_dialog' of github.com:owncloud/core into fix_3728_with_file_exists_dialog
Conflicts:
	apps/files/js/file-upload.js
2013-09-19 11:15:20 +02:00
Thomas Müller c30c153ea5 fixing typos and l10n 2013-09-19 11:13:11 +02:00
Jörn Friedrich Dreyer 89ed0007c0 jsdoc types should go into {} 2013-09-19 11:11:22 +02:00
Jörn Friedrich Dreyer 0d81a53e12 use 96x96 as 64x64 thumbnails in conflicts dialog, 64x64 looks very blocky ... maybe something is wrong there 2013-09-19 10:00:42 +02:00
Thomas Müller 43a96621ea adding comma to get cleaner diffs in the future 2013-09-18 23:42:36 +02:00
Thomas Müller 3c0e93e220 no file actions during upload 2013-09-18 23:06:48 +02:00
Jenkins for ownCloud 6b1843d91b [tx-robot] updated from transifex 2013-09-18 11:50:02 -04: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 12ff268e60 move upload dialog css to separate file 2013-09-18 17:20:14 +02:00
Jörn Friedrich Dreyer 715846626e hide excessive logging with a trace flag 2013-09-18 14:39:39 +02:00
Jörn Friedrich Dreyer 17337b22af Merge branch 'master' into fix_3728_with_file_exists_dialog
Conflicts:
	apps/files/js/file-upload.js
2013-09-18 14:19:58 +02:00
Thomas Müller 20a43d1982 remove file action elements before recreating them 2013-09-18 13:09:47 +02:00
Thomas Müller 6ed2df11fc store the permissions retrieved via ajax within the dom element 2013-09-18 13:09:04 +02:00
Thomas Müller 370ed814f7 add permissions of the file to the json response 2013-09-18 11:22:29 +02:00
Jörn Friedrich Dreyer 86c4c83b86 use exists 2013-09-17 19:11:18 +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
Jörn Friedrich Dreyer b40925ae17 initial scrollto implementation:
use places/folder icon,
move link construction to JS,
only show icon on hover,
use 'searchresult' as css class name,
add filter/unfilter methods,
highlight searched files in current filelist
only filter when correct FileList is present
2013-09-17 18:40:51 +02:00
Jörn Friedrich Dreyer d41e722629 refactor upload progress 2013-09-16 14:14:46 +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
Thomas Müller db7e1dd877 Merge pull request #4853 from owncloud/external-shared_mimetype-icons
Use external and shared icons in OC.Dialogs.filepicker()
2013-09-15 02:42:14 -07:00
Thomas Müller a0c2c2473a Merge pull request #4501 from owncloud/ajaxfilelist
Ajax calls for "files" and "files_trashbin" apps
2013-09-14 12:51:16 -07:00
kondou c117e719da Use external and shared icons in OC.Dialogs.filepicker() 2013-09-14 14:35:23 +02:00
Jenkins for ownCloud 556bd1ef23 [tx-robot] updated from transifex 2013-09-13 21:49:24 -04: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 4d38441e72 Fixed loading mask/spinner to stay fixed on scroll 2013-09-13 19:59:15 +02:00
Vincent Petry 611075bf20 Fixed JS error in trashbin app 2013-09-13 19:59:15 +02:00
Vincent Petry 3cf0820d35 Changed breadcrumb event handling to not use delegate
Using delegate might break apps that embed themselves in the files
container. When an app embeds itself and the user clicks a breadcrumb,
it will simply reload the whole browser page.
2013-09-13 19:59:15 +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 4ab5e58e02 update file summary on ajax file list load 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
Thomas Müller ef955bae56 calling replaceSVG() to display breadcrumb images correctly on IE8 2013-09-13 19:59:15 +02:00