Marina Glancy
1ef14a5aec
MDL-38129 gradeexport: custom profile fields case problem
...
Do not use custom pfofile field name as a field alias in DB query, use field id instead.
DML lowercases all column aliases and fields with uppercase letters no longer match.
2017-07-18 11:03:22 +08:00
AMOS bot
64562f309a
Automatically generated installer lang files
2017-07-18 00:06:34 +08:00
Dan Poltawski
7af4771d63
Merge branch 'MDL-59323-master' of https://github.com/sammarshallou/moodle
2017-07-17 16:40:20 +02:00
David Monllao
2c3a34f0c6
MDL-59411 course: Fix unavailable typo
2017-07-17 16:40:00 +02:00
David Monllao
bf442807f5
Merge branch 'wip-MDL-59411-master' of git://github.com/marinaglancy/moodle
2017-07-17 15:48:12 +02:00
Dan Poltawski
efc1d2bb6b
Merge branch 'MDL-59475-master-cas' of git://github.com/lameze/moodle
2017-07-17 14:18:21 +01:00
David Monllao
7d04eaca5c
Merge branch 'MDL-59527-master' of git://github.com/damyon/moodle
2017-07-17 14:07:59 +02:00
Dan Poltawski
2ce7fad864
MDL-59548 behat: fix trailing whitespace
2017-07-17 11:30:28 +01:00
Dan Poltawski
c899bfb088
Merge branch 'MDL-59548-master' of git://github.com/damyon/moodle
2017-07-17 11:21:56 +01:00
Alexander Bias
85d87d11c0
MDL-58174 themes: Make build_action_menu_from_navigation() protected
2017-07-17 11:17:26 +02:00
David Monllao
57f869c184
Merge branch 'wip-MDL-59377-master-3' of git://github.com/marinaglancy/moodle
2017-07-17 11:04:02 +02:00
Alexander Bias
46676b7633
MDL-59556 themes: Re-sort /theme/upgrade.txt
2017-07-17 10:51:54 +02:00
Alexander Bias
d7d2a72faf
MDL-59425 themes: Expose navigation node properties in boost flat nav
2017-07-17 10:46:45 +02:00
Dan Poltawski
1250166338
Merge branch 'MDL-59515' of https://github.com/NeillM/moodle
2017-07-17 09:42:27 +01:00
Dan Poltawski
540177523f
Merge branch 'MDL-59442-master' of git://github.com/lameze/moodle
2017-07-17 09:16:29 +01:00
David Monllao
9e3b60c95d
Merge branch 'MDL-59539-master' of git://github.com/tobiasreischmann/moodle
2017-07-17 10:14:55 +02:00
David Monllao
2764cd594b
Merge branch 'MDL-59068-master' of git://github.com/dpalou/moodle
2017-07-17 10:09:35 +02:00
Dan Poltawski
16c903acc0
Merge branch 'wip-MDL-57649-master' of git://github.com/abgreeve/moodle
2017-07-17 09:01:05 +01:00
David Monllao
35d27924f9
Merge branch 'MDL-54607-master' of git://github.com/ankitagarwal/moodle
2017-07-17 09:31:53 +02:00
David Monllao
3ea76efa00
Merge branch 'MDL-58948_chrome_mink_driver' of https://github.com/mrmark/moodle
2017-07-17 09:10:25 +02:00
David Monllao
05c616d0b1
Merge branch 'wip-MDL-55912-master' of git://github.com/abgreeve/moodle
2017-07-17 09:09:03 +02:00
Marina Glancy
1bc9ef82c9
MDL-59377 mod_label: set showdescription to be always 1
2017-07-17 13:43:51 +08:00
Marina Glancy
66347456ec
MDL-59377 course: when module intro is visible display embedded files
...
Even when course module is not available the intro text can still be visible on the
course page. In this case the availability restriction is displayed to the student
but link to the activity is not available
2017-07-17 13:42:08 +08:00
Andrew Nicols
5ee30c0fb4
Merge branch 'mdl55979-master' of https://github.com/tlock/moodle
2017-07-17 12:29:00 +08:00
Damyon Wiese
dda64b6f45
MDL-59548 behat: Helpers for autocomplete
...
Improve the helpers for autocomplete so that:
a) the set field for an auto complete will automatically close the suggestions list.
b) add a new helper to open the suggestions list
c) move the helper for clicking on an element in the suggestions list from tool_lp to core.
2017-07-17 11:10:15 +08:00
Andrew Nicols
5a842a92b3
Merge branch 'MDL-57476_file_callbacks' of https://github.com/gthomas2/moodle
2017-07-17 10:31:28 +08:00
Andrew Nicols
cdbfc8d3ef
Merge branch 'MDL-59371-master' of git://github.com/lameze/moodle
2017-07-17 10:23:06 +08:00
Adrian Greeve
c802d23dc8
MDL-39471 mod_assign: Comment visibility in blind marking.
...
Students can now see the identity of anyone making comments.
Markers on the otherhand can only see the identity of themselves
when making comments.
2017-07-17 09:25:04 +08:00
Adrian Greeve
0163e5d276
MDL-55912 mod_assign: Set grader details to the correct user.
2017-07-17 09:21:39 +08:00
Adrian Greeve
63cf03265b
MDL-57649 mod_lesson: Delete answer files correctly.
...
The files associated with answers and responses were
not being deleted due to the fact that the wrong itemid
was being used.
2017-07-17 09:15:21 +08:00
Simey Lameze
548f5cf04d
MDL-59521 core_calendar: conditionally hide description header
2017-07-17 08:20:18 +08:00
AMOS bot
b040bb6775
Automatically generated installer lang files
2017-07-17 00:06:18 +08:00
Matteo Scaramuccia
746702c88d
MDL-59109 scorm: Save autocommit setting in the backup.
2017-07-15 00:10:39 +02:00
Vladimir Zhirov
0398bbe675
MDL-59407 folder resource: remember view mode using preference API
2017-07-15 00:46:36 +04:00
David Mudrák
0fa2b2ee88
MDL-59544 workshop: Drop the custom validation of allowed file types
...
Now that the validation is provided directly by the filemanager, we do
not need to do the same here.
Note that existing Behat tests are left untouched to make sure there is
no regression.
2017-07-14 20:38:55 +02:00
David Mudrák
1661204a6c
MDL-59544 forms: Implicit validation of the filemanager and filepicker
...
The patch adds an extra validation step against accepted file types.
Even if the repository checks are bypassed (as illustrated in the
Behat), the invalid file is still caught by the element's validation
rules.
It turns out there is no way to test the filepicker element easily via
Behat. Additionally, it provides the renaming features only with
disabled javascript. So the Behat tests are provided for the filemanager
only.
AMOS BEGIN
CPY [err_wrongfileextension,mod_workshop],[err_wrongfileextension,core_form]
AMOS END
2017-07-14 20:38:54 +02:00
Neill Magill
a5fbe27d8e
MDL-59515 messages: Order of popup messages should be predictable
...
Before this change the messages in the message popup would be loaded
onto a page in a random order, based on the speed at which the user's
browser was able to render each template.
This causes the messages to be attached to the page sequentially, after
they have all been rendered asynchronously.
2017-07-14 15:50:48 +01:00
gthomas2
023037dc9e
MDL-57476 file: Add CUD callbacks
2017-07-14 13:51:51 +01:00
Dan Poltawski
16a68a2f76
weekly release 3.4dev
2017-07-14 11:46:44 +01:00
Dan Poltawski
de1c03ccce
NOBUG: Fixed file access permissions
2017-07-14 11:46:43 +01:00
Dan Poltawski
5b38d0b031
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
2017-07-14 11:46:42 +01:00
Juan Leyva
993e817576
MDL-56751 admin: New setting to set user created tokens duration
...
We were using a hardcoded value for 12 months.
With this change, administrators can change the duration time via a
security setting.
2017-07-14 10:24:53 +01:00
Tobias Reischmann
d029841300
MDL-59539 oauth2/issuer: Changed baseurl for guessing image URL
...
The url, which was used for guessing the image, was queried with the
key 'discoveryurl', which is not defined in the context of an issuer.
The baseurl should be sufficient to retrieve the favicon.ico from a
server. That's why the key for was changed from 'discoveryurl' to
'baseurl'.
2017-07-14 11:10:50 +02:00
Marina Glancy
884983723a
MDL-58362 registration: correctly retrieve registration values
2017-07-14 16:34:33 +08:00
Kathrin Osswald
b3b938bfbc
MDL-59418 theme Boost: Improve visibility of maintenance warning
2017-07-14 09:53:46 +02:00
Dan Poltawski
009dcd91fd
Merge branch 'MDL-59534' of git://github.com/stronk7/moodle
2017-07-14 07:16:05 +01:00
Damyon Wiese
47dd535097
MDL-59527 forms: Race cond with ajax autocomplete
...
Sometimes (rarely) the auto complete will show "No suggestions" when there are valid suggestions.
2017-07-14 12:41:14 +08:00
Simey Lameze
2a6224c273
MDL-59475 auth_cas: update phpCAS to version 1.3.5
2017-07-14 12:19:30 +08:00
Andrew Nicols
de1d92459e
Merge branch 'MDL-59383-master-behat-failure' of https://github.com/lameze/moodle
2017-07-14 11:52:53 +08:00
Simey Lameze
ebebbc442c
MDL-59383 core_calendar: remove failing behat steps
2017-07-14 11:42:56 +08:00
