Commit Graph

22623 Commits

Author SHA1 Message Date
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
Vincent Petry 6fb553e92c Do not call wrapStorage if storate with same name added twice 2015-01-22 16:24:24 +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 fc1865449d adding console command to migrate encryption keys - refs #13450 2015-01-22 16:10:45 +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
Vincent Petry f3d696599a Add unit test for external share JS dialog
Moved external share JS code into a small plugin to make it testable.

Added unit test for the external share dialog logic + ajax calls.
2015-01-21 11:26:54 +01:00
Vincent Petry 23ea45760f External share dialog must properly read entered password 2015-01-21 11:26:36 +01:00
Thomas Müller b533aad216 Unit tests are a must have for any changed code 2015-01-21 11:15:32 +01:00
Jenkins for ownCloud b8ab21d3ad [tx-robot] updated from transifex 2015-01-21 01:55:15 -05:00
Sugaroverdose 2244e0eba7 do not clear fields until request return success 2015-01-20 23:14:41 +03:00
Lukas Reschke 2ed2a7c7a8 Merge pull request #13520 from owncloud/fix-comparison-op
this must be larger then (>), since buggy behaviour occurs when the para...
2015-01-20 20:15:04 +01:00
Morris Jobke 9a17006b93 Merge pull request #13506 from owncloud/fix-scanner-s2s-trashbin
avoid $this->cache being null
2015-01-20 20:14:49 +01:00
Arthur Schiwon 9cb1ef5675 this must be larger then (>), since buggy behaviour occurs when the parameter is a small number 2015-01-20 17:50:53 +01:00
Robin Appelman 750cff0e3e Bypass the view when storing encryption keys 2015-01-20 16:20:49 +01:00
Thomas Müller 84bb4cc2e9 Merge pull request #13499 from owncloud/issue/13451-redis-json-encode
Issue/13451 redis json encode
2015-01-20 14:53:33 +01:00
Lukas Reschke 02848a5021 Merge pull request #13512 from owncloud/kill-ancient-code
kill ancient code
2015-01-20 14:16:33 +01:00
Morris Jobke ce47065d8f kill ancient code 2015-01-20 14:14:01 +01:00
Morris Jobke a87a2e8e2c Merge pull request #13494 from owncloud/windows_warning
add a Windows warning
2015-01-20 14:12:30 +01:00
Lukas Reschke fedc7c6f34 Merge pull request #13497 from owncloud/fix-basic-auth-for-session
Fix WebDAV auth for session authentication only
2015-01-20 13:38:36 +01:00
Frank Karlitschek 828d7d6cf5 add a Windows warning 2015-01-20 13:37:50 +01:00
Thomas Müller 87a754c72e avoid $this->cache being null - fixes #13491 2015-01-20 12:38:54 +01:00