upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-15 11:41:20 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 52
15762 commits 1033 branches 1221 tags 8.7 GiB
Commit graph

7137 commits

Author SHA1 Message Date
Bjoern Schiessle
7f81b14eff don't allow to create a file or folder named 'Shared' in the root folder, also exclude all combinations of lower and upper case letters 2014-03-06 12:09:32 +01:00
Bjoern Schiessle
c02c815603 don't create files folder, let ownCloud core handle it 2014-03-05 14:32:25 +01:00
Vincent Petry
5bf9aab464 Fixed configkey casing for PostgreSQL 
Backport of fd5dec0 from master
 2014-03-04 17:59:48 +01:00
Vincent Petry
722b81627c Merge pull request #7464 from owncloud/enc_fseek_fallback_stable6 
Enc fseek fallback stable6
 2014-03-04 12:53:08 +01:00
Thomas Müller
7534fae9bc Merge pull request #7462 from owncloud/ldap_proxy_access 
Ldap proxy access
 2014-02-28 21:51:37 +01:00
Arthur Schiwon
470a0ad611 remove remaining testing artefact 2014-02-28 10:58:51 +01:00
Bjoern Schiessle
9661001af1 remember original fopen access type in pre-proxy because sometimes they change 
during the fopen call, e.g. 'r' becomes 'r+' if we open an URL
 2014-02-28 10:38:58 +01:00
Vincent Petry
162ba722f6 Merge pull request #7468 from owncloud/stable6-enc-fixfieldnametypo 
[stable6] Fixed wrong field name
 2014-02-27 23:52:20 +01:00
Vincent Petry
4756d18a14 Fixed wrong field name 
This re-fixes an issue where the unencrypted size isn't updated
correctly when saving a text file in the UI multiple times.

Fixes #7467
 2014-02-27 19:50:16 +01:00
Bjoern Schiessle
9cff832282 add test for the stream wrapper to read encrypted files from the system folder /tmp 2014-02-27 18:02:13 +01:00
Bjoern Schiessle
7ced22ccc6 test for isEncryptedPath() 2014-02-27 18:02:05 +01:00
Bjoern Schiessle
6455722f29 extend the encryption stream wrapper to handle local files and add a fall back for file size calculation if the storage doesn't support fseek 2014-02-27 18:01:58 +01:00
Bjoern Schiessle
8b3d99308c implement ftell stream wrapper and fix return value from fseek stream wrapper 2014-02-27 18:01:51 +01:00
Bjoern Schiessle
f87319f834 fall back to getLocalFile if storage doesn't support fseek 2014-02-27 18:01:45 +01:00
Arthur Schiwon
4605c2cc2d intendetion. where did the whitespaces come from? 2014-02-27 16:20:53 +01:00
Arthur Schiwon
49e567a5cc LDAP: let proxy for multiple server access methods from Access 2014-02-27 16:18:03 +01:00
Bjoern Schiessle
9a0c78b831 close encryption session after decryption was finished 2014-02-27 11:48:29 +01:00
Jan-Christoph Borchardt
61a37331ce disable autocomplete for shared link password input, fix #7419 2014-02-26 22:21:36 +01:00
Bjoern Schiessle
b4f154f9b4 fix path in sharing results if it is a file in the Shared folder 2014-02-26 15:22:20 +01:00
Bjoern Schiessle
ac3f1d6f61 only add "received_from" if a share was found 2014-02-26 14:49:41 +01:00
Bjoern Schiessle
c8d34eaf9c add test case if a file gets moved out from the shared folder 2014-02-25 12:42:34 +01:00
Bjoern Schiessle
9183ade655 don't overwrite keys if rename was done by a stream copy 2014-02-25 12:36:06 +01:00
Vincent Petry
0187537a2e Fixed missing files on SMB storage 
Files with attribute "N" weren't parsed out of the file list returned by
smbclient. It seems that these files appear when created on a Linux SMB
mount directly and that have no executable bit.
 2014-02-24 09:22:02 +01:00
Vincent Petry
928947f1c3 Added extra checks for ext storage class 2014-02-22 08:13:11 +01:00
Bjoern Schiessle
e903c8b57b fix test so that it doesn't depend on the array order 2014-02-21 15:53:11 +01:00
Bjoern Schiessle
210832ddf1 fix usersPath and add unit tests 2014-02-21 15:53:03 +01:00
Arthur Schiwon
a04af7854d LDAP: fix and extend tests 2014-02-21 10:15:09 +01:00
Arthur Schiwon
75c7fd2886 LDAP: improve compilation of filters 2014-02-21 10:15:00 +01:00
Arthur Schiwon
3c9421381b LDAP: prevent other configuration from being deleted when deleting the first one which has an empty prefix for historical reasons 2014-02-20 16:25:50 +01:00
Joas Schilling
864f0342af Make google drive client secret and dropbox api secret a password field 
Fix issue #5794

Backport of 828985d
 2014-02-18 18:33:13 +01:00
Joas Schilling
5a2e99c975 External FTP Storage should request hostname instead of URL 
Fix issue #6277

Backport of 658af62
 2014-02-18 18:15:19 +01:00
Bjoern Schiessle
43738dacfb don't block login forever if we are stuck in the middle of the initial encryption 2014-02-17 10:24:04 +01:00
Bjoern Schiessle
78b10de7d6 catch errors during decryption 
Conflicts:
	apps/files_encryption/tests/util.php
 2014-02-17 10:23:48 +01:00
Bjoern Schiessle
37db8a13d4 catch errors during initial encryption 2014-02-17 10:21:16 +01:00
Joas Schilling
eb8b2210cd Send correct path on file upload when using public app 
Fix issue #7152
 2014-02-14 12:27:34 +01:00
Thomas Müller
c1241b1691 Load authentication apps to get users from all backends - fixes #7019 2014-02-11 18:42:09 +01:00
Bjoern Schiessle
6f5caaa87a refuse login as long as the initial encryption is running 2014-02-10 14:51:34 +01:00
blizzz
e5dac9fa24 Merge pull request #7124 from owncloud/fix_6541 
LDAP: also try MS AD's thumbnailPhoto when looking for an avatar image
 2014-02-10 14:44:43 +01:00
Joas Schilling
48bb8aeb01 Only add files to file list when uploading to current directory 
Fix Issue #6683
 2014-02-10 12:41:45 +01:00
blizzz
fd32501fe0 Merge pull request #7081 from owncloud/fix_6670 
LDAP: Wizard cannot determine Base DN in some cases, fixes #6670
 2014-02-10 11:27:31 +01:00
Arthur Schiwon
0a475bdab3 LDAP: improve debug message 2014-02-10 10:19:37 +01:00
Arthur Schiwon
3d6ab2b53b LDAP: also try MS AD's thumbnailPhoto when looking for an avatar image 2014-02-10 10:19:37 +01:00
Björn Schießle
5e315495c2 Merge pull request #7130 from owncloud/enc_fix_unit_tests 
name users after test
 2014-02-07 17:56:21 +01:00
Thomas Müller
b353637e45 Merge pull request #7129 from owncloud/ldap_info_doc 
LDAP: add documentation info in info.xml
 2014-02-07 17:13:45 +01:00
Thomas Müller
fb6290c87a Merge pull request #7083 from owncloud/backport_6777_stable6 
Backport 6777 stable6
 2014-02-07 17:08:25 +01:00
Bjoern Schiessle
76cb5a50c0 name users after test 2014-02-07 17:01:02 +01:00
Arthur Schiwon
5c40ef090a LDAP: add documentation info in info.xml 2014-02-07 15:55:35 +01:00
Bjoern Schiessle
9c9b161f51 replace 'size' with 'unencrypted_size' if encryption is enabled 2014-02-07 15:26:21 +01:00
Thomas Müller
5edc4c95bc Merge branch 'stable6' into backport_6777_stable6 
Conflicts:
	apps/files_sharing/css/public.css
	apps/files_sharing/templates/public.php
 2014-02-07 14:21:10 +01:00
Vincent Petry
f9bd4c5d24 Fixed searchByMime in shared cache 
- searchByMime now correctly returns files recursively search through
  all the dirs
- added unit test for searchByMime

Backport of fa5ddc3 to stable6
 2014-02-06 16:23:15 +01:00