Commit graph

262 commits

Author SHA1 Message Date
Jenkins for ownCloud
0deae7b86f [tx-robot] updated from transifex 2013-08-07 09:04:32 -04:00
Jenkins for ownCloud
17fe748abc [tx-robot] updated from transifex 2013-08-03 01:56:46 -04:00
Jörn Friedrich Dreyer
895d9ba1b9 Merge pull request #3006 from owncloud/===_and_!==_in_files_trashbin-app
Use !== and === in files_trashbin app
2013-08-02 03:14:24 -07:00
Jenkins for ownCloud
16726ab793 [tx-robot] updated from transifex 2013-08-02 02:00:45 -04:00
Jenkins for ownCloud
b037f2dc6e [tx-robot] updated from transifex 2013-08-01 01:57:04 -04:00
Jenkins for ownCloud
761f40328c [tx-robot] updated from transifex 2013-07-31 02:01:45 -04:00
Bjoern Schiessle
6f20e081e4 added missing isEmpty ajax file 2013-07-30 12:48:41 +02:00
Björn Schießle
0a9bb8ba73 reduce time for auto expire to 30 days by default 2013-07-26 15:15:47 +02:00
Björn Schießle
efd8ad6696 found some more places where we can disable buttons while performing a action 2013-07-26 14:54:27 +02:00
Björn Schießle
9d24b9c7e8 Hide Delete Permanently button when Restore happens 2013-07-26 13:17:09 +02:00
Björn Schießle
a5d9b985c3 make 'restored' extension translatable 2013-07-26 12:01:45 +02:00
Björn Schießle
0182a503a6 expire trash bin if trash bin exceeds max size after a new file was added to ownCloud 2013-07-26 11:45:38 +02:00
Björn Schießle
a00cff7c05 disable "deleted files" button if trash bin is empty 2013-07-26 11:14:29 +02:00
Björn Schießle
96e175ffbf don't move empty folders to the trash bin 2013-07-25 16:27:40 +02:00
Björn Schießle
bf668eb14f nicer format of unique names, use 'file (restored).txt' instead of 'files.txt.restored' 2013-07-25 16:20:06 +02:00
Jenkins for ownCloud
29d8ae2f95 [tx-robot] updated from transifex 2013-07-14 02:10:41 +02:00
kondou
70b4f85911 Use isIgnoredDir() 2013-07-10 02:36:43 +02:00
kondou
2f11f56d32 Use !== and === in files_trashbin-app 2013-07-10 02:34:00 +02:00
Victor Dubiniuk
257096f1d4 Encode current trashbin directory 2013-07-09 17:46:11 +03:00
Victor Dubiniuk
582631323a Migrate to encodePath 2013-07-09 17:46:11 +03:00
Jan-Christoph Borchardt
8d8f99fbc4 Merge pull request #3757 from owncloud/icon-cleanup
Icon cleanup
2013-07-08 06:56:29 -07:00
Jenkins for ownCloud
3cb4a72960 [tx-robot] updated from transifex 2013-07-08 02:09:41 +02:00
Björn Schießle
ae30eb48f2 make trash bin aware of system wide mounts with respect to encryption keys 2013-07-05 16:00:25 +02:00
Jenkins for ownCloud
c3b8f2bf64 [tx-robot] updated from transifex 2013-06-25 02:13:40 +02:00
Björn Schießle
99c62dfd76 Merge branch 'master' into fix_glob_escaping
Conflicts:
	apps/files_trashbin/lib/trash.php
2013-06-17 14:51:08 +02:00
Jan-Christoph Borchardt
2a57763542 use history icon in Deleted Files template as well 2013-06-17 13:30:57 +02:00
Jan-Christoph Borchardt
d9dcba9a39 remove unused loading spinners, just have one 2013-06-17 12:35:25 +02:00
Jan-Christoph Borchardt
257ebc2830 use consistent icon for 'restore'/versions/history, also SVG 2013-06-17 12:18:45 +02:00
Morris Jobke
c99e7e97a3 Merge pull request #3301 from bastho/fix_filestrashbin_missing-sub-folder
Fix inexisting trashbin's sub-folders
2013-06-15 01:31:32 -07:00
Björn Schießle
c3371812a0 fix indention 2013-06-14 15:14:23 +02:00
Björn Schießle
f91b02e9b6 only escape glob pattern 2013-06-14 15:07:06 +02:00
Jenkins for ownCloud
67c085417c [tx-robot] updated from transifex 2013-06-07 02:17:50 +02:00
Jenkins for ownCloud
666a5c1cc7 [tx-robot] updated from transifex 2013-06-05 02:01:42 +02:00
Georg Ehrke
841b420bc4 add event.preventDefault to undelete function 2013-05-27 16:37:43 +02:00
Georg Ehrke
d408cd7f37 fix https://github.com/owncloud/core/issues/3320 2013-05-27 15:24:37 +02:00
Jenkins for ownCloud
6a6c18dfab [tx-robot] updated from transifex 2013-05-25 02:11:52 +02:00
Thomas Müller
4911305887 Merge pull request #3416 from owncloud/files_encryption
New files encryption app
2013-05-24 02:21:19 -07:00
Jenkins for ownCloud
b47729c5fc [tx-robot] updated from transifex 2013-05-24 02:02:43 +02:00
Florin Peter
842d0608f1 added static function registerHooks() for better unit tests handling 2013-05-22 23:50:45 +02:00
Björn Schießle
5cd14425f9 Merge branch 'master' into files_encryption
Conflicts:
	apps/files_trashbin/l10n/nn_NO.php
2013-05-21 15:30:19 +02:00
Jenkins for ownCloud
afdad5c74d [tx-robot] updated from transifex 2013-05-21 02:04:52 +02:00
Florin Peter
31037241e1 Merge branch 'master' into files_encryption 2013-05-20 02:25:56 +02:00
Jenkins for ownCloud
6609de28d8 [tx-robot] updated from transifex 2013-05-20 02:10:11 +02:00
Jenkins for ownCloud
9428d813ba [tx-robot] updated from transifex 2013-05-18 02:03:28 +02:00
Florin Peter
01f1153b08 Merge branch 'files_encryption' of https://github.com/owncloud/core into 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
2013-05-15 10:18:25 +02:00
Björn Schießle
0ef8590773 Merge branch 'master' into update_etags_on_restore 2013-05-13 10:48:06 +02:00
Jenkins for ownCloud
74f92d0c7f [tx-robot] updated from transifex 2013-05-12 02:05:29 +02:00
Björn Schießle
cc433d47cb touch() needs to be performed relative to user/files otherwise ownCloud doesn't execute the hooks which means that etags aren't updated properly 2013-05-10 12:05:11 +02:00
Bastien Ho
bb640df06e duplicate verification 2013-05-10 11:16:18 +02:00
Bastien Ho
6082a09e62 Fix inexisting trashbin's sub-folders 2013-05-10 11:12:42 +02:00