summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Collapse)AuthorAgeFilesLines
* prevent the server's app-navigation's css to overrule the scoped css in vue ↵Marco Ambrosini2019-08-061-1/+1
| | | | | | components Signed-off-by: Marco Ambrosini <marcoambrosini@pm.me>
* Merge pull request #16651 from nextcloud/dependabot/npm_and_yarn/webpack-4.39.1Roeland Jago Douma2019-08-048-35/+35
|\ | | | | Bump webpack from 4.38.0 to 4.39.1
| * Bump webpack from 4.38.0 to 4.39.1dependabot-preview[bot]2019-08-048-35/+35
| | | | | | | | | | | | | | | | | | Bumps [webpack](https://github.com/webpack/webpack) from 4.38.0 to 4.39.1. - [Release notes](https://github.com/webpack/webpack/releases) - [Commits](https://github.com/webpack/webpack/compare/v4.38.0...v4.39.1) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
* | [tx-robot] updated from transifexNextcloud bot2019-08-044-4/+12
|/
* [tx-robot] updated from transifexNextcloud bot2019-08-034-2/+36
|
* [tx-robot] updated from transifexNextcloud bot2019-08-0222-6/+48
|
* Merge pull request #16622 from nextcloud/design/scrollbarJohn Molakvoæ2019-08-011-2/+5
|\ | | | | Standardize scrollbar color and width across Webkit and Firefox
| * Standardize scrollbar color and width across Webkit and FirefoxJan-Christoph Borchardt2019-07-311-2/+5
| | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | [tx-robot] updated from transifexNextcloud bot2019-08-01128-384/+412
| |
* | Merge pull request #16544 from nextcloud/bugfix/16540Roeland Jago Douma2019-07-3111-87/+211
|\ \ | |/ |/| Add missing password reset page to vue
| * Move actual password reset to vueJulius Härtl2019-07-3111-87/+211
| | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | [tx-robot] updated from transifexNextcloud bot2019-07-30128-382/+382
| |
* | Merge pull request #16563 from nextcloud/enh/lostcontroller/better_exceptionsMorris Jobke2019-07-292-18/+42
|\ \ | | | | | | Use proper exception in lostController
| * | Use proper exception in lostControllerRoeland Jago Douma2019-07-272-18/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 #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-292-0/+2
| |
* | 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>
* / [tx-robot] updated from transifexNextcloud bot2019-07-282-6/+6
|/
* [tx-robot] updated from transifexNextcloud bot2019-07-262-4/+4
|
* [tx-robot] updated from transifexNextcloud bot2019-07-252-0/+6
|
* Remove files_texteditor from shipped appsJulius Härtl2019-07-241-1/+0
| | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* [tx-robot] updated from transifexNextcloud bot2019-07-232-0/+8
|
* Merge pull request #16487 from ↵Roeland Jago Douma2019-07-221-1/+1
|\ | | | | | | | | nextcloud/dependabot/npm_and_yarn/blueimp-md5-2.11.0 Bump blueimp-md5 from 2.10.0 to 2.11.0
| * Bump blueimp-md5 from 2.10.0 to 2.11.0dependabot-preview[bot]2019-07-211-1/+1
| | | | | | | | | | | | | | | | | | Bumps [blueimp-md5](https://github.com/blueimp/JavaScript-MD5) from 2.10.0 to 2.11.0. - [Release notes](https://github.com/blueimp/JavaScript-MD5/releases) - [Commits](https://github.com/blueimp/JavaScript-MD5/compare/v2.10.0...v2.11.0) Signed-off-by: dependabot-preview[bot] <support@dependabot.com> Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
* | [tx-robot] updated from transifexNextcloud bot2019-07-224-10/+14
|/
* [tx-robot] updated from transifexNextcloud bot2019-07-2110-28/+108
|
* Merge pull request #16470 from ↵Morris Jobke2019-07-201-1/+2
|\ | | | | | | | | nextcloud/bugfix/noid/settings-menu-border-top_new Add border-top to settings menu when its open
| * Add border-top to settings menu when its openGreta Doci2019-07-191-1/+2
| | | | | | | | Signed-off-by: Greta Doci <gretadoci@gmail.com>
* | [tx-robot] updated from transifexNextcloud bot2019-07-206-4/+6
| |
* | [tx-robot] updated from transifexNextcloud bot2019-07-1916-0/+16
| |
* | Merge pull request #16420 from nextcloud/bugfix/noid/settings-menu-border-topMorris Jobke2019-07-181-2/+4
|\| | | | | Add border-top to settings menu when its open ref #16076
| * Add border-top to settings menu when its open ref #16076Greta Doci2019-07-171-2/+4
| | | | | | | | Signed-off-by: Greta Doci <gretadoci@gmail.com>
* | [tx-robot] updated from transifexNextcloud bot2019-07-182-0/+2
| |
* | Merge pull request #15040 from ↵Morris Jobke2019-07-172-20/+23
|\ \ | | | | | | | | | | | | nextcloud/feature/13980/push-for-deleted-notifications Notifications overhaul
| * | Keep the old method as a fallback and adjust the testsJoas Schilling2019-07-161-2/+2
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | Fix new core notifierJoas Schilling2019-07-152-20/+23
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | [tx-robot] updated from transifexNextcloud bot2019-07-172-2/+2
| | |
* | | Merge pull request #14228 from nextcloud/feature/noid/add-metadata-etagMorris Jobke2019-07-151-0/+73
|\ \ \ | | | | | | | | Add DB table to extend filecache with metadata etag, creation and upload time
| * | | Add DB table to extend filecache with metadata etag, creation time and ↵Morris Jobke2019-07-151-0/+73
| |/ / | | | | | | | | | | | | | | | upload time Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | Merge pull request #16334 from nextcloud/feature/noid/enterprise-logoRoeland Jago Douma2019-07-152-0/+1
|\ \ \ | |/ / |/| | Add enterprise logo
| * | Add enterprise logoMorris Jobke2019-07-152-0/+1
| | | | | | | | | | | | | | | | | | Also set it as theming logo if the subscription is valid. Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | Merge pull request #16369 from ↵Morris Jobke2019-07-159-16/+21
|\ \ \ | | | | | | | | | | | | | | | | nextcloud/rename-parameter-in-ocp-toast-for-consistency-with-oc-notification Rename parameter in OCP.Toast for consistency with OC.Notification
| * | | Rename parameter in OCP.Toast for consistency with OC.NotificationDaniel Calviño Sánchez2019-07-129-16/+21
| | |/ | |/| | | | | | | | | | | | | | | | | | | This fixes HTML messages in "OC.Notification.showTemporary" (as "showHtml" was not set based on "isHTML"), and also makes OCP.Toast to keep the old OC.Notification API when used directly. Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
* | | [tx-robot] updated from transifexNextcloud bot2019-07-144-4/+4
| | |
* | | [tx-robot] updated from transifexNextcloud bot2019-07-132-2/+2
|/ /
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-10 07:31:14 +0000