Commit Graph

403 Commits

Author SHA1 Message Date
Jenkins for ownCloud 5d9731cef2 [tx-robot] updated from transifex 2013-11-21 10:05:34 -05:00
Jenkins for ownCloud c3746e866a [tx-robot] updated from transifex 2013-11-15 22:56:31 -05:00
Georg Ehrke 90fac1f371 replace $path with '/files_trashbin/files/' . $file 2013-11-12 14:03:50 +01:00
Georg Ehrke feee4b865b add delete hook for trash bin app 2013-11-12 14:00:36 +01:00
Vincent Petry 80c8666d3a Deleting all files in trash now only sends a single flag
To prevent having to send the list of all files for deletion, only set a
flag "allfiles". This should make it a bit smoother when deleting 5000+
files.

Also fixes some "empty trash" message issues.
2013-11-11 17:58:33 +01:00
Jenkins for ownCloud e431ba5ce8 [tx-robot] updated from transifex 2013-11-11 05:47:59 -05:00
Jenkins for ownCloud e89f080f09 [tx-robot] updated from transifex 2013-11-03 14:39:28 -05:00
Jenkins for ownCloud b0b76fe064 [tx-robot] updated from transifex 2013-10-29 07:31:51 -04:00
Vincent Petry e41ea20ce4 Fixed clicking on the "Home" breadcrumb in the trash app
Clicking on the "home" breadcrumb now correctly brings the user back to
the files app.
2013-10-28 20:24:06 +01:00
Jenkins for ownCloud 119ecc6f34 [tx-robot] updated from transifex 2013-10-27 02:32:11 -04:00
Jenkins for ownCloud 6aee83cadf [tx-robot] updated from transifex 2013-10-19 08:27:13 -04:00
Vincent Petry b2986e1994 Merge pull request #5274 from owncloud/files-ie8-deletecheckbox
Fixed delete icon alignment in IE8
2013-10-11 08:24:57 -07:00
Vincent Petry 39b150921d Moved IE8 inline styles in files.css 2013-10-11 14:10:00 +02:00
Jenkins for ownCloud 44a5b0bad0 [tx-robot] updated from transifex 2013-10-10 22:30:58 -04: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
Bjoern Schiessle 7ab4fef7a9 update file summary after group delete/restore 2013-10-09 16:17:43 +02:00
Bjoern Schiessle 46bce8e540 fix checkbox 2013-10-09 13:15:53 +02:00
Bjoern Schiessle 51cfdb32b1 fix indention 2013-10-09 12:43:56 +02:00
Bjoern Schiessle 31a91ef892 fix group delete/restore 2013-10-09 12:35:15 +02:00
Bjoern Schiessle 9e3d28871e fix delete/restore individual files 2013-10-09 12:01:25 +02:00
Bjoern Schiessle 4404963918 fix trashbin layout 2013-10-09 11:11:55 +02:00
Jenkins for ownCloud c655eec3d1 [tx-robot] updated from transifex 2013-10-07 12:21:38 -04:00
Jenkins for ownCloud 3613e79e10 [tx-robot] updated from transifex 2013-10-06 19:16:10 -04:00
Jenkins for ownCloud a711399e62 [tx-robot] updated from transifex 2013-09-30 10:19:22 -04:00
Thomas Müller 687ba053b7 Merge branch 'master' into appframework-master 2013-09-27 14:25:47 +02:00
Jenkins for ownCloud f31d31844e [tx-robot] updated from transifex 2013-09-27 00:02:30 -04:00
Thomas Müller db39fede97 Merge branch 'master' into appframework-master
Conflicts:
	apps/files/lib/helper.php
	apps/files_trashbin/lib/helper.php
2013-09-25 09:52:12 +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
Jenkins for ownCloud 6b1843d91b [tx-robot] updated from transifex 2013-09-18 11:50:02 -04:00
Thomas Müller 9b420e8660 use \OC::$server->getPreviewManager() instead of \OCP\Preview 2013-09-17 13:33:47 +02: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
Jenkins for ownCloud 556bd1ef23 [tx-robot] updated from transifex 2013-09-13 21:49:24 -04:00
Vincent Petry ec2f20f720 Fixed files_trashbin to also use hash URL part for IE8 2013-09-13 21:00:15 +02: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 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
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
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
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
Jenkins for ownCloud 72689f643b [tx-robot] updated from transifex 2013-09-10 10:42:16 -04:00
Jenkins for ownCloud 92f6c3bb10 [tx-robot] updated from transifex 2013-09-08 21:37:53 -04:00
Jenkins for ownCloud e895cf9188 [tx-robot] updated from transifex 2013-09-07 04:46:57 -04:00
Jenkins for ownCloud 0527fb05ad [tx-robot] updated from transifex 2013-09-05 07:37:32 -04:00
Arthur Schiwon ec3639dc7a Always check variable type before using readdir to avoid surprises 2013-09-04 13:06:04 +02:00
Jenkins for ownCloud fe0b8ac2c0 [tx-robot] updated from transifex 2013-09-03 07:46:55 -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
Alessandro Cosentino b10a646bc8 rename emptyfolder to emptycontent 2013-08-31 11:25:11 -04:00
Georg Ehrke 8ef40277b2 Merge master into oc_preview 2013-08-30 18:11:18 +02:00
Jenkins for ownCloud dbc78b1a58 [tx-robot] updated from transifex 2013-08-30 09:38:20 -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
kondou 6bd0f3cba7 Reimplement filesummary in JS
Fix #993
2013-08-28 15:10:17 +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
Thomas Müller c9123263ab kill zh_CN.GB2312 2013-08-27 01:27:05 +02:00
Georg Ehrke 6f0c1e8d45 Merge master into oc_preview 2013-08-26 12:24:33 +02:00
Jenkins for ownCloud d587146a5a [tx-robot] updated from transifex 2013-08-25 19:21:52 -04:00
Georg Ehrke 6ffa2a28d0 Merge branch 'master' into oc_preview 2013-08-23 23:10:37 +02:00
Jenkins for ownCloud 02b2b5a808 [tx-robot] updated from transifex 2013-08-22 10:37:23 -04:00
Georg Ehrke 224b80f906 move isMimeSupported out of template files 2013-08-21 15:55:59 +02:00
Jenkins for ownCloud a89199cc7b [tx-robot] updated from transifex 2013-08-21 08:14:27 -04:00
Thomas Müller 884c6b5a82 Merge pull request #4512 from owncloud/readdir-strict-equals
use strict equals in readdir loops to prevent issues with '0' files
2013-08-20 01:17:25 -07:00
Jenkins for ownCloud e9644c2f52 [tx-robot] updated from transifex 2013-08-19 15:14:38 -04:00
Georg Ehrke d9e8ebabdc outsource sharing and deleted files previews to apps 2013-08-19 13:24:07 +02:00
Robin Appelman c5402f4575 use strict equals in readdir loops to prevent issues with '0' files 2013-08-19 12:04:53 +02:00
Georg Ehrke f2702ff1ca Merge master into oc_preview 2013-08-19 11:24:17 +02:00
Björn Schießle 9be836814c Merge pull request #4239 from owncloud/decrypt_files_again
Enable user to decrypt files again after encryption app was disabled
2013-08-18 09:51:48 -07:00
kondou 9e8a6b704d Add _many_ newlines at the end of files 2013-08-18 11:06:59 +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
Thomas Müller de52157e76 remove ru_RU - fixes #3135 2013-08-17 11:43:37 +02:00
Jenkins for ownCloud 6bd0ba79df [tx-robot] updated from transifex 2013-08-16 01:32:30 -04:00
Thomas Müller ada13a4d40 fixing all broken translation files 2013-08-15 15:41:45 +02:00
Jenkins for ownCloud 680ac48856 [tx-robot] updated from transifex 2013-08-15 04:53:54 -04:00
Georg Ehrke 4b5fb08c2c Merge master into oc_preview 2013-08-14 20:56:44 +02:00
Jörn Friedrich Dreyer 8f3f47e868 Merge pull request #4376 from owncloud/use_plurals
Use plural translations
2013-08-14 10:23:19 -07:00
Jenkins for ownCloud 9492aeffe9 [tx-robot] updated from transifex 2013-08-13 09:13:11 -04:00
kondou 9549bd3e68 Use plural translations 2013-08-09 20:37:18 +02:00
Jenkins for ownCloud 98f836363a [tx-robot] updated from transifex 2013-08-09 08:06:31 -04:00
Jenkins for ownCloud 0deae7b86f [tx-robot] updated from transifex 2013-08-07 09:04:32 -04:00
Georg Ehrke af983b843d fix merge conflicts 2013-08-05 14:27:38 +02:00
Jenkins for ownCloud 17fe748abc [tx-robot] updated from transifex 2013-08-03 01:56:46 -04:00
Jörn Friedrich Dreyer 895d9ba1b9 Merge pull request #3006 from owncloud/===_and_!==_in_files_trashbin-app
Use !== and === in files_trashbin app
2013-08-02 03:14:24 -07:00
Jenkins for ownCloud 16726ab793 [tx-robot] updated from transifex 2013-08-02 02:00:45 -04:00
Jenkins for ownCloud b037f2dc6e [tx-robot] updated from transifex 2013-08-01 01:57:04 -04:00
Jenkins for ownCloud 761f40328c [tx-robot] updated from transifex 2013-07-31 02:01:45 -04:00
Bjoern Schiessle 6f20e081e4 added missing isEmpty ajax file 2013-07-30 12:48:41 +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
Georg Ehrke 2ea8ee6139 add class='preview-icon' in trashbin app as well 2013-07-29 16:27:40 +02:00
Björn Schießle 2c8e5ec84f user interface to allow user to decrypt all his files once the encryption app was disabled
Conflicts:
	settings/templates/personal.php
2013-07-29 13:36:06 +02:00
Björn Schießle 0a9bb8ba73 reduce time for auto expire to 30 days by default 2013-07-26 15:15:47 +02:00
Björn Schießle efd8ad6696 found some more places where we can disable buttons while performing a action 2013-07-26 14:54:27 +02:00
Björn Schießle 9d24b9c7e8 Hide Delete Permanently button when Restore happens 2013-07-26 13:17:09 +02:00
Björn Schießle a5d9b985c3 make 'restored' extension translatable 2013-07-26 12:01:45 +02:00
Björn Schießle 0182a503a6 expire trash bin if trash bin exceeds max size after a new file was added to ownCloud 2013-07-26 11:45:38 +02:00
Björn Schießle a00cff7c05 disable "deleted files" button if trash bin is empty 2013-07-26 11:14:29 +02:00