summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* add VALARM for birthday eventsAchim Königs2016-03-231-0/+5
| | | | ACTION=DISPLAY *should* prevents audible alarms.
* 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
| * | | | | | | Merge branch 'exclude_lost_and_found' of https://github.com/RealRancor/core ↵Lukas Reschke2016-03-221-1/+2
| |\ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | into RealRancor-exclude_lost_and_found
| | * | | | | | Exclude lost+found dir in integrity checkRealRancor2016-03-191-1/+2
| | | | | | | |
* | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-03-2394-172/+34
| | | | | | | |
* | | | | | | | Merge pull request #23485 from owncloud/composer_allow_ocpThomas Müller2016-03-223-1/+5
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Allow OCP classes to be PSR-4 as well
| * | | | | | | | Move IServerContainter to PSR-4Roeland Jago Douma2016-03-221-0/+0
| | | | | | | | |
| * | | | | | | | Allos OCP classes to be PSR-4 as wellRoeland Jago Douma2016-03-222-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds the OCP namespace to the composer autoloader as well. This means that now we can use proper PSR-4 filenames in OCP.
* | | | | | | | | Merge pull request #23398 from owncloud/block_group_sharingThomas Müller2016-03-2216-42/+218
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Allow blocking of group sharing
| * | | | | | | | | Fix js strings if group sharing is disabledRoeland Jago Douma2016-03-223-6/+20
| | | | | | | | | |
| * | | | | | | | | Add intergration testsRoeland Jago Douma2016-03-222-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Only for sharees right now * Sharing intergration tests fail due to the test setup we have right now
| * | | | | | | | | Respect disabled group sharing in sharee endpointRoeland Jago Douma2016-03-223-35/+69
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fix tests
| * | | | | | | | | Block group sharing in API and in share managerRoeland Jago Douma2016-03-224-1/+88
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fix tests
| * | | | | | | | | Add config to sharemanagerRoeland Jago Douma2016-03-222-0/+14
| | | | | | | | | |
| * | | | | | | | | Add `allow sharing with groups` checkbox to admin pageRoeland Jago Douma2016-03-223-0/+10
| | | | | | | | | |
* | | | | | | | | | Merge pull request #22679 from owncloud/fix_22668Thomas Müller2016-03-222-1/+91
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | When the Share API is disabled do not return shares
| * | | | | | | | | | When the Share API is disabled do not return sharesRoeland Jago Douma2016-03-222-1/+91
| | |_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #22668 Block everything in the OCS Share API
* | | | | | | | | | Merge pull request #23488 from owncloud/only-use-usersession-if-installedThomas Müller2016-03-221-1/+5
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | Only use the user session if ownCloud is already installed
| * | | | | | | | | Only use the user session if ownCloud is already installedLukas Reschke2016-03-221-1/+5
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | When installing ownCloud with autotest and MySQL some log entries may be created which will invoke the logging class. IUserSession has a dependency on the database which will make the installation fail => :bomb:
* | | | | | | | | Merge pull request #23484 from ↵Thomas Müller2016-03-221-0/+4
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | owncloud/if-class-is-already-loaded-dont-load-it-again Dont double load class
| * | | | | | | | Dont double load classLukas Reschke2016-03-221-0/+4
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the class already exists we should not load it twice. Since the composer autoloader is also used in core this could otherwise load a file twice. This leads to problems otherwise with case insensitive operating systems like OS X. We can get rid of this once all file names in OC follow PSR-4, until then we probably need this check.
* | | | | | | | Merge pull request #23437 from owncloud/save-query-when-the-list-is-emptyThomas Müller2016-03-222-1/+12
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | Save the query when we get tags for no objects