24c7f38a00
Make sure we can store strings as per the interface
2016-02-22 15:43:20 +01:00
a0d0edc754
Make non-public-method protected
2016-02-22 15:26:59 +01:00
6f29949bca
Merge pull request #22527 from wern/master
...
Moved set -e option to enable executable checks again
2016-02-22 14:15:12 +01:00
f3b13c7656
Merge pull request #22536 from owncloud/add-integration-tests-for-tags
...
Add integration tests for tags plus fix permissions
2016-02-22 14:14:51 +01:00
a70421ff2f
Merge pull request #22552 from owncloud/fix-avconv-preview-parameters
...
Move `-an` after the input arg because it is an output option
2016-02-22 14:14:35 +01:00
3a20d84def
Merge pull request #22554 from owncloud/fix_22550
...
We should check for exceptions when trying to get the avatar
2016-02-22 14:14:15 +01:00
7f2b3dbfd2
Merge pull request #22555 from owncloud/jenkins-19978
...
Show username when writing "Insufficient storage" into owncloud.log
2016-02-22 14:13:59 +01:00
3a0c4d11d9
Merge pull request #22561 from owncloud/ie-publicpagefooter
...
Fix public page footer position in IE
2016-02-22 14:13:42 +01:00
642190f333
Fix public page footer position in IE
...
The content element needs hasLayout, so triggering it with a display
attribute.
Without this, the #content element's height would be as high as the
window's height instead of adjusting itself to its contents' height.
2016-02-22 11:26:50 +01:00
43a4990f09
Merge pull request #22548 from owncloud/fix-pagination-in-ie
...
Fixes pagination in IE
2016-02-22 10:29:10 +01:00
fe08b5e9d9
We should check for exceptions when trying to get the avatar
...
Fixes #22550
* Updated phpdoc of avatatmanager
* Add unit test
2016-02-22 10:14:14 +01:00
1a8a667863
Solution for Proposal #19974
...
Show username when writing into owncloud.log
2016-02-22 10:02:45 +01:00
6c96b3d07f
Throw normal exceptions instead of eating them
...
Partially addresses https://github.com/owncloud/core/issues/22550
Replaces https://github.com/owncloud/core/pull/20185
2016-02-22 09:41:56 +01:00
2865ccfdc4
Move `-an` after the input arg because it is an output option
2016-02-22 09:40:46 +01:00
04da5a56dd
Use the notification instead of the disruptive popup
2016-02-22 09:29:13 +01:00
3e59c04c7f
Fixes pagination in IE
...
* tested in Firefox, Chrome, Safari, IE and Edge with folder and file shares
* fixes #20044
2016-02-22 08:55:20 +01:00
8a8209796d
Merge pull request #22526 from owncloud/fix-english-texts
...
Fix error in source language strings
2016-02-21 00:03:22 +01:00
3bd95cca6b
Check if user has permission to create such a tag
...
Fixes https://github.com/owncloud/core/issues/22512
2016-02-19 20:45:20 +01:00
c13259cf9e
Add integration tests for tags
2016-02-19 20:45:20 +01:00
357cdfd07f
Merge pull request #22511 from owncloud/add-integration-tests-for-comments
...
Add integration tests for comments
2016-02-19 18:10:30 +01:00
16be9af20a
Add integration tests for comments
...
This adds integration tests for the comments. Especially with regard to the permission handling, didn't find any problem in it.
Fixes https://github.com/owncloud/core/issues/22367
2016-02-19 18:08:34 +01:00
32e4256945
Merge pull request #22529 from owncloud/tags-style
...
improve tags interface styling
2016-02-19 16:17:37 +01:00
f8677628d4
Merge pull request #22503 from owncloud/issue_22500
...
When (re-)sharing an incomming federated share set the corrent owner
2016-02-19 16:07:43 +01:00
fb38625741
Merge pull request #22518 from owncloud/checkdeletebeforecopyinsteadofrename
...
Check delete permission before attemping copy+delete
2016-02-19 16:06:55 +01:00
b5281b61ed
Merge pull request #22410 from owncloud/fix_22119
...
Do not copy skeleton on avatar access
2016-02-19 16:06:40 +01:00
5d914d6980
improve tags interface styling
2016-02-19 15:40:10 +01:00
12f2525d4f
moved set -e after executable checking with which as old position off set -e stopped the script at this point without any error message
2016-02-19 15:16:04 +01:00
8abdcb8085
Fix error ins source language strings
...
https://www.transifex.com/owncloud-org/owncloud/translate/#en_GB/core/50786279
https://www.transifex.com/owncloud-org/owncloud/translate/#en_GB/settings-1/50555028
2016-02-19 15:04:16 +01:00
5b3a79a28b
Merge pull request #22509 from owncloud/add-filesplugin-to-new-webdav-endpoint
...
Add FilesPlugin
2016-02-19 14:44:02 +01:00
2fd0e9b768
Merge pull request #22521 from owncloud/mssql-is-not-support-since-ages
...
Remove old adapter - mssql is not supported
2016-02-19 13:35:32 +01:00
66f0ba837f
Merge pull request #22348 from owncloud/issue-21812-calendar-old-caldav-url
...
Fix old calendar dav urls
2016-02-19 13:33:16 +01:00
5820666254
Merge pull request #22218 from owncloud/occ-no-extra-messages
...
Add global --no-warnings option to occ…
2016-02-19 13:32:52 +01:00
c20c836a46
Remove old adapter - mssql is not supported
2016-02-19 13:16:43 +01:00
4ef035cc61
make sure that the file name doesn't end with a trailing slash. Can for example happen single files shared across servers
2016-02-19 13:15:09 +01:00
a9e0cfad8b
Check delete permission before attemping copy+delete
...
Some move operations when cross-storage will be replaced by copy and
delete. Before attempting this, first check whether the source storage
has delete permissions.
This also prevents renaming system-wide external storages.
2016-02-19 12:59:10 +01:00
2dcf887cce
When (re-)sharing an incomming federated share set the corrent owner
...
Incomming federated shares are a special kind. We mount them as normal
webdav shares but we do supply owner info with the federated cloud id of
the share owner.
Since we do not yet have the new resharing behaviour on federated shares
we need to set the correct owner. Which will allow sharing and proper
mounting for other users.
fixes #22500
2016-02-19 12:43:03 +01:00
e987d8cd47
Add FilesPlugin - fixes #22507
2016-02-19 12:37:24 +01:00
1106c354ac
Merge pull request #22515 from owncloud/webdav_checksum_only_for_files
...
Only add checksum headers for 'real' files
2016-02-19 12:36:56 +01:00
b93003d3fb
Merge pull request #22487 from owncloud/hidden-text-for-information
...
Add hidden text to issue templates
2016-02-19 12:36:21 +01:00
ba941ea50e
Merge pull request #22472 from owncloud/scrutinizer-patch-1
...
Scrutinizer Auto-Fixes
2016-02-19 12:36:11 +01:00
b216be8cca
Add correct principals for the current user before ACL check
2016-02-19 12:35:33 +01:00
4e2f9ce05b
Convert the old principal to the new principal before getting calendars
2016-02-19 12:35:33 +01:00
ffc2950393
Merge pull request #22198 from owncloud/birthday-calendar
...
Sync a users contacts birthday to the users birthday calendar
2016-02-19 12:33:19 +01:00
751d3df469
Only add checksum headers for files
...
We can only add the checksum header for real ownCloud files (so we have
a fileinfo object etc).
2016-02-19 10:56:43 +01:00
f837c08465
Fix even more
2016-02-19 09:43:20 +01:00
8756a22c60
Fix more things
2016-02-19 09:43:11 +01:00
8e36678873
Fix PHPDoc
2016-02-19 09:43:11 +01:00
0d0151a3e1
Scrutinizer Auto-Fixes
...
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2016-02-19 09:43:11 +01:00
ae2304f23f
Merge pull request #22405 from owncloud/gdrive-mimetype-and-office-fixes
...
Fix GDrive handling of office files
2016-02-19 09:13:35 +01:00
f6e61a296f
Merge pull request #22424 from owncloud/add-generic-csrf-protection-to-webdav
...
Require CSRF token for non WebDAV authenticated requests
2016-02-19 09:13:00 +01:00
Joas Schilling
Thomas Müller
Vincent Petry
Roeland Jago Douma
Pierre Jochem
Lukas Reschke
Morris Jobke
Jan-Christoph Borchardt
Andreas Schubert
Bjoern Schiessle
Scrutinizer Auto-Fixer