Commit Graph

22537 Commits

Author SHA1 Message Date
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
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 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
Morris Jobke 570799ba40 Merge pull request #13581 from owncloud/make-naming-consistent
Make naming of encryption app consistent
2015-01-22 00:29:50 +01:00
Lukas Reschke 762949afd9 Make naming of encryption app consistent
Fixes https://github.com/owncloud/core/issues/13580
2015-01-21 23:29:09 +01:00
Thomas Müller c13bf8d820 Merge pull request #13552 from owncloud/request-uri-double-slash
Remove duplicated slashes from the requested url
2015-01-21 21:56:09 +01:00
Thomas Müller dc4ceda2f5 Merge pull request #13519 from Sugaroverdose/fix_#13500
Do not clear fields until request return success in users admin page on user creation
2015-01-21 20:05:17 +01:00
Robin Appelman 0b9f7642a6 Add unit test 2015-01-21 17:18:47 +01:00
Morris Jobke bb3d56155b Merge pull request #13559 from owncloud/increase-log-table-margin
add margin to log table - fixes #13558
2015-01-21 17:18:30 +01:00
Bjoern Schiessle 7216983a08 delete all server-to-server shares if a user gets deleted 2015-01-21 17:11:34 +01:00
Thomas Müller 8ba42abbe4 Merge pull request #13432 from owncloud/animate_gifs_public_sharing
show animated gifs on public sharing page
2015-01-21 17:09:46 +01:00
Thomas Müller 3deb6600d0 Merge pull request #13563 from owncloud/proper-title
use title instead of name
2015-01-21 17:06:12 +01:00
Morris Jobke 879248ad3d use title instead of name 2015-01-21 16:52:38 +01:00
Thomas Müller 9921308c62 Merge pull request #13540 from owncloud/s2s-fixpasswordfromdialog
External share dialog must properly read entered password
2015-01-21 16:51:56 +01:00
Morris Jobke 5864394d1a Merge pull request #13554 from owncloud/issue/13482
Set the debugoutput channel to error_log instead of echoing it
2015-01-21 16:30:54 +01:00
Thomas Müller 651c68fd6e Merge pull request #13553 from owncloud/s2s-webdavmkdirfix
Fix webdav mkdir for remote shares
2015-01-21 16:30:13 +01:00
Morris Jobke 3de967c10d add margin to log table - fixes #13558 2015-01-21 16:19:14 +01:00
Vincent Petry c48307027c Fixed external cache test namespace 2015-01-21 15:52:56 +01:00
Joas Schilling d4657aa592 Set the debugoutput channel to error_log instead of echoing it 2015-01-21 15:32:31 +01:00
Vincent Petry 9fbdd1072e Fix webdav mkdir for remote shares 2015-01-21 15:14:57 +01:00
Robin Appelman 04075eba6b Remove duplicated slashes from the requested url 2015-01-21 15:04:18 +01:00
Bernhard Posselt ff5715779c Merge pull request #13539 from owncloud/unit-tests-must-have
Unit tests are a must have for any changed code
2015-01-21 11:31:11 +01:00