83ec234f53
[tx-robot] updated from transifex
2013-12-02 17:28:29 -05:00
ee66db447f
make it possible to select folders
2013-12-02 16:30:03 +01:00
fac2f2a626
check explicitely all possible dir values
2013-12-02 12:13:32 +01:00
edc4447d6a
set delete all to true if a complete folder was deleted
2013-12-02 11:59:09 +01:00
8ce3ea3e2c
fix delete files from trash bin
2013-12-02 11:50:55 +01:00
71589e65d2
fix restore from files in sub-folders
2013-11-29 16:43:50 +01:00
b3724cd9c6
remove duplicate
2013-11-28 20:58:32 +01:00
863aedf784
detect mimetype from the original filename, without the delete timestamp
2013-11-28 18:59:12 +01:00
34a8c3c4cd
Merge pull request #6039 from owncloud/trashbin_move_file_to_owners_trash
...
move files to owners trash
2013-11-27 10:24:55 -08:00
5d2299eab8
only create complete share key if we know the exact path
2013-11-26 13:30:59 +01:00
f8fcd567a7
move files to owners trash
2013-11-25 16:51:31 +01:00
31d0ba0344
Merge pull request #5641 from owncloud/filestrash-emptytrash
...
Deleting all files in trash now only sends a single flag
2013-11-25 05:24:11 -08:00
c67b8f2b22
fixed documentation
2013-11-22 14:58:36 +01:00
5d9731cef2
[tx-robot] updated from transifex
2013-11-21 10:05:34 -05:00
c3746e866a
[tx-robot] updated from transifex
2013-11-15 22:56:31 -05:00
90fac1f371
replace $path with '/files_trashbin/files/' . $file
2013-11-12 14:03:50 +01:00
feee4b865b
add delete hook for trash bin app
2013-11-12 14:00:36 +01:00
80c8666d3a
Deleting all files in trash now only sends a single flag
...
To prevent having to send the list of all files for deletion, only set a
flag "allfiles". This should make it a bit smoother when deleting 5000+
files.
Also fixes some "empty trash" message issues.
2013-11-11 17:58:33 +01:00
e431ba5ce8
[tx-robot] updated from transifex
2013-11-11 05:47:59 -05:00
e89f080f09
[tx-robot] updated from transifex
2013-11-03 14:39:28 -05:00
b0b76fe064
[tx-robot] updated from transifex
2013-10-29 07:31:51 -04:00
e41ea20ce4
Fixed clicking on the "Home" breadcrumb in the trash app
...
Clicking on the "home" breadcrumb now correctly brings the user back to
the files app.
2013-10-28 20:24:06 +01:00
119ecc6f34
[tx-robot] updated from transifex
2013-10-27 02:32:11 -04:00
6aee83cadf
[tx-robot] updated from transifex
2013-10-19 08:27:13 -04:00
b2986e1994
Merge pull request #5274 from owncloud/files-ie8-deletecheckbox
...
Fixed delete icon alignment in IE8
2013-10-11 08:24:57 -07:00
39b150921d
Moved IE8 inline styles in files.css
2013-10-11 14:10:00 +02:00
44a5b0bad0
[tx-robot] updated from transifex
2013-10-10 22:30:58 -04:00
75629a1f00
Fixed delete icon alignment in IE8
...
Removed old inline CSS that forced every td to have position:static in
the files app. (#5056 )
2013-10-11 00:16:41 +02:00
7ab4fef7a9
update file summary after group delete/restore
2013-10-09 16:17:43 +02:00
46bce8e540
fix checkbox
2013-10-09 13:15:53 +02:00
51cfdb32b1
fix indention
2013-10-09 12:43:56 +02:00
31a91ef892
fix group delete/restore
2013-10-09 12:35:15 +02:00
9e3d28871e
fix delete/restore individual files
2013-10-09 12:01:25 +02:00
4404963918
fix trashbin layout
2013-10-09 11:11:55 +02:00
c655eec3d1
[tx-robot] updated from transifex
2013-10-07 12:21:38 -04:00
3613e79e10
[tx-robot] updated from transifex
2013-10-06 19:16:10 -04:00
a711399e62
[tx-robot] updated from transifex
2013-09-30 10:19:22 -04:00
687ba053b7
Merge branch 'master' into appframework-master
2013-09-27 14:25:47 +02:00
f31d31844e
[tx-robot] updated from transifex
2013-09-27 00:02:30 -04:00
db39fede97
Merge branch 'master' into appframework-master
...
Conflicts:
apps/files/lib/helper.php
apps/files_trashbin/lib/helper.php
2013-09-25 09:52:12 +02:00
28918d61d2
[tx-robot] updated from transifex
2013-09-22 12:58:42 -04:00
2a0c51a8bf
Merge pull request #4927 from owncloud/fix_namespaces_and_autoloading
...
namespaces use upcasefirst parts
2013-09-21 11:54:06 -07:00
5b95e7aa0f
[tx-robot] updated from transifex
2013-09-20 10:50:14 -04:00
4b3e56bcf9
remove unneccessary lib in namespace
2013-09-20 16:46:33 +02:00
9e39118b52
namespaces use upcasefirst parts
...
when _ is left in namespace and files are named after their classes the autoloader will also find classes in the lib folder of an app
its magic!
2013-09-20 16:37:07 +02:00
6b1843d91b
[tx-robot] updated from transifex
2013-09-18 11:50:02 -04:00
9b420e8660
use \OC::$server->getPreviewManager() instead of \OCP\Preview
2013-09-17 13:33:47 +02:00
a0c2c2473a
Merge pull request #4501 from owncloud/ajaxfilelist
...
Ajax calls for "files" and "files_trashbin" apps
2013-09-14 12:51:16 -07:00
556bd1ef23
[tx-robot] updated from transifex
2013-09-13 21:49:24 -04:00
ec2f20f720
Fixed files_trashbin to also use hash URL part for IE8
2013-09-13 21:00:15 +02:00
30a2f2f352
Use hash part of URL for IE8 in files app
...
Before this fix, the URL wasn't updated in IE8 when navigating into
folders.
This fix makes use of the hash part of URLs to make this work in IE8,
since IE8 doesn't support the history API nor changing the URL without
redirecting.
From now, both the regular query URL "?dir=somedir" and "#?dir=somedir"
will work in both IE8 and non-IE8 browsers.
In IE8, query based URLs are automatically converted to hash URLs upon
page load. The conversion is done on the server side by redirecting the
user to the updated URL.
When loading a page directly using a hash URL in the form
"#?dir=somedir" in IE8, the server doesn't get the hash, so it will not
return any results in that case and rely on ajax to load the first page.
2013-09-13 20:48:35 +02:00
4549cf519e
Added missing "files" JS to files_trashbin module
...
The recent refactoring for the breadcrumb resizing relies on the "Files"
object which is in the "files" Javascript file.
This fix includes it here as well.
2013-09-13 19:59:15 +02:00
1304b511e9
Ajax calls for "files" and "files_trashbin" apps
...
Frontend:
- The files app list now uses ajax calls to refresh the list.
- Added support the browser back button (history API).
- Added mask + spinner while loading file list
Backend:
- Added utility function in core JS for parsing query strings.
- Moved file list + breadcrumb template data code to helper
functions
- Fixed some file paths in trashbin app to be similar to the files app
2013-09-13 19:59:14 +02:00
d5ddbfb045
Merge pull request #4719 from owncloud/port_4701_master
...
Always check variable type before using readdir to avoid surprises
2013-09-12 15:44:20 -07:00
9d661eab23
adding calls to \OCA\files\lib\Helper::determineIcon($i) in files, trashbin and sharing
2013-09-12 00:40:35 +02:00
72689f643b
[tx-robot] updated from transifex
2013-09-10 10:42:16 -04:00
92f6c3bb10
[tx-robot] updated from transifex
2013-09-08 21:37:53 -04:00
e895cf9188
[tx-robot] updated from transifex
2013-09-07 04:46:57 -04:00
0527fb05ad
[tx-robot] updated from transifex
2013-09-05 07:37:32 -04:00
ec3639dc7a
Always check variable type before using readdir to avoid surprises
2013-09-04 13:06:04 +02:00
fe0b8ac2c0
[tx-robot] updated from transifex
2013-09-03 07:46:55 -04:00
f038cb9aea
Merge pull request #4671 from owncloud/emptycontent
...
centers text message in empty-content page (files and files_trashbin apps)
2013-09-01 17:47:55 -07:00
e68b5f8b0d
[tx-robot] updated from transifex
2013-09-01 13:30:40 -04:00
b10a646bc8
rename emptyfolder to emptycontent
2013-08-31 11:25:11 -04:00
8ef40277b2
Merge master into oc_preview
2013-08-30 18:11:18 +02:00
dbc78b1a58
[tx-robot] updated from transifex
2013-08-30 09:38:20 -04:00
b7758d0f8d
Merge master into oc_preview
2013-08-29 10:50:55 +02:00
81cab5ada8
Merge pull request #3926 from owncloud/improve_filesummary
...
Improve filelist summary
2013-08-28 15:11:09 -07:00
aed71bb420
also move empty folders to the trash bin as discussed here #4590
2013-08-28 15:46:44 +02:00
6bd0f3cba7
Reimplement filesummary in JS
...
Fix #993
2013-08-28 15:10:17 +02:00
d5062b9e0e
[tx-robot] updated from transifex
2013-08-27 11:23:18 -04:00
316d9bfed6
the trash bin can also contain empty files. Don't use the trash bin size as indicator to decide if the trash bin is empty or not
2013-08-27 14:39:43 +02:00
c9123263ab
kill zh_CN.GB2312
2013-08-27 01:27:05 +02:00
6f0c1e8d45
Merge master into oc_preview
2013-08-26 12:24:33 +02:00
d587146a5a
[tx-robot] updated from transifex
2013-08-25 19:21:52 -04:00
6ffa2a28d0
Merge branch 'master' into oc_preview
2013-08-23 23:10:37 +02:00
02b2b5a808
[tx-robot] updated from transifex
2013-08-22 10:37:23 -04:00
224b80f906
move isMimeSupported out of template files
2013-08-21 15:55:59 +02:00
a89199cc7b
[tx-robot] updated from transifex
2013-08-21 08:14:27 -04:00
884c6b5a82
Merge pull request #4512 from owncloud/readdir-strict-equals
...
use strict equals in readdir loops to prevent issues with '0' files
2013-08-20 01:17:25 -07:00
e9644c2f52
[tx-robot] updated from transifex
2013-08-19 15:14:38 -04:00
d9e8ebabdc
outsource sharing and deleted files previews to apps
2013-08-19 13:24:07 +02:00
c5402f4575
use strict equals in readdir loops to prevent issues with '0' files
2013-08-19 12:04:53 +02:00
f2702ff1ca
Merge master into oc_preview
2013-08-19 11:24:17 +02:00
9be836814c
Merge pull request #4239 from owncloud/decrypt_files_again
...
Enable user to decrypt files again after encryption app was disabled
2013-08-18 09:51:48 -07:00
9e8a6b704d
Add _many_ newlines at the end of files
2013-08-18 11:06:59 +02:00
cabe92ef12
Merge branch 'master' into decrypt_files_again
...
Conflicts:
apps/files_encryption/tests/keymanager.php
2013-08-17 13:15:22 +02:00
de52157e76
remove ru_RU - fixes #3135
2013-08-17 11:43:37 +02:00
6bd0ba79df
[tx-robot] updated from transifex
2013-08-16 01:32:30 -04:00
ada13a4d40
fixing all broken translation files
2013-08-15 15:41:45 +02:00
680ac48856
[tx-robot] updated from transifex
2013-08-15 04:53:54 -04:00
4b5fb08c2c
Merge master into oc_preview
2013-08-14 20:56:44 +02:00
8f3f47e868
Merge pull request #4376 from owncloud/use_plurals
...
Use plural translations
2013-08-14 10:23:19 -07:00
9492aeffe9
[tx-robot] updated from transifex
2013-08-13 09:13:11 -04:00
9549bd3e68
Use plural translations
2013-08-09 20:37:18 +02:00
98f836363a
[tx-robot] updated from transifex
2013-08-09 08:06:31 -04:00
0deae7b86f
[tx-robot] updated from transifex
2013-08-07 09:04:32 -04:00
af983b843d
fix merge conflicts
2013-08-05 14:27:38 +02:00
17fe748abc
[tx-robot] updated from transifex
2013-08-03 01:56:46 -04:00
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
16726ab793
[tx-robot] updated from transifex
2013-08-02 02:00:45 -04:00
b037f2dc6e
[tx-robot] updated from transifex
2013-08-01 01:57:04 -04:00
761f40328c
[tx-robot] updated from transifex
2013-07-31 02:01:45 -04:00
6f20e081e4
added missing isEmpty ajax file
2013-07-30 12:48:41 +02:00
7425efade7
Merge branch 'master' into oc_preview
...
Conflicts:
3rdparty
lib/template.php
2013-07-30 00:34:36 +02:00
2ea8ee6139
add class='preview-icon' in trashbin app as well
2013-07-29 16:27:40 +02:00
2c8e5ec84f
user interface to allow user to decrypt all his files once the encryption app was disabled
...
Conflicts:
settings/templates/personal.php
2013-07-29 13:36:06 +02:00
0a9bb8ba73
reduce time for auto expire to 30 days by default
2013-07-26 15:15:47 +02:00
efd8ad6696
found some more places where we can disable buttons while performing a action
2013-07-26 14:54:27 +02:00
9d24b9c7e8
Hide Delete Permanently button when Restore happens
2013-07-26 13:17:09 +02:00
a5d9b985c3
make 'restored' extension translatable
2013-07-26 12:01:45 +02:00
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
a00cff7c05
disable "deleted files" button if trash bin is empty
2013-07-26 11:14:29 +02:00
96e175ffbf
don't move empty folders to the trash bin
2013-07-25 16:27:40 +02:00
bf668eb14f
nicer format of unique names, use 'file (restored).txt' instead of 'files.txt.restored'
2013-07-25 16:20:06 +02:00
29d8ae2f95
[tx-robot] updated from transifex
2013-07-14 02:10:41 +02:00
a357e5b284
merge conflicts ...
2013-07-10 12:41:53 +02:00
cf449d42e8
properly encode path
2013-07-10 12:30:20 +02:00
70b4f85911
Use isIgnoredDir()
2013-07-10 02:36:43 +02:00
2f11f56d32
Use !== and === in files_trashbin-app
2013-07-10 02:34:00 +02:00
257096f1d4
Encode current trashbin directory
2013-07-09 17:46:11 +03:00
582631323a
Migrate to encodePath
2013-07-09 17:46:11 +03:00
8d8f99fbc4
Merge pull request #3757 from owncloud/icon-cleanup
...
Icon cleanup
2013-07-08 06:56:29 -07:00
d699135c5e
fix for previews in trashbin app
2013-07-08 15:14:25 +02:00
04292ff16c
implement use of preview icons in thrashbin app
2013-07-08 10:53:53 +02:00
3cb4a72960
[tx-robot] updated from transifex
2013-07-08 02:09:41 +02:00
ae30eb48f2
make trash bin aware of system wide mounts with respect to encryption keys
2013-07-05 16:00:25 +02:00
c3b8f2bf64
[tx-robot] updated from transifex
2013-06-25 02:13:40 +02:00
99c62dfd76
Merge branch 'master' into fix_glob_escaping
...
Conflicts:
apps/files_trashbin/lib/trash.php
2013-06-17 14:51:08 +02:00
2a57763542
use history icon in Deleted Files template as well
2013-06-17 13:30:57 +02:00
d9dcba9a39
remove unused loading spinners, just have one
2013-06-17 12:35:25 +02:00
257ebc2830
use consistent icon for 'restore'/versions/history, also SVG
2013-06-17 12:18:45 +02:00
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
c3371812a0
fix indention
2013-06-14 15:14:23 +02:00
f91b02e9b6
only escape glob pattern
2013-06-14 15:07:06 +02:00
67c085417c
[tx-robot] updated from transifex
2013-06-07 02:17:50 +02:00
666a5c1cc7
[tx-robot] updated from transifex
2013-06-05 02:01:42 +02:00
841b420bc4
add event.preventDefault to undelete function
2013-05-27 16:37:43 +02:00
d408cd7f37
fix https://github.com/owncloud/core/issues/3320
2013-05-27 15:24:37 +02:00
6a6c18dfab
[tx-robot] updated from transifex
2013-05-25 02:11:52 +02:00
4911305887
Merge pull request #3416 from owncloud/files_encryption
...
New files encryption app
2013-05-24 02:21:19 -07:00
b47729c5fc
[tx-robot] updated from transifex
2013-05-24 02:02:43 +02:00
842d0608f1
added static function registerHooks() for better unit tests handling
2013-05-22 23:50:45 +02:00
5cd14425f9
Merge branch 'master' into files_encryption
...
Conflicts:
apps/files_trashbin/l10n/nn_NO.php
2013-05-21 15:30:19 +02:00
afdad5c74d
[tx-robot] updated from transifex
2013-05-21 02:04:52 +02:00
31037241e1
Merge branch 'master' into files_encryption
2013-05-20 02:25:56 +02:00
6609de28d8
[tx-robot] updated from transifex
2013-05-20 02:10:11 +02:00
9428d813ba
[tx-robot] updated from transifex
2013-05-18 02:03:28 +02:00
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
0ef8590773
Merge branch 'master' into update_etags_on_restore
2013-05-13 10:48:06 +02:00
Jenkins for ownCloud
Bjoern Schiessle
Björn Schießle
Georg Ehrke
Vincent Petry
Jörn Friedrich Dreyer
Vincent Petry
Arthur Schiwon
Bernhard Posselt
Alessandro Cosentino
kondou
Robin Appelman
Victor Dubiniuk
Jan-Christoph Borchardt
Morris Jobke
Georg Ehrke
Florin Peter