Thomas Müller
|
b3b2b2d64c
|
Merge pull request #4363 from owncloud/fix-4355
Send mime-type for new files
|
2013-08-14 09:46:10 -07:00 |
Bjoern Schiessle
|
d314729cea
|
use OC files API to create missing directory which should handle special chars in every environment correctly
|
2013-08-14 17:58:41 +02:00 |
Bjoern Schiessle
|
7d0e9cc685
|
use __DIR__ instead of realpath
|
2013-08-14 17:15:01 +02:00 |
Arthur Schiwon
|
7b17fd2f17
|
LDAP: move small info text strings into tooltips
|
2013-08-14 16:51:38 +02:00 |
Arthur Schiwon
|
a4fc9bbe8c
|
LDAP: right align labels on settings page
|
2013-08-14 16:38:25 +02:00 |
kondou
|
4002491947
|
Reword a phrase
|
2013-08-14 06:29:19 +02:00 |
Jenkins for ownCloud
|
9492aeffe9
|
[tx-robot] updated from transifex
|
2013-08-13 09:13:11 -04:00 |
Bjoern Schiessle
|
eb0fdc8380
|
provide correct path for require_once
|
2013-08-12 17:38:57 +02:00 |
Bjoern Schiessle
|
53bb89824d
|
check if some encrypted files are left after the app was disabled and warn the user
|
2013-08-12 17:25:27 +02:00 |
Bjoern Schiessle
|
7b1067c2a0
|
change decryptUnknownKeyfile() to decryptKeyfile(), we always use openssl_seal
|
2013-08-12 16:19:08 +02:00 |
Bjoern Schiessle
|
0bab8935c9
|
preserve mtime if file gets encrypted/decrypted
|
2013-08-12 14:30:43 +02:00 |
Bjoern Schiessle
|
b982868c14
|
fix array declaration
|
2013-08-12 13:59:49 +02:00 |
Jenkins for ownCloud
|
5ebff8cfc4
|
[tx-robot] updated from transifex
|
2013-08-11 08:11:03 -04:00 |
kondou
|
9549bd3e68
|
Use plural translations
|
2013-08-09 20:37:18 +02:00 |
Bjoern Schiessle
|
44d201a526
|
Merge branch 'encryption_clean_up' of github.com:owncloud/core into encryption_clean_up
|
2013-08-09 15:57:07 +02:00 |
Bjoern Schiessle
|
5ba8d38b7f
|
remove old comments, TODos, etc.
|
2013-08-09 15:55:17 +02:00 |
Jenkins for ownCloud
|
98f836363a
|
[tx-robot] updated from transifex
|
2013-08-09 08:06:31 -04:00 |
Andreas Fischer
|
beb27168de
|
Use multiple lines for the JSON data array.
|
2013-08-08 22:14:21 +02:00 |
Andreas Fischer
|
0ab8850478
|
Adjust JSON code to stable5.
|
2013-08-08 22:14:21 +02:00 |
Andreas Fischer
|
1ed049a682
|
Do not repeat JSON success code.
|
2013-08-08 22:14:21 +02:00 |
Andreas Fischer
|
0718c92dc8
|
Do not repeat definition of $target.
|
2013-08-08 22:13:53 +02:00 |
Jan-Christoph Borchardt
|
8652137ad6
|
Merge pull request #3912 from owncloud/css_cleanup_kondou
General CSS cleanup
|
2013-08-08 07:31:01 -07:00 |
Thomas Müller
|
c458e785a1
|
fixing typos and PHPDoc
|
2013-08-08 15:08:58 +02:00 |
Jörn Friedrich Dreyer
|
ff67f115d4
|
fix #2711 using a custom event, also use css selectors over filterAttr
|
2013-08-08 13:50:04 +02:00 |
Bjoern Schiessle
|
512f98cac9
|
remove todo item
|
2013-08-08 13:38:15 +02:00 |
Bjoern Schiessle
|
023121aed0
|
adapt tests to the changes in crypt.php
|
2013-08-08 13:35:01 +02:00 |
Björn Schießle
|
c2f40d2495
|
Merge pull request #4243 from owncloud/no_empty_versions
don't create empty versions
|
2013-08-08 03:57:43 -07:00 |
Thomas Müller
|
f7915d745a
|
Merge pull request #4340 from owncloud/true-false-as-filename
Allow true and false as filenames.
|
2013-08-08 00:03:50 -07:00 |
Bjoern Schiessle
|
b39d2d1938
|
more error messages which might be useful for the user to debug his server config
|
2013-08-08 08:39:11 +02:00 |
Bjoern Schiessle
|
7ce03ba37c
|
improved error message to refect openSSL PHP extension and stock openSSL configuration issues
|
2013-08-08 08:39:01 +02:00 |
Bjoern Schiessle
|
7aeb0068be
|
also write error message to the log
|
2013-08-08 08:38:52 +02:00 |
Bjoern Schiessle
|
cfbdad9cdb
|
catch broken server config and disable encryption app.
|
2013-08-08 08:38:37 +02:00 |
Bjoern Schiessle
|
97e910e087
|
make methods private which are not used from outside
|
2013-08-08 08:37:39 +02:00 |
Robin Appelman
|
d91104e120
|
actually register html template
|
2013-08-07 23:48:44 +02:00 |
Andreas Fischer
|
67df0a60fb
|
Check expected type after JSON decode instead of checking what is not expected.
This will also allow "true" and "false" as filenames instead of only "null".
|
2013-08-07 17:01:14 +02:00 |
Robin Appelman
|
9321eceed6
|
add the option to have templates for newly created files
|
2013-08-07 16:53:09 +02:00 |
Jenkins for ownCloud
|
0deae7b86f
|
[tx-robot] updated from transifex
|
2013-08-07 09:04:32 -04:00 |
Jenkins for ownCloud
|
0fce89308e
|
[tx-robot] updated from transifex
|
2013-08-05 07:54:38 -04:00 |
Thomas Müller
|
bf1a9dfae3
|
Merge pull request #4285 from owncloud/scan-files-script-master
adding new cli script to rescan files
|
2013-08-05 01:09:15 -07:00 |
Jenkins for ownCloud
|
9923fe655b
|
[tx-robot] updated from transifex
|
2013-08-04 02:01:28 -04:00 |
Jenkins for ownCloud
|
17fe748abc
|
[tx-robot] updated from transifex
|
2013-08-03 01:56:46 -04:00 |
Thomas Müller
|
010c4e0b83
|
remove cli check
|
2013-08-02 21:28:04 +02:00 |
Thomas Müller
|
5e1a775016
|
adjust usage text
|
2013-08-02 21:23:26 +02:00 |
Alexander Bogdanov
|
72ad843203
|
Fixing owncloud/core#4301
Adding a CURLOPT_FOLLOWLOCATION for HTTP 301 support (e.g yandex disk uses those)
|
2013-08-02 23:18:29 +04:00 |
Bart Visscher
|
a7a05b321a
|
Use console.php entry point for file scanning from console
|
2013-08-02 15:36:54 +02: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 |
Björn Schießle
|
930f0e4c18
|
Merge pull request #4270 from owncloud/fix_4253
cancel sharing if some users doesn't have a working encryption set-up.
|
2013-08-01 07:43:50 -07:00 |
Jörn Friedrich Dreyer
|
77dad7070d
|
Merge pull request #4265 from berendt/OC_Files_Storage_AmazonS3_phpdoc
added @var tags
|
2013-08-01 07:40:01 -07:00 |
Jörn Friedrich Dreyer
|
43c6d82825
|
Merge pull request #4266 from berendt/OC_Files_Storage_AmazonS3_logging
write all catched exception messages to the log
|
2013-08-01 07:38:45 -07:00 |
Bjoern Schiessle
|
69173c2a6b
|
fix test and make warning translatable
|
2013-08-01 14:19:33 +02:00 |
Bjoern Schiessle
|
9253627327
|
cancel sharing if some users doesn't have a working encryption set-up.
|
2013-08-01 13:04:55 +02:00 |
Christian Berendt
|
5a4c39207e
|
write all catched exception messages to the log
|
2013-08-01 10:08:41 +02:00 |
Christian Berendt
|
3e53e25cd1
|
added @var tags
|
2013-08-01 10:05:01 +02:00 |
Jenkins for ownCloud
|
b037f2dc6e
|
[tx-robot] updated from transifex
|
2013-08-01 01:57:04 -04:00 |
Bjoern Schiessle
|
d7dd2ee465
|
don't know why it works locally but not on the build server... let's keep it out for the moment
|
2013-07-31 16:44:43 +02:00 |
Bjoern Schiessle
|
23e9721644
|
use OC\Files\View to read encrypted file, so that it also works with external storages
|
2013-07-31 16:35:14 +02:00 |
Bjoern Schiessle
|
fe2937e3cd
|
this hopefully fixes testRecoveryForUser(), works locally
for now I disabled testRecoveryFile(), no idea why jenkins deletes complete folders... Works nicely in the real world
|
2013-07-31 16:15:49 +02:00 |
Bjoern Schiessle
|
58233033c1
|
this test works locally, let's see what out build server says...
|
2013-07-31 12:03:50 +02:00 |
Jenkins for ownCloud
|
761f40328c
|
[tx-robot] updated from transifex
|
2013-07-31 02:01:45 -04:00 |
Thomas Müller
|
d3e610f589
|
Merge pull request #4225 from owncloud/better-404
More verbose 404, closes #3225
|
2013-07-30 13:20:28 -07:00 |
Victor Dubiniuk
|
15e9e95817
|
Use default cursor for list items
|
2013-07-30 20:58:21 +03:00 |
Bjoern Schiessle
|
6c96a5273b
|
fixing some unit tests
|
2013-07-30 18:21:23 +02:00 |
Bjoern Schiessle
|
2549322763
|
we need to use the path relative to data/
|
2013-07-30 18:17:33 +02:00 |
Bjoern Schiessle
|
853b106bb2
|
don't create empty versions
|
2013-07-30 16:01:27 +02:00 |
Bjoern Schiessle
|
a212c98125
|
handle error if we can't handle the given path
|
2013-07-30 15:27:59 +02:00 |
Bjoern Schiessle
|
a6ced6b53f
|
remove unused method, the right one is in util.php
|
2013-07-30 14:28:24 +02:00 |
Bjoern Schiessle
|
aca7fbe2c8
|
adapt unit tests to the modified stream wrapper
|
2013-07-30 14:18:01 +02:00 |
Bjoern Schiessle
|
6f20e081e4
|
added missing isEmpty ajax file
|
2013-07-30 12:48:41 +02:00 |
Bjoern Schiessle
|
3640c99462
|
encrypt/decrypt file versions
|
2013-07-30 12:19:04 +02:00 |
Bjoern Schiessle
|
22b8967031
|
check if app is enabled
|
2013-07-30 12:19:01 +02:00 |
Jan-Christoph Borchardt
|
1a1c100719
|
fix loading.gif size for both upload and deletion, force visiblity
|
2013-07-30 10:44:01 +02:00 |
Bjoern Schiessle
|
ba18452eda
|
only write keyfiles if it was a new file, otherwise nothing changed
|
2013-07-30 10:43:16 +02:00 |
Bjoern Schiessle
|
223d3c91d6
|
use path relative to data/
|
2013-07-30 10:14:17 +02:00 |
Bjoern Schiessle
|
a7a7ef2b3a
|
improved error handling
|
2013-07-30 09:48:30 +02:00 |
Jenkins for ownCloud
|
88e1ccbce3
|
[tx-robot] updated from transifex
|
2013-07-30 01:57:50 -04:00 |
Victor Dubiniuk
|
33fe24dc3d
|
Replace delete icon with spinner
|
2013-07-29 19:27:11 +03:00 |
Victor Dubiniuk
|
a10a17f818
|
Rewording
|
2013-07-29 18:25:17 +03:00 |
Björn Schießle
|
7f9795cc3d
|
Merge pull request #4203 from owncloud/trashbin_improvements
Trashbin improvements
|
2013-07-29 08:15:53 -07:00 |
Bjoern Schiessle
|
4a9f5f64da
|
remove whitespaces
|
2013-07-29 17:15:20 +02:00 |
Bjoern Schiessle
|
b6fa0e4eef
|
working decrypt files method
|
2013-07-29 17:06:05 +02:00 |
Victor Dubiniuk
|
dec7b2fa40
|
Move styles from core to app
|
2013-07-29 17:36:59 +03:00 |
Victor Dubiniuk
|
97f2c393c1
|
Allow apps to have own 404 content, closes #3225
|
2013-07-29 16:54:19 +03:00 |
Björn Schießle
|
e15e394fcc
|
add ajax call to decrypt all files
Conflicts:
apps/files_encryption/lib/crypt.php
|
2013-07-29 13:39:05 +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 |
Jenkins for ownCloud
|
0fde473cb7
|
[tx-robot] updated from transifex
|
2013-07-29 01:57:04 -04:00 |
Jenkins for ownCloud
|
48621115c1
|
[tx-robot] updated from transifex
|
2013-07-28 01:58:28 -04:00 |
Jenkins for ownCloud
|
fa35650e0a
|
[tx-robot] updated from transifex
|
2013-07-27 02:03:03 -04: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
|
3354249691
|
fix typo
|
2013-07-26 11:51:18 +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 |
Robin Appelman
|
88cc2ccb3b
|
use renamed constants
|
2013-07-25 16:14:46 +02:00 |
Björn Schießle
|
62f84ff79c
|
css for button no longer needed
|
2013-07-25 12:29:39 +02:00 |
Björn Schießle
|
e5b0c1e78b
|
remove unused code; use jquery
|
2013-07-25 11:15:24 +02:00 |