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

91442 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Stephen Bourget
29d25b33a5 MDL-63614 badges: Add COMPLETION_FAIL support to badge criteria 2018-12-19 10:31:28 -05: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
John Beedell
dfce9c02d2 MDL-64404 qtype: gapselect currency like options dont show 2018-12-17 12:15:39 +00: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
Jun Pataleta
5156ced934 Merge branch 'MDL-59629-35' of git://github.com/peterRd/moodle into MOODLE_35_STABLE 2018-12-17 15:56:04 +08:00
Damyon Wiese
512044f0c9 MDL-62963 boost: Increase contrast btn-secondary 
The background colour of these buttons is too light, so they don't look like buttons.
 2018-12-17 15:49:45 +08:00
Tomasz Muras
9d8470e4b8 MDL-52966 core: static cache fix for file types. 2018-12-17 15:40:54 +08:00
Andrew Nicols
613d4f9e6d Merge branch 'MDL-61633-35' of https://github.com/lucisgit/moodle into MOODLE_35_STABLE 2018-12-17 15:29:40 +08:00
Andrew Nicols
fc28257e09 Merge branch 'MDL-60518-35' of git://github.com/aanabit/moodle into MOODLE_35_STABLE 2018-12-17 14:59:59 +08:00
Jun Pataleta
672905cb4f Merge branch 'MDL-63260_35' of https://github.com/timhunt/moodle into MOODLE_35_STABLE 2018-12-17 14:10:02 +08:00
Damyon Wiese
1aaa130376 MDL-63378 theme_boost: Contrast of menu items 
Enforce the :active menu text colour during a mouse click on an action menu.
 2018-12-17 14:07:18 +08:00
Damyon Wiese
ee38a8d1e4 MDL-64107 questions: Increase highlight contrast 
When a question has just been edited, it is highlighted. We need to ensure
the colour contrast of text on background is accessible.
 2018-12-17 12:36:03 +08:00
Jake Dallimore
084dadaa86 Merge branch 'MDL-62756' of https://github.com/miotto/moodle into MOODLE_35_STABLE 2018-12-17 11:25:20 +08:00
Christian Wolters
790c306bf7 MDL-64025 admin_bookmarks: Enable bookmarking of admin categories 2018-12-16 15:49:56 +01:00
Bas Brands
16db1b8083 MDL-64392 core_question: flexbox compatible separator for question types 
* the br tag does not work well in a flexbox context, a 100% with div
works in both clean and boost.
 2018-12-14 16:31:18 +01:00
Amaia Anabitarte
f91e884d68 MDL-60518 core_competency: Set $USER global variable for tests 2018-12-14 10:27:41 +01:00
Frédéric Massart
7dcc1e721c MDL-60518 core_user: A user with ID 0 is never a real user 2018-12-14 10:27:41 +01:00
Mirko Otto
f32c2f7c47 MDL-62756 form: Remove any click handler first. 
The handler has the old state variable. Remove any click handler first.
 2018-12-14 10:22:11 +01:00
Jun Pataleta
808e7c80dc MDL-64285 core: Fix environment check test 
* Looping the environment results and skipping some items mean that
if a test gets skipped, the rest of the environment results won't be
tested. It's better to use a data provider for this in order to
individually test each environment result.
 2018-12-14 11:22:07 +08:00
Peter
bb13181338 MDL-59629 mod_block: Set the default region in add_region 
Check and update default region in add_region if none set.
 2018-12-14 10:29:55 +08:00
Peter
f13544412e MDL-63512 mod_lesson: Fix video links provided in feedback 2018-12-14 10:27:12 +08:00
Jake Dallimore
c8b4ee45a4 weekly release 3.5.3+ 2018-12-14 07:51:44 +08:00
Tony Butler
773e24cad4 MDL-61633 assignfeedback_editpdf: Scroll back to top when changing pages 2018-12-13 12:21:07 +00:00
Jake Dallimore
86eb5bb7e2 Merge branch 'MDL-62624-35' of git://github.com/mihailges/moodle into MOODLE_35_STABLE 2018-12-12 16:14:04 +08:00
Damyon Wiese
55a1e8b719 MDL-63916 backup: Do not display timestamp 
Convert the date+time field to a userdate for display.
 2018-12-12 12:20:18 +08:00
Jun Pataleta
76570e405a Merge branch 'MDL-41507-35' of git://github.com/rezaies/moodle into MOODLE_35_STABLE 2018-12-12 11:17:05 +08:00
Shamim Rezaie
eeb374e2e6 MDL-41507 core_group: Consistent default value for FEATURE_GROUPS 2018-12-12 14:05:01 +11:00
Jake Dallimore
b4999d92d9 MDL-63887 auth_ldap: fix unclean exit from sync when users not found 
We should return, not exit, and we should clean up before we do.
 2018-12-12 09:43:51 +08:00
Jake Dallimore
113c94cf9a Merge branch 'MDL-63887_35' of git://github.com/markn86/moodle into MOODLE_35_STABLE 2018-12-12 09:43:45 +08:00
Jake Dallimore
583799d5b9 Merge branch 'MDL-63150-35' of git://github.com/peterRd/moodle into MOODLE_35_STABLE 2018-12-12 08:32:55 +08:00
Jake Dallimore
7f0903200f Merge branch 'MDL-63145-35' of git://github.com/peterRd/moodle into MOODLE_35_STABLE 2018-12-12 08:30:20 +08:00