summaryrefslogtreecommitdiffstats
path: root/apps/files_trashbin
Commit message (Expand)AuthorAgeFilesLines
* 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
* Added missing "files" JS to files_trashbin moduleVincent Petry2013-09-131-0/+1
* Ajax calls for "files" and "files_trashbin" appsVincent Petry2013-09-138-83/+209
* Merge pull request #4719 from owncloud/port_4701_masterThomas Müller2013-09-121-15/+16
|\
| * 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 a...Thomas Müller2013-09-121-0/+1
* | [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
|\
| * 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
| |\
| | * Reimplement filesummary in JSkondou2013-08-281-0/+2
| * | 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 i...Bjoern Schiessle2013-08-271-4/+5
| * 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' 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
| |\
| | * Merge branch 'master' into decrypt_files_againBjoern Schiessle2013-08-1775-359/+501
| | |\
| | * | user interface to allow user to decrypt all his files once the encryption app...Björn Schießle2013-07-291-1/+1
| * | | Add _many_ newlines at the end of fileskondou2013-08-183-3/+3
| | |/ | |/|
| * | remove ru_RU - fixes #3135Thomas Müller2013-08-171-7/+0
| * | [tx-robot] updated from transifexJenkins for ownCloud2013-08-168-17/+20
| * | fixing all broken translation filesThomas Müller2013-08-1564-128/+128
| * | [tx-robot] updated from transifexJenkins for ownCloud2013-08-1564-212/+130
* | | Merge master into oc_previewGeorg Ehrke2013-08-1466-75/+202
|\| |
| * | Merge pull request #4376 from owncloud/use_pluralsJörn Friedrich Dreyer2013-08-141-10/+2
| |\ \
| | * | Use plural translationskondou2013-08-091-10/+2
| * | | [tx-robot] updated from transifexJenkins for ownCloud2013-08-131-0/+1
| |/ /
| * | [tx-robot] updated from transifexJenkins for ownCloud2013-08-0965-65/+198
| * | [tx-robot] updated from transifexJenkins for ownCloud2013-08-071-0/+1
* | | fix merge conflictsGeorg Ehrke2013-08-0525-27/+57
|\| |