Georg Ehrke
|
af983b843d
|
fix merge conflicts
|
2013-08-05 14:27:38 +02: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 |
|
Thomas Müller
|
7425efade7
|
Merge branch 'master' into oc_preview
Conflicts:
3rdparty
lib/template.php
|
2013-07-30 00:34:36 +02:00 |
|
Georg Ehrke
|
2ea8ee6139
|
add class='preview-icon' in trashbin app as well
|
2013-07-29 16:27:40 +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 |
|
Georg Ehrke
|
a357e5b284
|
merge conflicts ...
|
2013-07-10 12:41:53 +02:00 |
|
Georg Ehrke
|
cf449d42e8
|
properly encode path
|
2013-07-10 12:30:20 +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 |
|
Georg Ehrke
|
d699135c5e
|
fix for previews in trashbin app
|
2013-07-08 15:14:25 +02:00 |
|
Georg Ehrke
|
04292ff16c
|
implement use of preview icons in thrashbin app
|
2013-07-08 10:53:53 +02: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 |