summaryrefslogtreecommitdiffstats
path: root/apps/files_trashbin
Commit message (Expand)AuthorAgeFilesLines
...
* | 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
| * | | don't move empty folders to the trash binBjörn Schießle2013-07-251-0/+5
| * | | nicer format of unique names, use 'file (restored).txt' instead of 'files.txt...Björn Schießle2013-07-251-32/+39
| | |/ | |/|
| * | [tx-robot] updated from transifexJenkins for ownCloud2013-07-141-0/+1
| |/
* | add class='preview-icon' in trashbin app as wellGeorg Ehrke2013-07-292-2/+6
* | merge conflicts ...Georg Ehrke2013-07-108-334/+341
|\|
| * Encode current trashbin directoryVictor Dubiniuk2013-07-091-3/+6
| * Migrate to encodePathVictor Dubiniuk2013-07-092-6/+3
| * Merge pull request #3757 from owncloud/icon-cleanupJan-Christoph Borchardt2013-07-082-4/+4
| |\
| | * use history icon in Deleted Files template as wellJan-Christoph Borchardt2013-06-172-2/+2
| | * remove unused loading spinners, just have oneJan-Christoph Borchardt2013-06-171-2/+2
| | * use consistent icon for 'restore'/versions/history, also SVGJan-Christoph Borchardt2013-06-171-1/+1
| * | [tx-robot] updated from transifexJenkins for ownCloud2013-07-081-2/+2
| * | make trash bin aware of system wide mounts with respect to encryption keysBjörn Schießle2013-07-051-7/+21
| * | [tx-robot] updated from transifexJenkins for ownCloud2013-06-251-0/+1
| * | Merge branch 'master' into fix_glob_escapingBjörn Schießle2013-06-171-1/+8
| |\ \
| * | | fix indentionBjörn Schießle2013-06-141-319/+310
| * | | only escape glob patternBjörn Schießle2013-06-141-5/+7
| | |/ | |/|
* | | properly encode pathGeorg Ehrke2013-07-101-1/+1