Commit Graph

89847 Commits

Author SHA1 Message Date
Michael Aherne 46c5c88321 MDL-57630 messaging: Pass unit test with third-party plugins 2017-01-11 16:37:46 +00:00
Juan Leyva 9db43c7341 MDL-57629 webservice: Fix external functions phpdoc
Replace external_external_function_parameters with
external_function_parameters
2017-01-11 16:56:25 +01:00
Juan Leyva da1205ccc2 MDL-50545 mod_page: New WS mod_page_get_pages_by_courses 2017-01-11 12:53:22 +01:00
Juan Leyva f24dcf0c60 MDL-50539 mod_folder: New WS mod_folder_get_folders_by_courses 2017-01-11 12:42:15 +01:00
Juan Leyva 7440c7b298 MDL-50542 mod_label: New WS mod_label_get_labels_by_courses 2017-01-11 10:36:39 +01:00
Juan Leyva c76d5fd63e MDL-50549 mod_url: New WS mod_url_get_urls_by_courses 2017-01-11 10:28:05 +01:00
Eloy Lafuente (stronk7) 777361983c Merge branch 'wip-mdl-56519-m' of https://github.com/rajeshtaneja/moodle 2017-01-11 02:42:29 +01:00
Eloy Lafuente (stronk7) 122c3aff5c Merge branch 'wip-mdl-57595' of https://github.com/rajeshtaneja/moodle 2017-01-11 02:29:49 +01:00
Eloy Lafuente (stronk7) e238dcc8b2 MDL-57572 redis: Prevent installation to fail on sites without redis 2017-01-11 02:22:48 +01:00
Eloy Lafuente (stronk7) 7bdbad80d8 Merge branch 'MDL-57572-master' of https://github.com/mwehr/moodle 2017-01-10 19:25:44 +01:00
sam marshall 66234de24c MDL-57515 Resource: 'not very efficient' with a large number of files
Fixes bug where the resource module loads metadata for all files while
building course modinfo, even though it only needs the first file.
(This causes problems if you have ~10k files.)
2017-01-10 17:43:46 +00:00
Eloy Lafuente (stronk7) 96733b06d6 Merge branch 'MDL-57282-master' of https://github.com/xow/moodle 2017-01-10 12:38:14 +01:00
Dan Poltawski 38425d9fee Merge branch 'MDL-57480-master' of https://github.com/snake/moodle 2017-01-10 08:40:10 +00:00
Loc Nguyen 288ac7b9d7 MDL-57586 workshop: Change workshop variable protected to public
In class workshop_assessment_base, change $workshop from protected to public.
2017-01-10 14:22:11 +07:00
Marina Glancy fdc6656a37 MDL-56271 mod_feedback: recaptcha was not working 2017-01-10 14:08:04 +08:00
David Monllao b06f33d5cc Merge branch 'MDL-57149-master' of git://github.com/junpataleta/moodle 2017-01-10 06:23:03 +01:00
David Monllao c9359c562c Merge branch 'MDL-57385-master-2' of git://github.com/junpataleta/moodle 2017-01-10 05:26:37 +01:00
Jun Pataleta 3adf4b1837 MDL-57149 admin: Make langimport page Bootstrap-compatible
* Create template for the language import page.
* Apply Bootstrap classes to form elements.
* Use core notifications for displaying error/success messages.
2017-01-10 10:24:17 +08:00
Jun Pataleta ab1ca45eb0 MDL-57385 core: Set page layouts of non-mydashboard pages to standard
The following pages are using the "mydashboard" page layout:
* User preferences > Badges > Manage badges
* User preferences > Badges > Backpack settings
* User preferences > Repositories > Manage instances
* Private files
However, the "mydashboard" page layout should only be used for the user's
dashboard page. Changing these to use the "standard" page layout.
2017-01-10 09:44:13 +08:00
Jake Dallimore 865c4f5df9 MDL-57480 core_course: make drag and drop fire a dom updated event
When adding media via drag and drop, the notifyFilterContentUpdated
event should be called after the item is added to the DOM. This allows
things like videojs for example, to process the new content.
2017-01-10 07:42:52 +08:00
Dan Poltawski 76bab36896 MDL-57604 mod_assign: fix incorrect user being selector from chooser
Previously there was a logic bug where by if some students were filtered
from the list, the label for another student could be attached to the
'filered' student.

This fix reworks the promises a bit so we render the student summary and
then build an row with the explict user id, rather than itterating through
the array later.

I also remove the storing of the initial promise in a varible because
this is an easy way to introduce a bug (not waiting for the .then()
chained promise)
2017-01-09 20:36:30 +00:00
Dan Poltawski feb75612a7 Merge branch 'MDL-57427' of https://github.com/jrchamp/moodle 2017-01-09 16:25:15 +00:00
sam marshall b5f661b111 MDL-57601 Grade report: Error for ungraded quiz without view hidden
If a course contains an ungraded quiz (max grade set to 0), and there
is a user account which can view the grader reports but does not have
permission to view hidden grades, they will get errors.
2017-01-09 15:32:25 +00:00
Jonathan Champ d3a6b91aec MDL-57427 cache: Use perfdebug only when enabled 2017-01-09 10:18:13 -05:00
David Monllao 461d6d390c Merge branch 'MDL-57392-master' of git://github.com/jleyva/moodle 2017-01-09 13:40:14 +01:00
David Monllao 2e87e3ce90 Merge branch 'wip-mdl-55042' of https://github.com/rajeshtaneja/moodle 2017-01-09 12:54:16 +01:00
Juan Leyva 7bdcf970bc MDL-57409 tool_mobile: Return mobileapp settings in get_config WS 2017-01-09 12:19:29 +01:00
Juan Leyva fb0add0456 MDL-57409 tool_mobile: New forcelogout setting 2017-01-09 12:19:28 +01:00
Dan Poltawski 1975dcf25c Merge branch 'MDL-55461_atto_equation' of git://github.com/davosmith/moodle 2017-01-09 10:51:23 +00:00
Dan Poltawski fc893bc42d Merge branch 'MDL-40132_31' of https://github.com/IvannavISer/moodle 2017-01-09 10:23:11 +00:00
Dan Poltawski 66677b7102 Merge branch 'wip-mdl-56211' of https://github.com/rajeshtaneja/moodle 2017-01-09 09:58:57 +00:00
Dan Poltawski 5445df2957 Merge branch 'MDL-57373-master' of git://github.com/ankitagarwal/moodle 2017-01-09 09:42:27 +00:00
Dan Poltawski 3b2c5923f2 Merge branch 'MDL-53367_master' of https://github.com/juancs/moodle 2017-01-09 08:27:18 +00:00
Dan Marsden 6c563ccedf MDL-45821 mod_scorm: Check lesson_status correctly for multi-sco. 2017-01-09 20:07:31 +13:00
Rajesh Taneja 5d2988fc8a MDL-57595 behat: Added redirect and wait to ensure next step pass 2017-01-09 12:02:53 +08:00
AMOS bot 0d54830feb Automatically generated installer lang files 2017-01-08 00:04:47 +08:00
godric 4c4b966a92 MDL-40132 lib: Using compare rule results in fatal error.
In getValidationScript function variable $element can be an array or object.
Function attempt get non-existing attributes.
To avoid this we should check before accessing.
2017-01-07 09:40:27 +03:00
wehr 9c860cea46 MDL-57572 cache: Adds igbinary serializer to Redis cache store 2017-01-06 16:26:43 +01:00
John Okely b7c822a546 MDL-57282 behat: Deprecate I go to X in the course gradebook 2017-01-06 13:47:19 +08:00
Dan Poltawski 8ed0851a5e weekly release 3.3dev 2017-01-06 01:30:49 +00:00
Dan Poltawski 70d8808476 Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2017-01-06 01:30:48 +00:00
Rajesh Taneja 484503da62 MDL-56211 behat: Add suite name to faildump path
If suite is not default then add suite name
to end of faildump file name
2017-01-06 09:18:52 +08:00
David Mudrák 82a8d0d21d MDL-57580 mod_assign: Fix the incorrect type of some input parameters
The PARAM_TEXT has been misused in certain cases here. The 'action'
parameter seems to always be alphabetic, with values like
savesubmission, editsubmission and others as handled in assign::view().

Fixing the action handling fixes the reported XSS issue. While working
on it, I spotted two more places where PARAM_TEXT does not seem
appropriate. I include changes for them too, even if they are no
strictly related to the reported bug and there are no known ways to
abuse it.

* The 'plugin' looks like PARAM_PLUGIN and is even declared as such in
  some other parts of the assignment code (such as feedback forms).

* The 'workflowstate' is one of the ASSIGN_MARKING_WORKFLOW_STATE
  constants and is supposed to be alpha in external function input
  parameters handling, too.
2017-01-05 17:39:36 +01:00
Davo Smith 255d3aaaed MDL-56449 mod_assign: fix formatting of group warnings 2017-01-05 15:30:09 +00:00
Dan Poltawski 7716be5ae8 Merge branch 'MDL-57563-master-enfix' of git://github.com/mudrd8mz/moodle 2017-01-05 10:09:17 +00:00
Rajesh Taneja d44f7e4623 MDL-56519 behat: Add gherkin lint to watch and startup 2017-01-05 16:02:00 +08:00
Dan Poltawski e0d1efd896 Merge branch 'wip-mdl-57531' of https://github.com/rajeshtaneja/moodle 2017-01-05 06:51:54 +00:00
Rajesh Taneja 1024f6d1ec MDL-57531 behat: Set noreplyaddress to valid address
noreplyaddress should be a valid address, else
it will not be saved. For behat we don't send
email, so set it to noreply@example.com, to
avoid failing validation on localhost
2017-01-05 14:40:16 +08:00
Daniel Thee Roperto b51f6864c1 MDL-57576 assignment: Overwrite feedback file if it has the same name. 2017-01-05 15:33:28 +11:00
David Mudrák 1882e6ecac MDL-57563 lang: Use the new newsitemsnumber wording in behat 2017-01-04 22:09:44 +01:00