summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2016-03-2636-0/+110
|
* [tx-robot] updated from transifexJenkins for ownCloud2016-03-2544-4/+270
|
* Merge pull request #23549 from owncloud/dav-sharetypes-remoteThomas Müller2016-03-244-2/+8
|\ | | | | Return remote shares in oc:share-types Webdav property
| * Return remote shares in oc:share-types Webdav propertyVincent Petry2016-03-244-2/+8
| | | | | | | | | | Fixes web UI to properly display the share status icon when an outgoing remote share exists
* | Merge pull request #23545 from owncloud/issue-17144-lock-mount-point-on-removalThomas Müller2016-03-241-0/+4
|\ \ | | | | | | Lock the mountpoint while removing
| * | Lock the mountpoint while removingJoas Schilling2016-03-241-0/+4
| | |
* | | Merge pull request #23154 from owncloud/avatar-save-failureThomas Müller2016-03-244-7/+25
|\ \ \ | | | | | | | | dont die when we cant save the resized avatar, log instead
| * | | dont die when we cant save the resized avatar, log insteadRobin Appelman2016-03-114-7/+25
| | | |
* | | | Merge pull request #23511 from owncloud/sidebar-clickThomas Müller2016-03-242-4/+19
|\ \ \ \ | | | | | | | | | | sidebar click modification
| * | | | sidebar click modificationErik Pellikka2016-03-242-4/+19
| | |/ / | |/| |
* | | | Merge pull request #23551 from owncloud/objectstoremissingvarThomas Müller2016-03-241-0/+4
|\ \ \ \ | | | | | | | | | | add missing var
| * | | | add missing varJörn Friedrich Dreyer2016-03-241-0/+4
| | | | |
* | | | | Merge pull request #23342 from ↵Thomas Müller2016-03-2410-88/+212
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | owncloud/fix-group-sharing-for-v1-caldav-and-carddav Fix group shares on v1 caldav and carddav
| * | | | Fix acls for calendar objects and cards - fixes #23273Thomas Müller2016-03-249-84/+192
| | | | |
| * | | | Return proper current-user-principal on v1 endpoints - fixes #23306Thomas Müller2016-03-241-0/+15
| | | | |
| * | | | Fix group shares on v1 caldav and carddav - fixes #23328Thomas Müller2016-03-243-4/+5
| | | | |
* | | | | Merge pull request #23542 from ↵Thomas Müller2016-03-241-3/+6
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | owncloud/catch-empty-app-path-oh-we-really-should-use-exceptions-in-the-future getAppPath can return false
| * | | | getAppPath can return falseLukas Reschke2016-03-241-3/+6
| |/ / / | | | | | | | | | | | | Fixes https://github.com/owncloud/core/issues/23533
* | | | Merge pull request #23530 from owncloud/fix-shibbolethVincent Petry2016-03-243-36/+242
|\ \ \ \ | |/ / / |/| | | Check if request is sent from official ownCloud client
| * | | Check if request is sent from official ownCloud clientLukas Reschke2016-03-243-36/+242
|/ / / | | | | | | | | | | | | | | | There are authentication backends such as Shibboleth that do send no Basic Auth credentials for DAV requests. This means that the ownCloud DAV backend would consider these requests coming from an untrusted source and require higher levels of security checks. (e.g. a CSRF check) While an elegant solution would rely on authenticating via token (so that one can properly ensure that the request came indeed from a trusted client) this is a okay'ish workaround for this problem until we have something more reliable in the authentication code.
* | | [tx-robot] updated from transifexJenkins for ownCloud2016-03-24372-1018/+420
| | |
* | | Merge pull request #23515 from owncloud/issue-22695-wrong-menu-translationsThomas Müller2016-03-231-6/+4
|\ \ \ | | | | | | | | Fix the translations of the User menu
| * | | Fix the translations of the User menuJoas Schilling2016-03-231-6/+4
| | | |
* | | | Merge pull request #23507 from owncloud/fix-23496-masterThomas Müller2016-03-231-2/+4
|\ \ \ \ | | | | | | | | | | Avoid fatal php error dring cron execution
| * | | | fixes #23496Thomas Müller2016-03-231-2/+4
| | | | |
* | | | | Merge pull request #23509 from owncloud/bump_polyfillThomas Müller2016-03-231-0/+0
|\ \ \ \ \ | |_|_|_|/ |/| | | | [3rdparty] Bump symfony/polyfill packages
| * | | | [3rdparty] Bump symfony/polyfill packagesRoeland Jago Douma2016-03-231-0/+0
|/ / / /
* | | | Merge pull request #22506 from owncloud/node-get-from-cacheThomas Müller2016-03-236-66/+131
|\ \ \ \ | | | | | | | | | | Query the cache when checking if a node exists
| * | | | properly use fileinfo objectsRobin Appelman2016-03-212-34/+75
| | | | |
| * | | | set watch policy in testRobin Appelman2016-03-212-9/+39
| | | | |
| * | | | improve reuse in getUserFolderRobin Appelman2016-03-211-6/+6
| | | | |
| * | | | pass the fileinfo to the node if availableRobin Appelman2016-03-213-17/+10
| | | | |
| * | | | Query the cache when checking if a node existsRobin Appelman2016-03-211-2/+3
| | | | |
* | | | | Merge pull request #23434 from owncloud/symfony-event-dispatcherThomas Müller2016-03-231-0/+0
|\ \ \ \ \ | | | | | | | | | | | | [3rdparty] Bump symfony/event-dispatcher
| * | | | | [3rdparty] Bump symfony/event-dispatcherRoeland Jago Douma2016-03-231-0/+0
| | | | | |
* | | | | | Merge pull request #23431 from owncloud/use-dav-sabre-plugin-for-browser-2Thomas Müller2016-03-233-14/+29
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix display of vcard and calendar object details page in browser plugin
| * | | | | | Fix display of vcard and calendar object details page in browser pluginThomas Müller2016-03-233-14/+29
| | | | | | |
* | | | | | | Merge pull request #23142 from owncloud/request_propertiesThomas Müller2016-03-231-1/+8
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix analyzer warnings in request.php
| * | | | | | | Fix warning in request.phpRoeland Jago Douma2016-03-231-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Added proper @property tags * RunTimeException => RuntimeException Makes code analyzers happier
* | | | | | | | Merge pull request #22895 from owncloud/cleanup_default_share_providerThomas Müller2016-03-232-147/+16
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | Remove support for old shares in the default share provider
| * | | | | | | Remove dead functionRoeland Jago Douma2016-03-231-24/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was used when we did not have lazy shares yet. Now that we no longer support legacy shares this can go.
| * | | | | | | Remove support for old shares in the default share providerRoeland Jago Douma2016-03-232-123/+16
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In 9.0 we converted the old shares to the new shares. So for 9.1 we can savely remove the fallback code. This code was required when there was no initiator set. * Fixed unit tests
* | | | | | | Merge pull request #23362 from owncloud/fix-l10n-for-themesThomas Müller2016-03-236-19/+67
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Read available l10n files also from theme folder
| * | | | | | | Inject server root - allows proper testing and separation of concernsMorris Jobke2016-03-185-24/+30
| | | | | | | |
| * | | | | | | Read available l10n files also from theme folderMorris Jobke2016-03-173-7/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The old behaviour was that only languages could be used for an app that are already present in the apps/$app/l10n folder. If there is a themed l10n that is not present in the apps default l10n folder the language could not be used and the texts are not translated. With this change this is possible and also the l10n files are loaded even if the default l10n doesn't contain the l10n file.
* | | | | | | | Merge pull request #23463 from owncloud/lets-consistently-use-no-refererThomas Müller2016-03-2314-55/+55
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Consistently use rel=noreferrer
| * | | | | | | | Consistently use rel=noreferrerLukas Reschke2016-03-2014-55/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When linking to external entities we should consistently use rel=noreferrer
* | | | | | | | | Merge pull request #23495 from owncloud/disable-paste-zoneThomas Müller2016-03-233-0/+3
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / |/| | | | | | | | Disable pastezone for jquery.fileupload
| * | | | | | | | Disable pastezone for jquery.fileuploadLukas Reschke2016-03-223-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jquery.fileupload offers the [`pastezone`](https://github.com/blueimp/jQuery-File-Upload/wiki/Options#pastezone) functionality. This functionality is enabled by default and if somebody copy-pastes something into Chrome it will automatically trigger an upload of the content to any configured jquery.fileupload element embedded in the JS. This implementation triggers some problems: 1. The pastezone is defined globally by default (:see_no_evil:). So if there are multiple fileupload's on a page (such as in the personal settings) then stuff is going to be uploaded to all embedded uploads. 2. Our server code is not able to parse the data. For example for uploads in the files app we expect a file name which is not specified => Just an error is thrown. You can reproduce this by taking a file into your clipboard and in Chrome then pressing <kbd>CTRL + V</kbd>. 3. When copy-pasting some string from MS Office on the personal page a temporary avatar with said content is created. Considering that this is anyways was never working at all and causes bugs I've set the `pastezone` to `null`. This mens that upload via copy and paste will be disabled. Lesson learned: Third-party JS libraries can have some weird details.
* | | | | | | | | Merge pull request #23474 from owncloud/RealRancor-exclude_lost_and_foundThomas Müller2016-03-231-1/+2
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | | Exclude lost+found dir in integrity check