mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-31 12:45:04 +01:00
Code Issues Projects Releases Wiki Activity
78,579 Commits 36 Branches 519 Tags
Commit Graph

78579 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jun Pataleta
32cf4bcb93 MDL-54073 tool_lp: Unescape PARAM_TEXT properties in templates 
Use triple-curly brackets to unescape the PARAM_TEXT properties in
templates.
Changed idnumber's type to PARAM_RAW for frameworks and competencies.
 2016-05-12 11:24:51 +08:00
David Monllao
e4b5a062d8 on-demand release 3.1beta+ 2016-05-10 18:55:50 +08:00
David Monllao
23007b4134 Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2016-05-10 18:55:48 +08:00
Andrew Nicols
0b3c3bb8eb Merge branch 'MDL-54102_master' of git://github.com/markn86/moodle 2016-05-10 18:36:16 +08:00
Andrew Nicols
30dcc059be Merge branch 'MDL-54115_m31v1' of https://github.com/sbourget/moodle 2016-05-10 18:36:16 +08:00
Andrew Nicols
837cc5ba49 MDL-54004 behat: Whitespace fixes 2016-05-10 18:36:15 +08:00
Andrew Nicols
dc7e2dcf96 Merge branch 'MDL-54004_m31v2' of https://github.com/sbourget/moodle 2016-05-10 18:36:15 +08:00
Andrew Nicols
0301e11bae Merge branch 'MDL-53821-master' of git://github.com/ryanwyllie/moodle 2016-05-10 18:36:15 +08:00
Andrew Nicols
715c3f5fef Merge branch 'MDL-52506-master' of git://github.com/ryanwyllie/moodle 2016-05-10 18:36:14 +08:00
Mark Nelson
a9ad3002e1 MDL-54102 core: added more details about hooks 2016-05-10 15:34:49 +08:00
Ryan Wyllie
1b2f9dc60c MDL-53821 mod_assign: Hide full name when blind marking 
Hide the student's full name in the new grading intferface when blind
marking is on.
 2016-05-10 02:07:02 +00:00
Ryan Wyllie
e6858c084a MDL-52506 mod_assign: Fix return links for atto auto save 2016-05-10 01:22:48 +00:00
Stephen Bourget
bc823ac6bf MDL-54115 Behat: tests for the comments block 2016-05-09 18:55:33 -04:00
Stephen Bourget
c18aac4518 MDL-54004 Behat: tests for calendar block 2016-05-09 16:12:50 -04:00
Stephen Bourget
f464529a7a MDL-54004 Behat: tests for upcoming events block 2016-05-09 16:12:36 -04:00
AMOS bot
8538c6ad0d Automatically generated installer lang files 2016-05-10 00:04:19 +08:00
Dan Poltawski
8ab776ef69 Merge branch 'MDL-54040_master' of git://github.com/dmonllao/moodle 2016-05-09 10:29:25 +01:00
Andrew Nicols
bbdef8886f Merge branch 'MDL-52708' of https://github.com/ramdesh/moodle 2016-05-09 15:49:48 +08:00
Andrew Nicols
cc47c7174b Merge branch 'MDL-54072' of git://github.com/aolley/moodle 2016-05-09 15:14:27 +08:00
Andrew Nicols
3ff8d30246 Merge branch 'MDL-54102_master' of git://github.com/markn86/moodle 2016-05-09 15:08:54 +08:00
David Monllao
814b5d6772 Merge branch 'wip-mdl-54100' of https://github.com/rajeshtaneja/moodle 2016-05-09 14:34:23 +08:00
Andrew Nicols
197adc93d5 Merge branch 'MDL-53914-master' of git://github.com/FMCorz/moodle 2016-05-09 14:16:56 +08:00
Mark Nelson
3fb5ddc3d6 MDL-54102 core: describe newly introduced hooks 2016-05-09 14:04:01 +08:00
Andrew Nicols
b0ab1fdcff Merge branch 'm31_MDL-53837_Is_Executable_Python_Script_Windows' of https://github.com/scara/moodle 2016-05-09 13:29:32 +08:00
Rajesh Taneja
9914bd8b60 MDL-54100 behat: Catch undefined steps 2016-05-09 11:41:05 +08:00
David Monllao
33b60a4720 Merge branch 'MDL-54034-master' of git://github.com/FMCorz/moodle 2016-05-09 07:46:53 +08:00
David Monllao
8ec64e757e Merge branch 'MDL-53989-master' of git://github.com/ryanwyllie/moodle 2016-05-09 07:37:09 +08:00
Damyon Wiese
d26eae4af4 MDL-54042 user: Add unit test to cover change 2016-05-06 14:07:49 +01:00
Damyon Wiese
8eb15a38ef MDL-54042 user: Fix debugging in core_user_get_users_by_field 
The course object returned by enrol_get_all_users_courses does not include the defaultgroupingid.

This course object is passed to user_get_user_details - which does need
the defaultgroupingid.

All the other group info is returned (groupmode) etc - so it makes sense to also return this extra field.
 2016-05-06 14:07:48 +01:00
Frederic Massart
1d0140757a MDL-54034 ajax: Apply filters in ajax requests 
This also clarified that developers can decide to force filters
to be ignored when using external_format_text, though they cannot
force filters to be turned on as the clients should be able to
opt-out from filtering should they want to.
 2016-05-06 17:59:41 +08:00
Frederic Massart
f058c74eba MDL-53914 mod_wiki: Do not format_text during search index 2016-05-06 16:25:26 +08:00
David Monllao
1e72daa899 on-demand release 3.1beta+ 2016-05-06 16:15:29 +08:00
David Monllao
2f2383af51 Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2016-05-06 16:15:27 +08:00
David Monllao
729738d14c Merge branch 'MDL-54058-master' of git://github.com/junpataleta/moodle 2016-05-06 13:53:07 +08:00
Adam Olley
4ec4b2b65c MDL-54072 tool_recyclebin: Avoid hardcoded course_modules count 
One of the unit tests for tool_recyclebin makes an assumption that a
fresh install of Moodle has no course modules, which is true for vanilla
moodle.

However there are some third party plugins (mod_oublog and
mod_respondusws are the ones I've run into) that have a course module
added to the frontpage course on install.

So this change alters the test from comparing the count of modules in
the test course with a hardcoded value to first getting the existing
count of values before performing the actions that affect the count and
then using that value to compare with.
 2016-05-06 15:04:16 +09:30
Ryan Wyllie
fd83879728 MDL-53989 cbe: CMD + click selection for competency picker 2016-05-06 04:40:02 +00:00
Jun Pataleta
2cf9e3f0ca MDL-54058 tool_lp: Set framework select's width in competency picker 2016-05-06 10:34:29 +08:00
Andrew Nicols
d07c339272 Revert "Merge branch 'MDL-53599' of git://github.com/nhoobin/moodle" 
This reverts commit 15a813cda2cad66f2ae2434c5998d383d486c112, reversing
changes made to 6870e1fa77ccf0078b6e6990ab4a477ef62c8181.
 2016-05-06 10:18:10 +08:00
Andrew Nicols
68c1074625 Merge branch 'wip-mdl-53701' of https://github.com/rajeshtaneja/moodle 2016-05-06 09:58:28 +08:00
Dan Poltawski
a9e9f96382 MDL-54062 bootstrapbase: remove unused less file 
This file has never been included in our CSS.
 2016-05-06 09:27:36 +08:00
Rajesh Taneja
c5fe77ffe4 MDL-53810 behat: Zoom in Rubric before filling form. 
div is now overflow, selenium can't get element
in viewport, zoom in before entering the value
 2016-05-06 09:27:35 +08:00
Mark Nelson
a8abd53a32 MDL-54030 enrol_lti: confirm tool exists before deleting users 2016-05-06 09:27:35 +08:00
Damyon Wiese
8668796317 MDL-54046 enrol: Make docs urls match the old path 
Previously each enrolment method had it's own url in the docs. Because of the
refactor in 3.1 all pages are now served from the same script. We need to
manually set the docs url so that it points to the old docs pages.
 2016-05-06 09:27:34 +08:00
Mark Nelson
d066ed8db0 MDL-53977 enrol_lti: a hack to workaround a hack to utilise DB caching 2016-05-06 09:27:34 +08:00
Marina Glancy
c0dd0e3543 MDL-41640 mod_feedback: info question should default to course 
Also hide "response time" from options in case of anonymous feedback
 2016-05-06 09:27:34 +08:00
Marina Glancy
ac29314ed1 MDL-41640 mod_feedback: do not show 0 responsetime 2016-05-06 09:27:33 +08:00
Andrew Nicols
1c693f7226 MDL-53730 JavaScript: Build form-autocomplete 2016-05-06 09:27:33 +08:00
Adrian Greeve
be8b9189c4 MDL-53730 JavaScript: Fix for competency autoselect issue. 
When trying to select a user or competency the first select
would not work. Worked fine on the second select. This fixes
that problem and tidies up the code.
 2016-05-06 09:27:32 +08:00
Eloy Lafuente (stronk7)
4ae653024d MDL-53944 dml: make char2real() for mysql to support decimals 
- With the patch, 6 positions of scale accuracy are guaranteed
  per individual casted value.
- Backed with unit tests, both for varchar and clob.
- Added 2 missing tests about uses of the method with params
  and values.

Note: 6 was picked because looking to all databases implementation
postgres was found to be casting to real, aka, 6.
 2016-05-06 09:27:32 +08:00
Frederic Massart
440b4c54ca MDL-53957 form: Support frontpage for selection in course element 2016-05-06 09:27:31 +08:00