Commit graph

78839 commits

Author SHA1 Message Date
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
David Monllao
e314b35471 MDL-53170 search: New area for my courses
Thanks to Skylar Kelty for the initial implementation.
2016-05-10 18:15:42 +08:00
David Monllao
1f69cd819f MDL-53170 search: API fixes for core subsystems 2016-05-10 18:15:41 +08:00
Mark Nelson
a9ad3002e1 MDL-54102 core: added more details about hooks 2016-05-10 15:34:49 +08:00
Mark Nelson
27d9859972 MDL-54103 enrol_lti: show frame embedding warning 2016-05-10 15:03:24 +08:00
Adam Olley
415023cefc MDL-54120 competency: Don't assume there are no existing scales
Every time a unit test for competencies adds a scale, it's creating them
with hardcoded id's - which should always be avoided. So this change has
the unit test keep track of the scale id's created without hardcoding
them.
2016-05-10 14:48:18 +09:30
Nadav Kavalerchik
7ee8effc55 MDL-52800 Theme: Fix inplace editing tooltip styling 2016-05-10 05:06:43 +00:00
Frederic Massart
525370afe1 MDL-54044 block_site_main_menu: Fixed labels not being indented 2016-05-10 12:23:29 +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
Frederic Massart
67ee10307f MDL-54098 external: Remove usage of require_login and $PAGE->set_context 2016-05-09 19:42:37 +08:00
Dan Poltawski
8ab776ef69 Merge branch 'MDL-54040_master' of git://github.com/dmonllao/moodle 2016-05-09 10:29:25 +01:00
Frederic Massart
16825c4e95 MDL-50704 user: Do not validate timezones in user objects
The validation of the timezone field should not occur, especially
when it is automatically cleaned. Timezones can be volatile, we
must try hard to fallback on real timezones and must not lose reset
the values arbitrarily.

"There is absolutely no need to change $CFG->timezone and user timezones
in database - the timezones may come and go. If you change the value in
upgrade or on the fly you would not be able to get it back. This is the
reason why I implemented the "invalid timezone" thing in server and
user settings instead." - Petr Skoda (MDL-49684)
2016-05-09 17:28:38 +08:00
Frederic Massart
88474db22f MDL-50704 date: Fix invalid timezone mapping for +14
The value Etc/GMT-14 was added to the list of known timezones,
and Etc/GMT+13 & Etc/GMT+14 were removed as they are not valid.

Tests were added to ensure that legacy user timezones are mapped
to known timezones. Other tests were changed to reflect the changes
with regards to Etc/GMT+13 and +-14.
2016-05-09 17:28:38 +08: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
Ryan Wyllie
b7c7f0d10e MDL-54009 enrol_lti: Captilise language string 2016-05-09 07:09:15 +00:00
Andrew Nicols
3ff8d30246 Merge branch 'MDL-54102_master' of git://github.com/markn86/moodle 2016-05-09 15:08:54 +08:00
Ryan Wyllie
9c8ef1397f MDL-54009 mod_lti: Style LTI tool iframe border 2016-05-09 07:07:27 +00: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
Damyon Wiese
55907a738a MDL-53822 editpdf: Add a new tool for scrolling
I added a new tool to the toolbar to allow click and drag scrolling (especially useful for touchscreens).
2016-05-06 16:33:31 +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
Ryan Wyllie
a6c1a1c753 MDL-52133 mod_assign: Support userid on single grade page 2016-05-06 07:18:44 +00: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 15a813cda2, reversing
changes made to 6870e1fa77.
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