upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-05-26 19:32:28 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 12
15509 commits 987 branches 1211 tags 8.7 GiB
Commit graph

7015 commits

Author SHA1 Message Date
Bjoern Schiessle
3c7541e97c don't try to encrypt/decrypt cache chunks or files in the trash bin 2014-01-15 15:58:56 +01:00
Bjoern Schiessle
3ec3ebb3db copy files to owner trash recursively 2014-01-15 15:58:48 +01:00
Bjoern Schiessle
7dddf59942 it is not an urgent error... a DEBUG message is enough at this point 2014-01-14 15:09:26 +01:00
Vincent Petry
8ef32821be Fixed timezone issue with SMB storage 
Now forcing smbclient to also run on UTC

Backport of 1eb5ebd to stable6
 2014-01-14 15:04:41 +01:00
Thomas Müller
1e9f0409c3 Merge pull request #6408 from owncloud/ldap_fix_tls_detection 
LDAP fix TLS detection
 2014-01-14 05:01:08 -08:00
Andreas Fischer
bcec9cea78 Merge pull request #6756 from owncloud/remove-ru_RU-stable6 
remove ru_RU - it's almost untranslated

* owncloud/remove-ru_RU-stable6:
  remove ru_RU - it's almost untranslated
 2014-01-14 00:45:55 +01:00
Björn Schießle
87cfbb3a2b Merge pull request #6753 from owncloud/no_unshare_on_delete 
don't unshare on delete
 2014-01-13 07:48:22 -08:00
Thomas Müller
3b1396b538 remove ru_RU - it's almost untranslated 2014-01-13 16:44:03 +01:00
Carlos Cerrillo
ce1a1996f7 Fixing Issue #6301 on master branch 
Added private var $certPath to store the user root cert

Move logic to determine the $certPath path to the constructor and modify to get the path from OC_User::getHome()

Add curl options to use the certificate to avoid certificate errors with self-signed certicates in the downdload/upload method so we don't get blank files

Only set SSL things when ```$this->secure``` is ```true```

Fix ```createCertificateBundle``` and  ```getCertificates``` methods
from ```OC_Mount_config``` to use ```OC_User::getHome``` to get the
path

Backport of 7c264c88fe,
b245e2e3d8 and
c06844c374 to stable6 (squashed)
 2014-01-13 16:38:30 +01:00
Bjoern Schiessle
54cd174f61 don't unshare on delete 2014-01-13 15:25:59 +01:00
Vincent Petry
28be8496a9 Fixed various file name escaping issues in core apps 
- Refactored file tr lookup into FileList.findFileEl that uses
  filterAttr to avoid escaping issues in jQuery selectors
- Fixed versions and sharing app to properly escape file names in
  attributes

Backport to stable6 of 1042733
 2014-01-12 13:29:54 +01:00
Georg Ehrke
3ae7bfc298 fix preview for reshared file 2014-01-11 11:31:43 +01:00
Arthur Schiwon
1636c6dbd8 LDAP: add tests for countUsers 2014-01-09 17:00:14 +01:00
Arthur Schiwon
59ff8388ea remove unnecessary line 2014-01-09 17:00:06 +01:00
Arthur Schiwon
1c58d8b226 LDAP: implement userCount action. This required to (finally) clean up and refactor the search method, which will have a positive performance impact on paged search. 2014-01-09 16:59:58 +01:00
Vincent Petry
a711d4e39a Removed special handling of part files in shared storage rename 
This fixes the issue introduced by the transfer id which itself wasn't
taken into account by the shortcut code for part file in the shared
storage class.

Backport of 8eaa39f to stable6
 2014-01-09 15:23:55 +01:00
Arthur Schiwon
394bd17251 typo, grammar 2014-01-08 19:55:28 +01:00
Vincent Petry
c9cb258616 Moved content disposition code+workarounds to OCP\Response 
Added new OC\Response API called setContentDispositionHeader() that
contains the needed workarounds for UTF8 and IE.

Refactored download code to use the new API.

Removed unused trashbin download file.
 2014-01-07 22:11:22 +01:00
Bjoern Schiessle
13461698e4 tests added 2013-12-19 20:10:42 +01:00
Bjoern Schiessle
eaa5dd0282 we can also have a path user/cache/... 2013-12-19 20:10:29 +01:00
Bjoern Schiessle
672cbc5378 check if the old owner and the old path is available 2013-12-19 19:20:29 +01:00
Bjoern Schiessle
2f568c9766 fix rename of shared files 2013-12-19 19:20:17 +01:00
Vincent Petry
c4c972fd2f Merge pull request #6498 from owncloud/stable6-oracleencryptiontestfix 
[stable6] Trying to fix failing encryption tests on Oracle
 2013-12-19 06:45:37 -08:00
Thomas Müller
6de259e0ac Merge pull request #6291 from owncloud/ldap_doc_link 
LDAP: Adjust help link to documentation
 2013-12-19 02:56:34 -08:00
Vincent Petry
1f93b4e842 Removed numRows usage from encryption app 
numRows on Oracle always seem to return 0.

This fix removes numRows usage from the encryption and sharing app.

This fixes unit tests and potentially the encryption app itself
(migration status) when running on Oracle
 2013-12-18 21:14:26 +01:00
Bjoern Schiessle
2f0ec8256f reliable detect encrypted files 2013-12-17 18:14:36 +01:00
Frank Karlitschek
913df0c5ed clarifying license 2013-12-17 17:30:57 +01:00
Bjoern Schiessle
c88109a496 always show home breadcrumb in files view 2013-12-17 11:02:02 +01:00
Bjoern Schiessle
8f5dfd0920 always show 'Deleted Files' breadcrumb 2013-12-17 11:01:43 +01:00
Bjoern Schiessle
3160b23291 update file cache for target file 2013-12-16 17:49:14 +01:00
Bjoern Schiessle
73a0b690e9 only remove encryption keys if a real file gets deleted, skip this method if a file outside of /data/user/files was deleted 2013-12-16 17:49:05 +01:00
Bjoern Schiessle
bdb4890d04 call set password hook because it doesn't get triggered during test execution and fix paths 2013-12-16 17:48:52 +01:00
Bjoern Schiessle
9091dd7833 enable more tests 2013-12-16 17:48:44 +01:00
Vincent Petry
811ef19ada Removed comments in database schema of encryption app 2013-12-14 11:18:48 +01:00
Arthur Schiwon
3d81009347 LDAP: only read config from database, if configID is given. Not what we want to do when on-the-fly-testing settings from the admin page 2013-12-13 18:01:42 +01:00
Arthur Schiwon
1e407482be remove unused variables 2013-12-13 17:52:43 +01:00
Arthur Schiwon
d343c66f85 LDAP: fix TLS detection 2013-12-13 17:52:19 +01:00
Arthur Schiwon
3b5d032dd5 LDAP: fix method behind save button on advancend and expert tabs, fixes at least Home Folder setinng 2013-12-12 23:09:31 +01:00
Bjoern Schiessle
e83ff69465 toggle select all checkbox 2013-12-12 18:47:31 +01:00
Arthur Schiwon
7b388eb4a8 LDAP: the browser shall not autofill userdn and password, usually login credentials are inserted. fixes #6283 2013-12-12 14:04:10 +01:00
Arthur Schiwon
0134b1ebfa LDAP: adjust documentation URL for OC 6 2013-12-10 17:45:03 +01:00
Bart Visscher
281bbf4bd4 Don't try to encrypt a file when the temp file isn't created 2013-12-06 19:07:11 +01:00
root
87a28957aa correctly propagate the return value of ldap_set_option 
otherwise LDAP_OPT_REFERRALS won't be set to 0 and in turn
active directory paging will stop working
(Operations error on ldap_control_paged_result_response)
 2013-12-06 18:01:42 +01:00
Bjoern Schiessle
01de6c565a set unencrypted_size to 0 after decryption... so that the unencrypted_size gets re-calculated if encryption was enabled again 2013-12-06 17:08:17 +01:00
Bjoern Schiessle
c5d6af3c5a get owner from share item, if we expire a share while the user updates his /Shared folder than the owner is different from the currently logged in user 2013-12-06 14:41:59 +01:00
Bjoern Schiessle
cc1577054d it is not possible to unshare files 2013-12-06 12:36:31 +01:00
Bjoern Schiessle
91ca1cf985 fix typo 2013-12-05 20:02:41 +01:00
Bjoern Schiessle
f8a4bcdd50 only create new key on password change if a recovery key exists or if the user don't have any private/public keys 2013-12-05 19:41:01 +01:00
Bjoern Schiessle
418d401bf9 show change password form if key couldn't be decrypted 2013-12-05 18:50:52 +01:00
Bjoern Schiessle
d0afd774b7 add method to check if users private/public key exists 2013-12-05 18:49:55 +01:00