moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-07 01:46:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
90819 commits 37 branches 540 tags 1.3 GiB
Commit graph

90819 commits

This branch
This branch
All branches
Author SHA1 Message Date
Sara Arjona
57e3305b41 MDL-64222 badge: Removed backpackurl from the edit_form 2019-01-08 16:21:48 +01:00
Eloy Lafuente (stronk7)
80f46ee1c0 Merge branch 'MDL-64509-35-enfix' of git://github.com/mudrd8mz/moodle into MOODLE_35_STABLE 2019-01-08 16:19:56 +01:00
Andrew Nicols
7d837832e5 Merge branch 'MDL-58596-35' of git://github.com/vmdef/moodle into MOODLE_35_STABLE 2019-01-08 16:16:15 +08:00
Leon Stringer
43246bd859 MDL-58596 core_stats: fixed infinite loop cause by DST change 2019-01-08 08:09:38 +00:00
Jake Dallimore
29e7974006 Merge branch 'MDL-63686-35' of git://github.com/andrewnicols/moodle into MOODLE_35_STABLE 2019-01-08 14:38:31 +08:00
Andrew Nicols
7c512ad12f Merge branch 'MDL-24951-35' of git://github.com/Chocolate-lightning/moodle into MOODLE_35_STABLE 2019-01-08 14:20:25 +08:00
Andrew Nicols
5b01d6249b MDL-63686 core: Preload parent contexts 2019-01-08 14:12:27 +08:00
Andrew Nicols
a36f9d20ed Merge branch 'MDL-64497-m35' of https://github.com/sammarshallou/moodle into MOODLE_35_STABLE 2019-01-08 12:29:16 +08:00
Andrew Nicols
68da8600b7 Merge branch 'MDL-64400-35' of git://github.com/aanabit/moodle into MOODLE_35_STABLE 2019-01-08 08:32:16 +08:00
Andrew Nicols
b366722a14 Merge branch 'MDL-63276_35' of https://github.com/stronk7/moodle into MOODLE_35_STABLE 2019-01-08 06:56:29 +08:00
Eloy Lafuente (stronk7)
712fc8341c Merge branch 'MDL-63809-35-5' of git://github.com/rezaies/moodle into MOODLE_35_STABLE 2019-01-07 22:13:40 +01:00
Helen Foster
ed72175e45 MDL-64509 lang: Import fixed English strings (en_fix) 2019-01-07 20:21:09 +01:00
Andrew Nicols
042748a342 Merge branch 'MDL-57636_m35' of https://github.com/dasistwas/moodle into MOODLE_35_STABLE 2019-01-07 13:48:32 +08:00
David Bogner
98125d376a MDL-57636 frontpage: Fix display enrolled courses 2019-01-04 10:56:24 +01:00
Damyon Wiese
aa3c3bd353 MDL-64375 gradingform_rubric: Styles for overflow 
Allow people to define lots of levels, and make the scroll region just the rubric table,
not the entire content region.
 2019-01-04 08:44:41 +08:00
sam marshall
02fab5539c MDL-64497 GDPR: moodle_content_writer can cause endless loop 
Fixes a buggy function by replacing it with a call to file_get_contents,
and adds error detection on a couple of file accesses.
 2019-01-03 17:04:13 +00:00
Jake Dallimore
a32a22f07f Merge branch 'MDL-49651-35' of git://github.com/Chocolate-lightning/moodle into MOODLE_35_STABLE 2019-01-03 10:50:01 +08:00
Peter
f8be708257 MDL-64486 mod_glossary: Add missing separator for special links 2019-01-03 08:39:46 +08:00
Eloy Lafuente (stronk7)
2e8f29095f MDL-63276 environment: PHP 7.1 and Moodle 3.2 required 2019-01-03 01:18:54 +01:00
Eloy Lafuente (stronk7)
56ce8d00da MDL-63276 environment: 3.7 base information 
This is a direct copy of the 3.6 branch to
have changes under control easier in next commits.
 2019-01-03 01:18:54 +01:00
Michael Hawkins
3691ff2f40 MDL-62968 Boost: Adding editor SCSS support 2019-01-02 14:21:24 +08:00
Damyon Wiese
fdfa0d497f MDL-63761 grade: Performance fix for regrading 
Don't use a separate variable to count the number of items in finalids.
 2019-01-02 10:25:08 +08:00
Amaia Anabitarte
ecb4b0260e MDL-64400 core_messages: Mark notifications sent via email as read 2018-12-27 09:32:25 +01:00
Amaia Anabitarte
da73f1364d MDL-64400 core_messages: Allow cron to delete unread notifications too 2018-12-27 09:32:25 +01:00
Mathew
3430f5252a MDL-49651 mod_forum: Respect course visibility in cron 
This checks the courses' current visibility and the users permissions.
If they have the permission to view the course when it is hidden they'll get messages.

We already have checks for the users enrolled & subscription status.
 2018-12-24 09:34:47 +08:00
Mathew
2f56e8a287 MDL-24951 mod_forum: Check user capability to know what message to show. 
If the user has the following capabilty: mod/forum:canposttomygroups then show them
the more technical of the strings. Otherwise we use something a bit easier for them to ask their
tutor or teacher about.
 2018-12-24 09:13:36 +08:00
Víctor Déniz Falcón
566978d358 MDL-58596 core_stats: unit test for stats_get_base_weekly 2018-12-20 13:54:46 +00:00
Adrian Greeve
79d87ad683 weekly release 3.5.3+ 2018-12-20 11:09:14 +01:00
Adrian Greeve
f4b78030ae Merge branch 'install_35_STABLE' of https://git.in.moodle.com/amosbot/moodle-install into MOODLE_35_STABLE 2018-12-20 11:09:13 +01:00
Andrew Nicols
97eac5487e Merge branch 'MDL-63512-35' of git://github.com/peterRd/moodle into MOODLE_35_STABLE 2018-12-20 13:04:22 +08:00
Peter
f5065aad46 MDL-63512 mod_lesson: Update the lesson css to exclude mediaplugin div 2018-12-20 12:50:53 +08:00
Peter
b5cc9d4e96 MDL-63512 mod_lesson: Fix video links provided in feedback 2018-12-20 12:50:53 +08:00
Adrian Greeve
5f2edc4df7 Merge branch 'MDL-64392-35' of git://github.com/bmbrands/moodle into MOODLE_35_STABLE 2018-12-19 12:06:05 +01:00
Adrian Greeve
5900a79aca MDL-59954 course: Remove unused global. 2018-12-19 10:40:06 +01:00
Peter
18d086a8a4 MDL-59954 mod_course: Remove file size restriction on D&D on course page 
Remove file size restrictions for teachers on course page.
Use user_max_upload_file_size instead of the max_file_size
 2018-12-19 10:37:08 +01:00
Jake Dallimore
cb14d331fe Merge branch 'MDL-64216-m35' of https://github.com/micaherne/moodle into MOODLE_35_STABLE 2018-12-19 11:08:35 +08:00
Andrew Nicols
56ec2b0949 Merge branch 'MDL-63512-35' of git://github.com/peterRd/moodle into MOODLE_35_STABLE 2018-12-19 10:01:00 +08:00
AMOS bot
d8aba89429 Automatically generated installer lang files 2018-12-19 00:09:13 +00:00
Adrian Greeve
4632b4a151 Merge branch 'MDL-64025-35' of https://github.com/christianwolters/moodle into MOODLE_35_STABLE 2018-12-18 16:01:48 +01:00
Michael Hawkins
9d046294fb MDL-64240 mod_forum: Clean forum post text before storing 
Previously only edited messages were cleaned, so longer strings could
be stored in the database, which would never be displayed.
This update takes into account trusted text before cleaning (as editing does).
 2018-12-18 15:10:21 +08:00
Michael Hawkins
968c6115dc MDL-64240 mod_forum: Update word count to use current message length 
Previously this used the length of the message stored in the database,
before scripts etc are cleaned to display the content. That resulted
in cases where the count would seem much larger than the message size.
 2018-12-18 15:10:16 +08:00
Shamim Rezaie
e4eb5170a1 MDL-63809 question: handling bad questions in question_has_capability_on 2018-12-18 15:44:36 +11:00
Tim Hunt
1340c03ba6 MDL-63809 question bank: ensure question_has_capability_on can be called 2018-12-18 15:44:36 +11:00
Damyon Wiese
16668320a6 MDL-60082 assign: Grading worksheet with no grade 
If the grade type is NONE - do not include the maxgrade column.
 2018-12-18 11:14:19 +08:00
Damyon Wiese
a912d44652 MDL-64004 webservice: Do not update accesstime 
Do not update the automatically update the course access time when a
course is accessed via a webservice or ajax.
 2018-12-18 09:08:20 +08:00
Sara Cenni
9ffc3296cc MDL-64345 core: Make FB logo upgrade cross-DB compatible 2018-12-17 11:33:50 +01:00
Eloy Lafuente (stronk7)
7650dbcaae MDL-63891 assignfeedback_editpdf: add missing UK to install.xml 
Backport of MDL-57610.
 2018-12-17 11:22:18 +01:00
Adam Olley
4015cb2d05 MDL-63891 assignfeedback_editpdf: integration cleanup 
* Add a note to upgrade.php to notify devs/admins of the new setting.
* Replace update_record with set_field.
* Add missing phpdoc.

Backport of MDL-57610.
 2018-12-17 11:22:17 +01:00
Adam Olley
b1aac17d18 MDL-63891 assignfeedback_editpdf: Add test coverage for conversion task 
Without this, we have no coverage of the convert_submissions task. This test
validates it both works normally, and that it also skips queued items that have
exceeded the conversion attempt limit introduced in this improvement.

Backport of MDL-57610.
 2018-12-17 11:21:38 +01:00
Adam Olley
de341c20d4 MDL-63891 assignfeedback_editpdf: remove queued jobs that keep failing 
Without this, its possible to get a document in the editpdf conversion queue
that keeps failing - and in some cases completely crashing the PHP script
despite exception handling - which ends up blocking the processing of the queue
entirely.

This change allows for a configurable number of attempts the conversion
task will perform before removing the item from the queue.

Backport of MDL-57610.
 2018-12-17 11:21:38 +01:00