Commit Graph

6318 Commits

Author SHA1 Message Date
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
Vincent Petry 4549cf519e Added missing "files" JS to files_trashbin module
The recent refactoring for the breadcrumb resizing relies on the "Files"
object which is in the "files" Javascript file.

This fix includes it here as well.
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
Thomas Müller e6f21927d6 fixing no-repeat for IE8 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
Bart Visscher 666bbbe060 Use appinfo/register_command.php to add commands to the console command 2013-09-13 18:10:04 +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 d5ddbfb045 Merge pull request #4719 from owncloud/port_4701_master
Always check variable type before using readdir to avoid surprises
2013-09-12 15:44:20 -07:00
Jan-Christoph Borchardt c7ca86799b Merge pull request #4816 from owncloud/fixing-723-master
Fixing 723 master
2013-09-12 07:48:00 -07:00
Thomas Tanghus b7205d97d7 Merge pull request #4735 from owncloud/multiple_mimetypes_rawlist
Make it possible to pass rawlist.php an JSON array, to filter by more than one mimetype
2013-09-11 17:18:04 -07:00
Thomas Müller 9d661eab23 adding calls to \OCA\files\lib\Helper::determineIcon($i) in files, trashbin and sharing 2013-09-12 00:40:35 +02:00
Thomas Müller 5af111b0de added determineIcon to \OCA\files\lib\Helper 2013-09-12 00:39:52 +02:00
Thomas Müller 3066b44928 remove unused $relativePath 2013-09-12 00:39:03 +02:00
kondou 4d62f747fa Clean up rawlist.php and fix non-array request 2013-09-12 00:21:01 +02:00
Thomas Müller b49f43c3ae move icon generation logic out of the template 2013-09-12 00:13:19 +02:00
Jenkins for ownCloud 68015b2761 [tx-robot] updated from transifex 2013-09-11 06:50:06 -04:00
kondou 83d3df4111 Split some lines, use ===, avoid unnecessary operation 2013-09-11 12:12:40 +02:00
Bart Visscher 4ab8dc9c08 Merge pull request #4788 from owncloud/fixin-irods-session-master
Fixing session handling in iRODS
2013-09-11 00:01:55 -07:00
Thomas Müller 3b835ea1b6 never hack late night 2013-09-11 01:11:57 +02:00
Thomas Müller ec255b52be fixing boolean handling 2013-09-11 00:49:45 +02:00
Jörn Friedrich Dreyer 2c9b3d32ef unify .original div to fix css in firefox, clear:left to fix filename wrapping in chrome, shrink width of columns and get rid of ie8 hack 2013-09-10 17:34:28 +02:00
Jörn Friedrich Dreyer cec932f292 Merge branch 'master' into fix_3728_with_file_exists_dialog
Conflicts:
	apps/files/js/file-upload.js
2013-09-10 16:54:48 +02:00
Jenkins for ownCloud 72689f643b [tx-robot] updated from transifex 2013-09-10 10:42:16 -04:00
Thomas Müller d63ca25a94 proper test for use_logon_credentials 2013-09-10 12:35:14 +02:00
Thomas Müller 36e7a7c29b use \OC::$session instead of $_SESSION 2013-09-10 12:34:41 +02:00
Thomas Müller 21e5daa218 removing all ?> jutt in case 2013-09-10 11:25:40 +02:00
Thomas Müller c32c116957 removing ?> followed by whitespaces 2013-09-10 11:16:43 +02:00
Thomas Müller 956a2335ad Merge pull request #4647 from owncloud/fix_4619
Workaround for IE 9 & 10 for clicking filelist after adding new item
2013-09-10 01:22:25 -07:00
Thomas Tanghus 2cdde7a56a Merge pull request #4726 from owncloud/files-ie8-missingfilecheckboxes
Fixed missing checkboxes in IE8
2013-09-09 18:25:37 -07:00
Jenkins for ownCloud 92f6c3bb10 [tx-robot] updated from transifex 2013-09-08 21:37:53 -04:00
Vincent Petry 5f67ccba00 Fixed missing checkboxes in IE8
IE8 is not happy with the :checked CSS3 selector which causes it to
ignore the whole rule.

Replace it with a more compatible selector.
2013-09-08 22:21:07 +02:00
Jörn Friedrich Dreyer 03c90e968f whitespace and indentation fixes 2013-09-08 17:29:43 +02:00
Jörn Friedrich Dreyer 577e3f22b2 remove unused hooks 2013-09-08 10:43:52 +02:00
Jörn Friedrich Dreyer 8828fafd36 cleanup comments 2013-09-08 10:41:20 +02:00
Jenkins for ownCloud e895cf9188 [tx-robot] updated from transifex 2013-09-07 04:46:57 -04:00
Jörn Friedrich Dreyer ce03501646 fine ie8 compatability 2013-09-06 23:44:40 +02:00
Jörn Friedrich Dreyer 673e0c01a7 fix page leaving checks 2013-09-06 22:40:10 +02:00
Jörn Friedrich Dreyer 796e137e82 fix upload to folder 2013-09-06 18:51:27 +02:00
Jörn Friedrich Dreyer e2c0fe8296 fix upload of multiple files 2013-09-06 18:16:40 +02:00
Jörn Friedrich Dreyer 238d92b11c refactor replace and autorename resolution in upload.php 2013-09-06 17:53:58 +02:00
Bjoern Schiessle b2dde14dbc coding style fixes 2013-09-06 16:07:18 +02:00
Bjoern Schiessle 93f4dec798 fix part file handling and real size calculation, this should also solve #4581
Conflicts:
	apps/files_encryption/lib/stream.php
2013-09-06 16:06:34 +02:00
Bjoern Schiessle f6830e7462 check shares for the real file and not for the .part file 2013-09-06 16:05:11 +02:00
Bjoern Schiessle 404e36323a first check if a extension exists before comparing it 2013-09-06 16:05:03 +02:00
Bjoern Schiessle 597a3cf1ad handle part files correctly 2013-09-06 16:04:56 +02:00
Jörn Friedrich Dreyer 4d04dd9c4c Merge branch 'master' into fix_3728_with_file_exists_dialog 2013-09-06 13:42:05 +02:00
Pete McFarlane 83afba5070 prefix #filestable to tbody tr 2013-09-06 10:01:11 +01:00
kondou 226c205631 Use usort() instead of uasort() to not maintain keys 2013-09-06 06:45:16 +02:00
kondou 85e41d9500 Sort files by name, not by mimetype 2013-09-05 23:17:53 +02:00
kondou f84fe479a5 Only use mimetype_list and clean up a bit 2013-09-05 18:40:55 +02:00
Jörn Friedrich Dreyer 8a7e26b268 cleanup dead code 2013-09-05 17:46:19 +02:00
kondou 992b59f70b Make it possible to pass rawlist.php an JSON array, to filter by more than one mimetype 2013-09-05 16:54:12 +02:00
Jenkins for ownCloud 0527fb05ad [tx-robot] updated from transifex 2013-09-05 07:37:32 -04:00
Arthur Schiwon c01675de5d more is_resource checks before readdir 2013-09-05 11:58:57 +02:00
Jörn Friedrich Dreyer 03ddf8da80 Merge branch 'master' into fix_3728_with_file_exists_dialog
Conflicts:
	apps/files/js/file-upload.js
2013-09-05 10:31:43 +02:00
Jörn Friedrich Dreyer bbf8acb383 separate uploading code from progress code, add progress capability detection 2013-09-05 10:19:54 +02:00
Thomas Müller 3b25babe35 Merge pull request #4683 from owncloud/publicuploadjserror
Fixed public upload error that prevents upload
2013-09-04 11:50:38 -07:00
Jörn Friedrich Dreyer 49fd7e9f1e refactor dialog creation 2013-09-04 16:42:18 +02:00
Jörn Friedrich Dreyer 4af5a8c483 Merge branch 'master' into fix_3728_with_file_exists_dialog
Conflicts:
	apps/files/ajax/upload.php
	apps/files/js/file-upload.js
	apps/files/js/filelist.js
	apps/files/js/files.js
	apps/files/templates/part.list.php
2013-09-04 14:11:40 +02:00
Arthur Schiwon ec3639dc7a Always check variable type before using readdir to avoid surprises 2013-09-04 13:06:04 +02:00
Bjoern Schiessle 4dbc787055 check if stream wrapper is already registered to avoid warning 2013-09-03 15:56:25 +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
Jenkins for ownCloud fe0b8ac2c0 [tx-robot] updated from transifex 2013-09-03 07:46:55 -04:00
Bjoern Schiessle 3d49631b8d make sure that initial encryption also starts for a fresh installation 2013-09-03 13:24:30 +02: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
Bart Visscher cafc8cb223 Change Files Scan command to use OC\User\Manager 2013-09-02 18:18:12 +02:00
ringmaster 39f4538e0f This function doesn't cache anymore. Adjusted PHPDoc to suit. 2013-09-02 09:59:01 -04:00
ringmaster df7bfa4bf0 Don't cache the pkey, skip generation if the keyfile exists 2013-09-02 09:59:00 -04:00
Owen Winkler 9a263a500a Employ config option for OpenSSL config file, if provided.
This should help make OpenSSL configuration on Windows servers easier by allowing the openssl.cnf file to be set directly in the ownCloud config, rather than in SetEnv commands that don't exist and are hard to replicate in IIS.
2013-09-02 09:59:00 -04:00
Owen Winkler fb34f49913 Start a branch for easier OpenSSL configuration. 2013-09-02 09:58:19 -04:00
Bernhard Posselt f038cb9aea Merge pull request #4671 from owncloud/emptycontent
centers text message in empty-content page (files and files_trashbin apps)
2013-09-01 17:47:55 -07:00
Jenkins for ownCloud e68b5f8b0d [tx-robot] updated from transifex 2013-09-01 13:30:40 -04:00
Bart Visscher 0aba549e7f Use more object oriented way for console commands 2013-09-01 16:40:50 +02:00
Vincent Petry 307b673b79 Fixed public upload error that prevents upload
Public upload is broken because the file_upload_param variable expected
to exist by public.js didn't.

This fix sets the variable scope to the window to make it accessible
outside.
2013-09-01 16:14:46 +02:00
Alessandro Cosentino b10a646bc8 rename emptyfolder to emptycontent 2013-08-31 11:25:11 -04:00
Alessandro Cosentino 4b32d84314 text centered horizontally and vertically in emptycontent div 2013-08-31 11:12:07 -04:00
Georg Ehrke 668c4c2652 fix issue with filetable background 2013-08-30 22:05:44 +02:00
Georg Ehrke 8ef40277b2 Merge master into oc_preview 2013-08-30 18:11:18 +02:00
Georg Ehrke 40cee5639e use gerMimeTypeDetector detectPath instead of getMimeType 2013-08-30 18:07:49 +02:00
Jenkins for ownCloud dbc78b1a58 [tx-robot] updated from transifex 2013-08-30 09:38:20 -04:00
petemcfarlane ab1f78eac3 prefix 'tbody tr' to separate app/core css errors
For specific details see:
https://github.com/owncloud/core/pull/4536/files#r6082305
2013-08-30 10:48:04 +01:00
ringmaster f4ec5182bd Workaround for IE 9 & 10 for clicking filelist after adding new item 2013-08-29 12:06:07 -04:00
Georg Ehrke b7758d0f8d Merge master into oc_preview 2013-08-29 10:50:55 +02:00
Thomas Müller 81cab5ada8 Merge pull request #3926 from owncloud/improve_filesummary
Improve filelist summary
2013-08-28 15:11:09 -07:00
Bjoern Schiessle aed71bb420 also move empty folders to the trash bin as discussed here #4590 2013-08-28 15:46:44 +02:00
Bart Visscher ada15a2b8e Merge pull request #4489 from owncloud/clean-3rdparty-mess-master
Clean 3rdparty mess master
2013-08-28 06:12:58 -07:00
kondou 6bd0f3cba7 Reimplement filesummary in JS
Fix #993
2013-08-28 15:10:17 +02:00
Morris Jobke 5a03707184 Merge pull request #4601 from owncloud/fixing-4341-master
backport of #4357 to master
2013-08-28 04:42:50 -07:00
Jenkins for ownCloud 3e7ddbc9d9 [tx-robot] updated from transifex 2013-08-28 06:24:14 -04:00
Thomas Müller 3eed060ec9 backport of #4357 to master 2013-08-27 23:53:04 +02:00
Morris Jobke 34a32d862c Merge pull request #4572 from NCTU-NBA/pr-checkbox-displacement
Fix "select all" checkbox displacement when checked, fix #4571
2013-08-27 14:21:34 -07:00
Arthur Schiwon 321c514782 LDAP: case insensitive replace for more robustness 2013-08-27 22:23:48 +02:00
Jenkins for ownCloud d5062b9e0e [tx-robot] updated from transifex 2013-08-27 11:23:18 -04:00
Bjoern Schiessle 316d9bfed6 the trash bin can also contain empty files. Don't use the trash bin size as indicator to decide if the trash bin is empty or not 2013-08-27 14:39:43 +02:00
Morris Jobke ea446544ef Merge pull request #4586 from owncloud/fixing-3431-master
kill zh_CN.GB2312
2013-08-27 02:00:48 -07:00
Thomas Müller c9123263ab kill zh_CN.GB2312 2013-08-27 01:27:05 +02:00