Thomas Müller
78febb2ee5
Merge pull request #14201 from owncloud/propagator-dont-decrease-mtime
...
Dont lower the mtime of a folder when propagating changes
2015-02-16 11:32:17 +01:00
Lukas Reschke
b20174bdad
Allow AppFramework applications to specify a custom CSP header
...
This change allows AppFramework applications to specify a custom CSP header for example when the default policy is too strict. Furthermore this allows us to partially migrate away from CSS and allowed eval() in our JavaScript components.
Legacy ownCloud components will still use the previous policy. Application developers can use this as following in their controllers:
```php
$response = new TemplateResponse('activity', 'list', []);
$cspHelper = new ContentSecurityPolicyHelper();
$cspHelper->addAllowedScriptDomain('www.owncloud.org');
$response->addHeader('Content-Security-Policy', $cspHelper->getPolicy());
return $response;
```
Fixes https://github.com/owncloud/core/issues/11857 which is a pre-requisite for https://github.com/owncloud/core/issues/13458 and https://github.com/owncloud/core/issues/11925
2015-02-16 11:00:41 +01:00
Thomas Müller
09a33b11a4
Merge pull request #13809 from owncloud/fix-autoloader-message
...
Properly show the warning about the missing composer autoloader
2015-02-16 10:41:24 +01:00
Thomas Müller
d001c4e375
Merge pull request #13922 from owncloud/smb-autotest-external
...
[files_external] add SMB autotest
2015-02-16 10:27:55 +01:00
Thomas Müller
d5ca5c7bcc
Merge pull request #14138 from owncloud/fix-image-flip-php53
...
Don't flip image in PHP 5.4
2015-02-16 10:26:56 +01:00
Thomas Müller
036a8e3c1f
console commands shall not be limited with respect to execution time - fixes #14156
2015-02-16 09:16:32 +01:00
Jenkins for ownCloud
786ff6a5a3
[tx-robot] updated from transifex
2015-02-16 01:54:30 -05:00
Jenkins for ownCloud
31c0cce092
[tx-robot] updated from transifex
2015-02-15 01:54:31 -05:00
Jenkins for ownCloud
2f851ff8bb
[tx-robot] updated from transifex
2015-02-14 01:54:42 -05:00
Robin Appelman
7bfe476030
add unit test for webdav quota
2015-02-13 18:00:01 +01:00
Robin Appelman
9abaa0cc61
pass fileinfo to getStorageInfo
2015-02-13 17:59:58 +01:00
Robin Appelman
fb2a3284df
Cache quota info for directories
2015-02-13 17:50:53 +01:00
Thomas Müller
d665b7a4b1
Merge pull request #14206 from owncloud/issue/14204-revert-14171
...
Issue/14204 revert #14171
2015-02-13 16:06:34 +01:00
Joas Schilling
113fd47a0b
Update version to a higher one then before
2015-02-13 15:24:53 +01:00
Joas Schilling
200c0c89dc
Do not change behaviour of 'false'
2015-02-13 15:18:07 +01:00
Joas Schilling
3a5b0a8cfc
Revert "Improve: Index for file_map"
...
This reverts commit c9b5608405
.
2015-02-13 15:15:28 +01:00
Joas Schilling
6039523cd6
Revert "Incorporate review changes"
...
This reverts commit f6a452cabf
.
2015-02-13 15:15:10 +01:00
Robin Appelman
6ecfcde954
update test
2015-02-13 15:01:05 +01:00
Robin Appelman
134243d3e5
Dont lower the mtime of a folder when propagating changes
2015-02-13 14:30:05 +01:00
Lukas Reschke
4032c7b685
This is an array
2015-02-13 14:23:22 +01:00
Morris Jobke
1393563965
Merge pull request #14178 from RealRancor/fix_config_sample
...
Removed anchor in config.sample.php
2015-02-13 13:38:56 +01:00
Joas Schilling
d20a8fae45
Move displaying of files related activities to files app
2015-02-13 13:37:10 +01:00
Lukas Reschke
a7df23ceba
Manually type-case all AJAX files
...
This enforces proper types on POST and GET arguments where I considered it sensible. I didn't update some as I don't know what kind of values they would support 🙈
Fixes https://github.com/owncloud/core/issues/14196 for core
2015-02-13 13:33:20 +01:00
Lukas Reschke
276bfe5f33
Merge pull request #14197 from owncloud/ensure-that-passed-file-path-is-always-a-string
...
Ensure that passed argument is always a string
2015-02-13 13:30:54 +01:00
Roeland Jago Douma
9a6da8e6e2
Extended avatar unit tests
2015-02-13 12:57:24 +01:00
Lukas Reschke
95860d8113
Merge pull request #14086 from hlop/master
...
App install behind a Proxy
2015-02-13 12:56:01 +01:00
Lukas Reschke
9904b30070
Ensure that passed argument is always a string
...
Some code paths called the `normalizePath` functionality with types other than a string which resulted in unexpected behaviour.
Thus the function is now manually casting the type to a string and I corrected the usage in list.php as well.
2015-02-13 12:49:34 +01:00
Roeland Jago Douma
90218dcd4c
Added config check
2015-02-13 12:17:22 +01:00
Lukas Reschke
025110821f
URLEncode logout attribute
...
Otherwise logout can fail if the requesttoken contains a +
2015-02-13 12:08:23 +01:00
Joas Schilling
b768a70616
Use filterNotificationTypes to filter the types and group the methods
2015-02-13 11:30:36 +01:00
Joas Schilling
9ccfbc14f6
Copy sharing related activity code to Files_Sharing activity extension
2015-02-13 11:16:43 +01:00
Joas Schilling
51f8d240c1
Merge pull request #14171 from owncloud/fix/11639
...
Improve: Index for file_map
2015-02-13 10:55:21 +01:00
Jenkins for ownCloud
6b1ed4d688
[tx-robot] updated from transifex
2015-02-13 01:55:06 -05:00
RealRancor
840ad708d6
Removed anchor in config.sample.php
2015-02-12 22:00:24 +01:00
Lukas Reschke
f6a452cabf
Incorporate review changes
2015-02-12 19:14:54 +01:00
windaishi
c9b5608405
Improve: Index for file_map
...
Added two indices for file_map, that improve syncing and uploading and deleting files
2015-02-12 19:12:08 +01:00
Lukas Reschke
dfcd4acd5a
Merge pull request #13771 from owncloud/fix-humanfileSize
...
generate valid human readable text for 0
2015-02-12 18:34:54 +01:00
Lukas Reschke
bd5440a8a3
Merge pull request #13780 from owncloud/cmreflector-inheritance
...
Additional controllermethodreflector inheritance tests
2015-02-12 18:34:07 +01:00
Lukas Reschke
8e8acad550
Merge pull request #14145 from owncloud/no-whitespace-from-themes-master
...
catch any whitespaces which might get written to the output buffer while...
2015-02-12 17:23:28 +01:00
Thomas Müller
738fcdafbe
Merge pull request #14159 from owncloud/remove-internal
...
Remove internal annotation
2015-02-12 17:07:59 +01:00
Roeland Jago Douma
ecb7d44775
Small unit test rewrite
2015-02-12 17:05:59 +01:00
Roeland Jago Douma
e952687dcd
Added unit test
2015-02-12 16:50:14 +01:00
Roeland Jago Douma
47b96c9fa1
Added dependancy for the JS unit tests
...
Still not correct but it is a small step
2015-02-12 16:50:14 +01:00
Roeland Jago Douma
639a634cfd
Display user avatar in share dialog
2015-02-12 16:50:14 +01:00
Thomas Müller
fc7f279d90
catch any whitespaces which might get written to the output buffer while loading a theme
2015-02-12 16:42:17 +01:00
Lukas Reschke
2f80be45b0
Remove internal annotation
...
PHPStorm complained about those functions being declared as Internal. I doubt that this is actually the case since they are even in the public API.
2015-02-12 16:35:47 +01:00
Morris Jobke
c751ba0409
Merge pull request #14121 from Zillode/app-favicon
...
Disable application-specific favicons for non-user pages
2015-02-12 13:19:07 +01:00
Lukas Reschke
4142267a02
Merge pull request #9038 from owncloud/add_tag_file
...
Add .tag file to make tar balls tracable
2015-02-12 13:17:45 +01:00
Björn Schießle
780024e252
Merge pull request #14071 from owncloud/add_timeout_for_post_requests
...
add timeout to curl request
2015-02-12 11:38:35 +01:00
Lukas Reschke
b68c376e8e
Merge pull request #13913 from rullzer/showusergroups
...
Added overview of groups a user is member of
2015-02-12 11:21:40 +01:00