Commit Graph

23621 Commits

Author SHA1 Message Date
Lukas Reschke e32f1582c7 Show more detailed error message 2015-03-16 12:47:06 +01:00
Lukas Reschke dfd70337d6 Adjust unit test 2015-03-16 12:47:05 +01:00
Lukas Reschke f92f3a1a6e Incorporate review changes 2015-03-16 12:47:05 +01:00
Lukas Reschke 283476a2f7 Use new IMailer and add unit-tests for lostcontroller 2015-03-16 12:47:05 +01:00
Lukas Reschke 13486a5ada Migrate to SwiftMail
Replaces the OC_Mail and phpmailer with SwiftMail allowing us to mock it properly.

Fixes the unit test execution on master on local machines and https://github.com/owncloud/core/issues/12014

Conflicts:
	3rdparty
	lib/private/server.php
	lib/public/iservercontainer.php
	tests/lib/mail.php
	tests/settings/controller/mailsettingscontrollertest.php

Conflicts:
	3rdparty
	lib/private/mail.php
	lib/private/server.php
	lib/public/iservercontainer.php
	settings/ajax/lostpassword.php
	settings/application.php
2015-03-16 12:47:05 +01:00
Joas Schilling 3052b9571e Fix controller test 2015-03-16 12:45:18 +01:00
Joas Schilling 2731b80f74 Only register the core providers when necessary 2015-03-16 12:45:18 +01:00
Joas Schilling 47af533183 Move mimetype check from template to controller 2015-03-16 12:45:18 +01:00
Joas Schilling 8ed27d2ce0 Create an interface for OC_Image and OCP\Image for the public API 2015-03-16 12:45:15 +01:00
Joas Schilling 3b7aec1b7d Only sort the list when required 2015-03-16 12:44:12 +01:00
Joas Schilling 37b827f0b2 Order the providers alphabetically 2015-03-16 12:44:12 +01:00
Joas Schilling 9c86574acf Only do all the "find path" magic when we need to register them 2015-03-16 12:44:11 +01:00
Joas Schilling e38dea3542 Cache result for isMimeTypeSupported() 2015-03-16 12:44:11 +01:00
Joas Schilling e518eacba6 Add more type hinting 2015-03-16 12:44:11 +01:00
Joas Schilling 1a1dc9b335 Use DI for the config 2015-03-16 12:44:11 +01:00
Joas Schilling c1f266db88 Add an interface for the preview providers 2015-03-16 12:44:11 +01:00
Joas Schilling 227ff0a9e3 Clean up some docs 2015-03-16 12:44:11 +01:00
Joas Schilling 0b37d5aea3 Move default provider registration to preview manager 2015-03-16 12:44:11 +01:00
Joas Schilling cae8529359 Register preview providers on the preview manager instead of OC\Preview 2015-03-16 12:44:11 +01:00
Joas Schilling 4c4c0fa120 Use the PreviewManager where possible 2015-03-16 12:44:10 +01:00
Thomas Müller 1075914f8a Merge pull request #14883 from owncloud/imagepng_expects_resource_issue
validate resource's integrity before using it
2015-03-16 12:22:27 +01:00
Vincent Petry 72632ad402 Generate storage config ids when missing
When reading in old mount.json files, they do not contain config ids.
Since these are needed to be able to use the UI and the new service
classes, these will be generated automatically.

The config grouping is based on a config hash.
2015-03-16 12:18:01 +01:00
Thomas Müller c262d0d966 Update shipped.json 2015-03-16 11:59:40 +01:00
Georg Ehrke 09b05373ed validate resource's integrity before using it 2015-03-16 10:57:01 +01:00
Morris Jobke 17b10ef9b4 Add spaces 2015-03-16 10:52:29 +01:00
Morris Jobke 997a7a2668 Merge pull request #14766 from owncloud/fix-insertifnotexists-poc
Allow specifying the compare-array for insertIfNotExists()
2015-03-16 10:31:36 +01:00
Thomas Müller 1e0d8f1774 Merge pull request #14133 from rullzer/fix_10600
Always display max upload size in admin panel
2015-03-16 10:05:57 +01:00
Thomas Müller bbaf97ca43 Merge pull request #14644 from owncloud/trash-expire-command
Expire files from the trash in the background
2015-03-16 10:04:05 +01:00
Thomas Müller 6927773648 Merge pull request #14776 from owncloud/fix-14629-master
verify the file name length not to exceed 255 characters + verify path d...
2015-03-16 09:58:41 +01:00
Thomas Müller b159c7f274 Merge pull request #14848 from owncloud/kill-curl-fallback-master
drop any fallback code related to curl
2015-03-16 09:56:31 +01:00
Jenkins for ownCloud c1a3394f48 [tx-robot] updated from transifex 2015-03-16 01:55:15 -04:00
Morris Jobke 5d74534f06 Merge pull request #14899 from owncloud/setupwarning-text
Put notice about checking logs in setup warning
2015-03-15 20:20:32 +01:00
Jenkins for ownCloud 84b6ca9b81 [tx-robot] updated from transifex 2015-03-15 01:54:38 -04:00
Robin McCorkell 69d376fbf1 Put notice about checking logs in setup warning 2015-03-15 01:25:30 +00:00
Joas Schilling 82138d4255 Merge pull request #14872 from owncloud/issue/14870-avatar-user-non-object
Fix getting the avatar of a non-existing user
2015-03-14 11:43:18 +01:00
Jenkins for ownCloud 8c5be2bc48 [tx-robot] updated from transifex 2015-03-14 01:54:45 -04:00
Thomas Müller 918b86a5bc Merge pull request #14871 from owncloud/use-proper-error-type
Use proper error type and clean-up code
2015-03-13 23:30:49 +01:00
Thomas Müller b8eb0b7cb6 Merge pull request #14880 from owncloud/drop-example-backend
Drop example user backend
2015-03-13 23:00:03 +01:00
Vincent Petry fb4cf53253 Fix mount config unit tests
Fix expected result now that it returns the status.
Added isset for some properties that are not always present.
2015-03-13 17:43:38 +01:00
Joas Schilling 30357aaac0 No user no avatar easy as that 2015-03-13 17:35:34 +01:00
Lukas Reschke e77d2ff2b4 Remove outdated comment 2015-03-13 16:19:52 +01:00
Lukas Reschke bf9030e874 Drop example user backend
We already provide an interface for application developers, this file is outdated and thus should get removed.

Addresses No. 3 from https://github.com/owncloud/core/issues/14847
2015-03-13 16:12:32 +01:00
Morris Jobke 0d9f149dd9 Merge pull request #14867 from owncloud/drop-OC_User_HTTP
Remove OC_User_HTTP
2015-03-13 15:53:22 +01:00
Joas Schilling 5d71eb5670 Color avatars of non-existing users gray and display X instead 2015-03-13 15:29:52 +01:00
Joas Schilling 61ec37431a Fix order of expected and actual on assertEquals() calls 2015-03-13 15:29:52 +01:00
Joas Schilling 8304f5f508 Fix getting the avatar of a non-existing user 2015-03-13 15:29:52 +01:00
Robin Appelman 3159af1983 Wait with getting the timezone from the smb server until we need it 2015-03-13 14:36:34 +01:00
Lukas Reschke f668ed25fe Merge pull request #14874 from owncloud/correct-typehint
Can also be null
2015-03-13 14:36:00 +01:00
Lukas Reschke 38fec9b095 Can also be null
If the user does not exist this returns null and can lead to nasty bugs since the IDE is not indicating this...
2015-03-13 14:01:24 +01:00
Lukas Reschke 4eb118dd33 Use proper error type and clean-up code 2015-03-13 13:21:09 +01:00