summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Collapse)AuthorAgeFilesLines
* make decrypt all work with the master keyBjoern Schiessle2016-02-293-27/+46
|
* Merge pull request #22662 from owncloud/comments-countThomas Müller2016-02-292-5/+3
|\ | | | | remove comments count because it is not that relevant to show directly
| * remove comments count because it is not that relevant to show directlyJan-Christoph Borchardt2016-02-252-5/+3
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2016-02-298-0/+12
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2016-02-2832-18/+224
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2016-02-2714-0/+38
| |
* | Merge pull request #22671 from owncloud/issue-22670Thomas Müller2016-02-262-26/+26
|\ \ | | | | | | Move the tag filter at the end for now
| * | Move the tag filter at the end for nowJoas Schilling2016-02-262-26/+26
| | |
* | | Merge pull request #22640 from owncloud/fix_22587Thomas Müller2016-02-262-0/+129
|\ \ \ | | | | | | | | Remove delete permissions for read-only federated reshares
| * | | Remove delete permissions for read-only federated resharesRoeland Jago Douma2016-02-252-0/+129
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | An incomming federated share is just a mount point. Therefor if we request the permissions on the mountpoint DELETE permissions will be returned (among others). Since we can always remove a mountpoint, update a mount point. However now when trying to reshare we will try to reshare with DELETE permissions. Which is false. This PR removes the delete permissions if it is a shared storage. Basically a quick hack. Fixes #22587
* | | | Merge pull request #22608 from owncloud/collaborative-tagsThomas Müller2016-02-262-3/+4
|\ \ \ \ | | | | | | | | | | Rename system tags app to collaborative tags
| * | | | Rename system tags app to collaborative tagsJoas Schilling2016-02-262-3/+4
| | |/ / | |/| |
* | | | Merge pull request #22461 from owncloud/fix_6773Thomas Müller2016-02-2613-63/+150
|\ \ \ \ | |/ / / |/| | | Allow theming of actions
| * | | Fix favorite icon unit test for icon imageVincent Petry2016-02-251-2/+4
| | | |
| * | | Make more action icons themable + style fixesVincent Petry2016-02-255-22/+24
| | | | | | | | | | | | | | | | | | | | Action icons now appear properly in public link page. More actions are now CSS icons.
| * | | Close classRoeland Jago Douma2016-02-251-1/+1
| | | |
| * | | Make file actions use icon CSS classesRoeland Jago Douma2016-02-258-42/+125
| | |/ | |/| | | | | | | This makes theming of file actions possible
* / | [tx-robot] updated from transifexJenkins for ownCloud2016-02-2622-2/+58
|/ /
* | Merge pull request #22644 from owncloud/external-share-managerThomas Müller2016-02-251-3/+4
|\ \ | | | | | | inject the correct external share manager into the storage
| * | inject the correct external share manager into the storageRobin Appelman2016-02-251-3/+4
| | |
* | | Merge pull request #22628 from owncloud/fix-thrashbin-cronjobThomas Müller2016-02-251-0/+6
|\ \ \ | |/ / |/| | Skip users with no trashbin
| * | Skip users with no trashbinVictor Dubiniuk2016-02-241-0/+6
| | |
* | | Merge pull request #22636 from owncloud/fix-ssl-on-external-storagesThomas Müller2016-02-253-11/+40
|\ \ \ | | | | | | | | Fix HTTPS support on external storages
| * | | Properly cast typeLukas Reschke2016-02-243-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-encryptionThomas Müller2016-02-251-5/+11
|\ \ \ | | | | | | | | Copy into local file
| * | | More error handlingLukas Reschke2016-02-251-2/+6
| | | |
| * | | Copy into local fileLukas Reschke2016-02-251-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-disablesharingoptionbydefaultThomas Müller2016-02-254-3/+10
|\ \ \ | | | | | | | | Disable sharing by default for external storage mounts
| * | | Disable sharing by default for external storage mountsVincent Petry2016-02-244-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-displaynameThomas Müller2016-02-251-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 Schiwon2016-02-241-2/+2
| | |/ | |/| | | | | | | be 'Array', if cache is configured and enabled.
* / | [tx-robot] updated from transifexJenkins for ownCloud2016-02-25388-482/+2860
|/ /
* | Merge pull request #22593 from owncloud/swift-docker-fixThomas Müller2016-02-242-277/+1
|\ \ | | | | | | Enable upstream entrypoint changes with Ceph Docker
| * | Enable upstream entrypoint changes with Ceph DockerRobin McCorkell2016-02-232-277/+1
| |/
* | Merge pull request #22592 from owncloud/fix-response-headerThomas Müller2016-02-241-17/+0
|\ \ | | | | | | Add header for attachment disposition only once
| * | Drop unneeded use statementsMorris Jobke2016-02-231-4/+0
| | |
| * | Add header for attachment disposition only onceLukas Reschke2016-02-231-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-entriesThomas Müller2016-02-231-11/+11
|\ \ \ | |_|/ |/| | Allow defining a limit and offset for getObjectIdsForTags
| * | Fix dav unit testsJoas Schilling2016-02-231-11/+11
| |/
* | Merge pull request #22582 from owncloud/case-insensitive-contact-searchThomas Müller2016-02-232-3/+3
|\ \ | | | | | | Case insensitive contact search
| * | Case insensitive search in contacts - fixes #22575Thomas Müller2016-02-222-3/+3
| |/
* | Merge pull request #22516 from owncloud/core-cumulativenotificationsThomas Müller2016-02-233-2/+11
|\ \ | |/ |/| Accumulate notifications instead of blinking
| * Fix unit tests affected by side effectsVincent Petry2016-02-222-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 blinkingVincent Petry2016-02-221-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 protectedJoas Schilling2016-02-222-9/+9
|/
* Merge pull request #22536 from owncloud/add-integration-tests-for-tagsThomas Müller2016-02-224-6/+285
|\ | | | | 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
* | 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
* | 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.