Bjoern Schiessle
9183ade655
don't overwrite keys if rename was done by a stream copy
2014-02-25 12:36:06 +07:00
Vincent Petry
678afc4906
Merge pull request #7386 from owncloud/stable6-fixhostnamewithport
...
Fix case where port is missing
2014-02-25 12:32:41 +07:00
Vincent Petry
6d3b5b24fd
Fix case where port is missing
2014-02-25 11:22:53 +07:00
icewind1991
4286eeb531
Merge pull request #7369 from owncloud/stable6-smbmissingfiles
...
[stable6] Fixed missing files on SMB storage
2014-02-24 13:57:57 +07: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 +07:00
Vincent Petry
928947f1c3
Added extra checks for ext storage class
2014-02-22 08:13:11 +07:00
Lukas Reschke
fb1ebf13c6
Adjust version for stable6
2014-02-22 08:09:49 +07:00
Lukas Reschke
ed7e9be7cd
Add overwritehost config on setup and upgrade
2014-02-22 07:59:39 +07:00
Bjoern Schiessle
e903c8b57b
fix test so that it doesn't depend on the array order
2014-02-21 15:53:11 +07:00
Bjoern Schiessle
210832ddf1
fix usersPath and add unit tests
2014-02-21 15:53:03 +07:00
Vincent Petry
96ebefc597
Updated submodule
...
Includes XML fixes
2014-02-21 15:49:08 +07:00
Bjoern Schiessle
5348e2eb54
fix sharing unit tests
2014-02-21 14:44:09 +07:00
Bjoern Schiessle
f6e6f465f2
add unit test for \OC\URLGenerator::getAbsoluteURL to verify #6935
2014-02-21 13:49:11 +07:00
Thomas Müller
ce87f933a4
Merge pull request #7349 from owncloud/backport-7347
...
Backport of #7347 to stable6
2014-02-21 11:21:06 +07:00
Arthur Schiwon
a04af7854d
LDAP: fix and extend tests
2014-02-21 10:15:09 +07:00
Arthur Schiwon
75c7fd2886
LDAP: improve compilation of filters
2014-02-21 10:15:00 +07:00
Lukas Reschke
92b4d52079
Fix "headers are already sent" introduced with #6519
...
Backport of #7347
2014-02-21 10:05:05 +07:00
Thomas Tanghus
91b4045791
Test if $url is already prefixed by '/'
2014-02-20 18:19:05 +07:00
Thomas Tanghus
0f87a0248f
Add missing slash in URLGenerator::getAbsoluteURL(). Refs. #6840
2014-02-20 18:18:54 +07: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 +07:00
nhirokinet
2d946d2766
Update user.php to fix duplicate session-duplicate
2014-02-20 14:31:28 +07:00
NARUKAWA Hiroki
a422f19fac
Security Update: session fixation
...
Previous version is vulnerable to session fixation attack in some situations, guessing non-apache-module-php5 environment. Regeneration of session id should be done here.
2014-02-20 14:31:23 +07:00
Lukas Reschke
ebb1a70abc
Check whether the app is set
2014-02-20 11:26:55 +07:00
Lukas Reschke
b9d013e3ce
Check whether the Key is set
2014-02-20 11:26:47 +07:00
Lukas Reschke
b044ec0420
An admin should not be able to add remote and public services on its own. This should only be possible programmatically.
...
This change is due the fact that an admin may not be expected to execute arbitrary code in every environment.
2014-02-20 11:26:41 +07: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 +07: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 +07:00
Lukas Reschke
d07f459409
Use the proper content-type
...
We should use the proper content-type `application/xml` instead of the default `text/html` here.
Backport requested.
2014-02-18 11:45:05 +07:00
Vincent Petry
3d5d6b5ad1
Now using PHP session lifetime as default value for the JS config
...
This will fix the heartbeat when the session_lifetime config parameter
hasn't been set explicitly.
Backport of f9763e1fc5
2014-02-18 10:53:35 +07:00
Vincent Petry
80dcec773a
Merge pull request #7225 from owncloud/enc_improved_error_handling_oc6
...
[encryption] improved error handling (OC6)
2014-02-17 11:26:21 +07: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 +07:00
Bjoern Schiessle
78b10de7d6
catch errors during decryption
...
Conflicts:
apps/files_encryption/tests/util.php
2014-02-17 10:23:48 +07:00
Bjoern Schiessle
37db8a13d4
catch errors during initial encryption
2014-02-17 10:21:16 +07:00
Joas Schilling
eb8b2210cd
Send correct path on file upload when using public app
...
Fix issue #7152
2014-02-14 12:27:34 +07:00
Robin Appelman
118033cac6
Also clean up the filecache table when deleting a storage entry
2014-02-12 14:03:30 +07:00
Robin Appelman
b0ba69ff31
Also remove the user's home storage from the storage table when deleting a user
2014-02-12 14:03:30 +07:00
Thomas Müller
c1241b1691
Load authentication apps to get users from all backends - fixes #7019
2014-02-11 18:42:09 +07:00
Vincent Petry
ad813da7b1
Merge pull request #7157 from owncloud/stable6-xsendfilequotacheck
...
Fix xsendfile local storage detection with quota
2014-02-11 17:03:55 +07:00
Vincent Petry
b4f04c18db
Fix xsendfile local storage detection with quota
2014-02-11 15:04:17 +07:00
blizzz
23985428ea
Merge pull request #6778 from owncloud/fix_6430
...
on filtering the share box users and groups whose name begins with the s...
2014-02-11 10:38:04 +07:00
Bjoern Schiessle
018fed6014
getData() always needs to return an array
2014-02-10 15:16:58 +07:00
Arthur Schiwon
3be50224ff
intendation
2014-02-10 14:53:59 +07:00
Arthur Schiwon
0213928735
fix DI
2014-02-10 14:53:59 +07:00
Arthur Schiwon
1cf599d494
Inject logger
2014-02-10 14:53:59 +07:00
Arthur Schiwon
8a4dbdedcf
wrong tld
2014-02-10 14:53:59 +07:00
Arthur Schiwon
35b316f93f
test for share dialoge sorter
2014-02-10 14:53:59 +07:00
Arthur Schiwon
7e451a24bc
sort following entries in alphabetical order
2014-02-10 14:53:59 +07:00
Arthur Schiwon
f8620704d4
move sorter into a class
2014-02-10 14:53:58 +07:00
Arthur Schiwon
c6687e159b
respect coding guidelines
2014-02-10 14:53:58 +07:00
Arthur Schiwon
8227bc41cd
on filtering the share box users and groups whose name begins with the search term shall appear on top, fixes #6430
2014-02-10 14:53:58 +07:00