602b636d3e
Merge pull request #20807 from owncloud/dont-append-redirect-url-if-user-is-already-logged-in
...
Don't append redirect URL if user is logged-in
2015-12-03 16:53:59 +01:00
2ceae43989
Merge pull request #20545 from owncloud/scan-storage-in-background-job
...
Move files/ajax/scan.php to background job
2015-12-03 16:53:46 +01:00
c60c793cf2
More cleanups of OC_Config usage
2015-12-03 16:41:23 +01:00
1fe7957fd0
Merge pull request #20924 from owncloud/use-url-generator-to-generate-link
...
Use URLGenerator instead of hard-coded WEBROOT
2015-12-03 15:26:14 +01:00
cc72c6a30d
Added dav endpoints for system tags
2015-12-03 15:23:21 +01:00
1f69dcb593
Use URLGenerator instead of hard-coded WEBROOT
...
Fixes https://github.com/owncloud/core/issues/20922
2015-12-03 14:42:14 +01:00
aa0265bd34
Replace OC_Config in setup
2015-12-03 14:35:15 +01:00
2d1cc8aaeb
Merge pull request #19461 from owncloud/reuse_code
...
reuse code
2015-12-03 13:55:50 +01:00
19b2fe6a3a
Fix mimetype filter in getDirectoryContent
2015-12-03 13:09:13 +01:00
9dd11091d4
Fix code from comments
2015-12-03 10:00:11 +01:00
98f5c50aa4
Migrate storate status code to storagenotavailablexception
2015-12-03 09:59:45 +01:00
4ead2bc861
Fix code from PR comments
2015-12-03 09:58:55 +01:00
7cd13f462a
Add new external storage exceptions for different errors
2015-12-03 09:57:59 +01:00
e7239b6553
Merge pull request #20872 from owncloud/systemtags-better-not-found-exception
...
Systemtags better not found exception
2015-12-03 09:26:05 +01:00
a5c80ba8bc
Merge pull request #20894 from owncloud/post-delete-meta-view
...
Also add metadata for postDelete hooks triggered from the view
2015-12-03 09:24:54 +01:00
7fefd4f4d9
Merge pull request #20860 from owncloud/use-user-getEMailAddress-all-over-the-place
...
User IUser::getEMailAddress() all over the place
2015-12-03 09:21:53 +01:00
09600058d0
Merge pull request #20901 from owncloud/get-rid-of-more-legacy-config-stuff
...
Replace old config code with usage of proper APIs
2015-12-02 21:54:42 +01:00
dcc7ff09ba
Adding unit test for MailNotifications::sendInternalShareMail()
2015-12-02 21:42:14 +01:00
eebe2b9c23
User IUser::getEMailAddress() all over the place
2015-12-02 21:25:05 +01:00
df5872ec50
Merge pull request #20719 from owncloud/adding-system-addressbook-of-users
...
Adding system addressbook for users of this instance - a occ command …
2015-12-02 16:17:58 +01:00
37ecde065b
Replace old config code with usage of proper APIs
2015-12-02 15:56:59 +01:00
baecfc4080
Reduce OC_Config usage in lib/
...
* replaced by proper public interfaces
2015-12-02 14:49:40 +01:00
28ceab2f61
Fix endless recursion
2015-12-02 14:44:41 +01:00
0062888aaf
Also add metadata for postDelete hooks triggered from the view
2015-12-02 13:51:26 +01:00
8d218bf3ef
Merge pull request #20875 from owncloud/remove-changepropagator
...
remove old propagation logic
2015-12-02 13:03:31 +01:00
4d9af08f12
Execute only for web and not for CLI
2015-12-02 11:49:33 +01:00
09d9e430d8
Add a trailing slash to generated URLs
2015-12-02 11:27:07 +01:00
125b7e7512
Ensure that ownCloud is always accessed with a trailing slash
2015-12-02 11:26:41 +01:00
812a390f32
Merge pull request #20879 from owncloud/check-if-rewrite-base-is-set-if-rewrite-is-active
...
Check if rewrite base is set if rewrite is active
2015-12-02 10:56:44 +01:00
c46ea30248
Merge pull request #20865 from owncloud/post-delete-meta
...
Add metadata to post delete hooks
2015-12-02 10:12:54 +01:00
f840d8dee7
Merge pull request #20874 from owncloud/allow-di-mimetypedetector
...
Allow DI for OCP\Files\IMimeTypeDetector
2015-12-02 10:12:35 +01:00
0bd0212731
Merge pull request #20877 from owncloud/fix-empty-expirationDate
...
Check the expiration date for null
2015-12-02 10:12:16 +01:00
4c695e63c0
Fix comments
2015-12-02 09:20:58 +01:00
0391cc0451
Fix getCloudId
2015-12-02 09:14:41 +01:00
6abc02cb88
Proposal: add enumeration function to IUserManager which simply calls a callbask for each user in all backends
2015-12-02 09:14:41 +01:00
df6fc6cc70
Add the user's cloud id to the vCard
2015-12-02 09:14:41 +01:00
dad6470baa
Add IUser::getAvatarImage() for easy access
2015-12-02 09:14:41 +01:00
4f4b91a9ec
[tx-robot] updated from transifex
2015-12-02 02:00:28 -05:00
b00db2c933
DI in avatar code
...
* DI in avatar code
* Use the node API
* More unit tests
* Unit tests no longer require DB
2015-12-01 22:15:43 +01:00
6a067b1ec9
Set RewriteBase to / if OC::WEBROOT is not set
2015-12-01 22:03:25 +01:00
002e719789
Set "SetEnv" within base `.htaccess` file
...
mod_rewrite as used by the front controller may require a `RewriteBase` in case the installation is done using an alias. Since we cannot enforce a writable `.htaccess` file this will move the `front_controller_active` environment variable into the main .htaccess file. If administrators decide to have this one not writable they can still enable this feature by setting the `front_controller_active` environment variable within the Apache config.
2015-12-01 19:06:48 +01:00
3061e5d2fc
Check the expiration date for null
...
* null is always less than any value -> expirationDate gets null
which is "no date set"
* ref https://github.com/owncloud/core/issues/20590#issuecomment-158393075
2015-12-01 17:43:05 +01:00
62cc316c6a
remove old propagation logic
2015-12-01 16:50:20 +01:00
44852ce324
Allow DI for OCP\Files\IMimeTypeDetector
2015-12-01 16:49:20 +01:00
2515cb17be
Support pretty URLs
...
This changeset allows ownCloud to run with pretty URLs, they will be used if mod_rewrite and mod_env are available. This means basically that the `index.php` in the URL is not shown to the user anymore.
Also the not deprecated functions to generate URLs have been modified to support this behaviour, old functions such as `filePath` will still behave as before for compatibility reasons.
Examples:
http://localhost/owncloud/index.php/s/AIDyKbxiRZWAAjP => http://localhost/owncloud/s/AIDyKbxiRZWAAjP
http://localhost/owncloud/index.php/apps/files/ => http://localhost/owncloud/apps/files/
Due to the way our CSS and JS is structured the .htaccess uses some hacks for the final result but could be worse... And I was just annoyed by all that users crying for the removal of `index.php` ;-)
2015-12-01 16:46:07 +01:00
74e8c25a5b
Merge pull request #20285 from owncloud/add-integrity-checker
...
Add code integrity checker foundation
2015-12-01 15:27:50 +01:00
1d0c041ac8
Add a method to get the list of tags from the TagNotFound Exception
2015-12-01 14:54:34 +01:00
0d63e95a5d
Add metadata to post delete hooks
2015-12-01 13:22:58 +01:00
1761fdd9ee
Fix the docs of the exceptions and remove hardcoded language from the message
2015-12-01 12:32:50 +01:00
4971015544
Add code integrity check
...
This PR implements the base foundation of the code signing and integrity check. In this PR implemented is the signing and verification logic, as well as commands to sign single apps or the core repository.
Furthermore, there is a basic implementation to display problems with the code integrity on the update screen.
Code signing basically happens the following way:
- There is a ownCloud Root Certificate authority stored `resources/codesigning/root.crt` (in this PR I also ship the private key which we obviously need to change before a release 😉 ). This certificate is not intended to be used for signing directly and only is used to sign new certificates.
- Using the `integrity:sign-core` and `integrity:sign-app` commands developers can sign either the core release or a single app. The core release needs to be signed with a certificate that has a CN of `core`, apps need to be signed with a certificate that either has a CN of `core` (shipped apps!) or the AppID.
- The command generates a signature.json file of the following format:
```json
{
"hashes": {
"/filename.php": "2401fed2eea6f2c1027c482a633e8e25cd46701f811e2d2c10dc213fd95fa60e350bccbbebdccc73a042b1a2799f673fbabadc783284cc288e4f1a1eacb74e3d",
"/lib/base.php": "55548cc16b457cd74241990cc9d3b72b6335f2e5f45eee95171da024087d114fcbc2effc3d5818a6d5d55f2ae960ab39fd0414d0c542b72a3b9e08eb21206dd9"
},
"certificate": "-----BEGIN CERTIFICATE-----MIIBvTCCASagAwIBAgIUPvawyqJwCwYazcv7iz16TWxfeUMwDQYJKoZIhvcNAQEF\nBQAwIzEhMB8GA1UECgwYb3duQ2xvdWQgQ29kZSBTaWduaW5nIENBMB4XDTE1MTAx\nNDEzMTcxMFoXDTE2MTAxNDEzMTcxMFowEzERMA8GA1UEAwwIY29udGFjdHMwgZ8w\nDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBANoQesGdCW0L2L+a2xITYipixkScrIpB\nkX5Snu3fs45MscDb61xByjBSlFgR4QI6McoCipPw4SUr28EaExVvgPSvqUjYLGps\nfiv0Cvgquzbx/X3mUcdk9LcFo1uWGtrTfkuXSKX41PnJGTr6RQWGIBd1V52q1qbC\nJKkfzyeMeuQfAgMBAAEwDQYJKoZIhvcNAQEFBQADgYEAvF/KIhRMQ3tYTmgHWsiM\nwDMgIDb7iaHF0fS+/Nvo4PzoTO/trev6tMyjLbJ7hgdCpz/1sNzE11Cibf6V6dsz\njCE9invP368Xv0bTRObRqeSNsGogGl5ceAvR0c9BG+NRIKHcly3At3gLkS2791bC\niG+UxI/MNcWV0uJg9S63LF8=\n-----END CERTIFICATE-----",
"signature": "U29tZVNpZ25lZERhdGFFeGFtcGxl"
}
```
`hashes` is an array of all files in the folder with their corresponding SHA512 hashes (this is actually quite cheap to calculate), the `certificate` is the certificate used for signing. It has to be issued by the ownCloud Root Authority and it's CN needs to be permitted to perform the required action. The `signature` is then a signature of the `hashes` which can be verified using the `certificate`.
Steps to do in other PRs, this is already a quite huge one:
- Add nag screen in case the code check fails to ensure that administrators are aware of this.
- Add code verification also to OCC upgrade and unify display code more.
- Add enforced code verification to apps shipped from the appstore with a level of "official"
- Add enfocrced code verification to apps shipped from the appstore that were already signed in a previous release
- Add some developer documentation on how devs can request their own certificate
- Check when installing ownCloud
- Add support for CRLs to allow revoking certificates
**Note:** The upgrade checks are only run when the instance has a defined release channel of `stable` (defined in `version.php`). If you want to test this, you need to change the channel thus and then generate the core signature:
```
➜ master git:(add-integrity-checker) ✗ ./occ integrity:sign-core --privateKey=resources/codesigning/core.key --certificate=resources/codesigning/core.crt
Successfully signed "core"
```
Then increase the version and you should see something like the following:
As you can see a failed code check will not prevent the further update. It will instead just be a notice to the admin. In a next step we will add some nag screen.
For packaging stable releases this requires the following additional steps as a last action before zipping:
1. Run `./occ integrity:sign-core` once
2. Run `./occ integrity:sign-app` _for each_ app. However, this can be simply automated using a simple foreach on the apps folder.
2015-12-01 11:55:20 +01:00
3c5a6b829e
Allow DI the system tag stuff without Application class
2015-11-30 17:08:29 +01:00
08248f66ba
Merge pull request #20650 from owncloud/systemtags-core
...
Implement systemtag managers and mapper
2015-11-30 15:38:43 +01:00
995ceeb8d9
Merge pull request #20815 from owncloud/avatar-cache-size
...
cache resized avatars
2015-11-30 14:27:05 +01:00
fc21aa6c41
Merge pull request #20248 from owncloud/use-phpunit-groups-to-run-database-code-in-isolation
...
Use phpunit groups to run database code in isolation
2015-11-30 14:25:35 +01:00
f4eb15d340
Show error template
...
Otherwise this leads to an endless redirection in case of a CSRF exception. Also sets user expectation right.
2015-11-30 11:25:52 +01:00
a94819f4a4
Merge pull request #20809 from owncloud/dont-trust-update-server-message
...
Don't trust update server
2015-11-30 11:20:30 +01:00
f9fc254672
Add DB group to some files_external tests
...
Adding group Db to federation tests and ldap tests
Add group DB to Test_UrlGenerator
Adding group DB to trashbin and versions tests
Adding group DB to Test_Util_CheckServer for pg
2015-11-30 10:55:10 +01:00
c4bebf66d4
Do not count the entries when we only need to know if it is at least one
2015-11-30 10:20:00 +01:00
aa1a0a15ea
Fix use statements
2015-11-30 10:12:15 +01:00
9c1dbaf0ad
Merge pull request #20788 from owncloud/catch-missing-route
...
Dont die when we're missing a route
2015-11-30 10:11:12 +01:00
6816b36cdb
Add backticks inside function to escape the column
2015-11-30 10:07:00 +01:00
17ce120736
Revert "Dont bother with stream_resolve_include_path if the path is already absolute"
2015-11-29 10:54:29 +01:00
6b7e748245
cache resized avatars
2015-11-28 17:33:16 +01:00
391bc49dab
Move files/ajax/scan.php to background job
...
The background job will now be executed in chunks of 500 users all 10 minutes.
2015-11-28 13:06:53 +01:00
f3e9106864
Don't trust update server
...
In case the update server may deliver malicious content this would allow an adversary to inject arbitrary HTML into the response. So very bad stuff.
While signing the response would be better and something we can also do in the future (considering the code signing work), this is already a good first start.
2015-11-28 12:21:53 +01:00
4c4331982c
Merge pull request #20789 from owncloud/scanner-skip-not-available
...
Skip unavailable storages in scanner
2015-11-27 22:57:47 +01:00
b666367a79
Added system tags data structure and PHP side managers
...
Added SystemTagManager and SystemTagObjectMapper
2015-11-27 17:54:29 +01:00
2b316eaa83
Merge pull request #20792 from owncloud/autoloader-absolute-paths
...
Dont bother with stream_resolve_include_path if the path is already absolute
2015-11-27 16:03:39 +01:00
b05c8faba8
Dont die when we're missing a route
2015-11-27 14:29:06 +01:00
816cd66b4b
also log exception
2015-11-27 14:28:15 +01:00
bdbefe17d6
Merge pull request #20782 from mitar/better-https
...
Also allow empty value for no-HTTPS
2015-11-27 14:24:23 +01:00
50474c6041
Dont bother with stream_resolve_include_path if the path is already absolute
2015-11-27 14:12:14 +01:00
ae71f80f4a
Skip unavailable storages in scanner
2015-11-27 14:02:50 +01:00
59511d97ee
Also allow empty value for no-HTTPS.
...
This makes it work better with old version of Nginx.
2015-11-27 01:01:56 -08:00
7aed592957
Add full interface of server container as alias
2015-11-26 18:20:25 +01:00
8fe878afe9
Merge pull request #20602 from owncloud/fix-installed-apps
...
Always installed apps includes the hardcoded ones from shipped.json
2015-11-26 16:50:05 +01:00
80c43ffc6c
Merge pull request #20702 from owncloud/move-user-principal-into-subfolder
...
Users are available under it's own principal resource named 'principa…
2015-11-26 16:49:49 +01:00
19d5059109
Merge pull request #20393 from owncloud/querybuilder-select-with-alias
...
Add a method to select a field or value with alias
2015-11-26 16:19:20 +01:00
97ebc6d80c
Merge pull request #20746 from owncloud/untangle-linkToDocs
...
Untangle the linkToDocs method in OC_Helper
2015-11-26 15:08:28 +01:00
4d22c75d49
Merge pull request #20562 from owncloud/comments-interfaces
...
public interfaces for Comments
2015-11-26 15:06:35 +01:00
675417a75c
Untangle the linkToDocs method in OC_Helper
...
* now uses the proper URLGenerator interface
* add comment about DI problems
2015-11-26 13:58:43 +01:00
3882cc8ef3
Merge pull request #20744 from owncloud/oc_helper-getMimeType-cleanup
...
Remove last occurences of OC_Helper::getMimeType()
2015-11-26 12:37:25 +01:00
d660c6162f
proper description for IllegalIDChangeException
2015-11-26 12:15:00 +01:00
5a33390a69
Merge pull request #20731 from owncloud/per-storage-updater
...
Make Cache\Updater per storage
2015-11-26 12:01:44 +01:00
0b8296a756
remove unused method
2015-11-26 10:58:30 +01:00
4fcab98694
Remove unused internal methods
...
* removes OC_Helper::mb_substr_replace and OC_Helper::mb_str_replace
* keeps public interface wrapper working as expected
2015-11-26 10:25:43 +01:00
9318606faf
Remove last occurences of OC_Helper::getMimeType()
...
* ref #4774
2015-11-26 10:18:32 +01:00
b799e42b4e
Introduce \OCP\IUser::getEMailAddress()
2015-11-25 22:23:34 +01:00
9ec2f8886e
Merge pull request #20691 from owncloud/share2.0_di_fixes
...
[Sharing 2.0] di fixes
2015-11-25 15:25:50 +01:00
afe76840f8
Merge pull request #20705 from owncloud/fix_20648
...
Fix overriding function from 3rdparty warning
2015-11-25 15:24:20 +01:00
b025f07fb7
Make Cache\Updater per storage
2015-11-25 14:16:00 +01:00
50f6817ce9
Merge pull request #20439 from owncloud/etag-propagate-in-storage
...
Take submount etag into account for folder etags
2015-11-25 12:49:54 +01:00
89b9f5518b
Merge pull request #20636 from owncloud/savre-3.0
...
sabre/dav 3.0 and related
2015-11-24 16:20:48 +01:00
4bb346a1e6
Merge pull request #20692 from owncloud/federation_auto_add_servers
...
auto-add ownClouds to the list of trusted servers
2015-11-24 16:19:39 +01:00
ae36c01b95
Adjust sabre changes in core
2015-11-24 15:11:54 +01:00
cfdf2b9976
Fix overriding function from 3rdparty warning
...
Fixes #20648
2015-11-24 13:25:50 +01:00
964fa1fce3
use hooks to auto add server to the list of trusted servers once a federated share was created
2015-11-24 11:34:38 +01:00
b7b6770d35
Merge pull request #20693 from owncloud/phpdoc_node
...
Consistent interface declaration OCP\Files\Node
2015-11-24 10:56:53 +01:00
d785883eb2
Merge pull request #20682 from owncloud/objectid-to-string
...
Make sure that object id can be a string
2015-11-24 10:56:34 +01:00
85976b7293
[Sharing 2.0] Fix phpdoc etc
2015-11-24 10:26:36 +01:00
a2b8483779
[Sharing 2.0] Default share provider only generic DI
...
No injection of userfolders etc. Only generic DI components
(IRootFolder) etc should be used to make sure we can also run this from
the cli
2015-11-24 10:26:36 +01:00
aeae73b364
[Sharing 2.0] Removed unused DI stuff
...
The share manager etc should not care about filtering stuff. They should
return what is asked for them.
2015-11-24 10:26:36 +01:00
cb69e6c201
[tx-robot] updated from transifex
2015-11-24 01:56:32 -05:00
ab8937ba6a
missing setters for setChildrenCount and setLatestChildDateTime (formerly …Timestamp)
2015-11-23 23:58:22 +01:00
5873821b8d
Consistent interface declaration
2015-11-23 22:03:19 +01:00
4005c0337b
give creation datetime setter and getter a more meaningful and less misleading name
2015-11-23 17:32:22 +01:00
d43abd0b8f
public interfaces for Comments
2015-11-23 17:21:11 +01:00
018bd3ee24
Make sure that object id can be a string
2015-11-23 14:18:15 +01:00
728648ad77
Replace new occurences of ini_get with IniWrapper methods
2015-11-23 14:12:36 +01:00
9caf4ffbfc
Replacing ini_get instances with inigetwrapper usages
2015-11-23 14:12:31 +01:00
021137d7ae
Merge pull request #20679 from owncloud/fixphpdoc
...
p() supports string as argument
2015-11-23 13:32:46 +01:00
df906f475b
Merge pull request #20617 from owncloud/fix-usage-of-lastInsertId
...
lastInsertId() is properly working with Oracle if the table name is p…
2015-11-23 13:29:08 +01:00
240cc1c4ea
Merge pull request #20543 from owncloud/share2.0_fix_hooks
...
Move hook and delete children logic to share manager
2015-11-23 13:28:49 +01:00
1c7d7288c4
Add a method to select a field or value with alias
2015-11-23 13:28:31 +01:00
1360e22d7c
[Sharing 2.0] Move hook and delete children logic to share manager
...
To make sure hooks are always fired and child entries are always
cleaned. This logic is moved to the share manager.
* Updated unit tests
2015-11-23 12:28:54 +01:00
7138659080
p() supports string as argument
2015-11-23 12:11:23 +01:00
aa660ec232
Throw an exception in case no table name is passed into lastInsertId of the Oracle adapter
2015-11-23 11:44:08 +01:00
9f69021691
lastInsertId() is properly working with Oracle if the table name is properly passed in
2015-11-23 11:44:08 +01:00
a370c29068
Use a DateTime object instead of a timestamp
2015-11-23 11:41:48 +01:00
1835462ec4
reuse code
2015-11-23 11:02:46 +01:00
79bbda994b
Merge pull request #16902 from owncloud/jsocclient
...
Web UI uses Webdav instead of ajax/* calls
2015-11-23 09:38:01 +01:00
2f89eef334
Merge pull request #20524 from owncloud/pgsql-version-check-error
...
assume pgsql >=9 if checking the version fails
2015-11-23 09:05:13 +01:00
56e05a90af
[tx-robot] updated from transifex
2015-11-23 01:54:53 -05:00
2d7c9f0ba9
also match ie11 with Request::USER_AGENT_IE
2015-11-22 16:05:52 +01:00
a05e40932c
Now using IE8 workaround of davclient.js for all IE versions
2015-11-22 16:05:52 +01:00
358858c9e3
Fix undefined HTTP_USER_AGENT
2015-11-22 16:05:50 +01:00
fb3d5c7856
Add evert's davclient.js + es6-promise + IE8 workaround
...
- Add davclient.js lib
- Add es6-promise required by that lib
- Wrote IE8 workaround lib/shim for davclient.js
2015-11-22 16:05:49 +01:00
2321cc4854
[tx-robot] updated from transifex
2015-11-22 01:54:53 -05:00
427d107b9f
Merge pull request #20614 from owncloud/use-mocks-when-testing-isSharingDisabledForUser
...
Use mocks when testing isSharingDisabledForUser
2015-11-20 15:22:52 +01:00
c86483f3ed
Adjust PHPDoc as suggested
2015-11-20 14:38:29 +01:00
479cee66f4
Merge pull request #20034 from owncloud/icewind_streams_0.3.0
...
Bump 3rdparty for icewind/streams-0.3.0
2015-11-19 17:27:30 +01:00
c565a7b042
Fix failing unit test 💀
2015-11-19 16:44:43 +01:00
ea2bf49be0
Adjust the method name to reflect it's behaviour
2015-11-19 16:08:21 +01:00
30dd610a2a
Merge pull request #20563 from owncloud/systemtags-interface
...
Core interfaces for system tags and its manager
2015-11-19 15:47:47 +01:00
9ec2850c78
Use mocks when testing isSharingDisabledForUser
2015-11-19 15:36:16 +01:00
ca6bd5cacd
Follow the interface again
2015-11-19 14:34:59 +01:00
888df3933d
take the etag of child mounts into account for the folder etag
...
this replaces shared etag propagation
2015-11-19 13:32:00 +01:00
d006a7c723
Fix scanning of incomplete folders
2015-11-19 13:30:50 +01:00
02f847bc66
use relative path
2015-11-19 13:30:50 +01:00
d5061b8139
fix fileinfo for non existing files
2015-11-19 13:30:50 +01:00
1736c70075
Some more cleanup for getFIleInfo/getDirectoryContent
2015-11-19 13:30:50 +01:00
02be8a3a12
Split getting cache entry and checking update to a seperate method
2015-11-19 13:29:12 +01:00
ea6341df29
Core interfaces for system tags and its manager
2015-11-19 11:31:25 +01:00
1189528e1f
Always installed apps includes the hardcoded ones from shipped.json
...
* fixes #20568
2015-11-19 09:11:14 +01:00
c10be07c1b
[tx-robot] updated from transifex
2015-11-19 01:55:13 -05:00
71b86c0ed4
Handle non existing users as owner in the view
2015-11-18 17:08:18 +01:00
8d74e28af6
Merge pull request #20438 from owncloud/memcache-key-length-fix
...
Handle errors on memcached level
2015-11-18 14:20:57 +01:00
6efa72867a
Merge pull request #20540 from owncloud/fix-format-call-in-logger
...
Try to fix logging errors we did observe on ci ....
2015-11-18 09:18:54 +01:00
aba119951e
Merge pull request #20494 from owncloud/storage-forbidden-exception
...
Allow storage wrappers to through a forbidden exception with retry information for clients
2015-11-18 09:13:45 +01:00
8db9c49cda
Merge pull request #20551 from owncloud/notification-fix-tests
...
Notification - Add tests for the "return $this" and fix it on the new method
2015-11-18 09:12:27 +01:00
20c251a575
Merge pull request #20188 from owncloud/webdav-exposeshareowner
...
Expose share owner id and display name via files webdav
2015-11-17 13:40:25 +01:00
74ce6d29e1
Merge pull request #20544 from owncloud/move-index-to-appframework
...
Move index.php from files to AppFramework
2015-11-17 12:49:38 +01:00
e2cfcd992c
Allow storage wrappers to through a forbidden exception with retry information
2015-11-17 10:39:52 +01:00
2fde6a77d7
Add tests for the "return $this" and fix it on the new method
2015-11-17 09:26:13 +01:00
705d208a8a
Merge pull request #20539 from owncloud/notification-api-adjustment
...
Notification api update
2015-11-17 08:39:06 +01:00
daa388ce8d
Move index.php from files to AppFramework
...
1. Allows it to use the more secure CSP rules of the AppFramework.
2. Adds some unit tests.
2015-11-16 21:10:11 +01:00
6ffd042a64
fixes #20538
2015-11-16 16:29:21 +01:00
40d5d55124
Remove the icon for now
2015-11-16 16:17:23 +01:00
1666af89c2
Add "is primary action" to actions
2015-11-16 16:14:52 +01:00
8169e4fdc8
Merge pull request #20465 from owncloud/forms.css
...
Move form styles from styles.css to inputs.css
2015-11-16 15:29:02 +01:00
1e9fc33212
[Share2.0] OCS Share API getShare uses new code
2015-11-16 13:32:28 +01:00
cc1db4ba87
assume pgsql >=9 if checking the version fails
2015-11-16 13:11:32 +01:00
84e5b76d3c
Add getOwner() method to FileInfo and Node API
2015-11-13 10:41:33 +01:00
7ab56de58b
move form styles from styles.css to inputs.css
2015-11-13 00:19:57 +01:00
aff4aed43c
Merge pull request #20472 from owncloud/switch-ch-log_with_ms_precision
...
enable microseconds in log timestamps
2015-11-12 17:30:32 +01:00
d0464bf772
enable microseconds in log timestamps
2015-11-12 10:33:20 +01:00
3248db05f1
Merge pull request #17920 from andyboeh/master
...
Add possibility for alternative logins to force redirection of login page
2015-11-12 10:15:23 +01:00
af05be1ac7
Merge pull request #20461 from owncloud/assetpipeline-on-upgrade
...
Do not use the asset pipeline when doing updates
2015-11-12 08:51:30 +01:00
9145aa607a
[tx-robot] updated from transifex
2015-11-12 01:55:09 -05:00
c9753655dc
Do not use the asset pipeline when doing updates
2015-11-11 18:18:33 +01:00
5dd59b4bd2
[tx-robot] updated from transifex
2015-11-11 01:55:47 -05:00
c9b671a12f
Handle errors on memcached level - fixes #17397
2015-11-10 15:58:17 +01:00
bbe2f5c2d5
Merge pull request #20224 from owncloud/fileinfo-owner
...
Add getOwner to FileInfo
2015-11-10 14:36:15 +01:00
cc4321317e
Merge pull request #20428 from owncloud/add-log-statement-for-trusted-domain-error
...
Add warning log entry when user accesses untrusted domain
2015-11-10 13:19:27 +01:00
ba67dd9818
Add warning log entry when user accesses untrusted domain
2015-11-10 12:02:10 +01:00
480bf14698
Merge pull request #20389 from owncloud/storage_not_available
...
use a HintException to have some useful user output in case of an error
2015-11-10 11:53:47 +01:00
331ef0e3c0
Add getOwner to FileInfo
2015-11-10 10:55:29 +01:00
2960a208cd
use a HintException to have some useful user output in case of an error
2015-11-10 10:54:17 +01:00
422d29ae48
Merge pull request #20373 from owncloud/use-random-int-if-it-exists
...
Use native CSPRNG if available
2015-11-10 10:10:23 +01:00
960c8cb5bc
Merge pull request #16604 from owncloud/cache-escape-like
...
escape like parameter in cache operations
2015-11-10 09:45:00 +01:00
f8e020ff87
Merge pull request #20390 from owncloud/appcheckcode-no-duplicate-requirement
...
Do not allow two different version requirements
2015-11-10 00:27:05 +01:00
402e0afbc5
Fix Error message when sharing outside of group
...
For #19788
2015-11-09 15:52:17 +01:00
045ea4eb2b
Use native CSPRNG if available
...
Unfortunately only PHP 7…
2015-11-09 15:04:22 +01:00
fe04451cb1
Do not allow two different version requirements
2015-11-09 11:10:37 +01:00
f8637b6082
[tx-robot] updated from transifex
2015-11-08 01:55:13 -05:00
0bb5eadf89
[autoloader] Make sure to load construct full paths
...
This reduces a lot of the autoloader magic and makes sure that we
generate full paths in the autoloader.
2015-11-06 13:36:19 +01:00
cc4f4f222d
Merge pull request #20348 from owncloud/issue-20303-integer-group-names
...
Make sure that group names are strings not integers
2015-11-06 11:48:40 +01:00
8047597a81
Merge pull request #20288 from owncloud/fix_20234
...
make sure that we update the unencrypted size for the versions
2015-11-06 11:17:17 +01:00
292dc553c3
Make sure that group names are strings not integers
2015-11-06 10:40:09 +01:00
d36e1bbab2
escape like parameter for move queries
2015-11-05 16:41:33 +01:00
d514200b56
Add escapeLikeParameter to IDBConnection
2015-11-05 16:41:30 +01:00
b05e1b6ed3
define escape character for like statements on oracle
2015-11-05 16:29:35 +01:00
b394fe8709
define escape character for like statements on sqlite
2015-11-05 16:28:54 +01:00
236c3c62cc
move from OC_DB to IDBConnection
2015-11-05 16:25:02 +01:00
0be05fdddd
Add unshare hooks
2015-11-05 15:59:09 +01:00
6624fa212a
The new sharing code now handles deletion
...
OCS -> ShareManager -> DefaultShareProvider
2015-11-05 15:59:09 +01:00
9567fa1194
Initial setup of shareing 2.0 sharemanager and share
...
* Added sharemanager class
This is the central class where all API calls talk to (OCS/Activity).
This in turn talks to the share providers to get the actual sharing
done.
It uses all ShareObjects
* Added share class
Simple class to hold all the share properties that is passed around
* Added IShareProvider interface
Interface that providers os a share have to implement.
2015-11-05 15:59:08 +01:00
51ead4e59b
subadmin methods should not return any null user or group
2015-11-05 11:50:57 +01:00
6e7461f64c
Merge pull request #20320 from owncloud/drop-file_map
...
Drop unused table file_map
2015-11-05 10:03:41 +01:00
3778680f3f
Drop unused tables principalgroups and principals
...
* was removed in 3e84f170e7
2015-11-05 08:40:21 +01:00
6b6f19bb94
Drop unused table file_map
...
* used only for windows support
* windows support was dropped in 8.2.0 - see #17379
* was introduced in fd8cb9974b#18935
2015-11-05 08:21:53 +01:00
2f4fa5b49c
[tx-robot] updated from transifex
2015-11-05 01:55:14 -05:00
ba02a3771b
Merge pull request #20053 from owncloud/getfileinfo-locking
...
Don't lock if we're only reading cache metadata
2015-11-04 22:40:17 +01:00
a2cfbd975a
mark path as checked
2015-11-04 16:34:39 +01:00
d1a090e3e2
adjust comment, this parameter was added for 9.0
2015-11-04 15:12:22 +01:00
c487f0f138
when a file is locked use old cache data
2015-11-04 14:45:10 +01:00
bb216feeb2
Merge pull request #18361 from owncloud/sharing_performance_improvements
...
improve calculation of share recipients
2015-11-04 14:44:31 +01:00
0a56313ca4
fix whitespace
2015-11-04 14:41:03 +01:00
6d0a324144
make sure that we update the unencrypted size for the versions
2015-11-04 10:59:05 +01:00
c59ca9203d
Merge pull request #18821 from owncloud/global-classes
...
Global classes in core CSS
2015-11-04 10:30:10 +01:00
4719305e3b
cache result from parent folders
2015-11-04 09:27:29 +01:00
7fe047425f
[tx-robot] updated from transifex
2015-11-04 01:55:44 -05:00
fc7f7e5c37
only lock in getDirectoryContent if we need to update the cache
2015-11-03 18:23:22 +01:00
4f2656993e
only lock in getFileInfo if we need to update the cache
2015-11-03 18:23:22 +01:00
0397871f7e
Split checkUpdate
2015-11-03 18:23:22 +01:00
b2a437ffff
Add a new core capability which tells the clients which url to use
2015-11-03 14:27:36 +01:00
620dc7ce22
Merge pull request #20196 from owncloud/use-actual-mimetype-detection-instead-of-oath
...
Use actual mimetype detection instead of extension
2015-11-02 17:36:13 +01:00
56b537271e
Global Classes for Core.
...
Move up the global styles up the hierarchy.
Adds Clear Left, Right and both.
New CSS file for Global Styles.
2015-11-02 20:54:02 +05:30
b6ca23afe1
Merge pull request #20189 from owncloud/use-get-http-protocol
...
Use getHttpProtocol instead of $_SERVER
2015-11-02 10:13:41 +01:00
2374a0df5d
[tx-robot] updated from transifex
2015-11-01 01:54:58 -04:00
40ae54d60a
Use actual mimetype detection instead of extension
...
We cannot rely on the extension as the file may also be a valid TAR or ZIP file without such content. Especially when getting resources from the ownCloud appstore.
2015-10-31 00:55:37 +01:00
78cad94ff4
Add support for Redis password auth
...
For enhanced security it is recommended to configure Redis to only accept connections with a password. (http://redis.io/topics/security )
This is especially critical since Redis supports the LUA scripting language and thus a simple SSRF vulnerability (as proven in http://benmmurphy.github.io/blog/2015/06/04/redis-eval-lua-sandbox-escape/ for example) may lead to a remote code execution.
2015-10-30 20:19:23 +01:00
bafb86fb9f
Use getHttpProtocol instead of $_SERVER
2015-10-30 18:05:30 +01:00
ef76998eda
Add warning for broken l10n json files
...
* makes it easier to spot broken l10n files
2015-10-30 09:10:16 +01:00
91b2cdc62b
[tx-robot] updated from transifex
2015-10-30 01:55:52 -04:00
73d9699be9
Merge pull request #20135 from owncloud/check-if-null-subadmin
...
Drop OC_SubAdmin and replace usages
2015-10-29 17:07:45 +01:00
c30a68e2f8
Merge pull request #20060 from owncloud/cache-move-final-update-transaction
...
include the final update in the transaction when moving a folder in the cache
2015-10-29 16:45:59 +01:00
1ce911d2f9
Merge pull request #19592 from owncloud/availability-root-always-exists
...
The root of a storage always exists
2015-10-29 14:14:56 +01:00
01d3393b7b
include the final update in the transaction when moving a folder in the cache
2015-10-29 12:34:49 +01:00
530f7229e7
Merge pull request #19869 from owncloud/cache-adjustcurrentmtimeonrename
...
On rename, also refresh storage_mtime of the target file
2015-10-29 11:57:00 +01:00
c6f6a8758b
Drop OC_SubAdmin and replace usages
2015-10-29 11:31:18 +01:00
9ab44f1f00
Merge pull request #11509 from owncloud/internal_email_template
...
Allow separate templates for internal and external share notifications
2015-10-29 11:27:05 +01:00
33eb13e415
The root of a storage always exists
2015-10-29 11:21:50 +01:00
6feb31bf96
Allow separate templates for internal and external share notifications
2015-10-29 10:24:24 +01:00
e5a7e3124a
Add a repair step that checks for group membership on shares
2015-10-29 09:26:26 +01:00
ca2fd30073
Remove shares where the parent does not exist anymore
2015-10-29 09:26:26 +01:00
527ef76dd6
[tx-robot] updated from transifex
2015-10-29 01:55:45 -04:00
8ad3df9b9e
Merge pull request #19182 from cweiske/support-bzip2
...
Fix #19181 : Support .bz2 app archives
2015-10-28 14:05:11 +01:00
49e30abc82
Merge pull request #20102 from owncloud/fix_subadmin
...
Make \OC\SubAdmin php-5.4 compatible
2015-10-28 10:51:38 +01:00
07fe1df8c1
Make \OC\SubAdmin php-5.4 compatible
...
* Also close some cursors while we are at it
2015-10-28 09:09:16 +01:00
d74811fcc8
[tx-robot] updated from transifex
2015-10-28 01:55:29 -04:00
0875a4a18f
[tx-robot] updated from transifex
2015-10-27 01:55:44 -04:00
40ba8d267f
Merge pull request #19837 from owncloud/always-enabled-apps
...
Store list of apps which cannot be disabled in shipped.json
2015-10-26 17:14:29 +01:00
b900782513
Also adjust storage_mtime of target after rename
...
Some storages like Dropbox change their mtime on rename...
2015-10-26 15:41:23 +01:00
8f09d5b67c
Update license headers
2015-10-26 14:04:01 +01:00
7e3b4754f6
Merge pull request #20031 from owncloud/remove-dead-code
...
Remove dead code from autoloader
2015-10-26 11:07:56 +01:00
d4d954b2d9
Merge pull request #19982 from owncloud/fix-link-sharing-regression-master
...
Ensure the password is only hashed in case it's changed on the client…
2015-10-26 10:57:31 +01:00
2038b2ec34
Fail hard if shipped.json is missing
2015-10-26 09:53:04 +01:00
5a5bcccd0d
Don't show apps which are always enabled in the app manager
2015-10-26 09:53:04 +01:00
6fc59f85b6
Store list of apps which cannot be disabled in shipped.json
2015-10-26 09:53:04 +01:00
ff1271c7f3
Remove dead code
...
Those variables are never written to. Thus this is dead code which should be removed.
2015-10-25 23:47:53 +01:00
13e817e901
Throw exception on `getPath` if file does not exist
...
Currently the `getPath` methods returned `NULL` in case when a file with the specified ID does not exist. This however mandates that developers are checking for the `NULL` case and if they do not the door for bugs with all kind of impact is widely opened.
This is especially harmful if used in context with Views where the final result is limited based on the result of `getPath`, if `getPath` returns `NULL` PHP type juggles this to an empty string resulting in all possible kind of bugs.
While one could argue that this is a misusage of the API the fact is that it is very often misused and an exception will trigger an immediate stop of execution as well as log this behaviour and show a pretty error page.
I also adjusted some usages where I believe that we need to catch these errors, in most cases this is though simply an error that should hard-fail.
2015-10-25 17:58:21 +01:00
eb10e3abc2
[tx-robot] updated from transifex
2015-10-25 01:55:04 -04:00
9d7138aa50
Dont lock /$user/files
2015-10-23 14:59:16 +02:00
9071e756a1
Fix for broken ajax/share.php endpoint
...
Even more code mess :(
All tests pass again. But I'm really not happy with this endpoint.
2015-10-23 09:24:03 +02:00
711e1235ea
Expose syslog tag in the configuration
2015-10-22 17:42:55 +02:00
4f5ff9c105
Ensure the password is only hashed in case it's changed on the client - fixes #19950
2015-10-22 17:32:40 +02:00
e471600834
Merge pull request #19890 from owncloud/db-keep-shared-locks
...
Keep shared locks until the end of the request so we can reuse them
2015-10-22 10:43:00 +02:00
23e22c52b0
Use IRequest's `getScriptName` functionality instead of $_SERVER['SCRIPT_NAME']
2015-10-21 17:33:49 +02:00
8133d46620
Remove dependency on ICrypto + use XOR
2015-10-21 17:33:41 +02:00
f7f2a160dd
Merge pull request #19918 from owncloud/send-begin-message
...
Update: state which step we are going to start and warn if it might b…
2015-10-21 14:52:19 +02:00
1060be0886
Merge pull request #19927 from owncloud/install-shipped-apps-on-upgrade
...
Install new shipped apps on upgrade
2015-10-21 14:43:27 +02:00
c515628ebe
Legacy OC_SubAdmin is now just a wrapper
2015-10-21 11:32:38 +02:00
0e9ab13943
New \OC\SubAdmin class
...
* DI
* Tests
* moved OC_SubAdmin to legacy
* Added to private OC\GroupManager
2015-10-21 11:32:38 +02:00
d8276af301
Install new shipped apps on upgrade -fixes #19925
2015-10-21 11:14:12 +02:00
d0aeb268d6
Merge pull request #19883 from owncloud/provide-iappcontainer
...
Provide IAppContainer as dependency injection
2015-10-21 10:49:26 +02:00
cf9b8fc182
Merge pull request #18184 from owncloud/ocs-merge-headers
...
Merge headers of ocs results
2015-10-21 10:36:37 +02:00
f39c73c79c
add phpdoc
2015-10-21 09:43:30 +02:00
cc7bd53d17
Keep shared locks until the end of the request so we can reuse them
2015-10-21 09:43:30 +02:00
9200bbeaba
Update: state which step we are going to start and warn if it might be slow
2015-10-21 09:17:38 +02:00
74f41349b7
[tx-robot] updated from transifex
2015-10-21 01:56:16 -04:00
a543d20958
Fix #19181 : Support .bz2 app archives
...
At first a bz2 handling in needs to be fixed; PEAR's Archive_Tar
otherwise gives the following error:
> Unsupported compression type "bz"
> Supported types are "gz", "bz2" and "lzma2"
After that we can whitelist the application/bz2 MIME type in the installer.
2015-10-20 21:56:24 +02:00
1a84c8e9d2
Merge pull request #19884 from owncloud/locking_exception
...
catch all exception if table doesn't exists
2015-10-20 13:44:00 +02:00
64dc222ce5
Merge pull request #19874 from owncloud/delete-cookie-instead-of-setting-value-to-empty
...
Delete cookie instead of emptying value
2015-10-20 12:47:46 +02:00
168c2055ba
catch all exception if table doesn't exists
2015-10-20 11:34:08 +02:00
5752e3b3c0
Merge pull request #19666 from owncloud/fix_13002
...
Combine OCS API getUser method code into provisioning_api app
2015-10-20 11:10:39 +02:00
a0743f12c6
Provide IAppContainer as dependency injection
2015-10-20 10:33:53 +02:00
5944b33d56
[OCI setup] remove static logger/config calls
...
* logger/config object are already injected - this only uses it
2015-10-20 08:53:57 +02:00
dfd44942c6
[tx-robot] updated from transifex
2015-10-20 01:55:03 -04:00
5588c5f262
Delete cookie instead of emptying value
...
PHP will handle session cookies with an empty values as an E_WARNING error. ([php/#68063](https://bugs.php.net/bug.php?id=68063 ))
ownCloud sets the cookie to an empty value in case the session expires, it however after this starts a new session. Due to potential race conditions this can in unlikely cases lead to the fact that the session never gets restarted and the user is left with an empty cookie. PHP tries then to use the empty cookie which makes the instance not usable.
To work around any race condition we now tell PHP to explicitly delete the value which can be done by using `null` as value, PHP will then send a cookie with the value "deleted". Also theepiration has been set to -1.
2015-10-19 19:54:12 +02:00
2895c91291
Merge pull request #17641 from owncloud/fix_objectstore_rename
...
don't move files in cache twice, fixes renaming for objectstores
2015-10-19 17:18:57 +02:00
9c5337ca3e
Merge pull request #19833 from owncloud/fix_view_rmdir
...
Removemount expects absolutePath
2015-10-19 16:22:42 +02:00
7fe7655070
The full name has to be tested if it's a dir - fixes #19854
2015-10-19 10:07:33 +02:00
008082ebad
[tx-robot] updated from transifex
2015-10-19 01:55:02 -04:00
8d25528c49
[tx-robot] updated from transifex
2015-10-18 01:55:07 -04:00
c378456137
[tx-robot] updated from transifex
2015-10-17 01:55:34 -04:00
0c6c36d0c5
fix objectstore files having create permissions
2015-10-16 21:41:51 +02:00
e46741cf5d
detect object homestorage in share code
2015-10-16 21:41:51 +02:00
aab226cef7
don't move files in cache twice, fixes renaming for objectstores
2015-10-16 21:41:51 +02:00
6cd1126dd1
Merge pull request #19843 from owncloud/an-app-is-identified-by-having-a-info.xml-app.php-should-not-be-mandatory
...
an-app-is-identified-by-having-a-info.xml-app.php-should-not-be-manda…
2015-10-16 21:28:55 +02:00
8fdb12f8fb
Check for error when resharing
2015-10-16 20:43:17 +02:00
9e86d71cc5
When sharing with the owner show the path
...
The error message should contain the path that is being shared not the
numeric id.
2015-10-16 20:43:17 +02:00
a2ec080427
an-app-is-identified-by-having-a-info.xml-app.php-should-not-be-mandatory
2015-10-16 17:25:22 +02:00
3a14cfc295
Removemount expects absolutePath
2015-10-16 14:14:00 +02:00
2ff55560e2
Remove $ETagFunction - it was never used
2015-10-16 13:17:12 +02:00
f2889dc6e4
Consolidate webdav code - move all to one app
2015-10-16 13:17:12 +02:00
7224e99ccd
[tx-robot] updated from transifex
2015-10-16 01:55:03 -04:00
dd6cb67030
check if fopen was successful before continue
2015-10-15 16:27:38 +02:00
c7883b1769
only wrap source if fopen was successful
2015-10-15 16:27:38 +02:00
d392ddab70
Remove ArrayParser because it is unused
2015-10-14 16:50:56 +02:00
fbccdedb5c
Merge pull request #19731 from owncloud/update-list-of-deprecated-methods
...
Update list of deprecated methods
2015-10-14 16:34:55 +02:00
ba461b0c92
Merge pull request #19760 from owncloud/adding_occ_upgrade_text_note
...
Adding occ upgrade text note
2015-10-14 16:33:33 +02:00
db4dae527c
Merge pull request #19764 from owncloud/issue-19759-app-check-code-issue
...
Variables don't have a class, so we can't use toString() on it
2015-10-14 14:10:25 +02:00
aa10825026
update deprecation message
2015-10-14 14:08:45 +02:00
e2806b0ae8
Update list of deprecated methods
2015-10-14 14:08:45 +02:00
8379611dbe
Variables don't have a class, so we can't use toString() on it
2015-10-14 13:16:58 +02:00
28d6da8158
Merge pull request #19738 from owncloud/proppatch-lastmodified
...
Fix mtime PROPPATCH to be "lastmodified" instead of "getlastmodified"
2015-10-14 12:49:33 +02:00
757f320531
Merge pull request #19580 from owncloud/issue-19399-remote-shares-case-sensitivity
...
Make sure that remote shares use the correct uid casing
2015-10-14 12:39:57 +02:00
3e87560033
Merge pull request #19727 from owncloud/fix_19678
...
Return path instead of itemsource
2015-10-14 12:38:38 +02:00
bfac6c5eb7
Merge pull request #19730 from owncloud/fix_17560
...
Squash collection shares
2015-10-14 12:38:16 +02:00
2c32811156
adding occ upgrade text note
2015-10-14 12:16:17 +02:00
f9dd750ed7
[tx-robot] updated from transifex
2015-10-14 01:55:36 -04:00
002e9c76cd
Combine OCS API getUser method code into provisioning_api app
...
Fixes #13002
Move the cloud/users/{userid} code in total to the provisioning API.
2015-10-13 21:07:48 +02:00
02513f8d04
Fix mtime PROPPATCH to be "lastmodified" instead of "getlastmodified"
...
Fix regression that makes PROPPATCH of mtime work like it did in OC <=
8.0.
The PROPPATCH must be done on the "lastmodified" property.
The "getlastmodified" now return 403 again.
2015-10-13 12:51:21 +02:00
3891cd9068
Merge pull request #19677 from owncloud/silently-fail-app-upgrade-exceptions-master
...
Silently fail app upgrade exceptions
2015-10-13 11:04:02 +02:00
06aaa059d1
Squash collection shares
...
If folder1 is shared to user2 and user3. And folder1/folder2 is shared
to user4 and user5 then getting all the users with access to
folder1/folder2 should only list user2 and user 3 once.
Previously this was done twice since we request the info two times.
This fix makes sure that we only append unique results to the array.
* Added test
2015-10-13 10:05:49 +02:00
585e9cb0e9
Return path instead of itemsource
...
Fixes #19678
Errors should contain paths and not internal ids
2015-10-13 09:00:33 +02:00
1f146d678c
[tx-robot] updated from transifex
2015-10-13 01:55:06 -04:00
e03f0542e4
Strip directory from scriptName
...
`\OCP\IRequest::getScriptName` will also return the directory, so if ownCloud is installed in a subfolder such as `owncloud/` it will resolve to `/owncloud/ocs/v2.php`. This made this check fail and also made it return invalid status codes.
2015-10-12 23:39:16 +02:00
64a8d01694
Merge pull request #19683 from owncloud/repair-donotrepairfoldermimetypes
...
Do not update mime types for folders with extension
2015-10-12 15:08:19 +02:00
8185eaa6dd
also detect files in a .part folder as part file
2015-10-12 13:59:16 +02:00
0036c637fc
Merge pull request #19657 from owncloud/setup-transport
...
Setup sendmail transport
2015-10-12 13:44:26 +02:00
d29d018cc7
[tx-robot] updated from transifex
2015-10-11 01:54:58 -04:00
8098c06e70
Do not update mime types for folders with extension
...
Some folders might have an extension like "test.conf".
This fix prevents to overwrite the folder's mime type with another mime
type while running the mimetype repair step.
2015-10-09 18:16:36 +02:00
4cb5970947
Always pass in ILogger
2015-10-09 14:08:22 +02:00
bd21e5925c
Clean code
2015-10-09 13:46:59 +02:00
38143d670b
Catch exceptions during app upgrade - fixes #16240
2015-10-09 13:44:30 +02:00
a42dd117e2
Merge pull request #19654 from owncloud/db-locking-no-scan-transaction
...
Dont use a transaction in the scanner while using db based locking
2015-10-09 12:38:54 +02:00
bf579a153f
fix IE8 user agent detection
2015-10-09 11:19:06 +02:00
c7aef6c368
Fix uploading avatar and root certs in IE8
2015-10-09 11:19:05 +02:00
5cb83937fa
[tx-robot] updated from transifex
2015-10-09 01:55:02 -04:00
020bb33150
Merge pull request #19034 from owncloud/http-request-warning
...
Prevent warning decoding content
2015-10-08 21:51:47 +02:00
3130438fcc
Merge pull request #19651 from owncloud/recursive_mkdir_for_objectstores
...
make mkdir recursive, add phpdoc to api
2015-10-08 21:28:53 +02:00
18394205c2
Setup sendmail transport
...
Replaces https://github.com/owncloud/core/pull/19047 and fixes https://github.com/owncloud/enterprise/issues/854 and https://github.com/owncloud/core/issues/19110
2015-10-08 16:48:18 +02:00
1227786930
Merge pull request #19650 from owncloud/disable-appstore-for-ee
...
Disable app store for EE by default
2015-10-08 16:00:41 +02:00
7ff5a6ccf4
Dont use a transaction in the scanner while using db based locking
2015-10-08 15:29:04 +02:00
89a63ec74b
make mkdir recursive, add phpdoc to api
2015-10-08 14:54:21 +02:00
9866037d0c
Disable app store for EE by default
...
This disables the app store for EE versions by default to address some problems caused by the wrong assumption that "Official" means supported by ownCloud Inc.
Administrators can still enable the app store by setting `appstoreenabled` to true in the config file.
2015-10-08 14:52:52 +02:00
fd5636cda7
Merge pull request #19644 from owncloud/issue-19617-catch-exception-when-cleaning-locks
...
Catch "missing table" exception when cleaning up locks
2015-10-08 13:39:34 +02:00
2fda4e38e2
Merge pull request #19546 from owncloud/fix-search-for-node-api
...
Fix search operations for the Node API
2015-10-08 13:17:26 +02:00
8d2c8cf2a2
Merge pull request #19607 from owncloud/use-url
...
Use `/` if installed in main folder
2015-10-08 13:01:41 +02:00
95c8d7598b
Merge pull request #19609 from owncloud/check_dav_move_permissions
...
[webdav] Check if source can be deleted before move
2015-10-08 13:01:20 +02:00
336a127426
Catch "missing table" exception when cleaning up locks
2015-10-08 11:37:51 +02:00
e6d9869cf7
Only use zip64 when we have 64 bit php
2015-10-08 09:13:08 +02:00
c5649a634f
[tx-robot] updated from transifex
2015-10-08 01:54:58 -04:00
70ba594f45
Merge pull request #19537 from owncloud/fix-white-page-of-death
...
Fixes last causes for WSOD
2015-10-07 14:55:11 +02:00
9f25745649
Fix single file download - fixes #19614
2015-10-07 13:15:58 +02:00
1ee56c702d
[WEBDAV] check if delete of source is allowed on move
...
Fixes #5251
If we perform a move we need to make sure first that the source can be
deleted. Else the dest might be cleared but the move will fail later.
* Added unit tests
Eventually we need more and better checking here.
2015-10-07 11:58:16 +02:00
937fb70757
Do not trigger the update exception when we already show an error
2015-10-07 08:07:52 +02:00
cd818e7419
[tx-robot] updated from transifex
2015-10-07 01:55:56 -04:00
59cf817308
Merge pull request #19511 from owncloud/etag-share-permissions-update
...
Mark shares as dirty when changing permissions
2015-10-06 18:09:12 +02:00
c2d76d2010
fix internal path when searching in storage root
2015-10-06 15:54:17 +02:00
3173ed29df
The minimum size for internalRootLength is 1
2015-10-06 15:54:17 +02:00
285e73ac72
validate HTTP protocol in case of an exception
2015-10-06 15:25:31 +02:00
6a4f22c61f
Use `/` if installed in main folder
...
Otherwise an empty string is used indicating the cookie is only valid for those resources. This can lead to eunexpected behaviour.
Fixes https://github.com/owncloud/core/issues/19196
2015-10-06 15:24:19 +02:00
79524ce163
Merge pull request #19605 from owncloud/add-get-http-protocol
...
Add \OCP\IRequest::getHttpProtocol
2015-10-06 15:23:00 +02:00
13dd62f7b0
Make sure that remote shares use the correct uid casing
2015-10-06 15:16:19 +02:00
80a232da6a
Add \OCP\IRequest::getHttpProtocol
...
Only allow valid HTTP protocols.
Ref https://github.com/owncloud/core/pull/19537#discussion_r41252333 + https://github.com/owncloud/security-tracker/issues/119
2015-10-06 14:18:46 +02:00
48ef5b6b3b
OC_Log not longer exists
2015-10-06 14:18:22 +02:00
319e61f0ea
Merge pull request #19407 from owncloud/lock-zip-content
...
Lock zip content
2015-10-06 11:47:43 +02:00
0817024e6f
Mark shares as dirty when changing permissions
2015-10-06 11:38:41 +02:00
0385a62363
Merge pull request #19597 from owncloud/update-license-headers
...
update licence headers via script
2015-10-06 11:18:35 +02:00
b05422544d
Fixes last causes for WSOD
...
* print plain text if rendering of exception/error page is not possible
2015-10-06 10:20:53 +02:00
8366ce2767
deduplicate @xenopathic
2015-10-06 09:52:19 +02:00
da640adf68
Merge pull request #19577 from owncloud/share-donotreturnentrieswhenusernotingroup
...
Remove invalid share items from result when missing group membership
2015-10-06 09:24:22 +02:00
26b92c406c
Merge pull request #19530 from owncloud/issue-13213-sharing-conflict-when-sharing-subfile
...
Make sure the share we found is for the same item
2015-10-06 09:23:44 +02:00
3ff60cc2e3
[tx-robot] updated from transifex
2015-10-06 01:55:00 -04:00
b945d71384
update licence headers via script
2015-10-05 21:15:52 +02:00
b1ce53f890
use a normal rename when moving from the same storage in the encryption wrapper
2015-10-05 20:55:57 +02:00
be46cd6737
Refactor single file download into it's own method
2015-10-05 17:47:15 +02:00
57f841da2c
Recursively lock folder contents
2015-10-05 17:31:37 +02:00
1c7244c120
Remove invalid share items from result when missing group membership
...
Group shares usually have subshare entries for every user. In some
situations it can happen that the user was removed from the group but
the subshare entries still exist.
This fix makes sure that such subshare entries are not returned any more
as the user isn't in the group any more.
2015-10-05 17:21:34 +02:00
3bf818450a
release locks in case of exception
2015-10-05 16:53:57 +02:00
def8e0c12a
log the exception during zip creation
2015-10-05 16:53:57 +02:00
b5dce05cb6
Lock files which are zipped
2015-10-05 16:53:57 +02:00
149792abe6
Clean PHPDoc
2015-10-05 16:53:57 +02:00
bf82015254
add some output to explain the pre-conditions for decrypt-all
2015-10-05 12:41:05 +02:00
3bbb65998f
Make sure all variables are defined
2015-10-05 12:03:36 +02:00
8de0773214
Make sure the share we found is for the same item
2015-10-05 11:55:37 +02:00
56c35da8d5
Merge pull request #19416 from owncloud/node-hook-connector
...
pass view hooks trough to the node hooks
2015-10-05 10:25:04 +02:00
2ffb1c2135
[tx-robot] updated from transifex
2015-10-04 01:55:02 -04:00
99d7352ef9
Merge pull request #19545 from owncloud/fix-16908
...
Add remark that $run is not supported anymore
2015-10-03 10:17:36 +02:00
e0084059b9
[tx-robot] updated from transifex
2015-10-03 01:56:20 -04:00
f6e055b2fd
Add remark that $run is not supported anymore
...
Fixes https://github.com/owncloud/core/issues/16908
2015-10-02 23:19:26 +02:00
ff89824135
Merge pull request #19272 from owncloud/mimetypes-enhanced
...
Introduce a few new mimetypes for code, fix recursive mimetype aliases
2015-10-02 17:50:34 +02:00
8bdffb5ed3
Merge pull request #19525 from owncloud/share-preventmovemountpointintosharedfolder
...
Prevent moving mount point into already shared folder (outgoing)
2015-10-02 16:50:38 +02:00
64ca00925b
Prevent moving mount point into already shared folder (outgoing)
...
It is already not allowed to share a folder containing mount points /
incoming shares.
This fixes an issue that made it possible to bypass the check by moving
the incoming share mount point into an existing outgoing share folder.
2015-10-02 16:14:42 +02:00
c80dd82fe4
Added mimetype repair step
...
* Version number increased
2015-10-02 16:06:56 +02:00
aeb20675dd
Allow recursive mimetype aliases
...
application/xml -> text/html -> text/code
2015-10-02 15:28:23 +02:00
af01c04360
Merge pull request #19533 from owncloud/free-space-inf
...
Work around INF=0 on some shared hosts
2015-10-02 15:04:28 +02:00
a1d0d23b6a
Work around INF=0 on some shared hosts
2015-10-02 14:16:13 +02:00
6b53f7c40e
[l10n] remove unused static methods
2015-10-02 12:51:45 +02:00
8944cb539e
Merge pull request #19510 from owncloud/json-grouplist-sharing-exclude
...
save excluded groups in json format
2015-10-02 12:14:36 +02:00
7707bbe648
Allow identifying whether the current item is the filtered one
2015-10-02 09:53:39 +02:00
3098fd0d30
Merge pull request #19505 from owncloud/returnfloatforquota
...
always return float, update doc
2015-10-02 08:57:04 +02:00
b18307aafb
Merge pull request #19480 from owncloud/fix-l10n
...
Fix l10n on master
2015-10-02 08:56:33 +02:00
3b4592718a
[tx-robot] updated from transifex
2015-10-02 01:54:51 -04:00
b6591084a1
Merge pull request #19463 from owncloud/fix_18132
...
encryption: versions should always use the keys of the original file, no need to …
2015-10-01 16:56:28 +02:00
b2dd5cb616
save excluded groups in json format - fixes #10983
2015-10-01 15:37:55 +02:00
1d617c4bf6
always return float, update doc
2015-10-01 13:45:49 +02:00
1c3e28a73b
Add tests
2015-10-01 13:17:22 +02:00
dc49e76747
stricter check if thumbnail is cached
2015-10-01 13:14:47 +02:00
884e2fcd6e
to much copy paste
2015-10-01 13:14:47 +02:00
9925ff33f1
use cache data we already have to check if a thumbnail of specific size is cached
2015-10-01 13:14:47 +02:00
52d4495793
use the fileinfo to check if we have a valid file
2015-10-01 13:14:47 +02:00
f4d180ee5c
allow passing the fileinfo to the preview manager
2015-10-01 13:14:47 +02:00
e7232a848b
versions should always use the keys of the original file, no need to create new one
2015-10-01 10:10:19 +02:00
cc0812332c
add more precise version to also repair git master instances
2015-10-01 08:27:12 +02:00
6e104bc933
Repair step to remove bogus expiration dates from non-link shares
2015-10-01 08:27:12 +02:00
ff75652cb7
Merge pull request #19299 from owncloud/fixgetRawPathInfo
...
Fix get raw path info, always return a string
2015-09-30 22:17:02 +02:00
be8ad69d35
Merge pull request #19478 from owncloud/cache-found-l10n-per-app
...
cache found l10n per app and not globally
2015-09-30 19:08:42 +02:00
73819c4f05
Fix l10n on master
...
* $app isn't useful for this case
* kill it with 🔥
2015-09-30 17:29:54 +02:00
5a2b30d78f
cache found l10n per app and not globally
...
* fixes: if the first call to this is with an app that has no translations
all future call will get a list with only english in there - even
if their l10n holds more translations
2015-09-30 16:49:16 +02:00
1d8c10cf63
Merge pull request #19468 from owncloud/fix-36-vs-32-previews
...
Change small thumbnails to 32 px
2015-09-30 15:47:34 +02:00
acd6c9b605
Merge pull request #19460 from owncloud/fix-postScanFile-and-make-it-available-to-utils-scanner
...
Fix postScanFile event and make it available to utils scanner
2015-09-30 15:03:50 +02:00
a2817372ad
Clean temp files used for thumbnail generation
2015-09-30 14:07:59 +02:00
10978a7a61
Merge pull request #19373 from owncloud/sidebar-preview-cover
...
Cover both width and height for the sidebar preview
2015-09-30 11:07:18 +02:00
1051a3c6f5
Change small thumbnails to 32 px
...
* fixes #16913
* fixes issues in IE8 where the thumbnail is too big
2015-09-30 10:49:48 +02:00
cc64c09ee5
Make postScanFile and postScanFolder available to OC\Files\Utils\Scanner
2015-09-30 01:53:49 +02:00
9ea05c898e
Always send a postScanFile event when done scanning a file
...
postScanFile is important when scanning external storage as it indicates when the file is ready to be used
2015-09-30 01:50:15 +02:00
a5ad5bf29b
Fix preview caching
2015-09-29 17:10:08 +02:00
90810cc605
Merge pull request #19355 from owncloud/cache_result_of_checkUpgrade
...
[jenkins] Cache result of check upgrade
2015-09-29 16:19:39 +02:00
99f440148f
Merge pull request #19441 from owncloud/debug-log-mode-during-upgrade
...
[upgrade] switch to debug logging on upgrade
2015-09-29 16:08:31 +02:00
fbe43e6a26
cache result of \OCP\Util::needUpgrade()
...
reduce calls of \OCP\Util::needUpgrade()
where \OCP\Util::needUpgrade() is called we can call as well
self::checkUpgrade and use the cached result
In line 877 the call way unnecessary anyway because of the first part of
the if statement
move caching to \OCP\Util::needUpgrade
renaming variable
fixing testNeedUpgradeCore()
cache result of checkUpgrade() in self::$needUpgrade
reduce calls of \OCP\Util::needUpgrade()
where \OCP\Util::needUpgrade() is called we can call as well
self::checkUpgrade and use the cached result
In line 877 the call way unnecessary anyway because of the first part of
the if statement
move caching to \OCP\Util::needUpgrade
renaming variable
fixing testNeedUpgradeCore()
fix typo in variable name
deleting tabs
2015-09-29 15:34:42 +02:00
5acb38b5b3
[upgrade] switch to debug logging on upgrade
...
* resets afterwards
* adds output about the previous log level
2015-09-29 14:35:32 +02:00
e735a9915c
Add blob: scheme to default CSP policy
...
Fixes https://github.com/owncloud/core/issues/19438
2015-09-29 14:27:35 +02:00
c2dd0f80ec
Merge pull request #19424 from owncloud/use-jsqueeze
...
Use jsqueeze
2015-09-29 13:44:26 +02:00
69430e0310
Merge pull request #19367 from owncloud/lock-transaction-no-log
...
remove warning when trying to get a lock while in transaction
2015-09-29 13:18:34 +02:00
6414b4b516
Merge pull request #19426 from owncloud/fix-legacy-CSP-for-images
...
Whitelist "data:" in legacy CSP headers
2015-09-29 13:17:23 +02:00
f41a38ba15
Cover both width and height for the sidebar preview
2015-09-29 13:07:03 +02:00
7940a3fb65
Session closed exception wording
...
and a small comment typo
2015-09-29 12:17:47 +05:45
aa3596a410
[tx-robot] updated from transifex
2015-09-29 01:55:02 -04:00
c4bac1655d
Fix CSP for images for legacy apps
...
Fixes #19425
2015-09-28 23:21:26 +02:00
766b69a0c8
User upstream class SeparatorFilter
2015-09-28 22:52:45 +02:00
d40867d855
Suer JSqueezeFilter instead of JSMinFilter
2015-09-28 22:51:43 +02:00
00020535f9
pass view hooks trough to the node hooks
2015-09-28 17:18:46 +02:00
1e5a41f008
Add hook connector to connect view and node hooks
2015-09-28 17:18:40 +02:00
d68079f932
Merge pull request #18548 from owncloud/repair-mimetype-limitversion
...
Repair mime types only when upgrading from OC 8.0
2015-09-28 12:56:36 +02:00
65124b48dd
Adding ownCloud/TarStreamer
2015-09-28 11:46:54 +02:00
057994f4aa
Uniform behavour for tar and zip
2015-09-28 11:46:54 +02:00
027fb4e3fe
More corrections
2015-09-28 11:46:54 +02:00
28df7be319
Add namespace. Fix broken zip
2015-09-28 11:46:54 +02:00
74d879d039
Add PHpdoc
2015-09-28 11:46:54 +02:00
e3b95e8473
Introduce streamer
2015-09-28 11:46:53 +02:00
60f123193b
[tx-robot] updated from transifex
2015-09-28 05:07:18 -04:00
0aaece7de7
Merge pull request #19346 from owncloud/drop-passwords-from-exception-log
...
Remove passwords from logged exception stack traces
2015-09-25 20:04:01 +02:00
8f2a14c5d6
Merge pull request #19297 from owncloud/fix_19119
...
Do not blindy copy expiration date on reshare
2015-09-25 14:36:07 +02:00
b2a528e303
remove warning when trying to get a lock while in transaction
2015-09-25 14:16:50 +02:00
8432c73611
Merge pull request #19030 from owncloud/oparoz-smarter-logger
...
[jenkins] Dump Arrays, Objects and Exceptions to the log
2015-09-25 14:15:59 +02:00
787c668b39
Merge pull request #19360 from owncloud/move-filter-method-into-config-object
...
Move the filtering of sensitive data to the config class
2015-09-25 14:05:04 +02:00
68bf4440d3
Merge pull request #19293 from owncloud/individual-it-move_initTemplate
...
[jenkins] do not load unnecessary code in case of webdav
2015-09-25 13:49:51 +02:00
ab69a22606
Deduplicate constant
2015-09-25 13:17:23 +02:00
9a373cb5bb
Do not blindy copy expiration date on reshare
...
If a file/folder is reshared we should not blindly copy the expiration
date of the parent share. User/Group shares do not have expiration dates
currently, and thus this is always set to null.
Fixes #19119
* Added testcase
2015-09-25 13:06:05 +02:00
db84791bb0
Todo for myself to eliminate double code
...
This will be in a new PR
2015-09-25 15:43:12 +05:45
2e42f99d00
add $prepend option to addStyle() & addVendorStyle()
2015-09-25 15:41:55 +05:45
faba02564a
Move the filtering of sensitive data to the config class
2015-09-25 11:08:33 +02:00
e91e36f8df
Add the L10N Factory to the container interface
2015-09-25 09:05:12 +02:00
e7bc2a10e3
Merge pull request #15098 from owncloud/fix_preview_versions_revert_issue
...
fix issue with version rollback and thumbnails
2015-09-24 21:06:27 +02:00
db8e7ce8b9
Remove passwords from logged exception stack traces
...
* fixed #16318
* create logException in ILogger
* add unit tests
2015-09-24 20:01:30 +02:00
ebdd6d96ce
Merge pull request #19306 from owncloud/app-code-check-version
...
[App Code Check] add check for version and mandatory fields
2015-09-24 17:38:48 +02:00
f140084a8d
Use a 3rd party normalizer for the logger
2015-09-24 17:13:39 +02:00
03bf2f786a
public, remote and default_enable are not deprecated
2015-09-24 16:47:00 +02:00
5ee46c8500
Merge pull request #19337 from owncloud/fix-shipped-check-for-apps
...
Correctly check whether an app is shipped
2015-09-24 14:51:59 +02:00
383f381489
Merge pull request #19340 from owncloud/enc_fix_user_check
...
only check if the user exists if a user was added as parameter
2015-09-24 14:51:38 +02:00
5a3e57c2f5
encode arrays as string
2015-09-24 12:48:44 +02:00
8d6ec660a2
Merge pull request #19248 from owncloud/allow-status-code-403-and-503-for-listeners
...
Convert exceptions to SabreExceptions for the HTTP status code
2015-09-24 12:35:37 +02:00
d697ea58a4
only check if the user exists if a user was added as parameter
2015-09-24 12:21:40 +02:00
9da4869cd4
Correctly check whether an app is shipped
2015-09-24 12:06:29 +02:00
9b652ed5d5
[App Code Check] add check for version and mandatory fields
...
* ref #17598
* including unit tests for mandatory fields/versions
2015-09-24 11:58:12 +02:00
330ea18996
Merge pull request #19303 from owncloud/usecorrectvariable
...
Use correct variable
2015-09-24 11:34:19 +02:00
5a11e145da
Clean code
2015-09-24 11:03:01 +02:00
11974477bd
Merge pull request #19326 from owncloud/issue-19314-querybuilder-set-null
...
Allow `set('column', 'null')` to work like in Doctrine's QueryBuilder
2015-09-24 10:57:49 +02:00
df75c17e52
Merge pull request #16479 from owncloud/core-fixgetrelativepathwrongmatches
...
Prevent wrong matches in getRelativePath
2015-09-24 10:25:00 +02:00
70572c1e3c
Allow `set('column', 'null')` to work like in Doctrine
2015-09-24 09:53:09 +02:00
8b90a55831
use correct variable
...
wow ... just wow ...
2015-09-23 23:41:39 +02:00
2c00587b5d
Add since-tag
2015-09-23 16:16:57 +02:00
1493e86dea
Allow listeners to set status code and message
2015-09-23 15:15:07 +02:00
2ea2ec0004
Show 'Apps' in the browser title when app management is open
2015-09-23 15:00:58 +02:00
d54d9a573f
Revert "use correct variable"
...
This reverts commit 52cbaff061
2015-09-23 14:09:52 +02:00
52cbaff061
use correct variable
...
wow ... just wow ...
2015-09-23 13:59:37 +02:00
d81416c51d
return '' instead of false
2015-09-23 12:32:49 +02:00
af39e59e88
getService() is not needed -> remove
2015-09-23 12:00:07 +02:00
bf1cb20e90
do not load unnecessary code in case of webdav
...
changing from "protected static" to "protected"
as suggested by @nickvergessen
https://github.com/owncloud/core/pull/19114#discussion_r39719851
moving initTemplate() into template constr.
reduce to move initTemplate only
cleanup spaces
2015-09-23 11:57:10 +02:00
ee649d58c5
Merge pull request #19289 from owncloud/fix-type-hint-errors-container
...
Fix type hint errors in the container and the interface
2015-09-23 11:42:03 +02:00
bcdb3c26da
Merge pull request #19236 from owncloud/call_dot_directories_function
...
Replaces if ($file === '.' || $file === '..') by public function call isIgnoredDir
2015-09-23 11:34:23 +02:00
ad71d92acf
Merge pull request #19247 from owncloud/fix_locking_copy_operation
...
locking: handle exceptions correctly during copy operation
2015-09-23 11:28:27 +02:00
56a795ad37
Merge branch 'master' into fix-type-hint-errors-container
2015-09-23 11:01:59 +02:00
f3d60df56d
Merge pull request #19267 from owncloud/individual-it-reduce_db_calls_for_filelocks
...
[jenkins] Individual it reduce db calls for filelocks
2015-09-23 10:59:58 +02:00
0bda4d54c5
Repair mime types only when upgrading from OC 8.0
2015-09-23 10:51:37 +02:00
ee75f9f594
Fix type hint errors in the container and the interface
2015-09-23 10:13:41 +02:00
491250320a
Replaces if ($file === '.' || $file === '..') by if(\OC\Files\Filesystem::isIgnoredDir($file)). Eases to find where this operation is used.
2015-09-22 17:53:15 +02:00
63b2bc136a
Move mimetype files into /resources/config/
2015-09-22 16:43:28 +02:00
a8e8a9dfb9
Move certificate bundle into resources/config/
2015-09-22 16:43:28 +02:00
498e8f712c
Merge pull request #19268 from owncloud/revert-18911
...
Revert "Show cached previews directly"
2015-09-22 16:05:38 +02:00
5f11049852
reduce amount of db calls needed for file-locks
...
return result of insertIfNotExist()
reducing initLockField, throwing exeption in releaseLock
don't throw exception in releaseLock()
cleaning up whitespaces
2015-09-22 15:04:15 +02:00
d9db959331
Revert "Show cached previews directly"
...
This reverts commit 1b708e26ef
2015-09-22 15:01:31 +02:00
b9cd5bc1dc
Prevent wrong matches in getRelativePath
...
Before this fix, the root "/files" with path "/files_trashbin" would
return "_trashbin" as relative path...
2015-09-22 11:34:37 +02:00
17a64360e5
catch excexptions during the copy operation and make sure that we free the lock correctly
2015-09-22 11:32:10 +02:00
36ce254ffd
Move dummy backend to Tests namespace
2015-09-22 11:01:11 +02:00
67231ed9a7
Merge pull request #19231 from phil-davis/r1
...
Minor text typos
2015-09-21 23:35:30 +02:00
Thomas Müller
Morris Jobke
Vincent Petry
Lukas Reschke
Robin Appelman
Jesús Macias
Jenkins for ownCloud
Roeland Jago Douma
Joas Schilling
Robin Appelman
Mitar
Arthur Schiwon
Björn Schießle
Clark Tomlinson
Individual IT Services
Hendrik Leppelsack
Christian Schnidrig
Bjoern Schiessle
Raghu Nayyar
Stephen Colebrook
Volker Fröhlich
Roeland Jago Douma
Christian Weiske
Jörn Friedrich Dreyer
Martin
Olivier Paroz
Robin McCorkell
Phil Davis
Victor Dubiniuk
