From eb01a001bc295f9324a838789879ab5ecce30b5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= Date: Tue, 28 May 2019 09:42:47 +0200 Subject: [PATCH 1/3] MOBILE-3005 docker: Remove ionic info from the script --- Dockerfile | 2 -- 1 file changed, 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 29b541eb6..d7a27002c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -21,8 +21,6 @@ COPY . /app # Install npm libraries and run gulp to initialize the project. RUN npm install && gulp && rm -rf /root/.npm -RUN ionic info - # Provide a Healthcheck command for easier use in CI. HEALTHCHECK --interval=10s --timeout=3s --start-period=30s CMD curl -f http://localhost:8100 || exit 1 From a7e391bd1ee536a0c08db094ad1258f9706b2179 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= Date: Tue, 28 May 2019 09:42:47 +0200 Subject: [PATCH 2/3] MOBILE-3039 forum: Load subject when avalaible --- src/addon/mod/forum/pages/discussion/discussion.ts | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/addon/mod/forum/pages/discussion/discussion.ts b/src/addon/mod/forum/pages/discussion/discussion.ts index d145ca7f3..2d6b9af79 100644 --- a/src/addon/mod/forum/pages/discussion/discussion.ts +++ b/src/addon/mod/forum/pages/discussion/discussion.ts @@ -299,8 +299,6 @@ export class AddonModForumDiscussionPage implements OnDestroy { const direction = this.sort == 'flat-newest' ? 'DESC' : 'ASC'; this.forumProvider.sortDiscussionPosts(posts, direction); } - this.defaultSubject = this.translate.instant('addon.mod_forum.re') + ' ' + this.discussion.subject; - this.replyData.subject = this.defaultSubject; // Now try to get the forum. return this.fetchForum().then((forum) => { @@ -343,6 +341,10 @@ export class AddonModForumDiscussionPage implements OnDestroy { this.forum = {}; this.accessInfo = {}; }).then(() => { + this.defaultSubject = this.translate.instant('addon.mod_forum.re') + ' ' + + (this.discussion ? this.discussion.subject : ""); + this.replyData.subject = this.defaultSubject; + const startingPost = this.forumProvider.extractStartingPost(posts); if (startingPost) { // Update discussion data from first post. From 3e948fa2d93eb88153ed8de8876747467e0c754c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= Date: Tue, 28 May 2019 10:14:36 +0200 Subject: [PATCH 3/3] MOBILE-3039 tabs: Fix hide tabbar on tablet --- src/components/ion-tabs/ion-tabs.scss | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/components/ion-tabs/ion-tabs.scss b/src/components/ion-tabs/ion-tabs.scss index 48c459042..fabba1828 100644 --- a/src/components/ion-tabs/ion-tabs.scss +++ b/src/components/ion-tabs/ion-tabs.scss @@ -37,6 +37,13 @@ ion-app.app-root core-ion-tabs { } } + .tabbar[hidden] + .tabcontent { + width: 100%; + core-ion-tab { + @include position(0, 0, 0, 0); + } + } + .tabcontent { width: calc(100% - #{($core-sidetab-size)}); position: absolute;