summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #16594 from ↵Joas Schilling2019-07-302-58/+0
|\ | | | | | | | | nextcloud/tech-debt/noid/remove-unused-checkPasswordProtectedShare Remove unused OC\Share\Share::checkPasswordProtectedShare
| * Remove unused OC\Share\Share::checkPasswordProtectedShareMorris Jobke2019-07-292-58/+0
| | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | Merge pull request #16599 from nextcloud/fix/xss/on-favorite-fileRoeland Jago Douma2019-07-302-2/+2
|\ \ | | | | | | Fix/xss/on favorite file
| * | prevent potential XSS via unchecked use innerHTMLMax Fichtelmann2019-07-291-1/+1
| | | | | | | | | | | | Signed-off-by: Max Fichtelmann <max.fichtelmann@procilon.de>
| * | fix XSS when adding a file with a malicious name to favoritesMax Fichtelmann2019-07-291-1/+1
| | | | | | | | | | | | Signed-off-by: Max Fichtelmann <max.fichtelmann@procilon.de>
* | | Merge pull request #16593 from nextcloud/fix/noid/more-precise-error-messageRoeland Jago Douma2019-07-301-3/+2
|\ \ \ | | | | | | | | More precise error message when expected filesize does not match
| * | | More precise error message when expected filesize does not match - could be ↵Morris Jobke2019-07-291-3/+2
| | |/ | |/| | | | | | | | | | | | | on reading or writing side Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | Merge pull request #16579 from nextcloud/enh/PostLoginEventRoeland Jago Douma2019-07-306-46/+153
|\ \ \ | | | | | | | | Add proper PostLoginEvent
| * | | Update testsRoeland Jago Douma2019-07-291-44/+71
| | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | Add proper PostLoginEventRoeland Jago Douma2019-07-295-2/+82
| |/ / | | | | | | | | | | | | | | | | | | This can be used by othr mechanisms to listen for this event in a lazy fashion. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | Merge pull request #16596 from nextcloud/bugfix/noid/vtooltip-defaultsRoeland Jago Douma2019-07-3016-74/+51
|\ \ \ | | | | | | | | Set proper defaults for v-tooltip usages
| * | | Bump bundlesJulius Härtl2019-07-2912-68/+43
| | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | Force defaultHtml setting of v-tooltip to be disabledJulius Härtl2019-07-294-6/+8
| | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | | Merge pull request #16595 from ↵Roeland Jago Douma2019-07-301-11/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | nextcloud/tech-debt/noid/no-need-to-document-the-obvious Do not document the obvious
| * | | | Do not document the obviousMorris Jobke2019-07-291-11/+0
| | |/ / | |/| | | | | | | | | | | | | | | | | | This removes PHPDoc that is already available as source code type hints. Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | [tx-robot] updated from transifexNextcloud bot2019-07-30136-384/+400
| |_|/ |/| |
* | | Merge pull request #16502 from nextcloud/bugfix/16474Morris Jobke2019-07-292-8/+20
|\ \ \ | | | | | | | | Check the if we can actually access the storage cache for recent files
| * | | Add additional check for read permissionsJulius Härtl2019-07-241-1/+2
| | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | Check the if we can actually access the storage cache for recent filesJulius Härtl2019-07-242-7/+18
| | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | | Merge pull request #16591 from nextcloud/fix/noid/typo-in-commentMorris Jobke2019-07-291-1/+1
|\ \ \ \ | |_|/ / |/| | | Fix typo in comment
| * | | Fix typo in commentMorris Jobke2019-07-291-1/+1
|/ / / | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | Merge pull request #16582 from nextcloud/enh/split_up_security_middlewareRoeland Jago Douma2019-07-297-140/+238
|\ \ \ | | | | | | | | Split up security middleware
| * | | Split up security middlewareRoeland Jago Douma2019-07-277-140/+238
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With upcoming work for the feature policy header. Splitting this in smaller classes that just do 1 thing makes sense. I rather have a few small classes that are tiny and do 1 thing right (and we all understand what is going on) than have big ones. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | Merge pull request #16563 from nextcloud/enh/lostcontroller/better_exceptionsMorris Jobke2019-07-295-21/+53
|\ \ \ \ | | | | | | | | | | Use proper exception in lostController
| * | | | Use proper exception in lostControllerRoeland Jago Douma2019-07-275-21/+53
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is no need to log the expcetion of most of the stuff here. We should properly log them but an exception is excessive. This moves it to a proper exception which we can catch and then log. The other exceptions will still be fully logged. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | Merge pull request #16581 from nextcloud/dep/strict_csps_can_goRoeland Jago Douma2019-07-293-0/+3
|\ \ \ \ | | | | | | | | | | No need to have these classes we tighten the default CSP from time to time
| * | | | No need to have these classes we tighten the default CSP from time toRoeland Jago Douma2019-07-273-0/+3
| |/ / / | | | | | | | | | | | | | | | | | | | | time Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | Merge pull request #16570 from nextcloud/enh/supress_touch_errorRoeland Jago Douma2019-07-291-2/+2
|\ \ \ \ | |_|_|/ |/| | | Supress warnings touch can generate
| * | | Supress warnings touch can generateRoeland Jago Douma2019-07-261-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | We already catch the result value. Having the warning being logged explicitly doesn't help and polutes the log. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | Merge pull request #16571 from nextcloud/enh/update_preview_controllerMorris Jobke2019-07-291-6/+1
|\ \ \ \ | | | | | | | | | | Update PreviewController
| * | | | Update PreviewControllerRoeland Jago Douma2019-07-261-6/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The constructor is called with the userId. However if a user is not logged in this is null. Which means that we get an exception instead of this being handled gracefully in the middleware. There are cleaner solutions. But this is the solution that is the easiest to apply without lots of work and risk of breaking things (handling the logged in middleware before initializing the controller etc). Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | [tx-robot] updated from transifexNextcloud bot2019-07-298-2/+8
| | | | |
* | | | | Merge pull request #16573 from nextcloud/fix-default-timeouts-in-oc-notificationRoeland Jago Douma2019-07-288-16/+118
|\ \ \ \ \ | | | | | | | | | | | | Fix default timeouts in OC.Notification
| * | | | | Add unit tests for "OC.Notification.hide()"Daniel Calviño Sánchez2019-07-261-0/+56
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | | | | Fix default timeouts in OC.NotificationDaniel Calviño Sánchez2019-07-268-11/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When no timeout was given "show()" used the default timeout of "OCP.Toast", which is 7 seconds instead of indefinitely as stated in the documentation of "show()". "showHtml()" should also indefinitely show the notification if no timeout is given, but due to the strict comparison the notification was indefinitely shown only when a timeout of 0 was explicitly given. Now both methods show the notification indefinitely (or until it is explicitly hidden) when no timeout is given. The unit tests did not catch this error because "showHtml()" had no tests (as before the move to Toastify it was called from "show()" and thus implicitly tested), and because "show()" verified that "hide()" was not called after some time; "hide()" is no longer called from "show()" since "OCP.Toast" is used internally, so the test always passed even if the notification was indeed hidden. Now the test is based on whether the element is found or not, and explicit tests were added too for "showHtml()". Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | | | | Fix mixed test for "show" and "showTemporary"Daniel Calviño Sánchez2019-07-261-1/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "showTemporary()" when a timeout was given was being tested along with the "show()" tests; now there are two separate tests when a timeout is given, one for "showTemporary()" and one for "show()". Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
| * | | | | Check number of elements instead of if the jQuery object is definedDaniel Calviño Sánchez2019-07-261-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Tje jQuery object created through "$('#testArea .toastify')" will be always defined even if no elements were found, so the check does not really work; instead, it should be checked the number of elements found. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
* | | | | | Merge pull request #16583 from nextcloud/dependabot/npm_and_yarn/webpack-4.38.0Roeland Jago Douma2019-07-282-4/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | Bump webpack from 4.36.1 to 4.38.0
| * | | | | | Bump webpack from 4.36.1 to 4.38.0dependabot-preview[bot]2019-07-282-4/+4
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bumps [webpack](https://github.com/webpack/webpack) from 4.36.1 to 4.38.0. - [Release notes](https://github.com/webpack/webpack/releases) - [Commits](https://github.com/webpack/webpack/compare/v4.36.1...v4.38.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
* / | | | | [tx-robot] updated from transifexNextcloud bot2019-07-2864-56/+38
|/ / / / /
* | | | | Merge pull request #16560 from nextcloud/bugfix/noid/fix_cutype_reportingRoeland Jago Douma2019-07-271-11/+16
|\ \ \ \ \ | | | | | | | | | | | | fix calendar-user-type reporting
| * | | | | fix CUType reportingGeorg Ehrke2019-07-261-11/+16
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
* | | | | | Merge pull request #16558 from nextcloud/enh/less_verbose_locked_loggingRoeland Jago Douma2019-07-271-3/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | Do not log all locked exceptions
| * | | | | | Do not log all locked exceptionsRoeland Jago Douma2019-07-261-3/+3
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This can happen for valid reasons (multiple users writing at the same time) with for example the text app. Apps should properly handle it. No reason to log it by default. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | | [tx-robot] updated from transifexNextcloud bot2019-07-27126-212/+218
| |_|/ / / |/| | | |
* | | | | Merge pull request #16556 from ↵Morris Jobke2019-07-261-0/+25
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/feature/16554_adminAuditShareByMail/wiswedel log email shares in admin_audit log
| * | | | | log email shares in admin_audit logSascha Wiswedel2019-07-261-0/+25
| |/ / / / | | | | | | | | | | | | | | | Signed-off-by: Sascha Wiswedel <sascha.wiswedel@nextcloud.com>
* | | | | Merge pull request #16557 from nextcloud/enh/do_not_log_locked_filesMorris Jobke2019-07-261-1/+8
|\ \ \ \ \ | |_|_|/ / |/| | | | Do not log locked files
| * | | | Do not log locked filesRoeland Jago Douma2019-07-261-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is the code doing its job. There is no need to spam the log file with this. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | Merge pull request #16555 from nextcloud/fix/16529/mask-keysMorris Jobke2019-07-262-4/+7
|\ \ \ \ \ | | | | | | | | | | | | use a pattern to identify sensitive config keys
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-28 21:55:15 +0000