mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-31 12:45:04 +01:00
Code Issues Projects Releases Wiki Activity
95,693 Commits 36 Branches 519 Tags
Commit Graph

95693 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eloy Lafuente (stronk7)
8585294d5c Merge branch 'MDL-67098-master' of git://github.com/junpataleta/moodle 2019-11-09 16:14:45 +01:00
Eloy Lafuente (stronk7)
acfbb4bf44 Merge branch 'MDL-67146-master-enfix-2' of git://github.com/mudrd8mz/moodle 2019-11-09 16:11:39 +01:00
Sara Arjona
b80c1e015a Merge branch 'MDL-67061-master' of https://github.com/aanabit/moodle 2019-11-09 13:22:03 +01:00
Amaia Anabitarte
2c679b6ea8 MDL-67061 core_h5p: Behat tests for H5P content-types admin settings 2019-11-09 11:11:07 +01:00
Bas Brands
c43f99ca47 MDL-67061 core_h5p: List installed contenttypes/libraries 2019-11-09 11:11:07 +01:00
Sara Arjona
76b6e6ca08 Merge branch 'MDL-67174' of https://github.com/paulholden/moodle 2019-11-09 08:59:41 +01:00
Sara Arjona
3b381bd2da Merge branch 'MDL-67173-master' of git://github.com/cescobedo/moodle 2019-11-09 08:55:47 +01:00
Sara Arjona
75bf9a3ab8 Merge branch 'MDL-67167-master' of git://github.com/jleyva/moodle 2019-11-09 08:50:15 +01:00
David Mudrák
cf36114501 MDL-67146 lang: Update behat scenario files with the new string wording 2019-11-09 06:36:25 +01:00
Helen Foster
fda41f4588 MDL-67146 lang: Import fixed English strings (en_fix) 
Significant string changes:

* configallowemojipicker,core_admin - including emoji picker button in
  Atto
* viewconversation,mod_forum - 'conversation' changed to 'discussion'
 2019-11-09 06:35:22 +01:00
Sara Arjona
f9db5892ec weekly release 3.8dev+ 2019-11-08 15:39:36 +01:00
Sara Arjona
7347347e84 NOBUG: Fixed SVG browser compatibility 2019-11-08 15:39:33 +01:00
Sara Arjona
71528112b9 Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2019-11-08 15:39:33 +01:00
Andrew Nicols
fc0ded848c MDL-67058 h5p: Correct PHPUNIT_LONGTEST usage 2019-11-08 15:48:58 +08:00
Andrew Nicols
fd9333ca93 MDL-67058 h5p: Content fetch should use save_h5p API 2019-11-08 15:48:58 +08:00
Jun Pataleta
6846ba70a2 MDL-67098 forumreport_summary: Drop temp table at the end of processing 2019-11-08 15:28:23 +08:00
Andrew Nicols
ab8f1c3b8c MDL-67058 h5p: System user has permission 2019-11-08 15:20:17 +08:00
Jun Pataleta
2e809ec27c Merge branch 'MDL-66893-master-3' of https://github.com/ryanwyllie/moodle 2019-11-08 11:59:44 +08:00
Andrew Nicols
8948ebb7ac Merge branch 'MDL-66297-master' of git://github.com/mickhawkins/moodle 2019-11-08 11:17:38 +08:00
Michael Hawkins
d3ae8d42ea MDL-66297 mod_forum: Added word/char count column headings to export 2019-11-08 11:13:37 +08:00
Michael Hawkins
64da1d093a MDL-66297 forumreport_summary: Added filter data to forum export links 
From/to date filter timestamps, as well as discussion IDs of any
filtered groups.
 2019-11-08 11:13:36 +08:00
Michael Hawkins
2e7a16b954 MDL-66297 mod_forum: Prepared export to handle URL filters 
Added the ability for discussion IDs and from/to timestamps to be
passed in via URL (to match filters available in the summary report,
which will link to the export). Also fixed a bug where "all users"
would fail as an optional array param.
 2019-11-08 11:13:36 +08:00
Shamim Rezaie
1743d4a3e9 MDL-66297 forumreport_summary: add export links to the report 2019-11-08 11:13:36 +08:00
Shamim Rezaie
84ed2320dd MDL-66297 mod_forum: The export form can take params from URL 2019-11-08 11:13:36 +08:00
Adrian Greeve
fee88f39c5 Merge branch 'MDL-67169' of https://github.com/stronk7/moodle 2019-11-08 10:43:05 +08:00
Jake Dallimore
9560facb35 Merge branch 'MDL-67016-master-user-profile-see-own-courses' of https://github.com/danowar2k/moodle 2019-11-08 10:22:02 +08:00
Andrew Nicols
a50e27c7bd Merge branch 'MDL-67149-master' of https://github.com/sammarshallou/moodle 2019-11-08 10:09:58 +08:00
Jun Pataleta
e2ba123d1c Merge branch 'MDL-67122-master' of https://github.com/mickhawkins/moodle 2019-11-08 09:57:20 +08:00
Andrew Nicols
1e96159444 Merge branch 'MDL-66404-master' of git://github.com/cescobedo/moodle 2019-11-08 09:24:10 +08:00
Andrew Nicols
284af93b5e MDL-67043 h5p: Whitespace fix 2019-11-08 08:27:13 +08:00
Andrew Nicols
6f1b145ea8 Merge branch 'MDL-67043-master' of git://github.com/cescobedo/moodle 2019-11-08 08:25:14 +08:00
Eloy Lafuente (stronk7)
ed2fb5710f Merge branch 'MDL-67048_master' of https://github.com/adpe/moodle 2019-11-08 00:45:05 +01:00
Eloy Lafuente (stronk7)
f34c8e86e7 Merge branch 'MDL-67058-master' of git://github.com/vmdef/moodle 2019-11-08 00:30:08 +01:00
cescobedo
3b85322940 MDL-67173 core_h5p: Translate non-localURL in WS to invalidurl 
The WebService should return invalidurl when the coding error is
"Coding error detected, it must be fixed by a programmer: out_al_local_url called on a non-local URL"
So, we translate the error to be used by Mobile App.
 2019-11-07 23:05:41 +01:00
Eloy Lafuente (stronk7)
9eda724470 Merge branch 'MDL-67153' of https://github.com/timhunt/moodle 2019-11-07 19:49:42 +01:00
Paul Holden
afaf64b334 MDL-67174 core: update standard plugins list. 
Add Forum summary report and Atto emoji picker.
 2019-11-07 16:45:50 +00:00
Sara Arjona
3a9c515057 Merge branch 'MDL-66683-master' of git://github.com/cescobedo/moodle 2019-11-07 17:41:22 +01:00
cescobedo
5d69038bb6 MDL-66683 core: Revert MDL-66181 because created regressions 
This reverts commit ed080a580ffd0eea70ad3eaa9214234cf2463034.
This issue reverts the behaviour modified in MDL-66181, as that change
negatively impacted course-creation workflows. As this appears to be
the intended functionality, the Security team has agreed to revert
this change.
 2019-11-07 17:29:30 +01:00
Michael Hawkins
209cfe64fb MDL-67122 forumreport_summary: Fix template context eg and line length 
The template context needed updating now it populates a single select
and the summary_table constructor params should be broken over 2 lines
 2019-11-08 00:15:48 +08:00
Jake Dallimore
78d65acd54 MDL-66257 tool_cohortroles: unit test for users in multiple cohorts 2019-11-07 23:47:18 +08:00
cescobedo
7b5f4a62c1 MDL-66257 tool_cohortroles: Unassign the role on removal cohortroles. 2019-11-07 23:47:17 +08:00
Michael Hawkins
30fc34761b MDL-67122 forumreport_summary: Apply filters to report download 2019-11-07 23:42:34 +08:00
Sara Arjona
830eab425c Merge branch 'MDL-67166-master' of git://github.com/bmbrands/moodle 2019-11-07 16:30:18 +01:00
Eloy Lafuente (stronk7)
a5cd14e4d8 MDL-67169 phpunit: fix clear flaw in unit test provider 
Basically the provider is ignoring the CRLF to LF normalization
results and loading the original file again.

This doesn't have any impact normally, because all moodle
files are LF ones and people using other systems have their
git configurations set to work that way (not modify or force LF).

But there may be checkouts out there (for example travis) where
the git configuration by defult is to convert to the OS, causing
windows runs to fail badly there. See the issue for more info
and links.
 2019-11-07 13:44:06 +01:00
Juan Leyva
ff490afbff MDL-67167 block: Force returned configuration values to be JSON encoded 
Contributed plugins may set non-scalar values as valid instance configuration values (the core RSS client block does the same)
 2019-11-07 13:29:52 +01:00
Jun Pataleta
af9a491478 Merge branch 'MDL-67084-master' of git://github.com/junpataleta/moodle 2019-11-07 19:40:55 +08:00
Marina Glancy
9f2c665999 MDL-67084 core_form: duration element should export arrays 2019-11-07 19:21:16 +08:00
Jun Pataleta
c4e1c9d167 MDL-66598 auth_oauth2: OAuth2 upgrade step 
This basically does two things:
1. Updates all non-Facebook/Google/Microsoft issuers and sets their
'requireconfirmation' field to 1 so that future OAuth2 logins on these
issuers will always have an email confirmation sent to them.
2. Deletes the linked logins of users with non-Facebook/Google/Microsoft
OAuth2 issuers.
 2019-11-07 18:42:07 +08:00
Jun Pataleta
8a3316bd9b MDL-66598 auth_oauth2: Add warning messages in confirm emails 2019-11-07 18:42:07 +08:00
Jun Pataleta
df6092d65c MDL-66598 tool_oauth2: Make account confirmation required by default 
* Only Facebook, Google, and Microsoft issuers can optionally offer to
require account confirmation via email. We will require email
confirmation for the rest of the issuers.
 2019-11-07 18:42:07 +08:00