summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Make sure we can store strings as per the interfaceJoas Schilling2016-02-224-44/+43
|
* Merge pull request #22527 from wern/masterThomas Müller2016-02-221-2/+2
|\ | | | | Moved set -e option to enable executable checks again
| * moved set -e after executable checking with which as old position off set -e ↵Andreas Schubert2016-02-191-2/+2
| | | | | | | | stopped the script at this point without any error message
* | Merge pull request #22536 from owncloud/add-integration-tests-for-tagsThomas Müller2016-02-227-6/+1139
|\ \ | | | | | | Add integration tests for tags plus fix permissions
| * | Check if user has permission to create such a tagLukas Reschke2016-02-194-6/+285
| | | | | | | | | | | | Fixes https://github.com/owncloud/core/issues/22512
| * | Add integration tests for tagsLukas Reschke2016-02-193-0/+854
| | |
* | | Merge pull request #22552 from owncloud/fix-avconv-preview-parametersThomas Müller2016-02-221-2/+2
|\ \ \ | | | | | | | | Move `-an` after the input arg because it is an output option
| * | | Move `-an` after the input arg because it is an output optionJoas Schilling2016-02-221-2/+2
| | | |
* | | | Merge pull request #22554 from owncloud/fix_22550Thomas Müller2016-02-224-1/+35
|\ \ \ \ | | | | | | | | | | We should check for exceptions when trying to get the avatar
| * | | | We should check for exceptions when trying to get the avatarRoeland Jago Douma2016-02-224-1/+35
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | Fixes #22550 * Updated phpdoc of avatatmanager * Add unit test
* | | | Merge pull request #22555 from owncloud/jenkins-19978Thomas Müller2016-02-221-0/+3
|\ \ \ \ | | | | | | | | | | Show username when writing "Insufficient storage" into owncloud.log
| * | | | Solution for Proposal #19974Pierre Jochem2016-02-221-0/+3
| |/ / / | | | | | | | | | | | | Show username when writing into owncloud.log
* | | | Merge pull request #22561 from owncloud/ie-publicpagefooterThomas Müller2016-02-221-0/+5
|\ \ \ \ | | | | | | | | | | Fix public page footer position in IE
| * | | | Fix public page footer position in IEVincent Petry2016-02-221-0/+5
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | Merge pull request #22548 from owncloud/fix-pagination-in-ieVincent Petry2016-02-221-1/+0
|\ \ \ \ | |/ / / |/| | | Fixes pagination in IE
| * | | Fixes pagination in IEMorris Jobke2016-02-221-1/+0
|/ / / | | | | | | | | | | | | * tested in Firefox, Chrome, Safari, IE and Edge with folder and file shares * fixes #20044
* | | Merge pull request #22526 from owncloud/fix-english-textsThomas Müller2016-02-213-5/+5
|\ \ \ | |/ / |/| | Fix error in source language strings
| * | Fix error ins source language stringsThomas Müller2016-02-193-5/+5
| | | | | | | | | | | | | | | 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
* | | Merge pull request #22511 from owncloud/add-integration-tests-for-commentsLukas Reschke2016-02-195-2/+531
|\ \ \ | | | | | | | | Add integration tests for comments
| * | | Add integration tests for commentsLukas Reschke2016-02-195-2/+531
|/ / / | | | | | | | | | | | | | | | 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
* | | Merge pull request #22529 from owncloud/tags-styleThomas Müller2016-02-191-4/+32
|\ \ \ | | | | | | | | improve tags interface styling
| * | | improve tags interface stylingJan-Christoph Borchardt2016-02-191-4/+32
| | | |
* | | | Merge pull request #22503 from owncloud/issue_22500Thomas Müller2016-02-193-11/+105
|\ \ \ \ | | | | | | | | | | When (re-)sharing an incomming federated share set the corrent owner
| * | | | make sure that the file name doesn't end with a trailing slash. Can for ↵Bjoern Schiessle2016-02-191-0/+3
| | | | | | | | | | | | | | | | | | | | example happen single files shared across servers
| * | | | When (re-)sharing an incomming federated share set the corrent ownerRoeland Jago Douma2016-02-192-11/+102
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | Merge pull request #22518 from owncloud/checkdeletebeforecopyinsteadofrenameThomas Müller2016-02-192-0/+8
|\ \ \ \ | | | | | | | | | | Check delete permission before attemping copy+delete
| * | | | Check delete permission before attemping copy+deleteVincent Petry2016-02-192-0/+8
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | Merge pull request #22410 from owncloud/fix_22119Thomas Müller2016-02-192-33/+40
|\ \ \ \ | | | | | | | | | | Do not copy skeleton on avatar access
| * | | | Do not copy skeleton on avatar accessRoeland Jago Douma2016-02-162-33/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #22119 Just try to get the folder of the user. If it is not there a NotFoundException will be thrown. Which will be handled by the avatar endpoint.
* | | | | Merge pull request #22509 from owncloud/add-filesplugin-to-new-webdav-endpointThomas Müller2016-02-191-0/+4
|\ \ \ \ \ | |_|_|_|/ |/| | | | Add FilesPlugin
| * | | | Add FilesPlugin - fixes #22507Thomas Müller2016-02-191-0/+4
| | | | |
* | | | | Merge pull request #22521 from owncloud/mssql-is-not-support-since-agesThomas Müller2016-02-191-37/+0
|\ \ \ \ \ | | | | | | | | | | | | Remove old adapter - mssql is not supported
| * | | | | Remove old adapter - mssql is not supportedJoas Schilling2016-02-191-37/+0
| |/ / / /
* | | | | Merge pull request #22348 from owncloud/issue-21812-calendar-old-caldav-urlThomas Müller2016-02-194-5/+90
|\ \ \ \ \ | | | | | | | | | | | | Fix old calendar dav urls
| * | | | | Add correct principals for the current user before ACL checkJoas Schilling2016-02-193-3/+77
| | | | | |
| * | | | | Convert the old principal to the new principal before getting calendarsJoas Schilling2016-02-191-2/+13
| | | | | |
* | | | | | Merge pull request #22218 from owncloud/occ-no-extra-messagesThomas Müller2016-02-192-2/+23
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | Add global --no-warnings option to occ…
| * | | | | Add global --no-warning option to occ in order not to pollute output with ↵Victor Dubiniuk2016-02-192-2/+23
| | | | | | | | | | | | | | | | | | | | | | | | warnings
* | | | | | Merge pull request #22515 from owncloud/webdav_checksum_only_for_filesThomas Müller2016-02-191-5/+7
|\ \ \ \ \ \ | | | | | | | | | | | | | | Only add checksum headers for 'real' files
| * | | | | | Only add checksum headers for filesRoeland Jago Douma2016-02-191-5/+7
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | We can only add the checksum header for real ownCloud files (so we have a fileinfo object etc).
* | | | | | Merge pull request #22487 from owncloud/hidden-text-for-informationThomas Müller2016-02-191-0/+7
|\ \ \ \ \ \ | | | | | | | | | | | | | | Add hidden text to issue templates
| * | | | | | Add hidden text to issue templatesLukas Reschke2016-02-181-0/+7
| | | | | | | | | | | | | | | | | | | | | Explains that this is a bug tracker + links to owncloud.org/support
* | | | | | | Merge pull request #22472 from owncloud/scrutinizer-patch-1Thomas Müller2016-02-198-14/+21
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | Scrutinizer Auto-Fixes
| * | | | | | Fix even moreRoeland Jago Douma2016-02-191-1/+2
| | | | | | |
| * | | | | | Fix more thingsJoas Schilling2016-02-194-7/+7
| | | | | | |
| * | | | | | Fix PHPDocThomas Müller2016-02-191-1/+1
| | | | | | |
| * | | | | | Scrutinizer Auto-FixesScrutinizer Auto-Fixer2016-02-198-16/+22
| | |/ / / / | |/| | | | | | | | | | | | | | | | This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
* | | | | | Merge pull request #22198 from owncloud/birthday-calendarThomas Müller2016-02-1914-41/+548
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Sync a users contacts birthday to the users birthday calendar
| * | | | | Adding cli command to sync birthday calendarThomas Müller2016-02-186-14/+171
| | | | | |
| * | | | | Prevent deletion of birthday calendarThomas Müller2016-02-183-8/+8
| | | | | |
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-28 14:05:46 +0000