summaryrefslogtreecommitdiffstats
path: root/apps/files_trashbin
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2013-08-1564-212/+130
|
* Merge pull request #4376 from owncloud/use_pluralsJörn Friedrich Dreyer2013-08-141-10/+2
|\ | | | | Use plural translations
| * 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
|
* [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 !== and === in files_trashbin app
| * 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
| |
* | 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
| | | | | | | | ownCloud
* | 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 ↵Björn Schießle2013-07-251-32/+39
| | | | | | | | 'files.txt.restored'
* | [tx-robot] updated from transifexJenkins for ownCloud2013-07-141-0/+1
|/
* 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
|\ | | | | Icon cleanup
| * 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
|\ \ | | | | | | | | | | | | Conflicts: apps/files_trashbin/lib/trash.php
| * \ Merge pull request #3301 from bastho/fix_filestrashbin_missing-sub-folderMorris Jobke2013-06-151-2/+9
| |\ \ | | |/ | |/| Fix inexisting trashbin's sub-folders
| | * duplicate verificationBastien Ho2013-05-101-3/+0
| | |
| | * Fix inexisting trashbin's sub-foldersBastien Ho2013-05-101-2/+12
| | |
* | | fix indentionBjörn Schießle2013-06-141-319/+310
| | |
* | | only escape glob patternBjörn Schießle2013-06-141-5/+7
|/ /
* | [tx-robot] updated from transifexJenkins for ownCloud2013-06-072-9/+10
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2013-06-051-1/+10
| |
* | add event.preventDefault to undelete functionGeorg Ehrke2013-05-271-0/+1
| |
* | fix https://github.com/owncloud/core/issues/3320Georg Ehrke2013-05-271-0/+1
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2013-05-256-9/+11
| |
* | Merge pull request #3416 from owncloud/files_encryptionThomas Müller2013-05-248-84/+143
|\ \ | | | | | | New files encryption app
| * | added static function registerHooks() for better unit tests handlingFlorin Peter2013-05-222-5/+12
| | |
| * | Merge branch 'master' into files_encryptionBjörn Schießle2013-05-212-2/+16
| |\ \ | | | | | | | | | | | | | | | | Conflicts: apps/files_trashbin/l10n/nn_NO.php
| * \ \ Merge branch 'master' into files_encryptionFlorin Peter2013-05-201-16/+1
| |\ \ \
| * \ \ \ Merge branch 'files_encryption' of https://github.com/owncloud/core into ↵Florin Peter2013-05-158-84/+131
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | files_encryption Conflicts: apps/files/l10n/ar.php apps/files/l10n/bn_BD.php apps/files/l10n/de.php apps/files/l10n/de_DE.php apps/files/l10n/el.php apps/files/l10n/es.php apps/files/l10n/fa.php apps/files/l10n/fr.php apps/files/l10n/gl.php apps/files/l10n/id.php apps/files/l10n/ko.php apps/files/l10n/nl.php apps/files/l10n/nn_NO.php apps/files/l10n/pl.php apps/files/l10n/pt_BR.php apps/files/l10n/pt_PT.php apps/files/l10n/ro.php apps/files/l10n/ru.php apps/files/l10n/sl.php apps/files/l10n/uk.php apps/files/l10n/vi.php apps/files_encryption/l10n/ca.php apps/files_sharing/lib/cache.php apps/files_sharing/lib/sharedstorage.php apps/user_ldap/l10n/tr.php core/l10n/cs_CZ.php core/l10n/de.php core/l10n/de_DE.php core/l10n/ru.php core/l10n/sk_SK.php core/l10n/tr.php core/l10n/vi.php core/l10n/zh_CN.php l10n/af_ZA/files.po l10n/ar/files.po l10n/be/files.po l10n/bg_BG/files.po l10n/bn_BD/files.po l10n/ca/files.po l10n/ca/files_encryption.po l10n/cs_CZ/core.po l10n/cs_CZ/files.po l10n/da/files.po l10n/da/settings.po l10n/de/core.po l10n/de/files.po l10n/de/files_encryption.po l10n/de/files_external.po l10n/de/files_sharing.po l10n/de/files_trashbin.po l10n/de/files_versions.po l10n/de/lib.po l10n/de/settings.po l10n/de/user_ldap.po l10n/de_DE/files.po l10n/de_DE/files_encryption.po l10n/de_DE/files_external.po l10n/de_DE/files_sharing.po l10n/de_DE/files_trashbin.po l10n/de_DE/lib.po l10n/de_DE/settings.po l10n/de_DE/user_ldap.po l10n/el/files.po l10n/eo/files.po l10n/es/files.po l10n/es/lib.po l10n/es/settings.po l10n/es_AR/files.po l10n/eu/files.po l10n/fa/files.po l10n/fi/files.po l10n/fi_FI/files.po l10n/fr/core.po l10n/fr/files.po l10n/gl/files.po l10n/gl/settings.po l10n/he/core.po l10n/he/files.po l10n/he/user_ldap.po l10n/hi/files.po l10n/hr/files.po l10n/hu_HU/core.po l10n/hu_HU/files.po l10n/hu_HU/files_external.po l10n/hu_HU/settings.po l10n/hy/files.po l10n/ia/core.po l10n/ia/files.po l10n/ia/files_trashbin.po l10n/ia/settings.po l10n/id/files.po l10n/is/files.po l10n/it/files.po l10n/ja_JP/files.po l10n/ja_JP/user_ldap.po l10n/ka/files.po l10n/ka_GE/files.po l10n/kn/files.po l10n/ko/files.po l10n/ko/files_trashbin.po l10n/ko/settings.po l10n/ku_IQ/files.po l10n/lb/files.po l10n/lt_LT/core.po l10n/lt_LT/files.po l10n/lv/files.po l10n/mk/files.po l10n/ms_MY/files.po l10n/my_MM/files.po l10n/nb_NO/files.po l10n/ne/files.po l10n/nl/core.po l10n/nl/files.po l10n/nn_NO/files.po l10n/oc/files.po l10n/pl/files.po l10n/pl_PL/files.po l10n/pt_BR/files.po l10n/pt_PT/core.po l10n/pt_PT/files.po l10n/pt_PT/files_external.po l10n/pt_PT/settings.po l10n/ro/files.po l10n/ru/core.po l10n/ru/files.po l10n/si_LK/files.po l10n/sk/files.po l10n/sk_SK/core.po l10n/sk_SK/files.po l10n/sl/core.po l10n/sl/files.po l10n/sq/files.po l10n/sr/files.po l10n/sr@latin/files.po l10n/sv/files.po l10n/sw_KE/files.po l10n/ta_LK/files.po l10n/te/files.po l10n/th_TH/files.po l10n/tr/core.po l10n/tr/files.po l10n/tr/lib.po l10n/tr/settings.po l10n/tr/user_ldap.po l10n/uk/files.po l10n/ur_PK/files.po l10n/vi/core.po l10n/vi/files.po l10n/vi/files_external.po l10n/zh_CN.GB2312/files.po l10n/zh_CN/core.po l10n/zh_CN/files.po l10n/zh_CN/settings.po l10n/zh_HK/files.po l10n/zh_TW/core.po l10n/zh_TW/files.po l10n/zh_TW/files_versions.po l10n/zh_TW/settings.po l10n/zh_TW/user_ldap.po lib/base.php lib/files/filesystem.php lib/files/view.php lib/public/share.php settings/l10n/es.php settings/l10n/pt_PT.php settings/l10n/tr.php settings/l10n/zh_CN.php settings/personal.php
| | * | | | make sure to find the correct path for shared filesBjörn Schießle2013-05-031-9/+19
| | | | | |
| | * | | | remove encryption keys if a file gets deleted permanentlyBjörn Schießle2013-05-031-26/+46
| | | | | |