Thomas Müller
f248ee013b
Merge pull request #13694 from owncloud/little-bit-more-descriptive-htaccess-error
...
Make error more descriptive
2015-01-27 09:15:57 +01:00
Jenkins for ownCloud
c8f58054b0
[tx-robot] updated from transifex
2015-01-27 01:54:34 -05:00
Lukas Reschke
d8559dc78f
Make error more descriptive
...
Ref https://github.com/owncloud/core/issues/13693#issuecomment-71546767
2015-01-26 23:00:15 +01:00
Vincent Petry
bd888748bd
Merge pull request #13490 from owncloud/fix_reshare_s2s_share
...
use uid provided by setupfs hook to mount server2server shares
2015-01-26 19:54:14 +01:00
Vincent Petry
44d69d7178
Merge pull request #13677 from owncloud/s2s-doubleslashrequest
...
Prevent double slash in shareinfo request URL
2015-01-26 17:17:04 +01:00
Bjoern Schiessle
5ba19ba7fc
certificate manager should always use a \OC\Files\View otherwise we will get problems for different primary storages
2015-01-26 16:58:52 +01:00
Bjoern Schiessle
67da1f7e5a
certificate manager only needs the user-id, no need to pass on the complete user object
2015-01-26 16:58:52 +01:00
Bjoern Schiessle
66f0db30b2
use uid provided by setupfs hook to mount server2server shares, otherwise mount will fail for public link shares
2015-01-26 16:54:50 +01:00
Vincent Petry
d5b61f9afe
Prevent double slash in shareinfo request URL
2015-01-26 16:19:38 +01:00
Thomas Müller
836b80919f
Merge pull request #13660 from owncloud/remove-duplicate-service-definition
...
Remove duplicated definition of APIController
2015-01-26 15:48:41 +01:00
Thomas Müller
5da4071c45
Merge pull request #13621 from owncloud/system-config-multiset
...
Add a method to set/unset multiple config values with one write
2015-01-26 13:36:22 +01:00
Thomas Müller
9ad9d7bfbb
naming fixes while reviewing
2015-01-26 12:59:25 +01:00
Joas Schilling
d6939d67da
Remove duplicated definition of APIController
2015-01-26 10:20:01 +01:00
Jenkins for ownCloud
810d5a6a67
[tx-robot] updated from transifex
2015-01-26 01:54:29 -05:00
Frank Karlitschek
0f3f20d134
8.0 beta 2
2015-01-26 04:41:37 +01:00
Jenkins for ownCloud
a698637e91
[tx-robot] updated from transifex
2015-01-25 01:54:38 -05:00
Jenkins for ownCloud
b8e1dd9c87
[tx-robot] updated from transifex
2015-01-24 01:54:51 -05:00
Björn Schießle
4ec9ffdf0c
Merge pull request #13637 from owncloud/s2s_notification_new_defaults
...
by default send mail for new server-to-server share
2015-01-23 22:38:07 +01:00
Bjoern Schiessle
73a058e301
by default send mail for new server-to-server share
2015-01-23 21:59:07 +01:00
Clark Tomlinson
f8b1fde2c0
Merge pull request #13626 from owncloud/check-for-hhvm
...
Don't check for `always_populate_raw_post_data` on HHVM
2015-01-23 10:28:47 -05:00
Lukas Reschke
080a41a326
Merge pull request #13463 from owncloud/share-getitemsharedwithuser-emptygroup
...
Do not retrieve shares through group if user has no group
2015-01-23 15:58:13 +01:00
Vincent Petry
8fa3e7a6bf
Do not retrieve shares through group if user has no group
2015-01-23 15:11:06 +01:00
Joas Schilling
039397bd31
Use setConfigs() instead of calling setConfig() multiple times
2015-01-23 14:52:21 +01:00
Lukas Reschke
30a5758a95
Don't check for `always_populate_raw_post_data` on HHVM
...
HHVM seems to have problems with this at the moment (even setting those values in the php.ini of HHVM doesn't have helped much) and thus the unit test execution failed.
So it's better if we disable this check for now for HHVM.
2015-01-23 13:54:34 +01:00
Lukas Reschke
3a66b7c6ec
Merge pull request #13479 from owncloud/issue/13475-favorites-and-unavailable-external-storages
...
Ignore favorites that are not available when creating the favorites list
2015-01-23 11:44:54 +01:00
Morris Jobke
10b03051f8
Merge pull request #13590 from owncloud/sabredav-1.8.12
...
Update SabreDAV to 1.8.12
2015-01-23 11:12:53 +01:00
Thomas Müller
da46fe47f3
Update SabreDAV to 1.8.12
2015-01-23 11:12:40 +01:00
Joas Schilling
c61e9f3912
Add a method to set/unset multiple config values in one call
...
This reduces the number of file writes we do for config.php and therefor
hopefully helps lowering the chances for empty config.php files
2015-01-23 11:00:53 +01:00
Joas Schilling
7e6d2c73d2
Ignore favorites that are not available when creating the favorites list
...
Also correctly return the exception for all cases when adding/removing favos
2015-01-23 10:11:14 +01:00
Jenkins for ownCloud
bc93a8f140
[tx-robot] updated from transifex
2015-01-23 01:55:06 -05:00
Morris Jobke
7e4afa3f25
Merge pull request #13593 from owncloud/add-check-for-raw-post-data
...
Add check for `HTTP_RAW_POST_DATA` setting for >= 5.6
2015-01-22 23:59:52 +01:00
Morris Jobke
254a1fa12a
Merge pull request #13314 from owncloud/login-hook-logout
...
Return false if the login is canceled in a hook
2015-01-22 23:34:19 +01:00
Morris Jobke
4403c194c1
add always_populate_raw_post_data to .user.ini
2015-01-22 23:18:16 +01:00
Thomas Müller
5776bfec05
Merge pull request #13449 from owncloud/image_preview_limit
...
add config-option for an image's maximum filesize when generating previews
2015-01-22 23:02:38 +01:00
Thomas Müller
cb8440c55a
Merge pull request #13614 from owncloud/oc_image_log_fix
...
remove insane debug-log from OC_Image
2015-01-22 21:16:32 +01:00
Georg Ehrke
3af8bde949
add config-option for an image's maximum filesize when generating previews
2015-01-22 20:21:37 +01:00
Georg Ehrke
6b33481652
remove insane debug-log from OC_Image
2015-01-22 20:17:25 +01:00
Thomas Müller
8f06bf7bc6
Merge pull request #13598 from owncloud/fix-undefined-offset
...
Fix undefined offset 1 for wrong user mail address
2015-01-22 17:16:23 +01:00
Morris Jobke
3d42ecea37
Fix undefined offset 1 for wrong user mail address
...
* fixes Undefined offset: 1 at lib/private/mail.php#143
2015-01-22 16:23:50 +01:00
Thomas Müller
f4a9164660
Merge pull request #13600 from owncloud/server-warning
...
Get rid of log warning when using servercontainer
2015-01-22 16:03:54 +01:00
Bernhard Posselt
9df297324f
get rid of log warning when using servercontainer
2015-01-22 15:33:09 +01:00
Morris Jobke
55c28608c9
translate error messages
2015-01-22 14:52:47 +01:00
Robin Appelman
8eda661761
Throw an exception when login is canceled by an app
2015-01-22 14:13:17 +01:00
Robin Appelman
8a9acc5083
Allow custom error messages for the login page
2015-01-22 14:13:02 +01:00
Lukas Reschke
bb80cf4eca
Add check for `HTTP_RAW_POST_DATA` setting for >= 5.6
...
PHP 5.6 otherwise throws notices for perfectly valid code which results in broken endpoints.
Fixes https://github.com/owncloud/core/issues/13592
2015-01-22 13:50:38 +01:00
Morris Jobke
b5b491d1bb
Merge pull request #13509 from owncloud/share-deletechildrenwhenunsharefromgroup
...
Fix reshare permission change to not impair other deletion code
2015-01-22 10:40:29 +01:00
Vincent Petry
9f137ac259
Fix reshare permission change to not impair other deletion code
...
A recent change that prevents reshare permission changes to delete group
share children had the side-effect of also preventing group share
children deletion when it needed to be done.
This fix adds an extra flag to isolate the "reshare permission change"
deletion case and keep the other ones as they were before, not only to
fix the regression but also fix other potential regressions in code that
uses this method.
Also updated the comment because now Helper::delete() is no longer
limited to reshares but also applies to group share children.
2015-01-22 10:12:47 +01:00
Jenkins for ownCloud
5f3c6a97b2
[tx-robot] updated from transifex
2015-01-22 01:55:09 -05:00
Morris Jobke
c931eafc1f
Merge pull request #13517 from owncloud/keymanager-storage
...
Bypass the view when storing encryption keys
2015-01-22 00:41:48 +01:00
Morris Jobke
4dac664002
Merge pull request #13568 from owncloud/s2s_delete_shares_jenkins
...
[ignore] delete all server-to-server shares if a user gets deleted
2015-01-22 00:37:39 +01:00