Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix favorite icon unit test for icon image | Vincent Petry | 2016-02-25 | 1 | -2/+4 |
| | |||||
* | Make more action icons themable + style fixes | Vincent Petry | 2016-02-25 | 5 | -22/+24 |
| | | | | | Action icons now appear properly in public link page. More actions are now CSS icons. | ||||
* | Close class | Roeland Jago Douma | 2016-02-25 | 1 | -1/+1 |
| | |||||
* | Make file actions use icon CSS classes | Roeland Jago Douma | 2016-02-25 | 8 | -42/+125 |
| | | | | This makes theming of file actions possible | ||||
* | Merge pull request #22644 from owncloud/external-share-manager | Thomas Müller | 2016-02-25 | 1 | -3/+4 |
|\ | | | | | inject the correct external share manager into the storage | ||||
| * | inject the correct external share manager into the storage | Robin Appelman | 2016-02-25 | 1 | -3/+4 |
| | | |||||
* | | Merge pull request #22628 from owncloud/fix-thrashbin-cronjob | Thomas Müller | 2016-02-25 | 1 | -0/+6 |
|\ \ | |/ |/| | Skip users with no trashbin | ||||
| * | Skip users with no trashbin | Victor Dubiniuk | 2016-02-24 | 1 | -0/+6 |
| | | |||||
* | | Merge pull request #22636 from owncloud/fix-ssl-on-external-storages | Thomas Müller | 2016-02-25 | 3 | -11/+40 |
|\ \ | | | | | | | Fix HTTPS support on external storages | ||||
| * | | Properly cast type | Lukas Reschke | 2016-02-24 | 3 | -11/+40 |
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | The current logic is checking whether: 1. The returned value is a boolen 2. The returned value is a string and then matches for "true" Since the config is now written to the database the data is now a string with the value "1" if HTTPS is set to true. Effectively this option was thus always disabled at the moment, falling back to plain HTTP. This change casts the data to a boolean if it is defined as boolean. Fixes https://github.com/owncloud/core/issues/22605 Fixes https://github.com/owncloud/core/issues/22016 | ||||
* | | Merge pull request #22604 from owncloud/fix-google-drive-encryption | Thomas Müller | 2016-02-25 | 1 | -5/+11 |
|\ \ | | | | | | | Copy into local file | ||||
| * | | More error handling | Lukas Reschke | 2016-02-25 | 1 | -2/+6 |
| | | | |||||
| * | | Copy into local file | Lukas Reschke | 2016-02-25 | 1 | -3/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using the Guzzle stream directly here will only return 1739 characters for `fread` instead of all data. This leads to the problem that the stream is read incorrectly and thus the data cannot be properly decrypted => :bomb: This approach copies the data into a local temporary file, as done before in all stable releases as well as other storage connectors. While this approach will load the whole file into memory, this is already was has happened before in any stable release as well. See https://github.com/owncloud/core/commit/d608c37c90c308d0518d854de908ec4be5f462dc for the breaking change. To test this enable Google Drive as external storage and upload some files with encryption enabled. Reading the file should fail now. Fixes https://github.com/owncloud/core/issues/22590 | ||||
* | | | Merge pull request #22600 from owncloud/extstorage-disablesharingoptionbydefault | Thomas Müller | 2016-02-25 | 4 | -3/+10 |
|\ \ \ | | | | | | | | | Disable sharing by default for external storage mounts | ||||
| * | | | Disable sharing by default for external storage mounts | Vincent Petry | 2016-02-24 | 4 | -3/+10 |
| | | | | | | | | | | | | | | | | | | | | | | | | This is for newly created mount points. Migrated mount points will have sharing enabled as before. | ||||
* | | | | Merge pull request #22599 from owncloud/fix_ldap-cache-2nd-displayname | Thomas Müller | 2016-02-25 | 1 | -2/+2 |
|\ \ \ \ | |_|/ / |/| | | | take the first result of that array, if present. Fixes 2nd display na… | ||||
| * | | | take the first result of that array, if present. Fixes 2nd display name to ↵ | Arthur Schiwon | 2016-02-24 | 1 | -2/+2 |
| | |/ | |/| | | | | | | | be 'Array', if cache is configured and enabled. | ||||
* / | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-02-25 | 388 | -482/+2860 |
|/ / | |||||
* | | Merge pull request #22593 from owncloud/swift-docker-fix | Thomas Müller | 2016-02-24 | 2 | -277/+1 |
|\ \ | | | | | | | Enable upstream entrypoint changes with Ceph Docker | ||||
| * | | Enable upstream entrypoint changes with Ceph Docker | Robin McCorkell | 2016-02-23 | 2 | -277/+1 |
| |/ | |||||
* | | Merge pull request #22592 from owncloud/fix-response-header | Thomas Müller | 2016-02-24 | 1 | -17/+0 |
|\ \ | | | | | | | Add header for attachment disposition only once | ||||
| * | | Drop unneeded use statements | Morris Jobke | 2016-02-23 | 1 | -4/+0 |
| | | | |||||
| * | | Add header for attachment disposition only once | Lukas Reschke | 2016-02-23 | 1 | -13/+0 |
| | | | | | | | | | | | | | | | | | | | | | | | | Recent refactorings have resulted in the header being added twice, this makes browsers ignore the header which removes any security gains. This changeset adds the header only once and adds integration tests ensuring the correct header in future. https://github.com/owncloud/core/issues/22577 | ||||
* | | | Merge pull request #22569 from owncloud/issue-22566-too-much-mapping-entries | Thomas Müller | 2016-02-23 | 1 | -11/+11 |
|\ \ \ | |_|/ |/| | | Allow defining a limit and offset for getObjectIdsForTags | ||||
| * | | Fix dav unit tests | Joas Schilling | 2016-02-23 | 1 | -11/+11 |
| |/ | |||||
* | | Merge pull request #22582 from owncloud/case-insensitive-contact-search | Thomas Müller | 2016-02-23 | 2 | -3/+3 |
|\ \ | | | | | | | Case insensitive contact search | ||||
| * | | Case insensitive search in contacts - fixes #22575 | Thomas Müller | 2016-02-22 | 2 | -3/+3 |
| |/ | |||||
* | | Merge pull request #22516 from owncloud/core-cumulativenotifications | Thomas Müller | 2016-02-23 | 3 | -2/+11 |
|\ \ | |/ |/| | Accumulate notifications instead of blinking | ||||
| * | Fix unit tests affected by side effects | Vincent Petry | 2016-02-22 | 2 | -1/+6 |
| | | | | | | | | | | | | | | | | The notification tests were not restoring the clock properly, but indirectly helped other tests pass. Since now we're restoring the clock properly, the other tests were fixed to still work. | ||||
| * | Accumulate notifications instead of blinking | Vincent Petry | 2016-02-22 | 1 | -1/+5 |
| | | | | | | | | | | This makes it possible to display multiple notifications. If the options.type is set to "error", it will also add a close button. | ||||
* | | Make non-public-method protected | Joas Schilling | 2016-02-22 | 2 | -9/+9 |
|/ | |||||
* | Merge pull request #22536 from owncloud/add-integration-tests-for-tags | Thomas Müller | 2016-02-22 | 4 | -6/+285 |
|\ | | | | | Add integration tests for tags plus fix permissions | ||||
| * | Check if user has permission to create such a tag | Lukas Reschke | 2016-02-19 | 4 | -6/+285 |
| | | | | | | | | Fixes https://github.com/owncloud/core/issues/22512 | ||||
* | | Merge pull request #22555 from owncloud/jenkins-19978 | Thomas Müller | 2016-02-22 | 1 | -0/+3 |
|\ \ | | | | | | | Show username when writing "Insufficient storage" into owncloud.log | ||||
| * | | Solution for Proposal #19974 | Pierre Jochem | 2016-02-22 | 1 | -0/+3 |
| |/ | | | | | | | Show username when writing into owncloud.log | ||||
* | | Fix public page footer position in IE | Vincent Petry | 2016-02-22 | 1 | -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. | ||||
* | | Fixes pagination in IE | Morris Jobke | 2016-02-22 | 1 | -1/+0 |
|/ | | | | | * tested in Firefox, Chrome, Safari, IE and Edge with folder and file shares * fixes #20044 | ||||
* | Merge pull request #22503 from owncloud/issue_22500 | Thomas Müller | 2016-02-19 | 1 | -0/+3 |
|\ | | | | | 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 Schiessle | 2016-02-19 | 1 | -0/+3 |
| | | | | | | | | example happen single files shared across servers | ||||
* | | Merge pull request #22509 from owncloud/add-filesplugin-to-new-webdav-endpoint | Thomas Müller | 2016-02-19 | 1 | -0/+4 |
|\ \ | | | | | | | Add FilesPlugin | ||||
| * | | Add FilesPlugin - fixes #22507 | Thomas Müller | 2016-02-19 | 1 | -0/+4 |
| | | | |||||
* | | | Merge pull request #22348 from owncloud/issue-21812-calendar-old-caldav-url | Thomas Müller | 2016-02-19 | 4 | -5/+90 |
|\ \ \ | |/ / |/| | | Fix old calendar dav urls | ||||
| * | | Add correct principals for the current user before ACL check | Joas Schilling | 2016-02-19 | 3 | -3/+77 |
| | | | |||||
| * | | Convert the old principal to the new principal before getting calendars | Joas Schilling | 2016-02-19 | 1 | -2/+13 |
| | | | |||||
* | | | Merge pull request #22515 from owncloud/webdav_checksum_only_for_files | Thomas Müller | 2016-02-19 | 1 | -5/+7 |
|\ \ \ | |/ / |/| | | Only add checksum headers for 'real' files | ||||
| * | | Only add checksum headers for files | Roeland Jago Douma | 2016-02-19 | 1 | -5/+7 |
| |/ | | | | | | | | | We can only add the checksum header for real ownCloud files (so we have a fileinfo object etc). | ||||
* | | Merge pull request #22198 from owncloud/birthday-calendar | Thomas Müller | 2016-02-19 | 14 | -41/+548 |
|\ \ | |/ |/| | Sync a users contacts birthday to the users birthday calendar | ||||
| * | Adding cli command to sync birthday calendar | Thomas Müller | 2016-02-18 | 6 | -14/+171 |
| | | |||||
| * | Prevent deletion of birthday calendar | Thomas Müller | 2016-02-18 | 3 | -8/+8 |
| | | |||||
| * | Sync a users contacts birthday to the users birthday calendar | Thomas Müller | 2016-02-18 | 10 | -38/+388 |
| | |