Georg Ehrke
|
f2702ff1ca
|
Merge master into oc_preview
|
2013-08-19 11:24:17 +02:00 |
|
Björn Schießle
|
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 |
|
kondou
|
9e8a6b704d
|
Add _many_ newlines at the end of files
|
2013-08-18 11:06:59 +02:00 |
|
Bjoern Schiessle
|
cabe92ef12
|
Merge branch 'master' into decrypt_files_again
Conflicts:
apps/files_encryption/tests/keymanager.php
|
2013-08-17 13:15:22 +02:00 |
|
Thomas Müller
|
de52157e76
|
remove ru_RU - fixes #3135
|
2013-08-17 11:43:37 +02:00 |
|
Jenkins for ownCloud
|
6bd0ba79df
|
[tx-robot] updated from transifex
|
2013-08-16 01:32:30 -04:00 |
|
Thomas Müller
|
ada13a4d40
|
fixing all broken translation files
|
2013-08-15 15:41:45 +02:00 |
|
Jenkins for ownCloud
|
680ac48856
|
[tx-robot] updated from transifex
|
2013-08-15 04:53:54 -04:00 |
|
Georg Ehrke
|
4b5fb08c2c
|
Merge master into oc_preview
|
2013-08-14 20:56:44 +02:00 |
|
Jörn Friedrich Dreyer
|
8f3f47e868
|
Merge pull request #4376 from owncloud/use_plurals
Use plural translations
|
2013-08-14 10:23:19 -07:00 |
|
Jenkins for ownCloud
|
9492aeffe9
|
[tx-robot] updated from transifex
|
2013-08-13 09:13:11 -04:00 |
|
kondou
|
9549bd3e68
|
Use plural translations
|
2013-08-09 20:37:18 +02:00 |
|
Jenkins for ownCloud
|
98f836363a
|
[tx-robot] updated from transifex
|
2013-08-09 08:06:31 -04:00 |
|
Jenkins for ownCloud
|
0deae7b86f
|
[tx-robot] updated from transifex
|
2013-08-07 09:04:32 -04:00 |
|
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
|
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 |
|
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 |
|