85082 Commits

Author SHA1 Message Date
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
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
Dan Poltawski
009dcd91fd Merge branch 'MDL-59534' of git://github.com/stronk7/moodle 2017-07-14 07:16:05 +01: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
Eloy Lafuente (stronk7)
1d52027e57 MDL-59534 feedback: avoid some randomness with behat test failures 2017-07-13 20:08:33 +02:00
sam marshall
e80e4778c5 MDL-58957 Global search: fix failing text compare in Oracle 2017-07-13 14:41:37 +01:00
Dan Poltawski
671971775f Merge branch 'MDL-59437-master' of git://github.com/damyon/moodle 2017-07-13 09:16:19 +01:00
Andrew Nicols
f6a7d54f24 Merge branch 'MDL-59365-master-fix2' of http://github.com/damyon/moodle 2017-07-13 13:04:08 +08:00
Andrew Nicols
e45c3ae9b2 Merge branch 'MDL-58957-master-fix' of https://github.com/lameze/moodle 2017-07-13 12:58:27 +08:00
Damyon Wiese
b7386d0034 MDL-59437 participants: Add sort/pagination behat 2017-07-13 11:48:43 +08:00
Eloy Lafuente (stronk7)
d131489e3d MDL-59437 behat: avoid using participants page for tag tests
While participants page is being refactored, there are links (fullname)
going and changing, leading to inestability in tests that were using
those links.

When possible, provide an alternative, stable path, in this case, the
tags page itself can be used to jump to the user profile, keeping the
tag tests better isolated.
2017-07-13 11:48:35 +08:00
Eloy Lafuente (stronk7)
28fcc33944 MDL-59437 behat: old "edit" cog to go to enrollments page is gone
There use to be a little cot to easily navigate from the
participations page to the enrollments page.

In boost it was already hidden, but present and the test was still
working (non-javascript).

With the conversion, the functionality is 100% gone so, right now,
the only way to navigate from participats to enrollments (that will
dissappear with with unification), is using the course admin cog.
2017-07-13 11:48:28 +08:00
Simey Lameze
54ff9a4bb8 MDL-58957 theme_boost: add rule to prevent target conflict 2017-07-13 11:10:36 +08:00
Simey Lameze
a14907faa8 MDL-58957 core_block: fix link to site home 2017-07-13 11:10:36 +08:00
Damyon Wiese
af6d23853a MDL-59365 enrol: Behat fixes
Fixes for the new enrol users popup with behat.
2017-07-13 10:55:01 +08:00
David Monllao
002ac8e9fe MDL-59368 users: Clear whitespace 2017-07-12 16:53:55 +02:00
David Monllao
ed45119212 MDL-59368 users: Fix incorrect reference 2017-07-12 16:47:20 +02:00
David Monllao
eac6f51590 Merge branch 'MDL-59368-master' of git://github.com/damyon/moodle 2017-07-12 16:46:49 +02:00
David Monllao
9e548756cf Merge branch 'MDL-59384-master-final' of https://github.com/lameze/moodle 2017-07-12 14:12:53 +02:00
Simey Lameze
38b325a3e6 MDL-59384 core_calendar: add delete event logic to modal
Part of MDL-59333.
2017-07-12 20:03:04 +08:00
Simey Lameze
ea0368d599 MDL-59384 core_calendar: add calendar event amd module 2017-07-12 20:00:37 +08:00
Simey Lameze
1e8e6e132c MDL-59384 core_calendar: add necessary data-* attributes
Part of MDL-59333.
2017-07-12 19:58:57 +08:00
Simey Lameze
97c4a29d41 MDL-59384 core_modal: trigger bodyRendered event
Part of MDL-59333.
2017-07-12 19:57:22 +08:00
Simey Lameze
e4aff89a16 MDL-59384 core_calendar: add deleteEvent function to repository
Part of MDL-59333.
2017-07-12 19:56:27 +08:00
Simey Lameze
542f5afacc MDL-59384 core_calendar: make delete_calendar_events ajax visible
Part of MDL-59333.
2017-07-12 19:55:24 +08:00
Dan Poltawski
eff0303ad8 Merge branch 'MDL-56486-master-workshopfiletypes' of git://github.com/mudrd8mz/moodle 2017-07-12 12:22:32 +01:00
Simey Lameze
f02e119afd MDL-59383 core_modal: trigger event on modal module 2017-07-12 18:57:55 +08:00
Simey Lameze
e1c811609b MDL-59383 core_calendar: change modal body rendering 2017-07-12 18:56:45 +08:00
Simey Lameze
8a5c06b705 MDL-59383 core_calendar: proper handling of description on webservice 2017-07-12 18:56:30 +08:00
Simey Lameze
f2e981e869 MDL-59383 core_calendar: css fixes to summary modal body 2017-07-12 18:56:14 +08:00
Simey Lameze
d4a87aa370 MDL-59383 core_modal: trigger event on modal module 2017-07-12 18:28:11 +08:00
David Mudrák
6218889e2d MDL-56486 workshop: Do not rely on the button implementation in behat
It turned out that behat's "I should see ..." does not work for buttons
rendered as `<input>` elements so this assertion worked only in Boost
where the button is rendered as `<button>` but not in Clean.

But we do not really need this check here. All we need is to make sure
that the form has been saved successfully. For which, checking for the
text on the page is enough.

p.s. Another mistake of mine to not double-check behat on both standard
themes. Sigh ...
2017-07-12 11:58:08 +02:00
David Mudrák
581710e278 MDL-56486 workshop: Fix behat scenario for submission attachments
This Behat scenario was not failing only because it actually relied on
the bug in the wrongly set accepted_types for submission attachments.
Now that the previous commit has fixed that bug, this scenario started
to fail correctly.

We need to do the same trick here as we are doing in the latter
scenario: we first upload a valid file to bypass the upload repository
checks, and rename it before submitting the form. That allows us to see
that the invalid file is caught finally.

p.s. It was a silly mistake of mine. I should had been wondering why
the same procedure worked for one field and not for the other. I would
spot the bug with wrong accepted_types earlier.
2017-07-12 11:39:49 +02:00
Dan Poltawski
331785d0f7 Merge branch 'MDL-56486-master-workshopfiletypes' of git://github.com/mudrd8mz/moodle 2017-07-12 09:50:36 +01:00
David Mudrák
afa6deec48 MDL-56486 workshop: Fix accepted_types for submission attachments
It was a copy&paste mistake that the accepted_types option for the
submission attachments used the value configured for overall feedback
attachments.

Credit goes to Marina Glancy for catching this during testing.
2017-07-12 09:57:06 +02:00
Dan Poltawski
f409b3984b Merge branch 'MDL-59365-master-fix1' of http://github.com/damyon/moodle 2017-07-12 08:15:38 +01:00
David Monllao
347be35d75 Merge branch 'MDL-59383-fix-1' of https://github.com/lameze/moodle 2017-07-12 09:07:03 +02:00
Simey Lameze
19ab239f18 MDL-59383 core_calendar: change modal body rendering 2017-07-12 15:00:30 +08:00
Simey Lameze
f405284728 MDL-59383 core_calendar: proper handling of description on webservice 2017-07-12 15:00:29 +08:00
Simey Lameze
6133141798 MDL-59383 core_calendar: css fixes to summary modal body 2017-07-12 15:00:29 +08:00
Damyon Wiese
2cc2001bef MDL-59365 enrol: Teachers can see other users on the site
In order to enrol new users into a course, you need to see users who are not in the current course.
2017-07-12 14:47:11 +08:00
David Monllao
5e961676c3 Merge branch 'MDL-59431-master-fix2' of git://github.com/andrewnicols/moodle 2017-07-12 08:34:30 +02:00
Andrew Nicols
bd5416aab5 Merge branch 'wip-MDL-57462-master-fix' of git://github.com/abgreeve/moodle 2017-07-12 10:49:59 +08:00
Damyon Wiese
bfd42c1a88 MDL-59368 groups: More phpunit coverage
Cover $withmembers parameter to groups_get_all_groups with a unit test.
2017-07-12 10:41:32 +08:00
Adrian Greeve
24a7acf354 MDL-57432 installation: Fix to the php version check. 2017-07-12 10:39:20 +08:00
Damyon Wiese
f3ecea3af4 MDL-59368 groups: Peer review fixes
* Fix coalesce on postgres.
* The edit icon's alt shows the HTML entities causing
* enrol/tests/behat/add_to_group.feature Contains a '@doit' tag which I assume is there from testing.
* group/classes/output/user_groups_editable.php
** Missing MOODLE_INTERNAL check.
** Unused variables context_system and moodle_exception.
** The PHPDocs for the constructors are wrong.
** export_for_template() returns an array, not stdClass (according to parent docs).
** Change moodle_exception to coding_exception at the beginning.
* group/lib.php
** Missing docs for core_group_inplace_editable().
* user/classes/participants_table.php
** The docs for the class variables $groups, $course and $context need a '\' beforehand as they are in a namespace.
** I would prefer $this->context = $context; and $this->groups = ... to be done at the end of the constructor with the other class variable assignments.
** You could get rid of the class variable courseid if we are setting course and use $this->course->id instead.
** The function col_groups has @param \stdclass $row but it should be $data
* lib/amd/src/form-autocomplete.js and lib/amd/src/inplace_editable.js
** Some issues here CiBot has pointed out.
* lib/classes/output/inplace_editable.php
** @see should be on a new line.
2017-07-12 10:09:09 +08:00
Damyon Wiese
f746a078cb MDL-59368 groups: Postgres fix
Postgres is strict about mixing types.
2017-07-12 10:07:58 +08:00