Commit Graph

17752 Commits

Author SHA1 Message Date
Lukas Reschke 166f2af5d8 Merge pull request #8582 from owncloud/remove-outdated-update-sc
We do not support updates from 4.5 > 7.0 or even 3.0 > 7.0
2014-05-14 00:28:05 +02:00
Thomas Müller 5fb94bf76f Merge pull request #8542 from owncloud/phpdoc-improvements
PHPDoc Improvements
2014-05-13 23:23:11 +02:00
Thomas Müller 401bc60981 Merge pull request #8586 from owncloud/more-unit-tests
Add tests for other types that PHP might cast
2014-05-13 23:06:15 +02:00
Lukas Reschke b0381cfe12 Add tests for other types that PHP might cast
Addition to https://github.com/owncloud/core/pull/8572
2014-05-13 22:01:11 +02:00
Thomas Müller 37ba6f503a fixing variable naming 2014-05-13 19:09:15 +01:00
Thomas Müller 58857b8df5 @returns -> @return 2014-05-13 19:09:15 +01:00
Thomas Müller 55fc693750 @breif -> @brief 2014-05-13 19:09:15 +01:00
Thomas Müller fa503a4772 fix PHPDoc 2014-05-13 19:09:15 +01:00
Thomas Müller 650a55e2ba object -> \OC\Preview 2014-05-13 19:09:14 +01:00
Thomas Müller 7853bc4cac adding PHPDoc 2014-05-13 19:09:14 +01:00
Thomas Müller 147007bdd8 fixing typo and missing @throws 2014-05-13 19:09:14 +01:00
Robin McCorkell 4755392c65 More PHPDoc for file functions 2014-05-13 19:09:14 +01:00
Robin McCorkell f7e777f7d2 Fix various code errors detected by Scrutinizer
Fixed:
- An error with a misplaced bracket in lib/private/util.php
- An error with an incorrect function being called in lib/public/contacts.php
2014-05-13 19:09:14 +01:00
Robin McCorkell bac8962bbc Fix Scrutinizer errors 2014-05-13 19:08:14 +01:00
Robin McCorkell bd3bf4b507 Change parameter order of implode 2014-05-13 19:08:14 +01:00
Robin McCorkell 875a8acedf Fix Scrutinizer errors about missing user backend 2014-05-13 19:08:14 +01:00
Robin McCorkell 8ab01599a9 Use OC_User_Interface instead of OC_User_Backend 2014-05-13 19:08:14 +01:00
Lukas Reschke 7e448a376f Fix PHPDoc and typos
Some things my IDE complained about while creating a custom backend.

Fix PHPDoc and typos

Some things my IDE complained about while creating a custom backend.

Conflicts:
	lib/private/group/database.php
	lib/private/group/dummy.php
	lib/private/group/example.php
2014-05-13 19:08:14 +01:00
Robin McCorkell 3bed3d2a23 Change parameter type for useBackend 2014-05-13 19:08:14 +01:00
Robin McCorkell 87b548ed91 Fix all PHPDoc types and variable names, in /lib 2014-05-13 19:08:14 +01:00
Robin McCorkell a7ae2e874a Squash 'a | b' into 'a|b', in /lib 2014-05-13 19:08:14 +01:00
Robin McCorkell b5bc37d2e4 Fix @return array PHPDocs, in /lib 2014-05-13 19:08:14 +01:00
Robin McCorkell b653ad164b Replace @returns with @return, in /lib 2014-05-13 19:08:14 +01:00
Lukas Reschke 2d1296bb03 We do not support updates from 4.5 > 7.0 2014-05-13 18:54:43 +02:00
Thomas Müller f5bc680f9c Merge pull request #8572 from owncloud/core-getabsolutepathwithzero
Fixed getAbsolutePath case when path is "0"
2014-05-13 17:41:18 +02:00
Vincent Petry bab8c1f8e5 Fixed getAbsolutePath case when path is "0"
Make sure to correctly check for string emptiness when the passed path
is "0".
2014-05-13 17:38:46 +02:00
Thomas Müller 7babd44dd0 Merge pull request #8524 from owncloud/prompt-dialog
Add prompt dialog to OC.dialogs
2014-05-13 17:32:06 +02:00
Björn Schießle b8de1e5d71 Merge pull request #8398 from owncloud/enc_backup_keys
backup the encryption key after the encryption was disabled
2014-05-13 09:25:16 -04:00
Morris Jobke e934129bf6 Merge pull request #8566 from owncloud/controller-defaults
Allow setting of controller default method values through normal PHP default values
2014-05-13 14:32:07 +02:00
Bjoern Schiessle a9ac11718e backup the encryption key after the encryption was disabled so that the user
can restore them if needed
2014-05-13 12:35:25 +02:00
Vincent Petry 6d00675d69 Merge pull request #8562 from owncloud/better-addmountpoint
Extract mount point merging logic into separate function
2014-05-13 12:19:41 +02:00
Morris Jobke 22e57d7e5a Merge pull request #8550 from owncloud/fix-sticky-footer
fix sticky footer on log in page
2014-05-13 11:02:14 +02:00
Bernhard Posselt a152e320f6 make it possible to omit parameters and use the default parameters from the controller method 2014-05-13 10:40:49 +02:00
Vincent Petry c06063255f Merge pull request #8526 from owncloud/escape-share-emails-master
escape display name and email
2014-05-13 10:29:54 +02:00
Vincent Petry e3f6abf1f0 Merge pull request #8546 from owncloud/fix-preview-orientation-encrypted-master
Rotate thumbnail when encryption is enabled
2014-05-13 10:27:41 +02:00
Jenkins for ownCloud a60db322c2 [tx-robot] updated from transifex 2014-05-13 01:55:41 -04:00
Robin McCorkell 08a8a409d6 Extract mount point merging logic into separate function 2014-05-13 00:14:30 +01:00
Thomas Müller 408189b7e4 Merge pull request #8556 from owncloud/kill-legacy-code-master
Kill legacy code master
2014-05-12 20:55:24 +02:00
Lukas Reschke aea44ee0d5 Merge pull request #8538 from owncloud/make-my-ide-less-complain-about-ldap
Use proper PHPDoc and variable names in the LDAP lib
2014-05-12 19:31:43 +02:00
Lukas Reschke cd7fc5cb80 Use array as type 2014-05-12 19:31:21 +02:00
Thomas Müller ee8a7b53da Merge pull request #8553 from owncloud/fix-8549-master
adding X-Robots-Tag to all responses of ownCloud + move addSecurityHeade...
2014-05-12 17:45:08 +02:00
Thomas Müller 1d18fd4e6d Merge pull request #8482 from owncloud/public-logger
Make logger available in the container
2014-05-12 16:40:58 +02:00
Thomas Müller f5ed92bf31 remove legacy aka deprecated code: OC_Cache_FileGlobalGC 2014-05-12 16:34:47 +02:00
Thomas Müller e0dd69e4e6 remove legacy aka deprecated code: OC_FilesystemView 2014-05-12 16:30:39 +02:00
Thomas Müller 33987eea83 remove legacy aka deprecated code: OC_Cache 2014-05-12 16:23:33 +02:00
Thomas Müller 4dd1a49a68 remove legacy aka deprecated code: OC_Filesystem 2014-05-12 16:20:07 +02:00
Thomas Müller 3cd32dcb7c adding X-Robots-Tag to all responses of ownCloud + move addSecurityHeaders() to OC_Response, which seems to be a more reasonable place 2014-05-12 15:14:01 +02:00
Thomas Müller 93dbb39e77 adding unit test for message interpolation 2014-05-12 14:17:36 +02:00
Jan-Christoph Borchardt b92c4cb84d fix sticky footer on log in page 2014-05-12 13:40:04 +02:00
Morris Jobke 9d95fff427 fix missing spaces 2014-05-12 13:32:03 +02:00