David Monllao
c9af13123d
MDL-54751 course_modules: New major upgrade point
...
Also trailing whitespace cleaned.
2016-11-07 08:59:04 +08:00
David Monllao
90abff01b3
Merge branch 'MDL-54751-master-v5' of https://github.com/snake/moodle
2016-11-07 08:55:44 +08:00
Jake Dallimore
f939a6d452
MDL-54751 core_completion: Exclude activities pending deletion
2016-11-07 07:41:59 +08:00
Jake Dallimore
ff4230d88e
MDL-54751 behat: Support for adhoc module and section deletion in behat
...
Introduced new behat step for running all pending adhoc tasks and
modified the relavant behat tests.
2016-11-07 07:41:59 +08:00
Jake Dallimore
3704ff8cde
MDL-54751 phpunit: Support adhoc module and section deletion in phpunit
...
Created a new phpunit util function run_all_adhoc_tasks which runs any
pending tasks, for use in unit tests. Added new recyclebin and course
unit tests covering the new functionality.
2016-11-07 07:41:59 +08:00
Jake Dallimore
45bd824e59
MDL-54751 core_grades: Gradebook highlights modules pending deletion
...
Added warning to all gradebook pages if any modules are pending
deletion. Modified the return values for get_name, and is_locked for
affected grade items to indicate their pending deletion.
2016-11-07 07:41:59 +08:00
Jake Dallimore
3869d77411
MDL-54751 core_course: Edit course libs to support deletion flag
...
Changed the course libs such that module and section deletion is now
handed off to relevant functions in the util class and exempted
modules scheduled for deletion from the course backups.
2016-11-07 07:41:59 +08:00
Jake Dallimore
048f909b07
MDL-54751 core: introduce deletion flag for course modules
...
Created a flag, 'deletioninprogress' on the course_modules table to be
used when deleting course modules and course sections. Modified
modinfolib caches such that, when rebuilt, these caches hide the
relevant modules based on the value of the flag.
2016-11-07 07:41:59 +08:00
Eloy Lafuente (stronk7)
b23b9a5b38
MDL-38158 core_media: bump upgrade / version and fix filter test
2016-11-06 02:11:20 +01:00
Eloy Lafuente (stronk7)
6e29346609
Merge branch 'wip-MDL-38158-master' of https://github.com/marinaglancy/moodle
2016-11-06 02:11:19 +01:00
Dan Poltawski
f95c00e551
Merge branch 'wip-MDL-54986-master' of https://github.com/Beedell/moodle
2016-11-04 14:31:00 +00:00
Marina Glancy
fab11235d8
MDL-38158 core_media: Convert media players to new plugin type
...
AMOS BEGIN
MOV [siteyoutube,core_media],[pluginname,media_youtube]
MOV [siteyoutube_desc,core_media],[pluginname_help,media_youtube]
MOV [sitevimeo,core_media],[pluginname,media_vimeo]
MOV [sitevimeo_desc,core_media],[pluginname_help,media_vimeo]
MOV [html5audio,core_media],[pluginname,media_html5audio]
MOV [html5audio_desc,core_media],[pluginname_help,media_html5audio]
MOV [html5video,core_media],[pluginname,media_html5video]
MOV [html5video_desc,core_media],[pluginname_help,media_html5video]
MOV [flashanimation,core_media],[pluginname,media_swf]
MOV [flashanimation_desc,core_media],[pluginname_help,media_swf]
AMOS END
2016-11-04 17:30:40 +08:00
Marina Glancy
3c73b26c4b
MDL-38158 core_media: more correct semantic for html5 video audio tags
2016-11-04 17:30:31 +08:00
Andrew Nicols
11bafc2b21
Merge branch 'MDL-56641-master' of git://github.com/damyon/moodle
2016-11-03 15:07:01 +08:00
Andrew Nicols
bc378b50ec
Merge branch 'wip-MDL-44467-master' of git://github.com/abgreeve/moodle
2016-11-03 14:08:21 +08:00
David Monllao
5d0299e275
Merge branch 'MDL-56666-master' of git://github.com/jleyva/moodle
2016-11-03 10:28:59 +08:00
Damyon Wiese
2a7c540c48
MDL-56641 admin: Managers can access search page
2016-11-03 09:36:33 +08:00
John Beedell
6e1e299554
MDL-54986 Quiz: Disable add button for quiz with attempts
2016-11-02 17:02:59 +00:00
Dan Poltawski
56f763b1f9
Merge branch 'MDL-55841-master' of https://github.com/xow/moodle
2016-11-02 15:24:33 +00:00
Dan Poltawski
ab64cd40b0
Merge branch 'MDL-56372_static_bind_clean_return_val' of https://github.com/BenKelada/moodle
2016-11-02 15:14:46 +00:00
Dan Poltawski
cb2b9a905c
Merge branch 'MDL-55825-master' of git://github.com/junpataleta/moodle
2016-11-02 14:41:10 +00:00
Dan Poltawski
4d27d62d08
Merge branch 'wip-MDL-55927-master' of git://github.com/abgreeve/moodle
2016-11-02 14:00:29 +00:00
Dan Poltawski
de8388f529
Merge branch 'MDL-56637-master' of git://github.com/dpalou/moodle
2016-11-02 13:56:22 +00:00
Juan Leyva
2521afd2e8
MDL-56666 message: New WS core_message_get_user_message_preferences
2016-11-02 12:16:23 +00:00
Dan Poltawski
540b01b60d
Merge branch 'MDL-56161-master' of git://github.com/damyon/moodle
2016-11-02 09:36:09 +00:00
Damyon Wiese
b07981e1e1
MDL-56621 forms: Give a default value if format not set
...
For forms with a text area, we need to provide a default for the format.
This only affects boost because it is export_for_template.
2016-11-02 14:42:33 +08:00
Andrew Nicols
c6ae02c184
Merge branch 'MDL-48468' of https://github.com/mr-russ/moodle
2016-11-02 10:13:42 +08:00
David Monllao
f5d9072e51
Merge branch 'MDL-56462-master' of git://github.com/damyon/moodle
2016-11-02 09:14:09 +08:00
Damyon Wiese
9e2f13125a
MDL-56161 boost: alignment static form elements
...
Wrap the HTML from a static form element with "form-control-static" to apply correct padding.
Also use a span, not a label for unlabelable static form elements.
2016-11-02 09:06:12 +08:00
Dan Poltawski
b9703b8e05
Merge branch 'MDL-56621-master' of git://github.com/damyon/moodle
2016-11-01 21:20:53 +00:00
Dan Poltawski
57911c1f40
Merge branch 'MDL-47162' of https://github.com/stronk7/moodle
2016-11-01 12:13:19 +00:00
Eloy Lafuente (stronk7)
f593e8271a
MDL-47162 badges: site & profile badges do not have courseid
...
Because of that, we need to set the, now mandatory, SITEID for
those message events to be happy. This does not affect course or
activity badges, both coming with correct courseid.
2016-11-01 12:47:54 +01:00
Dan Poltawski
9f02188575
Merge branch 'MDL-56587-master' of git://github.com/cameron1729/moodle
2016-11-01 11:35:36 +00:00
Dan Poltawski
9bf205fb73
Merge branch 'MDL-55732-master' of git://github.com/damyon/moodle
2016-11-01 09:47:11 +00:00
Damyon Wiese
757f42cb15
MDL-56587 theme_boost: Align header items
...
Remove chunks of conflicting CSS added in various places and add navbar-nav -> nav-link to header items.
2016-11-01 11:36:08 +08:00
Adrian Greeve
839b391f74
MDL-56489 Lib: force_settings_menu added to pagelib.
...
This introduces a flag to force the settings menu
to be displayed on the page if the theme uses a settings
menu. This is for use by activities and resources.
2016-11-01 10:00:12 +08:00
Eloy Lafuente (stronk7)
a1f6a27c80
Merge branch 'MDL-47162' of git://github.com/merrill-oakland/moodle
2016-10-31 22:45:37 +01:00
Eloy Lafuente (stronk7)
8df0fb490b
Merge branch 'wip-MDL-56615-master' of git://github.com/marinaglancy/moodle
2016-10-31 20:25:31 +01:00
Eloy Lafuente (stronk7)
7aa17ce256
Merge branch 'MDL-56297-master' of git://github.com/damyon/moodle
2016-10-31 19:47:40 +01:00
Eric Merrill
880fc15bf0
MDL-47162 core_message: Updating all uses of messaging to add courseid
2016-10-31 14:13:13 -04:00
Eloy Lafuente (stronk7)
c40a53775f
Merge branch 'MDL-55799-master' of git://github.com/lameze/moodle
2016-10-31 17:23:11 +01:00
Dan Poltawski
5ad34c43f6
Merge branch 'MDL-56597-master' of git://github.com/damyon/moodle
2016-10-31 15:10:02 +00:00
Damyon Wiese
2259c0f078
MDL-56621 templates: Add missing example contexts
2016-10-31 21:27:52 +08:00
Damyon Wiese
6fb8a7ab7e
MDL-56621 forms: Hide format menu if only one
...
This was a regression in the new templates for editors.
2016-10-31 15:06:50 +08:00
Andrew Nicols
0b03040605
Merge branch 'MDL-56501-master' of git://github.com/lameze/moodle
2016-10-31 14:10:37 +08:00
Simey Lameze
343ba16c31
MDL-56501 message: introduce new manageallmessaging capability
2016-10-31 14:09:03 +08:00
Andrew Nicols
de32120676
Merge branch 'MDL-56577-master' of git://github.com/junpataleta/moodle
2016-10-31 14:02:27 +08:00
Andrew Nicols
42a372e20f
Merge branch 'MDL-56273' of https://github.com/mr-russ/moodle
2016-10-31 14:00:36 +08:00
Jun Pataleta
6af2ccda91
MDL-56577 core_form: Let other option attrs to be set in select elements
2016-10-31 12:19:21 +08:00
Frédéric Massart
77bec234e0
MDL-56282 enrol_meta: Fix error when editing existing instances
...
We had a few problems here.
1/ The auto complete element was displaying the picker though the
field was frozen.
2/ Checking for existing enrolment including the courses chosen was
not checking if the courses found were in the instance we edit.
3/ Upon creation we support multiple courses but when editing we
should not expect more than the course in the instance being edited.
2016-10-31 12:15:02 +08:00
