mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-12 03:52:16 +02:00
Code Issues Projects Releases Wiki Activity
96,623 Commits 36 Branches 531 Tags
Commit Graph

96623 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eloy Lafuente (stronk7)
d2ac7726eb Merge branch 'MDL-67979-master-enfix' of git://github.com/mudrd8mz/moodle 2020-02-26 17:13:12 +01:00
Jun Pataleta
47fd698541 Merge branch 'MDL-67921-master' of git://github.com/sarjona/moodle 2020-02-26 16:51:19 +08:00
Jun Pataleta
042753b27f Merge branch 'master_MDL-67980' of https://github.com/golenkovm/moodle 2020-02-26 14:30:49 +08:00
Eloy Lafuente (stronk7)
392e270c93 Merge branch 'MDL-67950-passwordpolicy-callback' of https://github.com/brendanheywood/moodle 2020-02-26 00:20:49 +01:00
Eloy Lafuente (stronk7)
8e933354a6 Merge branch 'MDL-67644-master' of git://github.com/dpalou/moodle 2020-02-25 23:59:41 +01:00
Eloy Lafuente (stronk7)
d1658a47eb Merge branch 'MDL-67806-master' of git://github.com/dpalou/moodle 2020-02-25 23:57:15 +01:00
Eloy Lafuente (stronk7)
a32e7f7933 Merge branch 'MDL-67237-master' of git://github.com/dpalou/moodle 2020-02-25 23:53:19 +01:00
Eloy Lafuente (stronk7)
b5220abb0f Merge branch 'MDL-67920-master' of git://github.com/aanabit/moodle 2020-02-25 23:32:17 +01:00
Eloy Lafuente (stronk7)
db7861cf7a Merge branch 'MDL-67131-master' of git://github.com/cescobedo/moodle 2020-02-25 23:30:41 +01:00
David Mudrák
930d9782e1 MDL-67979 lang: Reflect the new string wording in the Behat test 
This effectively only adds the full stop and would not break the test
but still.
 2020-02-25 12:21:09 +01:00
Helen Foster
a753f4f9a1 MDL-67979 lang: Import fixed English strings (en_fix) 
Significant string changes:

* configcustommenuitems,core_admin - corrected example
* custommenuitems_desc,tool_mobile - fallback behaviour of custom menu
  items in the app
 2020-02-25 12:21:09 +01:00
Eloy Lafuente (stronk7)
5ea7d1b205 Merge branch 'MDL-67862-master' of git://github.com/junpataleta/moodle 2020-02-25 12:09:33 +01:00
Eloy Lafuente (stronk7)
8b64627235 Merge branch 'MDL-67364-master' of git://github.com/mickhawkins/moodle 2020-02-25 12:05:33 +01:00
Jun Pataleta
88fb49b657 Merge branch 'MDL-67846-master' of git://github.com/lameze/moodle 2020-02-25 16:52:45 +08:00
Simey Lameze
041ff27245 MDL-67846 mod_forum: export user full name 2020-02-25 15:26:22 +08:00
Jun Pataleta
6b6705a8ad Merge branch 'MDL-67586-integration' of https://github.com/Chocolate-lightning/moodle 2020-02-25 14:25:16 +08:00
Mathew May
e04b4be619 MDL-67586 core_course: Recommended modules frontend 2020-02-25 14:07:40 +08:00
Jun Pataleta
b5b7e88caa Merge branch 'MDL-67262' of git://github.com/stronk7/moodle 2020-02-25 09:37:38 +08:00
Eloy Lafuente (stronk7)
30206d545e MDL-67262 core_course: fix behat looking for non-existing page 2020-02-24 23:15:28 +01:00
Jun Pataleta
c31085bb66 MDL-67262 core_course: Rebuild recommended activities JS module 2020-02-24 16:04:06 +08:00
Jun Pataleta
326527c25b Merge branch 'MDL-67262-master-2' of git://github.com/snake/moodle 2020-02-24 15:56:04 +08:00
Jake Dallimore
b3fe33ac75 MDL-67262 core_course: integration review changes 2020-02-24 13:13:49 +08:00
Adrian Greeve
ebdbe8736e MDL-67262 core_course: Unit and behat tests for recommendations. 2020-02-24 11:00:44 +08:00
Adrian Greeve
cd09777dbd MDL-67262 core_course: Added the ability to recommend activities. 
This allows an adminsitrator or a user with
'moodle/course:recommendactivity' to recommend activities in the
activity chooser.
 2020-02-24 10:59:55 +08:00
Mikhail Golenkov
e63040d02b MDL-67980 tasks: Sort ad-hoc tasks by nextruntime. 2020-02-24 09:30:09 +11:00
cescobedo
5d81efd1f7 MDL-67131 core_h5p: Allow use webservice/pluginfile|tokenpluginfile url 
With this fix the player accepts webservice/pluginfile.php, pluginfile.php
and tokenpluginfile.php URLs to find the h5p files.
Also, we allow to build fileurl with the proper endpoint if
the URL is webservice/pluginfile, tokenpluginfile.php or pluginfile.php
as Mobile App needs.
 2020-02-21 09:46:23 +01:00
Sara Arjona
92ad6bd901 MDL-67921 core_h5p: re-implement framework->getOption 
The implementation done for getOption was not correct because it
was only taking into account the displayoptions for download and
embed.
Besides, setOption implementation has been added.
 2020-02-21 09:29:07 +01:00
Amaia Anabitarte
f531a30252 MDL-67920 core_h5p: Move upload button into form and fix title 
Minor bugs in Site administration > H5P > Manage H5P content types admin page'
 2020-02-21 08:59:27 +01:00
Jun Pataleta
37b2ee3f64 weekly release 3.9dev 2020-02-21 11:02:08 +08:00
Jun Pataleta
dd8144ebff Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2020-02-21 11:01:17 +08:00
Eloy Lafuente (stronk7)
a1a5f87093 Merge branch 'MDL-67727-master' of git://github.com/crazyserver/moodle 2020-02-20 16:12:23 +01:00
Jun Pataleta
5a4c63aa4f Merge branch 'MDL-67585-master-4' of git://github.com/snake/moodle 2020-02-20 11:58:02 +08:00
Adrian Greeve
a7b2378d72 MDL-67585 core_course: Added legacyitem to exporter. 
Legacy items have no id and so can not be favourited nor
recommended. We needed a way to easily determine whether to show
these features in the templates.
 2020-02-20 11:42:24 +08:00
Adrian Greeve
54561c885e MDL-67585 core_course: Removing functions introduced this release. 
For the initial rewrite of the activity chooser we had some
temporary functions to make everything work. These have been replaced
with different functions and so these functions are now being removed.
 2020-02-20 11:42:23 +08:00
Adrian Greeve
618d310663 MDL-67585 core_course: Update to provider to add favourites info. 
This adds information to the privacy report about the user being
able to favourite activities in the activity chooser.
 2020-02-20 11:42:23 +08:00
Adrian Greeve
5c78541f80 MDL-67585 core_course: Service factory for course content items. 2020-02-20 11:42:23 +08:00
Jake Dallimore
806e736a7c MDL-67585 core_course: use new content item service to load the chooser 2020-02-20 11:42:23 +08:00
Jake Dallimore
85b4eec5b7 MDL-67585 core_course: new web service to return course content items 2020-02-20 11:42:23 +08:00
Jake Dallimore
a826857844 MDL-67585 core_course: added web services for content item favourites 
Two new services:
add_content_item_to_user_favourites
remove_content_item_from_user_favourites
 2020-02-20 11:42:23 +08:00
Jake Dallimore
f09e9b887e MDL-67585 core_course: add favouriting to the content item service class 2020-02-20 11:42:22 +08:00
Jake Dallimore
57dfcf951d MDL-67585 core_course: add hook get_all_content_items 
Returns all content items which are provided by the plugin, irrespective
of whether or not a user can see an item in a particular course. This is
used to generate a global list of content items, allowing for admin
level features to be added.
 2020-02-20 11:42:22 +08:00
Jake Dallimore
520add19d6 MDL-67585 core_course: deprecate the callback get_shortcuts() 
This involves a few changes:
- The callback is still called by the repository but only if the
replacement callback get_course_content_items is not implemented.
- Debugging is called when the get_shortcuts callback is called.
- We leave lti's implementation of get_shortcuts alone, in order to
maintain the output of get_module_metadata during its deprecation life
span.
 2020-02-20 11:42:21 +08:00
Jake Dallimore
39b9e293e7 MDL-67585 core_course: only accept content items from mods and submods 
This matches the prior behaviour in core.
 2020-02-20 09:28:57 +08:00
Jake Dallimore
8fc7d83f38 MDL-67585 core_course: add get_course_content_items hook 
Plugins use this to report which content items relate to a user in
a course.
 2020-02-20 09:28:57 +08:00
Jake Dallimore
38a9d717a9 MDL-67585 format_singleactivity: fix hassubtype to use the service data 
TODO: really need to properly work out subtypes lower down in the repo.
 2020-02-20 09:28:57 +08:00
Jake Dallimore
12f73788b4 MDL-67585 core_course: deprecate get_module_metadata() from course/lib 2020-02-20 09:28:57 +08:00
Jake Dallimore
2f040002ee MDL-67585 core_course: Use the content_item_service to build the picker 
Replace get_module_metadata calls with calls to the new
content_item_service class.
 2020-02-20 09:28:57 +08:00
Jake Dallimore
dd494a41a4 MDL-67585 core_course: add content_item_service class 
The service object encapsulates access control logic and allows
consumers to query content items in different contexts/scopes.
 2020-02-20 09:28:57 +08:00
Jake Dallimore
8210186372 MDL-67585 core_course: add user param to course_allowed_module 
We want to be able to call this for a user, not rely on a global.
 2020-02-20 09:28:57 +08:00
Jake Dallimore
eec2d09f84 MDL-67585 core_course: add exporter for course content items 
An exporter will allow let us add calculated fields like 'favourited'
to the data being transferred.
 2020-02-20 09:28:57 +08:00