summaryrefslogtreecommitdiffstats
path: root/apps/files_trashbin/lib
Commit message (Collapse)AuthorAgeFilesLines
* Merge master into oc_previewGeorg Ehrke2013-08-291-9/+5
|\
| * also move empty folders to the trash bin as discussed here #4590Bjoern Schiessle2013-08-281-5/+0
| |
| * 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
* | Merge master into oc_previewGeorg Ehrke2013-08-191-1/+1
|\|
| * Merge branch 'master' into decrypt_files_againBjoern Schiessle2013-08-172-42/+97
| |\ | | | | | | | | | | | | 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
* | | fix merge conflictsGeorg Ehrke2013-08-051-2/+2
|\ \ \ | | |/ | |/|
| * | Merge pull request #3006 from owncloud/===_and_!==_in_files_trashbin-appJörn Friedrich Dreyer2013-08-021-2/+2
| |\ \ | | | | | | | | Use !== and === in files_trashbin app
| | * | Use !== and === in files_trashbin-appkondou2013-07-101-2/+2
| | |/
* | | Merge branch 'master' into oc_previewThomas Müller2013-07-302-40/+95
|\| | | | | | | | | | | | | | | | | Conflicts: 3rdparty lib/template.php
| * | reduce time for auto expire to 30 days by defaultBjörn Schießle2013-07-261-1/+1
| | |
| * | 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'
* | add class='preview-icon' in trashbin app as wellGeorg Ehrke2013-07-291-1/+1
| |
* | merge conflicts ...Georg Ehrke2013-07-101-319/+325
|\|
| * make trash bin aware of system wide mounts with respect to encryption keysBjörn Schießle2013-07-051-7/+21
| |
| * Merge branch 'master' into fix_glob_escapingBjörn Schießle2013-06-171-1/+8
| |\ | | | | | | | | | | | | Conflicts: apps/files_trashbin/lib/trash.php
| * | 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
| | |
* | | implement use of preview icons in thrashbin appGeorg Ehrke2013-07-081-0/+4
| |/ |/|
* | 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
| |
* | added static function registerHooks() for better unit tests handlingFlorin Peter2013-05-221-1/+10
| |
* | Merge branch 'files_encryption' of https://github.com/owncloud/core into ↵Florin Peter2013-05-151-68/+122
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | |
| * | disable proxys before copying files to the trash binBjörn Schießle2013-05-031-1/+5
| | |
| * | get original path in case of shared files when restoring file from trash binBjörn Schießle2013-05-031-18/+23
| | |
| * | get original path in case of shared filesBjörn Schießle2013-05-031-15/+30
| | |
| * | merged files_trashbinFlorin Peter2013-05-011-86/+309
| | |
| * | revert changes to fbbc76f281f50afa3072d99e4e0d413df835b3d3 because master is ↵Florin Peter2013-05-011-309/+86
| |/ | | | | | | very unstable right now
* / touch() needs to be performed relative to user/files otherwise ownCloud ↵Björn Schießle2013-05-101-1/+4
|/ | | | doesn't execute the hooks which means that etags aren't updated properly
* delete and restore of versions and share-keys now worksFlorin Peter2013-04-281-20/+37
| | | | fix restore of the same file name
* added handling for share-keysFlorin Peter2013-04-281-13/+88
| | | | this works only with latest files_encryption branch up from 813641e6e86601cc73da0f00d8430da62e872180
* restore fixedFlorin Peter2013-04-281-22/+40
|
* fixed some problems and broken codeFlorin Peter2013-04-281-42/+83
|
* restore encryption keys from trash bin (development snapshot)Björn Schießle2013-04-281-45/+72
|
* move encryption keys to trash binBjörn Schießle2013-04-281-31/+76
|
* improved free space calculation if no quota is set, discussed in #2936Björn Schießle2013-04-171-23/+43
|
* write a info message to the log if a file gets removed from the trash bin ↵Björn Schießle2013-04-161-0/+2
| | | | automatically
* cleanup the trash bin tables in the database after a user was deletedBjörn Schießle2013-04-112-0/+30
|
* only add filesize to trashbin size if the file was moved to the trash bin ↵Björn Schießle2013-04-101-2/+4
| | | | successfully
* add backticks around table namesBjörn Schießle2013-03-251-9/+9
|
* Add backtick for trash app to prevent pg errorsBrice Maron2013-03-151-11/+11
|
* make trashbin work with different user homesBjörn Schießle2013-03-041-4/+4
|
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-08 12:20:41 +0000