diff --git a/config.xml b/config.xml index ae353eb0d..a97ad98de 100644 --- a/config.xml +++ b/config.xml @@ -1,5 +1,5 @@ - + Moodle Moodle official app Moodle Mobile team @@ -27,7 +27,7 @@ - + diff --git a/moodle.config.json b/moodle.config.json index d345c5ec3..103c210ea 100644 --- a/moodle.config.json +++ b/moodle.config.json @@ -1,8 +1,8 @@ { "app_id": "com.moodle.moodlemobile", "appname": "Moodle Mobile", - "versioncode": 41000, - "versionname": "4.1.0-dev", + "versioncode": 41001, + "versionname": "4.1.0", "cache_update_frequency_usually": 420000, "cache_update_frequency_often": 1200000, "cache_update_frequency_sometimes": 3600000, diff --git a/package-lock.json b/package-lock.json index e1ab5d454..9a020e161 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "moodlemobile", - "version": "4.1.0-dev", + "version": "4.1.0", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 76d188d59..e359872da 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "moodlemobile", - "version": "4.1.0-dev", + "version": "4.1.0", "description": "The official app for Moodle.", "author": { "name": "Moodle Pty Ltd.", diff --git a/src/addons/mod/data/pages/entry/entry.ts b/src/addons/mod/data/pages/entry/entry.ts index 470f97f7a..cb6d43cfe 100644 --- a/src/addons/mod/data/pages/entry/entry.ts +++ b/src/addons/mod/data/pages/entry/entry.ts @@ -352,6 +352,7 @@ export class AddonModDataEntryPage implements OnInit, OnDestroy { if (this.offset === undefined) { // No offset passed, display the first entry. pageIndex = 0; + this.offset = 0; } else if (this.offset > 0) { // Online entry. pageIndex = this.offset % perPage + (entries.offlineEntries?.length || 0); diff --git a/src/addons/mod/forum/tests/behat/basic_usage.feature b/src/addons/mod/forum/tests/behat/basic_usage.feature index eb5750689..7f7035095 100755 --- a/src/addons/mod/forum/tests/behat/basic_usage.feature +++ b/src/addons/mod/forum/tests/behat/basic_usage.feature @@ -329,4 +329,9 @@ Feature: Test basic usage of forum activity in app When I press the back button in the app And I press "Sort by last post creation date in descending order" in the app And I press "Sort by last post creation date in ascending order" in the app - Then I should find "There was a problem connecting to the site. Please check your connection and try again." in the app + Then I should find "Forum not available in this sorting order" in the app + + When I press the back button in the app + And I press "Test forum name" in the app + Then I should find "Forum not available in this sorting order" in the app + And I should find "Sort by last post creation date in ascending order" in the app diff --git a/src/addons/mod/forum/tests/behat/groups.feature b/src/addons/mod/forum/tests/behat/groups.feature index 1d10056eb..b542c22c0 100755 --- a/src/addons/mod/forum/tests/behat/groups.feature +++ b/src/addons/mod/forum/tests/behat/groups.feature @@ -366,4 +366,4 @@ Feature: Test usage of forum activity with groups in app When I press "Visible groups" in the app And I press "Group 1" in the app - Then I should find "There was a problem connecting to the site. Please check your connection and try again." in the app + Then I should find "Forum not available in this sorting order" in the app