summaryrefslogtreecommitdiffstats
path: root/apps/files_trashbin
Commit message (Expand)AuthorAgeFilesLines
* 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
|\| |
| * | [tx-robot] updated from transifexJenkins for ownCloud2013-08-032-0/+2
| * | Merge pull request #3006 from owncloud/===_and_!==_in_files_trashbin-appJörn Friedrich Dreyer2013-08-028-27/+27
| |\ \
| | * | Use isIgnoredDir()kondou2013-07-101-1/+1
| | * | Use !== and === in files_trashbin-appkondou2013-07-108-27/+27
| * | | [tx-robot] updated from transifexJenkins for ownCloud2013-08-022-0/+2
| * | | [tx-robot] updated from transifexJenkins for ownCloud2013-08-015-0/+5
| * | | [tx-robot] updated from transifexJenkins for ownCloud2013-07-317-0/+7
| * | | added missing isEmpty ajax fileBjoern Schiessle2013-07-301-0/+14
* | | | Merge branch 'master' into oc_previewThomas Müller2013-07-304-42/+114
|\| | |
| * | | reduce time for auto expire to 30 days by defaultBjörn Schießle2013-07-261-1/+1
| * | | found some more places where we can disable buttons while performing a actionBjörn Schießle2013-07-261-6/+18
| * | | Hide Delete Permanently button when Restore happensBjörn Schießle2013-07-261-0/+4
| * | | make 'restored' extension translatableBjörn Schießle2013-07-261-2/+3
| * | | expire trash bin if trash bin exceeds max size after a new file was added to ...Björn Schießle2013-07-262-7/+34
| * | | disable "deleted files" button if trash bin is emptyBjörn Schießle2013-07-261-0/+15