mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-04-01 06:22:35 +02:00
Code Issues Projects Releases Wiki Activity
82,872 Commits 36 Branches 527 Tags
Commit Graph

18842 Commits

Author SHA1 Message Date
Dan Poltawski
bb72d31944 Merge branch 'MDL-57515-master' of https://github.com/sammarshallou/moodle 2017-01-17 10:20:08 +00:00
Dan Poltawski
5bd052f809 Merge branch 'MDL-50542-master' of git://github.com/jleyva/moodle 2017-01-17 07:32:38 +00:00
Dan Poltawski
fb0d86f671 Merge branch 'MDL-50549-master' of git://github.com/jleyva/moodle 2017-01-17 06:52:07 +00:00
Dan Poltawski
cd0e2e89f2 Merge branch 'MDL-57368-master-2' of https://github.com/snake/moodle 2017-01-16 16:20:05 +00:00
Mike Churchward
d679a45f73 MDL-57590 mod_forum: fixed search form with forumid and actionurl. 2017-01-16 11:13:03 -05:00
Dan Poltawski
0ad39883b7 MDL-57490 lesson: convert legacy js to jquery 2017-01-16 13:22:50 +00:00
Dan Poltawski
d574114aed MDL-57490 scorm: convert legacy js to jquery 2017-01-16 13:22:50 +00:00
Dan Poltawski
6db06d0e2a MDL-57490 quiz: convert legacy js to jquery 2017-01-16 13:22:50 +00:00
Dan Poltawski
a04ad3675a Merge branch 'MDL-57554-master' of git://github.com/crazyserver/moodle 2017-01-16 11:17:58 +00:00
Dan Poltawski
41dd0ac8d4 Merge branch 'master_MDL-45821' of git://github.com/danmarsden/moodle 2017-01-16 08:57:52 +00:00
Dan Poltawski
0893bb0897 Merge branch 'MDL-57627-master' of git://github.com/crazyserver/moodle 2017-01-16 08:22:25 +00:00
Dan Poltawski
bd17f93f28 Merge branch 'wip-MDL-56271-master' of git://github.com/marinaglancy/moodle 2017-01-16 08:01:23 +00:00
Pau Ferrer Ocaña
db3c9ff83f MDL-57554 forum: Mark as read on view_forum_discussion calls 2017-01-13 09:27:20 +01:00
Pau Ferrer Ocaña
4669389d1a MDL-57627 forum: Return if the user is tracking forum 2017-01-13 09:25:48 +01:00
Jake Dallimore
195f646dfc MDL-57368 mod_feeback: fix drag and drop question reordering in boost 2017-01-12 11:32:03 +08: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
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
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
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
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
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
Helen Foster
442879042c MDL-57563 lang: Merge English strings from the en_fix language pack 2017-01-04 22:03:08 +01:00
David Mudrák
1af801be98 MDL-56225 mod_forum: Fix inability to edit attachments 
The 'attachments' is not a real DB field here. It comes from the form's
filepicker and holds the id of the attachments filearea. The function
forum_add_attachment() expects it as a property of the first argument.

There were two possible approaches here. Either to pass the raw $newpost
to forum_add_attachment(), or add the attachments into the list
modifiable fields. The second approach is safer.
 2017-01-04 11:34:01 +00:00
David Monllao
9afc02742b Merge branch 'master_MDL-49557' of git://github.com/danmarsden/moodle 2017-01-04 11:34:00 +00:00
Andrew Nicols
6528ec3505 MDL-56225 mod_forum: Remove unnecessary attributes from update 2017-01-04 11:33:57 +00:00
Davo Smith
e7f3fd59d4 MDL-56449 mod_assign: fuller description of group submission problems 2017-01-04 10:35:41 +00:00
Dan Marsden
e68cdceee3 MDL-49557 mod_scorm: optionally strip quotes. 2017-01-04 15:43:46 +13:00
Rajesh Taneja
f2e6dcba51
MDL-52168 behat: Select iframe in which text needs to be checked 2017-01-03 15:14:04 +08:00
Eloy Lafuente (stronk7)
0e5205d36c Merge branch 'wip-mdl-57494' of https://github.com/rajeshtaneja/moodle 2017-01-03 02:34:58 +01:00
Rajesh Taneja
57bee542ab
MDL-56519 behat: Fixed lint errors 2017-01-03 09:12:54 +08:00
Dan Poltawski
00e741af48 Merge branch 'master_MDL-49557' of git://github.com/danmarsden/moodle 2017-01-02 12:35:11 +00:00
Dan Poltawski
241473ce2e Merge branch 'master_MDL-52168' of git://github.com/danmarsden/moodle 2017-01-02 12:20:34 +00:00
Dan Poltawski
25a222734e Merge branch 'wip-MDL-57464-master' of git://github.com/abgreeve/moodle 2017-01-02 11:16:27 +00:00
Dan Poltawski
5d970e1aa0 Merge branch 'master_MDL-50643' of git://github.com/danmarsden/moodle 2016-12-29 11:46:47 +00:00
Dan Poltawski
398e8fa1ed Merge branch 'MDL-55955_master' of git://github.com/markn86/moodle 2016-12-28 21:19:03 +00:00
Dan Poltawski
16cfeccad8 Merge branch 'wip-MDL-57366-master' of git://github.com/abgreeve/moodle 2016-12-28 21:19:02 +00:00
Dan Marsden
63c2ea5038 MDL-52168 mod_scorm: Fix issue when scorm does not define org. 2016-12-28 10:54:49 +13:00
Adrian Greeve
a7eb619b76 MDL-57464 mod_lesson: fix notice with sub-clusters. 2016-12-23 11:10:20 +08:00
Dan Marsden
39eee56fa6 MDL-49557 mod_scorm: fix AICC pre-requisite handling. 2016-12-23 12:21:53 +13:00