mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-09 10:22:08 +02:00
Code Issues Projects Releases Wiki Activity
86,827 Commits 36 Branches 530 Tags
Commit Graph

86827 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jake Dallimore
51af04ab2f Merge branch 'MDL-59606' of git://github.com/timhunt/moodle 2017-10-30 11:23:18 +08:00
Andrew Nicols
9e6d1a3884 Merge branch 'MDL-60605_filetree-spacing' of https://github.com/dvdcastro/moodle 2017-10-30 10:50:26 +08:00
Jun Pataleta
391ea5b7de Merge branch 'MDL-59936-master' of git://github.com/andrewnicols/moodle 2017-10-30 14:34:58 +13:00
Andrew Nicols
9d0e1fca5a Merge branch 'MDL-60360_enable_file_indexing_retroactively' of https://github.com/mattporritt/moodle 2017-10-30 09:17:13 +08:00
Ryan Wyllie
8f730872a7 MDL-59936 calendar: use event colour in summary modal header 2017-10-30 08:34:26 +08:00
Ryan Wyllie
4febb36efe MDL-59936 calendar: use icons in event summary modal 2017-10-30 08:33:54 +08:00
Ryan Wyllie
368832d51c MDL-59936 javascript: hide modal footer without content 2017-10-30 08:33:54 +08:00
Jun Pataleta
cc80554892 Merge branch 'MDL-60608-master' of git://github.com/lameze/moodle 2017-10-30 11:47:54 +13:00
Jun Pataleta
e905b656f5 Merge branch 'MDL-60570-master' of git://github.com/andrewnicols/moodle 2017-10-30 11:00:44 +13:00
Jun Pataleta
526d354991 Merge branch 'MDL-60572-master' of git://github.com/jleyva/moodle 2017-10-30 10:10:34 +13:00
Andrew Nicols
eb3b38f04c MDL-60570 calendar: Correct course filter label in day view 2017-10-29 21:05:55 +08:00
David Castro
4e52eb8eb0 MDL-60605 assignment: Added some styles to fix spacing in YUI file tree 2017-10-27 11:06:25 -05:00
Tim Hunt
dae0ccfc45 MDL-59606 quiz responses: fix edge cases in the report 
This patch conbines valuable contributions from Kashmira Nagwekar and
Luca Bösch. Many thanks to them. However, the final form of the fix,
and hence the blame, falls to me -- Tim.

There were several issues here:

* The load_questions_usages_by_activity method in
  question/engine/datalib.php was incorrectly treating the case
  when no data was returned. (Looks like a historic copy-pase from
  other methods that fetch one item by unique id, which therefore
  must exist.)

* The report was not correctly handling the display when the 'Which
  tries' was set to 'with, and without, attempts'.

* It was possible to select the 'All tries' option when also saying
  'Users without attempts'. This combination makes not sense, so
  a disabledIf rule was added to the form.
 2017-10-27 16:57:01 +01:00
David Monllao
40f1801c4b on-demand release 3.4beta+ 2017-10-27 12:49:10 +02:00
Juan Leyva
6078d420bf MDL-60572 admin: Enforce URLs in forgottenpasswordurl setting 
Also display warnings for admins.
 2017-10-27 11:15:01 +02:00
Juan Leyva
2479a7c446 MDL-60572 admin: Fix forgottenpasswordurl for WS 
We should expect URLs in that field.
The tool_mobile change is to not break the WS response if
forgottenpasswordurl does not contain a URL.
 2017-10-27 11:12:32 +02:00
Simey Lameze
0d049757c0 MDL-60608 calendar: change eventdefaultcontext default to 0 2017-10-27 14:19:16 +08:00
Matt Porritt
0f56f6e6da MDL-60360 Global Search: Enable file indexing message update. 
If you have Global Search set up on a site without file
indexing enabled, then at a later date you enable file indexing
files associated with existing objects are not added.

The only way to have files for existing objects indexed is to
run a reindex of all content.

This patches updates the file indexing language string in the
solr search settings of Global Search to make this clear
to the site administrator.
 2017-10-27 11:11:12 +11:00
David Monllao
ff340a0afa Merge branch 'wip-MDL-57055-master' of git://github.com/abgreeve/moodle 2017-10-26 19:17:28 +02:00
David Monllao
62a38a4ece Merge branch 'MDL-60559-master' of git://github.com/andrewnicols/moodle 2017-10-26 19:15:44 +02:00
David Monllao
a272c25649 Merge branch 'MDL-60600_master' of https://github.com/marxjohnson/moodle 2017-10-26 18:33:49 +02:00
Mark Johnson
a9ca3fa167 MDL-60600 core_output: Clear static icon system cache between unit tests 2017-10-26 14:59:35 +01:00
David Monllao
7ec04e0e09 Merge branch 'MDL-60430-master' of https://github.com/mihailges/moodle 2017-10-26 10:27:34 +02:00
Jun Pataleta
1fc642324a Merge branch 'MDL-59909-master' of git://github.com/damyon/moodle 2017-10-26 21:09:12 +13:00
Damyon Wiese
7f91fb036b Merge branch 'MDL-60366_feedback_upgrade' of git://github.com/davosmith/moodle 2017-10-26 16:02:13 +08:00
David Monllao
fd39db29e2 Merge branch 'MDL-59973-master' of git://github.com/damyon/moodle 2017-10-26 09:47:22 +02:00
David Monllao
341505e5de Merge branch 'MDL-60458-master' of git://github.com/damyon/moodle 2017-10-26 09:41:09 +02:00
Damyon Wiese
ef7df2ae0a Merge branch 'MDL-60564_master' of git://github.com/markn86/moodle 2017-10-26 14:43:39 +08:00
Damyon Wiese
ed6d81c9f7 MDL-59973 calendar: Remove duplication 
The function calendar_get_default_courses is responsible for loading all variants of calendar
course lists.

1 the list of courses that the current user will see events for in the site calendar.
2 the list of courses the current user will see when they are looking at a specific course calendar.
3 the list of course calendars the current user can create / edit events in.
 2017-10-26 14:39:35 +08:00
Damyon Wiese
01ed53df0f MDL-59973 calendar: Only load required fields 
When loading courses for the course filter on the calendar, we only need the id and shortname.
 2017-10-26 14:21:29 +08:00
Andrew Nicols
4d03dbf13d Merge branch 'wip-MDL-60543-master' of git://github.com/marinaglancy/moodle 2017-10-26 14:19:43 +08:00
Andrew Nicols
4cc469b2cc Merge branch 'MDL-60162' of git://github.com/timhunt/moodle 2017-10-26 14:04:45 +08:00
Damyon Wiese
1b7d75f19f MDL-59973 calendar: Improve help for admin setting 2017-10-26 13:28:01 +08:00
Damyon Wiese
4dc645d64d MDL-59973 calendar: Unittest calendar_get_default_courses 2017-10-26 13:28:01 +08:00
Damyon Wiese
a5327e449d MDL-59973 calendar: Admin calendar course lists 
Consolidate the logic for the list of courses an admin will see in the calendar.

They will see all courses if calendar_admincanseeall is enabled.

They will see only courses they are enrolled in of calendar_admincanseeall is not enabled.

They will also see the current course, if they are admin and it is not already in the list.

This applies to the course selector and the create and update event forms.

The calendar link in the navigation block has also been changed to link to the current course calendar instead of the global
one.
 2017-10-26 13:28:00 +08:00
Andrew Nicols
4d4b8ae6bf Merge branch 'MDL-60535-questionbank-button-styled' of https://github.com/lucaboesch/moodle 2017-10-26 13:17:56 +08:00
Jake Dallimore
1e67827131 Merge branch 'MDL-60434_master' of git://github.com/dmonllao/moodle 2017-10-26 13:11:46 +08:00
Damyon Wiese
7dfc9ea6b3 Merge branch 'wip-MDL-60390-fix' of https://github.com/marinaglancy/moodle 2017-10-26 12:52:11 +08:00
Marina Glancy
69e89f4a82 MDL-60390 tool_messageinboud: not strict index comparision 
This is something that changed in the upgraded Horde library. structure->findBody() returns string but structure->contentTypeMap is indexed with ints
 2017-10-26 12:44:51 +08:00
Andrew Nicols
b799cde890 Merge branch 'wip-MDL-60104-m34' of git://github.com/amygroshek/moodle 2017-10-26 11:32:54 +08:00
Andrew Nicols
9fd91f8eec Merge branch 'master-MDL-51892' of https://github.com/fwsl/moodle 2017-10-26 11:08:50 +08:00
Jake Dallimore
6e186498fd Merge branch 'MDL-59686-master' of git://github.com/lameze/moodle 2017-10-26 10:16:21 +08:00
Simey Lameze
3c2b703e00 MDL-59686 form: fix autosave support for editor field 2017-10-26 09:03:31 +08:00
Adrian Greeve
e6ccfad242 MDL-57055 mod_label: Add label administration for boost. 
This patch adds the label adminstration settings to the
label edit page.
 2017-10-26 08:41:33 +08:00
Jun Pataleta
75909e3c92 Merge branch 'MDL-59938-master' of git://github.com/andrewnicols/moodle 2017-10-26 11:22:30 +13:00
Jun Pataleta
2a1f7a4442 Merge branch 'MDL-60571-manualgrading-savegotonextpage-styled' of https://github.com/lucaboesch/moodle 2017-10-26 10:02:27 +13:00
David Monllao
7851132177 Merge branch 'MDL-60516-master' of git://github.com/andrewnicols/moodle 2017-10-25 15:16:21 +02:00
David Monllao
4f7a80341e Merge branch 'MDL-59942-master' of git://github.com/andrewnicols/moodle 2017-10-25 15:14:54 +02:00
David Monllao
3b4e9a9fc8 Merge branch 'wip_MDL-60250_master' of git://github.com/gjb2048/moodle 2017-10-25 15:12:23 +02:00
David Monllao
507335e2de Merge branch 'MDL-60538-master' of https://github.com/mihailges/moodle 2017-10-25 15:08:49 +02:00