aboutsummaryrefslogtreecommitdiffstats
path: root/apps/files_trashbin
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into appframework-masterThomas Müller2013-09-271-2/+2
|\
| * [tx-robot] updated from transifexJenkins for ownCloud2013-09-271-2/+2
| |
* | Merge branch 'master' into appframework-masterThomas Müller2013-09-2527-11/+162
|\| | | | | | | | | | | Conflicts: apps/files/lib/helper.php apps/files_trashbin/lib/helper.php
| * [tx-robot] updated from transifexJenkins for ownCloud2013-09-221-2/+2
| |
| * Merge pull request #4927 from owncloud/fix_namespaces_and_autoloadingThomas Müller2013-09-215-9/+9
| |\ | | | | | | namespaces use upcasefirst parts
| | * remove unneccessary lib in namespaceJörn Friedrich Dreyer2013-09-201-2/+2
| | |
| | * namespaces use upcasefirst partsJörn Friedrich Dreyer2013-09-205-9/+9
| | | | | | | | | | | | | | | 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!
| * | [tx-robot] updated from transifexJenkins for ownCloud2013-09-202-2/+3
| |/
| * [tx-robot] updated from transifexJenkins for ownCloud2013-09-1820-0/+150
| |
* | use \OC::$server->getPreviewManager() instead of \OCP\PreviewThomas Müller2013-09-171-1/+1
|/
* Merge pull request #4501 from owncloud/ajaxfilelistThomas Müller2013-09-148-81/+228
|\ | | | | Ajax calls for "files" and "files_trashbin" apps
| * Fixed files_trashbin to also use hash URL part for IE8Vincent Petry2013-09-132-2/+27
| |
| * Use hash part of URL for IE8 in files appVincent Petry2013-09-131-7/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * Added missing "files" JS to files_trashbin moduleVincent Petry2013-09-131-0/+1
| | | | | | | | | | | | | | 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.
| * Ajax calls for "files" and "files_trashbin" appsVincent Petry2013-09-138-83/+209
| | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | [tx-robot] updated from transifexJenkins for ownCloud2013-09-131-2/+3
|/
* Merge pull request #4719 from owncloud/port_4701_masterThomas Müller2013-09-121-15/+16
|\ | | | | Always check variable type before using readdir to avoid surprises
| * Always check variable type before using readdir to avoid surprisesArthur Schiwon2013-09-041-15/+16
| |
* | adding calls to \OCA\files\lib\Helper::determineIcon($i) in files, trashbin ↵Thomas Müller2013-09-121-0/+1
| | | | | | | | and sharing
* | [tx-robot] updated from transifexJenkins for ownCloud2013-09-103-6/+8
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2013-09-081-2/+3
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2013-09-071-2/+2
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2013-09-052-4/+4
|/
* [tx-robot] updated from transifexJenkins for ownCloud2013-09-031-2/+3
|
* Merge pull request #4671 from owncloud/emptycontentBernhard Posselt2013-09-011-1/+1
|\ | | | | centers text message in empty-content page (files and files_trashbin apps)
| * rename emptyfolder to emptycontentAlessandro Cosentino2013-08-311-1/+1
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2013-09-012-3/+3
|/
* Merge master into oc_previewGeorg Ehrke2013-08-301-2/+2
|\
| * [tx-robot] updated from transifexJenkins for ownCloud2013-08-301-2/+2
| |
* | Merge master into oc_previewGeorg Ehrke2013-08-294-26/+13
|\|
| * Merge pull request #3926 from owncloud/improve_filesummaryThomas Müller2013-08-281-0/+2
| |\ | | | | | | Improve filelist summary
| | * Reimplement filesummary in JSkondou2013-08-281-0/+2
| | | | | | | | | | | | Fix #993
| * | also move empty folders to the trash bin as discussed here #4590Bjoern Schiessle2013-08-281-5/+0
| |/
| * [tx-robot] updated from transifexJenkins for ownCloud2013-08-271-5/+6
| |
| * the trash bin can also contain empty files. Don't use the trash bin size as ↵Bjoern Schiessle2013-08-271-4/+5
| | | | | | | | indicator to decide if the trash bin is empty or not
| * kill zh_CN.GB2312Thomas Müller2013-08-271-12/+0
| |
* | Merge master into oc_previewGeorg Ehrke2013-08-262-4/+5
|\|
| * [tx-robot] updated from transifexJenkins for ownCloud2013-08-252-4/+5
| |
* | Merge branch 'master' into oc_previewGeorg Ehrke2013-08-2311-21/+23
|\|
| * [tx-robot] updated from transifexJenkins for ownCloud2013-08-222-4/+4
| |
| * [tx-robot] updated from transifexJenkins for ownCloud2013-08-211-2/+2
| |
| * Merge pull request #4512 from owncloud/readdir-strict-equalsThomas Müller2013-08-201-1/+1
| |\ | | | | | | use strict equals in readdir loops to prevent issues with '0' files
| | * use strict equals in readdir loops to prevent issues with '0' filesRobin Appelman2013-08-191-1/+1
| | |
| * | [tx-robot] updated from transifexJenkins for ownCloud2013-08-197-14/+16
| |/
* | move isMimeSupported out of template filesGeorg Ehrke2013-08-212-2/+7
| |
* | outsource sharing and deleted files previews to appsGeorg Ehrke2013-08-192-0/+47
| |
* | Merge master into oc_previewGeorg Ehrke2013-08-1969-224/+138
|\|
| * Merge pull request #4239 from owncloud/decrypt_files_againBjörn Schießle2013-08-181-1/+1
| |\ | | | | | | Enable user to decrypt files again after encryption app was disabled
| | * Merge branch 'master' into decrypt_files_againBjoern Schiessle2013-08-1775-359/+501
| | |\ | | | | | | | | | | | | | | | | Conflicts: apps/files_encryption/tests/keymanager.php
| | * | user interface to allow user to decrypt all his files once the encryption ↵Björn Schießle2013-07-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | app was disabled Conflicts: settings/templates/personal.php