Eloy Lafuente (stronk7) [Mon, 7 Aug 2017 23:48:35 +0000 (01:48 +0200)]
Merge branch 'MDL-59614-master' of git://github.com/junpataleta/moodle
Eloy Lafuente (stronk7) [Mon, 7 Aug 2017 17:55:19 +0000 (19:55 +0200)]
Merge branch 'MDL-59506-master' of git://github.com/andrewnicols/moodle
Eloy Lafuente (stronk7) [Mon, 7 Aug 2017 17:48:17 +0000 (19:48 +0200)]
Merge branch 'MDL-59638_master' of git://github.com/dmonllao/moodle
Dan Poltawski [Mon, 7 Aug 2017 15:20:11 +0000 (16:20 +0100)]
Merge branch 'MDL-59172-master' of https://github.com/snake/moodle
David Monllao [Mon, 7 Aug 2017 12:41:32 +0000 (14:41 +0200)]
Merge branch 'MDL-59642-master' of git://github.com/andrewnicols/moodle
David Monllao [Mon, 7 Aug 2017 10:39:20 +0000 (12:39 +0200)]
MDL-59116 analytics: Add rangeindex field to predict_samples index
Dan Poltawski [Mon, 7 Aug 2017 08:31:34 +0000 (09:31 +0100)]
Merge branch 'MDL-59666-master' of git://github.com/junpataleta/moodle
Dan Poltawski [Mon, 7 Aug 2017 07:44:37 +0000 (08:44 +0100)]
Merge branch 'MDL-59116_master' of git://github.com/dmonllao/moodle
David Monllao [Mon, 7 Aug 2017 07:42:08 +0000 (09:42 +0200)]
Merge branch 'MDL-59532-master' of git://github.com/jleyva/moodle
David Monllao [Mon, 7 Aug 2017 07:34:36 +0000 (09:34 +0200)]
Merge branch 'MDL-59644-master' of git://github.com/lameze/moodle
David Monllao [Mon, 7 Aug 2017 07:27:38 +0000 (09:27 +0200)]
Merge branch 'wip-MDL-59655-master' of git://github.com/marinaglancy/moodle
David Monllao [Mon, 7 Aug 2017 07:26:03 +0000 (09:26 +0200)]
Merge branch 'MDL-59656_master' of git://github.com/markn86/moodle
David Monllao [Mon, 7 Aug 2017 07:21:21 +0000 (09:21 +0200)]
Merge branch 'wip-MDL-59055-master' of git://github.com/marinaglancy/moodle
Andrew Nicols [Mon, 7 Aug 2017 06:51:19 +0000 (14:51 +0800)]
Merge branch 'MDL-59727-master' of git://github.com/junpataleta/moodle
Andrew Nicols [Mon, 7 Aug 2017 06:47:31 +0000 (14:47 +0800)]
Merge branch 'MDL-51745-master' of https://github.com/jebarviabb/moodle
David Monllao [Mon, 7 Aug 2017 06:31:24 +0000 (08:31 +0200)]
Merge branch 'MDL-59734-master' of git://github.com/andrewnicols/moodle
Andrew Nicols [Mon, 7 Aug 2017 06:28:23 +0000 (14:28 +0800)]
Merge branch 'MDL-59726-master' of git://github.com/junpataleta/moodle
Josh Ebarvia [Wed, 21 Jun 2017 02:14:41 +0000 (11:44 +0930)]
MDL-51745 mod_lesson: Use format_text in response feedback
David Monllao [Mon, 7 Aug 2017 06:22:01 +0000 (08:22 +0200)]
Merge branch 'MDL-59668_master' of git://github.com/markn86/moodle
Andrew Nicols [Mon, 7 Aug 2017 05:53:19 +0000 (13:53 +0800)]
Merge branch 'MDL-59665_master' of git://github.com/dmonllao/moodle
Andrew Nicols [Mon, 7 Aug 2017 05:34:42 +0000 (13:34 +0800)]
Merge branch 'MDL-59662-errors-typo' of https://github.com/lucaboesch/moodle
Jun Pataleta [Mon, 31 Jul 2017 11:05:11 +0000 (19:05 +0800)]
MDL-59614 course: Behat tests for activity navigation
Part of MDL-59313.
David Monllao [Fri, 21 Jul 2017 15:46:42 +0000 (17:46 +0200)]
MDL-59116 analytics: Multiple predictions for each analysable time range
Now we only predict using the most recent range available, this means
that if someone upgrades to moodle 3.4 at three quarters of a course
we will only calculate the latest range, previous ranges were not
displayed anyway once more recent predictions were available.
This commit deletes all previous predictions :) this shouldn't be a
problem in master as we don't provide any guarantee, the alternative
(retrive sampleids from mdl_files) would have been slow and a waste of
time as well as require horrible code in an upgrade step (text fields
do not accept defaults nor we can use NOTNULL).
Andrew Nicols [Mon, 7 Aug 2017 04:43:42 +0000 (12:43 +0800)]
Merge branch 'MDL-59698-master' of git://github.com/damyon/moodle
Andrew Nicols [Mon, 7 Aug 2017 04:36:38 +0000 (12:36 +0800)]
Merge branch 'MDL-59728-boost-question-bank-header-align' of https://github.com/lucaboesch/moodle
Andrew Nicols [Mon, 7 Aug 2017 03:35:26 +0000 (11:35 +0800)]
Merge branch 'MDL-59206-master' of git://github.com/damyon/moodle
Jun Pataleta [Mon, 7 Aug 2017 02:49:07 +0000 (10:49 +0800)]
MDL-59727 core_user: Fix Behat tests for bulk enrolment test
Jun Pataleta [Mon, 7 Aug 2017 02:04:27 +0000 (10:04 +0800)]
MDL-59726 behat: Fix Behat tests affected by the new participants filter
Andrew Nicols [Wed, 12 Jul 2017 04:39:26 +0000 (12:39 +0800)]
MDL-59506 core_lock: use a null lock during install
Use a different lock factory during installation which does not actually
lock at all.
Damyon Wiese [Thu, 3 Aug 2017 07:58:06 +0000 (15:58 +0800)]
MDL-59055 grades: behat test
Marina Glancy [Tue, 20 Jun 2017 07:46:08 +0000 (15:46 +0800)]
MDL-59055 grades: provide backward-compatibility of changes
Marina Glancy [Tue, 20 Jun 2017 07:27:16 +0000 (15:27 +0800)]
MDL-59055 grades: fix bug displaying item id instead of grade
Thanks to Marcelo Santos for initial patch
Andrew Nicols [Mon, 7 Aug 2017 01:42:23 +0000 (09:42 +0800)]
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.
Jake Dallimore [Tue, 1 Aug 2017 06:53:33 +0000 (14:53 +0800)]
MDL-59172 user: user_can_view_profile() now checks viewalldetails cap
Luca Bösch [Fri, 4 Aug 2017 13:18:45 +0000 (15:18 +0200)]
MDL-59728 questions: Align question bank headers.
Luca Bösch [Mon, 31 Jul 2017 17:02:57 +0000 (19:02 +0200)]
MDL-59662 database: Typo in variable name.
Andrew Nicols [Wed, 2 Aug 2017 06:23:57 +0000 (14:23 +0800)]
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.
Jun Pataleta [Tue, 1 Aug 2017 07:01:07 +0000 (15:01 +0800)]
MDL-59666 mod_assign: Add validation for grading due date
Andrew Nicols [Fri, 4 Aug 2017 03:49:44 +0000 (11:49 +0800)]
weekly release 3.4dev
Andrew Nicols [Fri, 4 Aug 2017 03:49:24 +0000 (11:49 +0800)]
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
Andrew Nicols [Fri, 4 Aug 2017 01:56:22 +0000 (09:56 +0800)]
Merge branch 'MDL-59366-master-fix-2' of git://github.com/junpataleta/moodle
Jun Pataleta [Fri, 4 Aug 2017 01:50:27 +0000 (09:50 +0800)]
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.
Andrew Nicols [Fri, 4 Aug 2017 01:23:26 +0000 (09:23 +0800)]
Merge branch 'MDL-59366-master-fix' of git://github.com/junpataleta/moodle
Jun Pataleta [Fri, 4 Aug 2017 01:12:19 +0000 (09:12 +0800)]
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
Jun Pataleta [Fri, 4 Aug 2017 01:08:33 +0000 (09:08 +0800)]
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.
Jun Pataleta [Fri, 4 Aug 2017 01:07:36 +0000 (09:07 +0800)]
MDL-59366 core_user: Disable sorting for roles and groups columns
Mark Nelson [Thu, 3 Aug 2017 05:48:59 +0000 (13:48 +0800)]
MDL-59668 mod_lti: use 'forceview' param to keep nav flow consistent
Part of MDL-59313.
Andrew Nicols [Thu, 3 Aug 2017 06:53:25 +0000 (14:53 +0800)]
Merge branch 'MDL-59382-int-fix-1' of github.com:ryanwyllie/moodle
Ryan Wyllie [Thu, 3 Aug 2017 06:45:19 +0000 (06:45 +0000)]
MDL-59382 calendar: fix editing event duration
Mark Nelson [Thu, 3 Aug 2017 04:36:27 +0000 (12:36 +0800)]
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.
Andrew Nicols [Thu, 3 Aug 2017 04:29:56 +0000 (12:29 +0800)]
Merge branch 'm34_MDL-59583_Fix_MariaDB_10d2d7_Breaking_Change' of https://github.com/scara/moodle
Damyon Wiese [Thu, 3 Aug 2017 02:26:05 +0000 (10:26 +0800)]
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.
Andrew Nicols [Thu, 3 Aug 2017 01:33:07 +0000 (09:33 +0800)]
MDL-59382 calendar: CiBoT fix
Andrew Nicols [Thu, 3 Aug 2017 01:31:44 +0000 (09:31 +0800)]
Merge branch 'MDL-59382-master-4' of git://github.com/ryanwyllie/moodle
Ryan Wyllie [Thu, 3 Aug 2017 01:07:01 +0000 (01:07 +0000)]
MDL-59382 calendar: fix CiBoT warnings
Matteo Scaramuccia [Wed, 2 Aug 2017 22:13:03 +0000 (00:13 +0200)]
MDL-59583 dml: fixed NULL values w/ MariaDB 10.2.7+
Jun Pataleta [Wed, 2 Aug 2017 08:58:23 +0000 (16:58 +0800)]
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.
Mark Nelson [Wed, 2 Aug 2017 07:28:26 +0000 (15:28 +0800)]
MDL-59612 core: apply filters to activity names
Part of MDL-59313.
Ryan Wyllie [Wed, 2 Aug 2017 07:30:07 +0000 (07:30 +0000)]
MDL-59382 calendar: fix course id for site event
Simey Lameze [Tue, 1 Aug 2017 04:02:35 +0000 (12:02 +0800)]
MDL-59382 theme: bring the date picker forward
Simey Lameze [Tue, 1 Aug 2017 02:10:16 +0000 (10:10 +0800)]
MDL-59382 theme_bootstrapbase: proper handling of large modals
Simey Lameze [Fri, 28 Jul 2017 06:32:09 +0000 (14:32 +0800)]
MDL-59382 core: make CiBoT happy.
Simey Lameze [Fri, 28 Jul 2017 03:18:06 +0000 (11:18 +0800)]
MDL-59382 core_calendar: fix behat failures
Andrew Nicols [Wed, 2 Aug 2017 05:39:23 +0000 (13:39 +0800)]
Merge branch 'MDL-57259-master' of git://github.com/ryanwyllie/moodle
Simey Lameze [Wed, 2 Aug 2017 01:22:18 +0000 (09:22 +0800)]
MDL-59644 core_output: fix font awesome mapping for lock icons
David Monllao [Wed, 2 Aug 2017 05:04:33 +0000 (07:04 +0200)]
Merge branch 'MDL-59602-master' of https://github.com/andrewnicols/moodle
Andrew Nicols [Wed, 2 Aug 2017 04:56:05 +0000 (12:56 +0800)]
MDL-59602 enrol: Correct course name for restored course
Andrew Nicols [Wed, 2 Aug 2017 04:55:54 +0000 (12:55 +0800)]
MDL-59602 course: Use course navigation for course nav test
Simey Lameze [Thu, 27 Jul 2017 06:22:57 +0000 (14:22 +0800)]
MDL-59382 core_calendar: change behat step
Ryan Wyllie [Mon, 24 Jul 2017 08:01:14 +0000 (08:01 +0000)]
MDL-59382 calendar: add modal to create and update events
Ryan Wyllie [Mon, 24 Jul 2017 07:55:33 +0000 (07:55 +0000)]
MDL-59382 calendar: rename repository and events
Renamed the calendar_repository and calendar_events to repository and
events respectively since they are already in the calendar namespace
there is no need for the redundant calendar prefix.
Ryan Wyllie [Mon, 24 Jul 2017 07:35:57 +0000 (07:35 +0000)]
MDL-59382 theme_boost: add title block to modal template
Ryan Wyllie [Mon, 24 Jul 2017 07:31:17 +0000 (07:31 +0000)]
MDL-59382 calendar: fix event mapper and exporter
Ryan Wyllie [Mon, 24 Jul 2017 06:59:39 +0000 (06:59 +0000)]
MDL-59382 form: fix name in template context
Ryan Wyllie [Mon, 24 Jul 2017 06:54:17 +0000 (06:54 +0000)]
MDL-59382 javascript: template context can be given to modal factory
Ryan Wyllie [Mon, 24 Jul 2017 06:53:32 +0000 (06:53 +0000)]
MDL-59382 javascript: fix large styling for modals
Ryan Wyllie [Mon, 24 Jul 2017 06:56:29 +0000 (06:56 +0000)]
MDL-57259 external: fix page url debug in fragment loading
Ryan Wyllie [Mon, 24 Jul 2017 06:56:29 +0000 (06:56 +0000)]
MDL-57259 external: fix page url debug in fragment loading
Andrew Nicols [Wed, 2 Aug 2017 02:51:05 +0000 (10:51 +0800)]
Merge branch 'MDL-55364-master-fix' of https://github.com/xow/moodle
Andrew Nicols [Wed, 2 Aug 2017 02:47:52 +0000 (10:47 +0800)]
Merge branch 'wip-MDL-59523-master-fix' of git://github.com/abgreeve/moodle
John Okely [Wed, 2 Aug 2017 02:27:47 +0000 (10:27 +0800)]
MDL-55364 forum: Combine user picture and user name rows
Adrian Greeve [Wed, 2 Aug 2017 02:09:29 +0000 (10:09 +0800)]
MDL-59523 course_reset: Added date update message when resetting.
Dan Poltawski [Tue, 1 Aug 2017 10:34:18 +0000 (11:34 +0100)]
Merge branch 'MDL-55364-master' of https://github.com/xow/moodle
Dan Poltawski [Tue, 1 Aug 2017 09:36:14 +0000 (10:36 +0100)]
Merge branch 'MDL-59366-master' of git://github.com/junpataleta/moodle
Dan Poltawski [Tue, 1 Aug 2017 09:15:54 +0000 (10:15 +0100)]
Merge branch 'MDL-59658-master' of git://github.com/junpataleta/moodle
David Monllao [Tue, 1 Aug 2017 08:29:39 +0000 (10:29 +0200)]
Merge branch 'MDL-59613-master' of git://github.com/junpataleta/moodle
Dan Poltawski [Tue, 1 Aug 2017 08:08:19 +0000 (09:08 +0100)]
Merge branch 'MDL-30634-master' of git://github.com/Dave-B/moodle
David Monllao [Tue, 1 Aug 2017 08:03:31 +0000 (10:03 +0200)]
MDL-53492 hub: Fix remaining conflict
David Monllao [Tue, 1 Aug 2017 07:20:57 +0000 (09:20 +0200)]
Merge branch 'wip-MDL-53492-master' of git://github.com/marinaglancy/moodle
Jun Pataleta [Tue, 1 Aug 2017 07:09:34 +0000 (15:09 +0800)]
MDL-59658 core: Add login/logout steps for course participants scenario
* Add student1 and student2 login/logout steps for the course
participants filtering scenario in order to have last access data
for students 1 and 2 since the participants table is sorted by last
access by default.
* Remove @javascript tags for the following scenario:
- Filter users on assignment submission page
- Filter users on view gradebook page
- Filter users on course participants page
JS is not really necessary in these scenario and we can get faster
execution time.
Andrew Nicols [Tue, 1 Aug 2017 06:54:05 +0000 (14:54 +0800)]
Merge branch 'MDL-58928-alt-attribute-enrolment-edit-delete-icons' of https://github.com/lucaboesch/moodle
Andrew Nicols [Tue, 1 Aug 2017 05:44:16 +0000 (13:44 +0800)]
Merge branch 'MDL-59518-master' of git://github.com/ankitagarwal/moodle
Andrew Nicols [Tue, 1 Aug 2017 05:43:04 +0000 (13:43 +0800)]
Merge branch 'MDL-59523-master' of git://github.com/ankitagarwal/moodle
Andrew Nicols [Tue, 1 Aug 2017 05:39:38 +0000 (13:39 +0800)]
Merge branch 'MDL-9367-master' of git://github.com/ankitagarwal/moodle
Adrian Greeve [Fri, 21 Jul 2017 03:15:17 +0000 (11:15 +0800)]
MDL-59518 restore: Unit tests for restoring and dates
These unit tests check that the dates do not roll
forward when restoring a backup.
Adrian Greeve [Tue, 18 Jul 2017 01:14:10 +0000 (09:14 +0800)]
MDL-59518 restore: System date info no longer rolled forward.
Only dates that are part of a configuration setting should
have the date rolled forward in a restore.
David Monllao [Tue, 1 Aug 2017 04:10:44 +0000 (06:10 +0200)]
MDL-59665 analytics: Reuse existing lang string
Damyon Wiese [Tue, 1 Aug 2017 05:18:55 +0000 (13:18 +0800)]
MDL-59206 event: Add an event for a config_log
This is useful because config_logs are sent via logstores, and we may be interested to know how
many people change a particular admin setting across many sites (aggregated data).
Ankit Agarwal [Thu, 29 Jun 2017 08:08:47 +0000 (13:38 +0530)]
MDL-9367 restore: Roll only configuration dates
It was decided to roll only configuration dates and any date related to user content
such as 'timecreated' , 'timemodified' etc should not be rolled forward.
Ankit Agarwal [Tue, 25 Jul 2017 05:38:59 +0000 (11:08 +0530)]
MDL-59523 course_reset: Roll dates when needed