Commit Graph

25549 Commits

Author SHA1 Message Date
Vincent Petry e01db549a0 Merge pull request #17048 from owncloud/hotfix/fix-firewall-blocking-dir-message
adding correct blocking logic for ffw
2015-06-23 15:08:47 +02:00
Morris Jobke c86e129ce9 [updater] keep maintenance active on failure and mark failure in red 2015-06-23 14:45:53 +02:00
Björn Schießle cce841c665 Merge pull request #17045 from owncloud/enc_improvements
encryption improvements
2015-06-23 14:30:21 +02:00
Jan-Christoph Borchardt 71e5bc1803 explicitly set z-index on app-content, fix overlap from navigation 2015-06-23 14:03:27 +02:00
Jörn Friedrich Dreyer 4b5324341c Merge pull request #17090 from owncloud/upgrade-app-info
[upgrade] print update message before running the update code
2015-06-23 13:14:35 +02:00
Morris Jobke 1ba9fd3ada [upgrade] print update message before running the update code
* otherwise you don't know during which app update something failed
2015-06-23 13:13:44 +02:00
Joas Schilling e722614639 Merge pull request #17092 from owncloud/fix-language-experimental
Accept this language change "at your own risk"
2015-06-23 12:14:11 +02:00
Bjoern Schiessle 95602d4069 make sure that we always read the header from the original file 2015-06-23 11:41:21 +02:00
Joas Schilling e0fb5f4b5e Accept this language change at your own risk 2015-06-23 10:59:15 +02:00
Morris Jobke fe42553e8a [updater] propagate error case properly
* add $success to the updateEnd hook
* add new return code for a update failure
* add exception class to failure hook message
2015-06-23 10:03:27 +02:00
Morris Jobke fdd01cf15c Added error message on initMountpoints exception 2015-06-23 09:54:03 +02:00
Lukas Reschke 2654696086 Merge pull request #17081 from owncloud/issue-17079-risky-test-sabre-objecttree
Make an assertion in risky test testGetNodeForPathRoot
2015-06-23 09:11:36 +02:00
Morris Jobke a059b090c3 Merge pull request #17085 from owncloud/use-trusted-mimetype
Use trusted mimetype
2015-06-23 08:45:05 +02:00
Jenkins for ownCloud 3cad0d4ed2 [tx-robot] updated from transifex 2015-06-23 01:56:15 -04:00
Thomas Müller 25581c7b63 Merge pull request #16940 from owncloud/ext-s3-touchmtimefix
Properly set mtime on S3 for touch operation
2015-06-22 22:25:45 +02:00
Robin Appelman 5e1865530b take share target into account when updating recipient etags 2015-06-22 18:21:54 +02:00
Clark Tomlinson 5466dcadc0 adding correct blocking logic for fff 2015-06-22 11:42:42 -04:00
VicDeo 5cfcda3e95 Merge pull request #17068 from owncloud/fix_16878
fix search for results only from subfolder
2015-06-22 17:55:56 +03:00
Joas Schilling 45f9083a58 Make an assertion in risky test testGetNodeForPathRoot 2015-06-22 16:49:04 +02:00
Joas Schilling 738b78f1b0 Use \OC\HintException and translate the hint 2015-06-22 15:34:06 +02:00
Jan-Christoph Borchardt 9dde482315 remove whitespace on bottom when no search results, fix laylout, fix #16878 2015-06-22 15:30:29 +02:00
Lukas Reschke 3d2ac6dbb6 Use trusted mimetype
We shall not use untrusted mimetypes in this context
2015-06-22 15:30:27 +02:00
Joas Schilling 2b7e5f841a Merge spliteUserRemote with fixRemoteUrlInShareWith 2015-06-22 15:25:23 +02:00
Bjoern Schiessle d38a378b8c make sure that we split username and server address at the first '@' from the right to allow usernames containing '@' 2015-06-22 15:25:23 +02:00
Björn Schießle a88b370dc8 Merge pull request #12546 from oparoz/patch-1
Send the mime icon if we can't generate a preview
2015-06-22 13:55:17 +02:00
Bjoern Schiessle 8eda9ae83c add filter-empty class if no search result in current folder 2015-06-22 12:13:05 +02:00
Thomas Müller c74c8eff3a Enable x-sendfile only if we do not lock the file system 2015-06-22 12:07:53 +02:00
Thomas Müller ced15c44b4 Merge pull request #16657 from owncloud/view-emit-path
emit hooks from a view as long as the path is inside the default root
2015-06-22 11:29:11 +02:00
Bernhard Posselt 7fe5ab4d4a Merge pull request #17056 from owncloud/appframework-type-cast
Allow multiple whitespace in type hints in AppFramework
2015-06-22 10:35:28 +02:00
Jenkins for ownCloud c77e44117d [tx-robot] updated from transifex 2015-06-22 01:55:00 -04:00
Robin McCorkell 05fb9ceef9 Merge pull request #17025 from owncloud/sftp-rmdir-emptydir
Workaround for empty dir deletion for SFTP
2015-06-21 23:50:58 +01:00
Robin McCorkell 103f8ca6e8 Merge pull request #17052 from owncloud/fix-phpdoc-groupmgm
Use proper type
2015-06-21 23:33:19 +01:00
Robin McCorkell f1e3e25158 AppFramework annotation whitespace unit test 2015-06-21 20:26:57 +01:00
Jenkins for ownCloud 59513ac377 [tx-robot] updated from transifex 2015-06-21 01:55:06 -04:00
Robin McCorkell 04b6f67f07 Allow multiple whitespace in type hints in AppFramework
Type hints such as `@param bool     $doSomething` will now correctly get
parsed, allowing for alignment of docblock parameters if the app developer so
wishes.
2015-06-20 23:52:01 +01:00
Jenkins for ownCloud 183bd6dd49 [tx-robot] updated from transifex 2015-06-20 01:55:10 -04:00
Lukas Reschke 1ead0b6f95 Use proper type
This is a string
2015-06-19 21:00:42 +02:00
Lukas Reschke 00a65e30ce Request approved state for disabled apps with ocsid
In case an application gets disabled the level is set to "experimental" if it does not contain a `shipped` tag. This can for example be reproduced by installing the documents app from the appstore and then disabling it. Or cloning an app from git.

With this change the controller will now load the level of the application from the appstore if a valid OCSID has been provided.

Fixes https://github.com/owncloud/core/issues/17003
2015-06-19 19:04:54 +02:00
Olivier Paroz ba3b6f9be4 Remove unneeded returns from private cropping methods 2015-06-19 15:07:49 +02:00
Morris Jobke 5ed9743570 Merge pull request #17041 from owncloud/ocp-since-checker
Add tool to check OCP for missing @since tag
2015-06-19 14:40:15 +02:00
Bjoern Schiessle ed3dc199ae remove files_encryption from database at the end of the migration process 2015-06-19 14:15:56 +02:00
Thomas Müller 5c2646a4bf Merge pull request #17024 from owncloud/master-verify-if-path-exists-in-upload
[master] Verify if path exists
2015-06-19 13:20:38 +02:00
Thomas Müller 1b7ec7d5ec Merge pull request #17040 from owncloud/fix-param-naming
Fix naming of param in private/server.php
2015-06-19 11:36:40 +02:00
Thomas Müller 78e581d52a Merge pull request #17026 from owncloud/update-config.sample.php
[config.sample.php] set correct default value for skeletondirectory
2015-06-19 11:10:01 +02:00
Morris Jobke fc064212b9 [config.sample.php] set correct default value for skeletondirectory 2015-06-19 11:08:34 +02:00
Morris Jobke b230b8e2c6 move the OCPSinceChecker.php to build/ 2015-06-19 11:03:09 +02:00
Morris Jobke eddbdb8f21 Fix missing @since tags in OCP 2015-06-19 10:51:36 +02:00
Morris Jobke ba43ec974c Add tool to check OCP for missing @since tag
* gets executed in autotest.sh and fails if some PHPDoc is missing
* doesn't check classes/methods that are marked as @deprecated
* iterates over all .php files in lib/public
2015-06-19 10:50:48 +02:00
Morris Jobke 7e046d0595 Fix naming of param in private/server.php 2015-06-19 10:23:04 +02:00
Joas Schilling 6adddb3095 Merge pull request #16889 from owncloud/group-sorting-fixes
Only sort by group name when LDAP is involved
2015-06-19 08:29:25 +02:00