From e11226c24669b492b0a790d6d616a401748d4ba7 Mon Sep 17 00:00:00 2001 From: Dani Palou Date: Mon, 5 Jul 2021 10:12:51 +0200 Subject: [PATCH 1/5] MOBILE-3320 more: Display chevron in IAB custom items --- src/core/features/mainmenu/pages/more/more.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/features/mainmenu/pages/more/more.html b/src/core/features/mainmenu/pages/more/more.html index 3312c99c6..df537d5e3 100644 --- a/src/core/features/mainmenu/pages/more/more.html +++ b/src/core/features/mainmenu/pages/more/more.html @@ -43,7 +43,7 @@ + [detailIcon]="item.type == 'browser' ? 'open-outline' : 'chevron-forward'">

{{item.label}}

From 4ad7a93fc79a48c84c933a110a6104c55e949e4d Mon Sep 17 00:00:00 2001 From: Dani Palou Date: Mon, 5 Jul 2021 10:13:49 +0200 Subject: [PATCH 2/5] MOBILE-3320 travis: Don't install gulp in global --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index f53bb168e..c6416ee0d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -26,10 +26,10 @@ before_install: - npm --version - nvm --version - npm ci - - npm install npm@^6 gulp -g + - npm install npm@^6 -g before_script: - - gulp + - npx gulp script: - scripts/build.sh From 1e0d9189631891bfb9f4e829401595a9ff24d44f Mon Sep 17 00:00:00 2001 From: Dani Palou Date: Mon, 5 Jul 2021 10:53:07 +0200 Subject: [PATCH 3/5] MOBILE-3320 iframe: Fix some iframes height was too small --- .../mod/resource/components/index/addon-mod-resource-index.html | 2 +- src/addons/mod/url/components/index/addon-mod-url-index.html | 2 +- src/core/features/viewer/pages/iframe/iframe.html | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/addons/mod/resource/components/index/addon-mod-resource-index.html b/src/addons/mod/resource/components/index/addon-mod-resource-index.html index 68d143323..411279e8b 100644 --- a/src/addons/mod/resource/components/index/addon-mod-resource-index.html +++ b/src/addons/mod/resource/components/index/addon-mod-resource-index.html @@ -18,7 +18,7 @@ - + - + - + From 393b311d1626813437569211eee47ffe6914572d Mon Sep 17 00:00:00 2001 From: Dani Palou Date: Mon, 5 Jul 2021 11:14:22 +0200 Subject: [PATCH 4/5] MOBILE-3320 ui: Remove unneeded padding start --- src/addons/blog/pages/entries/entries.html | 2 +- src/addons/notifications/pages/list/list.html | 2 +- src/core/features/rating/components/ratings/ratings-modal.html | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/addons/blog/pages/entries/entries.html b/src/addons/blog/pages/entries/entries.html index ed95f9bfc..3e1a1a772 100644 --- a/src/addons/blog/pages/entries/entries.html +++ b/src/addons/blog/pages/entries/entries.html @@ -33,7 +33,7 @@

- + {{entry.created | coreDateDayOrTime}} {{entry.user && entry.user!.fullname}} diff --git a/src/addons/notifications/pages/list/list.html b/src/addons/notifications/pages/list/list.html index e9507a60c..c526fe5cf 100644 --- a/src/addons/notifications/pages/list/list.html +++ b/src/addons/notifications/pages/list/list.html @@ -38,7 +38,7 @@

{{ notification.subject }}

{{ notification.userfromfullname }}

 - + {{ notification.timecreated | coreDateDayOrTime }} diff --git a/src/core/features/rating/components/ratings/ratings-modal.html b/src/core/features/rating/components/ratings/ratings-modal.html index f6c05d92a..1eef7adfc 100644 --- a/src/core/features/rating/components/ratings/ratings-modal.html +++ b/src/core/features/rating/components/ratings/ratings-modal.html @@ -17,7 +17,7 @@

{{ rating.userfullname }}

{{ rating.rating }}

- + {{ rating.timemodified | coreDateDayOrTime }} From f09ac093004fb6888b3c9b8fb38ff311dc777065 Mon Sep 17 00:00:00 2001 From: Dani Palou Date: Mon, 5 Jul 2021 11:16:41 +0200 Subject: [PATCH 5/5] MOBILE-3320 lib: Use angular animations 10.0.14 --- package-lock.json | 6 +++--- package.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 8436c7567..89128236b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -538,9 +538,9 @@ } }, "@angular/animations": { - "version": "11.0.1", - "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-11.0.1.tgz", - "integrity": "sha512-RS2ZsO3yidn/dMAllR+V0EX5BOQLQDi5s2kvd4wANHYAkU/yVXWKl09nbe8LTwLVH+iOYX7AAcAUUokQPEEHxQ==", + "version": "10.0.14", + "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-10.0.14.tgz", + "integrity": "sha512-0BOGQOuaudIG0pq6FAnG55teKM7tEQZdIwdoOf0okhh9n0cFWSWRUjvUxWt25bWswlO+HxELyJioiRUvVSES4g==", "requires": { "tslib": "^2.0.0" } diff --git a/package.json b/package.json index 899750288..01beb7354 100644 --- a/package.json +++ b/package.json @@ -37,7 +37,7 @@ "ionic:build:before": "gulp" }, "dependencies": { - "@angular/animations": "11.0.1", + "@angular/animations": "10.0.14", "@angular/common": "10.0.14", "@angular/core": "10.0.14", "@angular/forms": "10.0.14",