Skip to content

Commit afd9d46

Browse files
authored
Merge pull request #2334 from moodlehq/integration
Integration
2 parents 86cd84c + 886a0c6 commit afd9d46

File tree

27 files changed

+389
-176
lines changed

27 files changed

+389
-176
lines changed

config.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version='1.0' encoding='utf-8'?>
2-
<widget id="com.moodle.moodlemobile" version="3.8.1" xmlns="http://www.w3.org/ns/widgets" xmlns:android="http://schemas.android.com/apk/res/android" xmlns:cdv="http://cordova.apache.org/ns/1.0">
2+
<widget id="com.moodle.moodlemobile" version="3.8.2" xmlns="http://www.w3.org/ns/widgets" xmlns:android="http://schemas.android.com/apk/res/android" xmlns:cdv="http://cordova.apache.org/ns/1.0">
33
<name>Moodle</name>
44
<description>Moodle official app</description>
55
<author email="[email protected]" href="http://moodle.com">Moodle Mobile team</author>

desktop/assets/windows/AppXManifest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<Identity Name="3312ADB7.MoodleDesktop"
77
ProcessorArchitecture="x64"
88
Publisher="CN=33CDCDF6-1EB5-4827-9897-ED25C91A32F6"
9-
Version="3.8.1.0" />
9+
Version="3.8.2.0" />
1010
<Properties>
1111
<DisplayName>Moodle Desktop</DisplayName>
1212
<PublisherDisplayName>Moodle Pty Ltd.</PublisherDisplayName>

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "moodlemobile",
3-
"version": "3.8.1",
3+
"version": "3.8.2",
44
"description": "The official app for Moodle.",
55
"author": {
66
"name": "Moodle Pty Ltd.",
@@ -225,7 +225,7 @@
225225
"category": "public.app-category.education",
226226
"icon": "resources/desktop/icon.icns",
227227
"target": "mas",
228-
"bundleVersion": "3.8.1",
228+
"bundleVersion": "3.8.2",
229229
"extendInfo": {
230230
"ElectronTeamID": "2NU57U5PAW"
231231
}

src/assets/exttomime.json

Lines changed: 67 additions & 52 deletions
Large diffs are not rendered by default.

src/assets/img/files/h5p-64.png

2.77 KB
Loading

src/assets/img/login/faq_url.png

18.9 KB
Loading

src/assets/lang/en.json

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1331,7 +1331,7 @@
13311331
"core.block.blocks": "Blocks",
13321332
"core.browser": "Browser",
13331333
"core.cancel": "Cancel",
1334-
"core.cannotconnect": "Cannot connect: Verify that you have correctly typed the URL and that your site uses Moodle {{$a}} or later.",
1334+
"core.cannotconnect": "<strong>Cannot connect</strong>: Verify that you have correctly typed your site address.",
13351335
"core.cannotdownloadfiles": "File downloading is disabled. Please contact your site administrator.",
13361336
"core.captureaudio": "Record audio",
13371337
"core.capturedimage": "Taken picture.",
@@ -1707,7 +1707,17 @@
17071707
"core.login.emailnotmatch": "Emails do not match",
17081708
"core.login.erroraccesscontrolalloworigin": "The cross-origin call you're trying to perform has been rejected. Please check https://docs.moodle.org/dev/Moodle_Mobile_development_using_Chrome_or_Chromium",
17091709
"core.login.errordeletesite": "An error occurred while deleting this site. Please try again.",
1710+
"core.login.errorexampleurl": "The URL https://campus.example.edu is only an example URL, it's not a real site. <strong>Please use the URL of your school or organization's site.</strong>",
17101711
"core.login.errorupdatesite": "An error occurred while updating the site's token.",
1712+
"core.login.faqcannotconnectanswer": "Please, contact your site administrator.",
1713+
"core.login.faqcannotconnectquestion": "I typed my site address correctly but I still can't connect.",
1714+
"core.login.faqsetupsiteanswer": "Visit {{$link}} to check out the different options you have to create your own Moodle site.",
1715+
"core.login.faqsetupsitelinktitle": "Get started.",
1716+
"core.login.faqsetupsitequestion": "I want to set up my own Moodle site.",
1717+
"core.login.faqtestappanswer": "To test the app in a Moodle Demo Site, type \"teacher\" or \"student\" in the \"Your site address\" field and click the \"Connect!\" button.",
1718+
"core.login.faqtestappquestion": "I just want to test the app, what can I do?",
1719+
"core.login.faqwhatisurlanswer": "<p>Every organisation or school has their own custom address for their Moodle site.</p><p>To find the address of the Moodle site you want to connect to, do the following:</p><ol><li>Open a web browser and go to your school's or organisation's Moodle site login page</li><li>At the top of the page, on the address bar, you will see the URL of your Moodle site. E.g. \"campus.example.edu\".{{$image}}</li><li>Copy the address (do not copy the /login and what comes after), paste it into the Moodle App and click \"Connect!\"</li><li>Now you can log into your site, using your username and password</li>",
1720+
"core.login.faqwhatisurlquestion": "What is the URL of my Moodle site? How can I find my school’s site?",
17111721
"core.login.findyoursite": "Find your site",
17121722
"core.login.firsttime": "Is this your first time here?",
17131723
"core.login.forcepasswordchangenotice": "You must change your password to proceed.",
@@ -1736,7 +1746,6 @@
17361746
"core.login.mobileservicesnotenabled": "Mobile access is not enabled on your site. Please contact your site administrator if you think it should be enabled.",
17371747
"core.login.mustconfirm": "You need to confirm your account",
17381748
"core.login.newaccount": "New account",
1739-
"core.login.newsitedescription": "Please enter the URL of your Moodle site. Note that it might not be configured to work with this app.",
17401749
"core.login.notloggedin": "You need to be logged in.",
17411750
"core.login.password": "Password",
17421751
"core.login.passwordforgotten": "Forgotten password",
@@ -1762,7 +1771,7 @@
17621771
"core.login.selectacountry": "Select a country",
17631772
"core.login.selectsite": "Please select your site:",
17641773
"core.login.signupplugindisabled": "{{$a}} is not enabled.",
1765-
"core.login.siteaddress": "Site address",
1774+
"core.login.siteaddress": "Your site address",
17661775
"core.login.sitehasredirect": "Your site contains at least one HTTP redirect. The app cannot follow redirects, this could be the issue that's preventing the app from connecting to your site.",
17671776
"core.login.siteinmaintenance": "Your site is in maintenance mode",
17681777
"core.login.sitepolicynotagreederror": "Site policy not agreed.",
@@ -1816,6 +1825,7 @@
18161825
"core.more": "more",
18171826
"core.mygroups": "My groups",
18181827
"core.name": "Name",
1828+
"core.needhelp": "Need help?",
18191829
"core.networkerroriframemsg": "This content is not available offline. Please connect to the internet and try again.",
18201830
"core.networkerrormsg": "There was a problem connecting to the site. Please check your connection and try again.",
18211831
"core.never": "Never",
@@ -2090,6 +2100,7 @@
20902100
"core.warningofflinedatadeleted": "Offline data from {{component}} '{{name}}' has been deleted. {{error}}",
20912101
"core.whatisyourage": "What is your age?",
20922102
"core.wheredoyoulive": "In which country do you live?",
2103+
"core.whoissiteadmin": "\"Site Administrators\" are the people who manage the Moodle at your school/university/company or learning organisation. If you don't know how to contact them, please contact your teachers/trainers.",
20932104
"core.whoops": "Oops!",
20942105
"core.whyisthishappening": "Why is this happening?",
20952106
"core.whyisthisrequired": "Why is this required?",

src/assets/mimetoext.json

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
"application/clariscad": ["ccad"],
2121
"application/commonground": ["dp"],
2222
"application/cu-seeme": ["cu"],
23+
"application/dash+xml": ["mpd"],
2324
"application/davmount+xml": ["davmount"],
2425
"application/docbook+xml": ["dbk"],
2526
"application/drafting": ["drw"],
@@ -71,6 +72,7 @@
7172
"application/mac-compactpro": ["cpt"],
7273
"application/macbinary": ["bin"],
7374
"application/mads+xml": ["mads"],
75+
"application/maple": ["mw","mws"],
7476
"application/marc": ["mrc"],
7577
"application/marcxml+xml": ["mrcx"],
7678
"application/mathematica": ["ma","mb","nb"],
@@ -355,6 +357,7 @@
355357
"application/vnd.mobius.plc": ["plc"],
356358
"application/vnd.mobius.txf": ["txf"],
357359
"application/vnd.moodle.backup": ["mbz"],
360+
"application/vnd.moodle.profiling": ["mpr"],
358361
"application/vnd.mophun.application": ["mpn"],
359362
"application/vnd.mophun.certificate": ["mpc"],
360363
"application/vnd.mozilla.xul+xml": ["xul"],
@@ -520,7 +523,7 @@
520523
"application/vnd.wqd": ["wqd"],
521524
"application/vnd.wt.stf": ["stf"],
522525
"application/vnd.xara": ["xar","web"],
523-
"application/vnd.xfdl": ["xfdl"],
526+
"application/vnd.xfdl": ["xfdl","xfd"],
524527
"application/vnd.yamaha.hv-dic": ["hvd"],
525528
"application/vnd.yamaha.hv-script": ["hvs"],
526529
"application/vnd.yamaha.hv-voice": ["hvp"],
@@ -579,6 +582,7 @@
579582
"application/x-debian-package": ["deb","udeb"],
580583
"application/x-deepv": ["deepv"],
581584
"application/x-dgc-compressed": ["dgc"],
585+
"application/x-digidoc": ["bdoc","cdoc","ddoc"],
582586
"application/x-director": ["cct","cst","cxt","dcr","dir","dxr","fgd","swa","w3d"],
583587
"application/x-doom": ["wad"],
584588
"application/x-dtbncx+xml": ["ncx"],
@@ -709,6 +713,7 @@
709713
"application/x-shockwave-flash": ["swf","swfl"],
710714
"application/x-silverlight-app": ["xap"],
711715
"application/x-sit": ["sit"],
716+
"application/x-smarttech-notebook": ["gallery","gallerycollection","galleryitem","nbk","notebook","xbk"],
712717
"application/x-sprite": ["spr","sprite"],
713718
"application/x-sql": ["sql"],
714719
"application/x-stuffit": ["sit"],
@@ -762,13 +767,14 @@
762767
"application/xv+xml": ["mxml","xhvml","xvm","xvml"],
763768
"application/yang": ["yang"],
764769
"application/yin+xml": ["yin"],
765-
"application/zip": ["zip"],
770+
"application/zip": ["zip","h5p"],
766771
"audio/aac": ["aac"],
767772
"audio/adpcm": ["adp"],
768773
"audio/aiff": ["aif","aifc","aiff"],
769774
"audio/amr": ["amr"],
770775
"audio/au": ["au"],
771776
"audio/basic": ["au","snd"],
777+
"audio/flac": ["flac"],
772778
"audio/it": ["it"],
773779
"audio/make": ["funk","my","pfunk"],
774780
"audio/make.my.funk": ["pfunk"],
@@ -816,7 +822,7 @@
816822
"audio/x-mod": ["mod"],
817823
"audio/x-mpeg": ["mp2"],
818824
"audio/x-mpeg-3": ["mp3"],
819-
"audio/x-mpegurl": ["m3u"],
825+
"audio/x-mpegurl": ["m3u","m3u8"],
820826
"audio/x-mpequrl": ["m3u"],
821827
"audio/x-ms-wax": ["wax"],
822828
"audio/x-ms-wma": ["wma"],
@@ -1026,8 +1032,9 @@
10261032
"video/jpeg": ["jpgv"],
10271033
"video/jpm": ["jpgm","jpm"],
10281034
"video/mj2": ["mj2","mjp2"],
1029-
"video/mp4": ["mp4","f4v","m4v","mp4v","mpg4"],
1035+
"video/mp4": ["mp4","f4v","m4v","mp4v","mpg4","fmp4"],
10301036
"video/mpeg": ["mpeg","m1v","m2v","mp2","mp3","mpa","mpe","mpg"],
1037+
"video/MP2T": ["ts"],
10311038
"video/msvideo": ["avi"],
10321039
"video/ogg": ["ogv"],
10331040
"video/quicktime": ["mov","3gp","moov","qt"],

src/config.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
"app_id": "com.moodle.moodlemobile",
33
"appname": "Moodle Mobile",
44
"desktopappname": "Moodle Desktop",
5-
"versioncode": 3810,
6-
"versionname": "3.8.1-dev",
5+
"versioncode": 3820,
6+
"versionname": "3.8.2",
77
"cache_update_frequency_usually": 420000,
88
"cache_update_frequency_often": 1200000,
99
"cache_update_frequency_sometimes": 3600000,

src/core/compile/providers/compile.ts

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,8 @@ import { CORE_SITEHOME_PROVIDERS } from '@core/sitehome/sitehome.module';
3939
import { CORE_USER_PROVIDERS } from '@core/user/user.module';
4040
import { CORE_PUSHNOTIFICATIONS_PROVIDERS } from '@core/pushnotifications/pushnotifications.module';
4141
import { IONIC_NATIVE_PROVIDERS } from '@core/emulator/emulator.module';
42+
import { CORE_EDITOR_PROVIDERS } from '@core/editor/editor.module';
43+
import { CORE_SEARCH_PROVIDERS } from '@core/search/search.module';
4244

4345
// Import only this provider to prevent circular dependencies.
4446
import { CoreSitePluginsProvider } from '@core/siteplugins/providers/siteplugins';
@@ -75,6 +77,8 @@ import { CoreSiteHomeComponentsModule } from '@core/sitehome/components/componen
7577
import { CoreUserComponentsModule } from '@core/user/components/components.module';
7678
import { CoreQuestionComponentsModule } from '@core/question/components/components.module';
7779
import { CoreBlockComponentsModule } from '@core/block/components/components.module';
80+
import { CoreEditorComponentsModule } from '@core/editor/components/components.module';
81+
import { CoreSearchComponentsModule } from '@core/search/components/components.module';
7882

7983
// Import some components listed in entryComponents so they can be injected dynamically.
8084
import { CoreCourseUnsupportedModuleComponent } from '@core/course/components/unsupported-module/unsupported-module';
@@ -144,7 +148,7 @@ export class CoreCompileProvider {
144148
IonicModule, TranslateModule.forChild(), CoreComponentsModule, CoreDirectivesModule, CorePipesModule,
145149
CoreCourseComponentsModule, CoreCoursesComponentsModule, CoreSiteHomeComponentsModule, CoreUserComponentsModule,
146150
CoreCourseDirectivesModule, CoreSitePluginsDirectivesModule, CoreQuestionComponentsModule, AddonModAssignComponentsModule,
147-
AddonModWorkshopComponentsModule, CoreBlockComponentsModule
151+
AddonModWorkshopComponentsModule, CoreBlockComponentsModule, CoreEditorComponentsModule, CoreSearchComponentsModule
148152
];
149153

150154
constructor(protected injector: Injector, logger: CoreLoggerProvider, compilerFactory: JitCompilerFactory) {
@@ -237,7 +241,8 @@ export class CoreCompileProvider {
237241
.concat(ADDON_MOD_SURVEY_PROVIDERS).concat(ADDON_MOD_URL_PROVIDERS).concat(ADDON_MOD_WIKI_PROVIDERS)
238242
.concat(ADDON_MOD_WORKSHOP_PROVIDERS).concat(ADDON_NOTES_PROVIDERS).concat(ADDON_NOTIFICATIONS_PROVIDERS)
239243
.concat(CORE_PUSHNOTIFICATIONS_PROVIDERS).concat(ADDON_REMOTETHEMES_PROVIDERS).concat(CORE_BLOCK_PROVIDERS)
240-
.concat(CORE_FILTER_PROVIDERS).concat(CORE_H5P_PROVIDERS);
244+
.concat(CORE_FILTER_PROVIDERS).concat(CORE_H5P_PROVIDERS).concat(CORE_EDITOR_PROVIDERS)
245+
.concat(CORE_SEARCH_PROVIDERS);
241246

242247
// We cannot inject anything to this constructor. Use the Injector to inject all the providers into the instance.
243248
for (const i in providers) {

0 commit comments

Comments
 (0)