Commit Graph

7876 Commits

Author SHA1 Message Date
Joas Schilling ea3780f911 Replace exception with standard exception 2014-11-27 11:10:05 +01:00
Joas Schilling e1f3abf7a5 Correctly namespace and autoload DatabaseException 2014-11-27 11:10:04 +01:00
Vincent Petry 51190f711d Merge pull request #12451 from owncloud/issue/6101-remove-gettype-class
Move constants from GET_TYPE to OC\Files so they can be autoloaded
2014-11-27 11:03:55 +01:00
Lukas Reschke b20d698ebd Cache results of available languages
This function is about 8 times calles for every single page call, when caching this variable I was able to gain a small performance improvement from 20,512 µs to 630 µs profiled with xhprof

Surely, this is no gigantic gain but if we would do that for every function out there...
2014-11-27 00:01:55 +01:00
Thomas Müller 5097d4dc05 remove deprecated \OC:$session 2014-11-26 15:32:47 +01:00
Joas Schilling 8e28bf012c Move constants from GET_TYPE to OC\Files so they can be autoloaded 2014-11-26 12:56:54 +01:00
Joas Schilling 3338eede3c Correctly namespace DatabaseSetupException 2014-11-26 12:30:07 +01:00
Joas Schilling a109f94fee Depcrate namespaced functions, since they can not be autoloaded 2014-11-26 11:01:24 +01:00
Lukas Reschke c749570a06 Merge pull request #12411 from owncloud/unknown-command-windows
Replace some more "command -v" calls with the Helper method
2014-11-26 10:29:41 +01:00
Morris Jobke 1da46b1a58 Merge pull request #12438 from owncloud/jenkins-no-new-session-ocs-api
because OC_User::login will create a new session we shall only try to lo...
2014-11-26 10:22:16 +01:00
Morris Jobke 60e4aa120f Merge pull request #12350 from mprokop/link_expiration
fix calculation of expiration date if there is a default expiration date...
2014-11-26 10:19:12 +01:00
Thomas Müller 320a3c3784 because OC_User::login will create a new session we shall only try to login if user and pass are set
ensure to never destroy an existing session
2014-11-26 09:19:10 +01:00
Morris Jobke c5fa8f1bdc Merge pull request #12421 from owncloud/issue/6101-remove-namespace-permission-constants
Issue/6101 remove namespace permission constants
2014-11-26 08:31:23 +01:00
Morris Jobke e9696a8c9a Merge pull request #12420 from owncloud/sqlite-wal-2
adding new config parameter for sqlite to specify the journal mode
2014-11-26 00:47:22 +01:00
Joas Schilling 0274dcba57 Replace some more "command -v" calls with the Helper method 2014-11-25 18:10:03 +01:00
Joas Schilling 2c39aec8cb Replace deprecated constant with new class constant 2014-11-25 16:30:21 +01:00
Thomas Müller a6c088a1ef adding new config parameter for sqlite to specify the journal mode 2014-11-25 16:29:06 +01:00
Joas Schilling 711912a7b3 Move namespaced constants to namespaced class 2014-11-25 16:27:27 +01:00
Lukas Reschke fc116f563f Allow read-only configuration
Workaround required for IIS setups running ownCloud to prevent dataloss.

Long-term solution would be to move some configuration settings to the database
2014-11-25 16:26:47 +01:00
Thomas Müller 0f18274ca5 Merge pull request #12416 from owncloud/app-info-xml-parser-2
App info xml parser 2
2014-11-25 15:56:52 +01:00
Georg Ehrke 1a1b459ae8 delete old previews 2014-11-25 15:42:02 +01:00
Thomas Müller 5ce34fbaf6 handle invalid xml file 2014-11-25 11:53:28 +01:00
Thomas Müller d4f107d4dd simplify xml parser code 2014-11-25 11:53:28 +01:00
Thomas Müller c503ecd544 Introduce app info xml parser including basic unit test - necessary for #10777 2014-11-25 11:53:28 +01:00
Olivier Paroz 93a6cc17a5 The class name is Movie NOT Movies 2014-11-25 11:35:38 +01:00
Morris Jobke 53b2d85709 Merge pull request #12402 from owncloud/fix-phpdoc
Fix PHPDoc and deprecated code
2014-11-25 09:20:36 +01:00
Lukas Reschke eb1dcb87c1 Merge pull request #12380 from owncloud/remove-oc-migrate
Remove OC_Migrate
2014-11-25 00:25:37 +01:00
Lukas Reschke b947b65e5b Fix PHPDoc and deprecated code
Some PHPDocs were incorrect, also used this opportunity to replace some deprecated functions.
2014-11-24 23:09:49 +01:00
Olivier Paroz e2a9bd7838 You can only change the oritentation of a JPEG
TIFFs also have EXIF headers, but they're not supported by the Image class

PHP doc
http://php.net/manual/en/function.exif-read-data.php
2014-11-24 17:32:53 +01:00
Thomas Müller ddacd7f900 Merge pull request #12294 from owncloud/route-postfix
Add route postfix to allow url versioning when only the http method changed
2014-11-24 16:32:54 +01:00
Morris Jobke 168fce0b18 Merge pull request #12303 from owncloud/windows-unknown-command-command
Deduplicate findBinaryPath() and do not try "command -v" on windows
2014-11-24 14:03:07 +01:00
Morris Jobke 1b17429c1d Merge pull request #12142 from owncloud/DeprecateOldIAPICalls
Deprecate older API wrappers and calls
2014-11-24 14:01:49 +01:00
Morris Jobke 8782b2237c Merge pull request #12084 from owncloud/sharing_fix_shared_with_info
sharing: make sure that we only find the shares from a given owner
2014-11-24 11:44:43 +01:00
Lukas Reschke 216d617938 Remove OC_Migrate
This is unused legacy code. Let it die with ~~~honor~~ fire.

Fixes https://github.com/owncloud/core/issues/12346
2014-11-24 10:53:45 +01:00
Jenkins for ownCloud 0edcfc1dc1 [tx-robot] updated from transifex 2014-11-24 01:54:35 -05:00
Georg Ehrke 45d985f2d8 remove ugly hack and don't use OC\Preview\Image for tiffs and svgs 2014-11-23 19:11:03 +01:00
Jenkins for ownCloud fa3f7ad9e9 [tx-robot] updated from transifex 2014-11-22 01:55:21 -05:00
Bjoern Schiessle a7ebfe87c9 also check for the correct owner if it was submitted 2014-11-21 16:17:37 +01:00
Miguel Prokop 397f14ed86 Consolidate if statement, and update unit test 2014-11-21 13:31:56 +01:00
Miguel Prokop 1d4d308a6c fix calculation of expiration date if there is a default expiration date set (but not forced) and the user does not want the link to expire. 2014-11-21 11:01:39 +01:00
Jenkins for ownCloud f8421958b3 [tx-robot] updated from transifex 2014-11-21 02:54:26 -05:00
Morris Jobke 593ef76e36 Revert "drop OC_Preferences::getUsers and getApps"
This reverts commit 09fd34eed9.
2014-11-20 22:02:26 +01:00
Morris Jobke 09fd34eed9 drop OC_Preferences::getUsers and getApps 2014-11-20 17:56:05 +01:00
Morris Jobke 985f8c3f69 Merge pull request #12330 from owncloud/jenkins-eat-that
drop dependency of some commands on old config object
2014-11-20 17:11:08 +01:00
Thomas Müller 7fa4c6d0bc Merge pull request #12321 from owncloud/checkForXMLWriter
Check for XMLWriter class
2014-11-20 17:04:27 +01:00
Morris Jobke 604bf61e10 Merge pull request #12299 from owncloud/clean-lib-base-config
replace all static calls to OC_Config and OC_Preferences to calls to OCP...
2014-11-20 16:24:37 +01:00
Lukas Reschke 713c8e0dac Merge pull request #12325 from owncloud/removeunneccessarylang
cleanup languages. closes #11274
2014-11-20 16:12:49 +01:00
Morris Jobke 8ae8eb4734 drop dependency of some commands on old config object 2014-11-20 15:03:16 +01:00
Thomas Müller cbb9caf030 Merge pull request #12226 from owncloud/remove-phpass
Remove phpass and migrate to new Hasher interface
2014-11-20 14:59:59 +01:00
Morris Jobke 46e6104795 Merge pull request #12297 from owncloud/issue/10991-all-testcase
Issue/10991 all testcase
2014-11-20 14:53:18 +01:00
Volkan Gezer 995fe4a176 cleanup languages. closes #11274 2014-11-20 14:46:17 +01:00
Lukas Reschke 9a1673c79d Check for XMLWriter class
This is not installed by default in all cases and will break the DAV features of ownCloud. Lot's of reports such as https://github.com/owncloud/ios-issues/issues/167#issuecomment-63798507
2014-11-20 13:13:14 +01:00
Vincent Petry 6a08fca363 Merge pull request #12253 from owncloud/port-12154
Port 12154
2014-11-20 12:47:27 +01:00
Joas Schilling d15f1882f9 Simplify the binary finding code in the movie preview class 2014-11-20 12:41:55 +01:00
Joas Schilling 64421d76fd Deduplicate function by moving it to the OC_Helper 2014-11-20 12:37:59 +01:00
Jenkins for ownCloud fffc5bc002 [tx-robot] updated from transifex 2014-11-20 01:55:06 -05:00
Joas Schilling bb540722cd Use base class to reset the file mapper 2014-11-19 14:52:07 +01:00
Morris Jobke 980dd4d22a replace double quotes with single quotes 2014-11-19 13:15:04 +01:00
Morris Jobke fef9d4218c replace all static calls to OC_Config and OC_Preferences to calls to OCP\IConfig 2014-11-19 13:06:22 +01:00
Bernhard Posselt 4e90c44301 add postfix
add postfix
2014-11-19 12:01:42 +01:00
Jenkins for ownCloud 705976ba0a [tx-robot] updated from transifex 2014-11-19 01:54:59 -05:00
Morris Jobke d40bdfb35e drop unneeded var_dump - fixes #9997 2014-11-18 22:36:42 +01:00
Morris Jobke 81d112fb42 Merge pull request #12261 from oparoz/patch-1
Replace deprecated switches
2014-11-18 18:59:34 +01:00
Björn Schießle 106d0f9c75 Merge pull request #12224 from owncloud/fix_12211
make sure that we don't find the wrong shares if a user and a group have the same ID
2014-11-18 17:26:02 +01:00
Olivier Paroz cb118ce371 Replace deprecated switches
Warning: -convert-to is deprecated.  Use --convert-to instead.
Warning: -outdir is deprecated.  Use --outdir instead.
2014-11-18 15:04:01 +01:00
Lukas Reschke 309788003d Merge pull request #12259 from owncloud/app-enabled-plugin-appmanager
Fix type hinting for app manager
2014-11-18 13:56:40 +01:00
Lukas Reschke 8d4e63dd7c Merge pull request #12242 from owncloud/fix-undefined-size
Check if the size field is available
2014-11-18 12:37:16 +01:00
Lukas Reschke 260a084d27 Add repair steps for legacy config files
Remove all ports from the trusted domains

Conflicts:
	lib/private/repair.php
	lib/repair/repairconfig.php
2014-11-18 12:36:03 +01:00
Lukas Reschke d0a30b0e55 Ignore port for trusted domains
This lead to a lot of confusion in the past and did not really offer any value. Let's remove the port check therefore. (it's anyways not really a part of the domain)

Fixes https://github.com/owncloud/core/issues/12150 and https://github.com/owncloud/core/issues/12123 and also a problem reported by @DeepDiver1975.

Conflicts:
	lib/private/request.php
2014-11-18 12:36:03 +01:00
Robin Appelman 0b630a37ab Fix type hinting for app manager 2014-11-18 12:22:13 +01:00
Bjoern Schiessle ea4eedd35a only users can have a display name different from the id 2014-11-18 11:46:28 +01:00
Bjoern Schiessle 367468ff1f make sure that we only find the shares from the correct share type if users and groups with the same ID exists 2014-11-18 11:11:49 +01:00
Bjoern Schiessle 5192641447 make sure that we don't find the wrong shares if a user and a group have the same ID 2014-11-18 11:03:08 +01:00
Morris Jobke 36ba935381 Merge pull request #12237 from owncloud/fix-12236
Make declaration compatible
2014-11-18 10:30:17 +01:00
Lukas Reschke 944cd327b1 Merge pull request #9962 from owncloud/app-group-enable-remote
Fix remote.php routes for apps that are enabled for specific groups
2014-11-18 10:08:20 +01:00
Jenkins for ownCloud 91f7c0af6e [tx-robot] updated from transifex 2014-11-18 01:54:31 -05:00
Lukas Reschke 6535540dcd Check if the size field is available
In some cases the 'size' field is not available resulting in some PHP errors such as:

```json
{"reqId":"03548fd9e3d3aca15a5796b3b35d7b9d","remoteAddr":"::1","app":"PHP","message":"Undefined index: size at \/Users\/lreschke\/Programming\/core\/lib\/private\/files\/fileinfo.php#125","level":3,"time":"2014-11-17T21:38:57+00:00"}
```

This can be experienced when creating a new empty file and deleting it right away, then when going to the trash bin this error is thrown.
2014-11-17 22:39:40 +01:00
Lukas Reschke e8f90133e0 Merge pull request #11727 from owncloud/moveCallCheckRegisterToSomeWhereElse
Move CSRF check
2014-11-17 18:34:55 +01:00
Lukas Reschke 0b9dffa828 Make declaration compatible
Fixes #12236
2014-11-17 18:30:17 +01:00
Vincent Petry af7688ec17 Merge pull request #11741 from owncloud/delete_all_children_preview_2
delete all children's previews when deleting a folder
2014-11-17 16:45:54 +01:00
Morris Jobke 146cb920c9 Merge pull request #12218 from owncloud/issue/10991-fixes
Issue/10991 Make unit tests pass on windows
2014-11-17 16:44:45 +01:00
Robin Appelman 7cb12d4bff Add sabredav plugin to check if a user has access to an app 2014-11-17 15:50:24 +01:00
Robin Appelman 36528c6ef6 Merge pull request #12031 from owncloud/app-manager
Add \OC\App\Manager to handle enabling/disabling apps
2014-11-17 15:49:15 +01:00
Lukas Reschke 07f0d76fc6 Move CSRF check
Because we're closing the session now before controllers are executed there are cases where we cannot write the session.
2014-11-17 15:10:53 +01:00
Lukas Reschke 8595b76df2 Remove phpass and migrate to new Hasher interface
This PR removes phpass and migrates to the new Hasher interface.

Please notice that due to https://github.com/owncloud/core/issues/10671 old hashes are not updated but the hashes are backwards compatible so this shouldn't hurt.
Once the sharing classes have a possibility to update the passwords of single shares those methods should be used within the newHash if block.
2014-11-17 13:39:13 +01:00
Joas Schilling 0ab973a3a6 Make it possible to cleanPath() absolute Windows paths 2014-11-17 10:48:15 +01:00
Joas Schilling 39ae569c5c Correctly close handle of directory when listing certificates 2014-11-17 10:48:14 +01:00
Jenkins for ownCloud 9df50c7be6 [tx-robot] updated from transifex 2014-11-17 01:54:33 -05:00
Morris Jobke b9e86b0951 Merge pull request #12186 from owncloud/fix-12182
eliminate OC_Template::printErrorPage in database classes, fixes #12182
2014-11-15 16:50:15 +01:00
Lukas Reschke cd5925036a Check if app is enabled for user
Fixes https://github.com/owncloud/core/issues/12188 for AppFramework apps
2014-11-15 11:13:55 +01:00
Arthur Schiwon 74ffda8261 do not output DB information, and do not set header 2014-11-14 17:43:22 +01:00
Arthur Schiwon 08205c63f9 errors are already logged 2014-11-14 16:59:54 +01:00
Arthur Schiwon 7ed678b04d eliminate OC_Template::printErrorPage in database classes, fixes #12182 2014-11-14 15:48:55 +01:00
Jenkins for ownCloud 0811b39e5f [tx-robot] updated from transifex 2014-11-14 01:54:47 -05:00
Morris Jobke c0d63680ed Merge pull request #11479 from owncloud/cleanup-group-admin-on-deleteGroup
cleanup group admin(s) on deleteGroup
2014-11-13 22:39:40 +01:00
Morris Jobke e5d46d0d94 Merge pull request #11956 from owncloud/remove-check-for-allow_user_to_change_display_name
removal of wrong/double implemented check
2014-11-13 15:39:07 +01:00
michag86 7e70c4ee95 removal of wrong/double implemented check
Check already implemented in core/settings/ajax/changedisplayname.php
2014-11-13 13:02:02 +01:00
Lukas Reschke 5f8fb8d1ee Run preupdate before an update
The update routine tries to test the database migration before actually performing the update.

However, this will fail hard if the schema has changed (for example an unique key has been added). App developers can convert the DB in preupdate.php, however it is not called before and therefore the update fails.

This actually breaks ownCloud updates from ownCloud 6 to ownCloud 7 when the files_antivirus app is enabled.
2014-11-13 12:07:49 +01:00
Jenkins for ownCloud a069171cda [tx-robot] updated from transifex 2014-11-13 01:54:36 -05:00
Morris Jobke 97a8fa418d Merge pull request #12141 from owncloud/kill-dav-client
OC_DAVClient is not longer used - no need to carry it around anymore
2014-11-12 21:20:52 +01:00
Lukas Reschke 4302a78b27 Deprecate older API wrappers and calls
Those old classes have now non-static pendants and can be deprecated IMHO.
2014-11-12 17:39:25 +01:00
Thomas Müller 6e3a841652 Merge pull request #12139 from owncloud/DoNotTouchMe
Try to read the file only instead of trying to touch
2014-11-12 17:29:56 +01:00
Thomas Müller fede6b93e5 OC_DAVClient is not longer used - no need to carry it around anymore 2014-11-12 17:07:34 +01:00
Jan-Christoph Borchardt d5796bbaf9 Merge pull request #12128 from owncloud/drop-formfactor
Drop form_factor that is appended to JS, CSS and template filenames
2014-11-12 16:23:19 +01:00
Lukas Reschke 49ddaf9489 Try to read the file only instead of trying to touch
The permissions are already catched properly on the installation so we just have to check whether the file is readable to prevent fatal errors from happening.

Fixes https://github.com/owncloud/core/issues/12135
2014-11-12 15:57:19 +01:00
Morris Jobke 952abdc51a Drop form_factor that is appended to JS, CSS and template filenames 2014-11-12 13:07:23 +01:00
Lukas Reschke da31177a8f Remove debug statement
Either we throw an exception or we ignore it. But we should certainly not print this to the end-user...
2014-11-12 11:32:48 +01:00
Thomas Müller c998f620d0 Merge pull request #12105 from owncloud/dav-fixcleanpath
Fix root path handling for WebDAV ext storage
2014-11-12 09:16:55 +01:00
Thomas Müller 9aef0421cf Merge pull request #12107 from owncloud/dav-propfindmimetype
Return real mime type on PROPFIND
2014-11-12 09:16:26 +01:00
Jenkins for ownCloud 1846fb0285 [tx-robot] updated from transifex 2014-11-12 01:55:24 -05:00
Bernhard Posselt 6d5a239abf Fix Pimple unset 2014-11-11 22:04:46 +01:00
Thomas Müller 4c1244f50c Merge pull request #11917 from owncloud/fix-11909
Add checkbox to enforce SSL for subdomains
2014-11-11 20:37:50 +01:00
Vincent Petry 0b2c24081f Return real mime type on PROPFIND
Return the real (insecure) mime type on PROPFIND
2014-11-11 15:42:50 +01:00
Vincent Petry 4b943a4810 Fix root path handling for WebDAV ext storage
Added missing cleanPath() call that converts "/" to "" when calling
SabreDAV. This is needed because SabreDAV will discard its base URL when
passing "/".
2014-11-11 15:20:36 +01:00
Robin Appelman 43eb375ace Add \OC\App\Manager to handle enabling/disabling apps 2014-11-10 13:52:52 +01:00
Vincent Petry 9b99c1d6f0 Merge pull request #12072 from owncloud/sabre-convertstoragenotavailableexception-secondtry
Convert StorageNotAvailableException to SabreDAV exception
2014-11-10 12:52:52 +01:00
Vincent Petry 676b911b22 Merge pull request #12027 from owncloud/cleanup_exceptions
[encryption] clean up encryption exceptions
2014-11-10 12:46:53 +01:00
Vincent Petry cccedf6f30 Convert StorageNotAvailableException to SabreDAV exception
Convert \OCP\Files\StorageNotAvailableException to
\Sabre\DAV\Exception\ServiceUnavailable for every file/directory
operation happening inside of SabreDAV.

This is necessary to avoid having the exception bubble up to remote.php
which would return an exception page instead of an appropriate response.
2014-11-10 12:01:24 +01:00
Jenkins for ownCloud c3e3432662 [tx-robot] updated from transifex 2014-11-10 01:54:30 -05:00
Craig Morrissey 541344d880 logging changes 2014-11-07 12:45:42 -05:00
Bjoern Schiessle f27b6b0ab8 don't scan part files 2014-11-07 15:20:51 +01:00
Bjoern Schiessle a10ae2816e clean up encryption exceptions 2014-11-07 13:48:31 +01:00
Robin Appelman d26a427f92 Also propagate etag changes when the watcher finds a changed file 2014-11-07 12:56:09 +01:00
Lukas Reschke e345697cab Merge pull request #11954 from owncloud/enc_stop_uploading_if_private_key_is_missing
Enc stop uploading if private key is missing
2014-11-07 11:19:04 +01:00
Thomas Müller 88c329b394 Merge pull request #12019 from owncloud/fix-template-shortcuts
second parameter in template shortcuts script() and style() is optional
2014-11-07 11:01:10 +01:00
Jenkins for ownCloud 7d47d50724 [tx-robot] updated from transifex 2014-11-07 01:55:10 -05:00
Lukas Reschke d383c45c13 Merge pull request #12003 from owncloud/password-migration
Use new hashing API for OC_User_Database
2014-11-06 22:43:57 +01:00
Morris Jobke 81e6329c04 second parameter in template shortcuts script() and style() is optional 2014-11-06 21:26:50 +01:00
Morris Jobke e53354bfd7 Merge pull request #12009 from owncloud/make-optional
Make second argument optional
2014-11-06 19:43:11 +01:00
Robin Appelman 0c230fb57e Merge pull request #11945 from owncloud/share-setup-other-user
Setup shared mounts for the correct user when setting up the filesystem
2014-11-06 19:24:24 +01:00
Robin Appelman c21d1da01a Support displaynames for dummy user backend 2014-11-06 18:31:40 +01:00
Lukas Reschke 20cd9a134f Make second argument optional
Equivalent to addVendorScript und addScript from OC_Util
2014-11-06 18:17:21 +01:00
Lukas Reschke 5b8a6b66b5 Load PHPAss via autoloader 2014-11-06 16:32:53 +01:00
Lukas Reschke 8f1fa32e1f Merge pull request #11998 from owncloud/add-get-logger-to-interface
Add getLogger() to IServerContainer
2014-11-06 16:04:54 +01:00
Lukas Reschke c4d7483a0a Use new hashing API for OC_User_Database
This will use the new Hashing API for OC_User_Database and migrate old passwords upon initial login of the user.
2014-11-06 15:42:06 +01:00
Lukas Reschke 24ca2d858f Add OCP\Security\IHasher
Public interface for hashing which also works with legacy ownCloud hashes and supports updating the legacy hash via a passed reference.

Follow-up of https://github.com/owncloud/core/pull/10219#issuecomment-61624662
Requires https://github.com/owncloud/3rdparty/pull/136
2014-11-06 15:16:14 +01:00
Lukas Reschke 5f2a083686 Merge pull request #11883 from owncloud/clear-session-for-setup
Clear session before setup
2014-11-06 14:39:51 +01:00
Lukas Reschke f73d653036 Merge pull request #11972 from owncloud/usermanager-remove-delete
Remove confusingly names \OC\User\Manager::delete and fix the automatic ...
2014-11-06 13:52:25 +01:00
Lukas Reschke 0e3e1e3563 Add getLogger() to IServerContainer
Makes my IDE complaining less ;-)
2014-11-06 13:36:36 +01:00
Morris Jobke 73569b29bc md5 now handled via bower 2014-11-06 13:22:16 +01:00
Morris Jobke e49b9022a1 bower snapjs 2014-11-06 12:03:57 +01:00
Vincent Petry afa14d571c Merge pull request #11982 from owncloud/bower-underscore
bower underscore
2014-11-06 08:42:29 +01:00
Jenkins for ownCloud fa4018d36c [tx-robot] updated from transifex 2014-11-06 01:55:04 -05:00
Morris Jobke 957dee5af1 bower underscore 2014-11-05 23:23:03 +01:00
Lukas Reschke 4659b0e6a0 Merge pull request #11936 from owncloud/bower-jquery
Bower jquery
2014-11-05 16:43:24 +01:00
Robin Appelman 1eefc21329 Remove confusingly names \OC\User\Manager::delete and fix the automatic cache cleanup instead 2014-11-05 15:45:58 +01:00
Thomas Müller e624e9064c Merge pull request #11965 from owncloud/fix-jsonresponse
fix typo in content type for JSONResponse
2014-11-05 14:03:12 +01:00
Thomas Müller 06267fec8f Merge pull request #11928 from owncloud/support-HTML-in-logo
Support HTML in logo
2014-11-05 13:54:29 +01:00
Bjoern Schiessle c2a45c1238 throw exception if private key is missing 2014-11-05 13:05:46 +01:00
Bernhard Posselt 91a23bfa9c fix typo in content type 2014-11-05 12:04:56 +01:00