85572 Commits

Author SHA1 Message Date
Andrew Nicols
a41ef5ece5 Merge branch 'MDL-59698-master' of git://github.com/damyon/moodle 2017-08-07 12:43:42 +08:00
Andrew Nicols
ab202d9247 Merge branch 'MDL-59728-boost-question-bank-header-align' of https://github.com/lucaboesch/moodle 2017-08-07 12:36:38 +08:00
Cameron Ball
8243706542
MDL-59700 filestorage: Add before_file_created hook 2017-08-07 12:27:04 +08:00
Andrew Nicols
aca995a2f4 Merge branch 'MDL-59206-master' of git://github.com/damyon/moodle 2017-08-07 11:35:26 +08:00
John Okely
5918f31e32 MDL-58889 boost: Make text and link colours AA compliant
We have to choose a colour that is 4.5:1 against white and 3:1 against
the text colour. I darkened the link colour somewhat and darkened the
text colour
2017-08-07 11:14:00 +08:00
Jun Pataleta
e004de157c MDL-59727 core_user: Fix Behat tests for bulk enrolment test 2017-08-07 10:49:07 +08:00
Jun Pataleta
f156e3dd92 MDL-59726 behat: Fix Behat tests affected by the new participants filter 2017-08-07 10:04:54 +08:00
Andrew Nicols
5bc4c797a7 MDL-59506 core_lock: use a null lock during install
Use a different lock factory during installation which does not actually
lock at all.
2017-08-07 09:59:44 +08:00
Damyon Wiese
fe9965e305 MDL-59055 grades: behat test 2017-08-07 09:57:52 +08:00
Marina Glancy
20060b3b2e MDL-59055 grades: provide backward-compatibility of changes 2017-08-07 09:56:14 +08:00
Marina Glancy
be85f0cf88 MDL-59055 grades: fix bug displaying item id instead of grade
Thanks to Marcelo Santos for initial patch
2017-08-07 09:56:14 +08:00
Andrew Nicols
ed7431a37b MDL-59734 auth_ldap: Fix role sync
The unit tests were failing because the upgrade step was missed.
In addition, there was a typo in a variable name, which meant that the
role was not actually synchronised.
2017-08-07 09:42:24 +08:00
Jake Dallimore
4d068a6708 MDL-59172 user: user_can_view_profile() now checks viewalldetails cap 2017-08-07 09:27:04 +08:00
John Okely
5d9e7abbaf MDL-59725 assignsubmission_file: Don't use click interface in behat 2017-08-07 09:25:46 +08:00
John Okely
29b31865d7 MDL-59725 assignsubmission_file: Improve accepted types string 2017-08-07 09:25:20 +08:00
Luca Bösch
a0e6026215 MDL-59728 questions: Align question bank headers. 2017-08-04 15:18:45 +02:00
Luca Bösch
3437a77552 MDL-59662 database: Typo in variable name. 2017-08-04 10:30:11 +02:00
Andrew Nicols
d504e9207c MDL-59642 stats: Correct random unit test failure
The unit test was creating four events, and then relying on them being
retrieved in the order in which they were created.

I've modified the test to:
* ensure timecreated are spaced apart; and
* add an order by timecreated when fetching them.
2017-08-04 15:06:51 +08:00
Jun Pataleta
b5ede848ce MDL-59666 mod_assign: Add validation for grading due date 2017-08-04 14:42:01 +08:00
Andrew Nicols
8146b1f06d weekly release 3.4dev 2017-08-04 11:49:44 +08:00
Andrew Nicols
807572b3dd Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2017-08-04 11:49:24 +08:00
Andrew Nicols
10b788ffa6 Merge branch 'MDL-59366-master-fix-2' of git://github.com/junpataleta/moodle 2017-08-04 09:56:22 +08:00
Jun Pataleta
1453d146b3 MDL-59366 enrol: Nuke manage_enrolments_from_participants.feature
This will be removed soon. Better remove it now since it started to
cause failures after the new course participants page improvements
have landed.
2017-08-04 09:51:28 +08:00
Andrew Nicols
b32b78cc0c Merge branch 'MDL-59366-master-fix' of git://github.com/junpataleta/moodle 2017-08-04 09:23:26 +08:00
Jun Pataleta
b29c2fad0b MDL-59366 user: Be more specific on which autocomplete is being opened
* Specify that the autocomplete in the student's row in the
  participants table is being opened
2017-08-04 09:15:50 +08:00
Jun Pataleta
37fc1d4db7 MDL-59366 enrol: Be more specific on which autocomplete is being opened
* Specify that the autocomplete in the student's row in the
  participants table is being opened.
2017-08-04 09:14:30 +08:00
Jun Pataleta
cd3f250f32 MDL-59366 core_user: Disable sorting for roles and groups columns 2017-08-04 09:14:30 +08:00
Mark Nelson
6d29cccf04 MDL-59668 mod_lti: use 'forceview' param to keep nav flow consistent
Part of MDL-59313.
2017-08-03 15:35:31 +08:00
Andrew Nicols
7d9e0b066e Merge branch 'MDL-59382-int-fix-1' of github.com:ryanwyllie/moodle 2017-08-03 14:53:25 +08:00
Ryan Wyllie
6cb580713b MDL-59382 calendar: fix editing event duration 2017-08-03 06:45:19 +00:00
Mark Nelson
c54af7fdc0 MDL-59668 mod_lti: trigger completion event in view.php
This was done so that the navigation links are rendered
correctly with accurate completion info.

Part of MDL-59313.
2017-08-03 12:43:09 +08:00
Andrew Nicols
ee640d3f2d Merge branch 'm34_MDL-59583_Fix_MariaDB_10d2d7_Breaking_Change' of https://github.com/scara/moodle 2017-08-03 12:29:56 +08:00
Damyon Wiese
63f4aa20b2 MDL-59698 behat: Remove bad tests
These tests are an abuse and should not have been accepted. Behat tests should use real pages.
Adding testing only entry points to Moodle is a bad security practice and is not the purpose of behat.
2017-08-03 10:26:05 +08:00
Andrew Nicols
b2af37058d MDL-59382 calendar: CiBoT fix 2017-08-03 09:36:56 +08:00
Andrew Nicols
c6de3bd68f Merge branch 'MDL-59382-master-4' of git://github.com/ryanwyllie/moodle 2017-08-03 09:31:44 +08:00
Ryan Wyllie
d6942fb5ba MDL-59382 calendar: fix CiBoT warnings 2017-08-03 01:07:01 +00:00
Matteo Scaramuccia
2ec50fe3fd MDL-59583 dml: fixed NULL values w/ MariaDB 10.2.7+ 2017-08-03 00:13:03 +02:00
Jun Pataleta
1e674d0147 MDL-59613 course: Activity list dropdown menu fixes
* Use the formatted name of the modules to be listed in the dropdown.
* Skip the current activity when adding activities for the dropdown.
2017-08-02 17:02:24 +08:00
Mark Nelson
a965ae38ef MDL-59612 core: apply filters to activity names
Part of MDL-59313.
2017-08-02 16:55:03 +08:00
Ryan Wyllie
22d44a63af MDL-59382 calendar: fix course id for site event 2017-08-02 07:52:21 +00:00
Simey Lameze
63dd75229b MDL-59382 theme: bring the date picker forward 2017-08-02 07:52:20 +00:00
Simey Lameze
3862bcfaa3 MDL-59382 theme_bootstrapbase: proper handling of large modals 2017-08-02 07:52:20 +00:00
Simey Lameze
705eea84d1 MDL-59382 core: make CiBoT happy. 2017-08-02 07:52:20 +00:00
Simey Lameze
c448e19bff MDL-59382 core_calendar: fix behat failures 2017-08-02 07:52:20 +00:00
Andrew Nicols
9bed446559 Merge branch 'MDL-57259-master' of git://github.com/ryanwyllie/moodle 2017-08-02 13:39:23 +08:00
Simey Lameze
7934986284 MDL-59644 core_output: fix font awesome mapping for lock icons 2017-08-02 13:37:03 +08:00
David Monllao
bf0ffc9c3a Merge branch 'MDL-59602-master' of https://github.com/andrewnicols/moodle 2017-08-02 07:04:33 +02:00
Andrew Nicols
3d4739ab64 MDL-59602 enrol: Correct course name for restored course 2017-08-02 13:02:29 +08:00
Andrew Nicols
b4a4fa6a4c MDL-59602 course: Use course navigation for course nav test 2017-08-02 12:55:54 +08:00
Simey Lameze
81170930c2 MDL-59382 core_calendar: change behat step 2017-08-02 04:47:43 +00:00