Dan Poltawski
2a2f7b6493
Merge branch 'MDL-55364-master' of https://github.com/xow/moodle
2017-08-01 11:34:18 +01:00
Dan Poltawski
e3a2d7a473
Merge branch 'MDL-59366-master' of git://github.com/junpataleta/moodle
2017-08-01 10:36:14 +01:00
Dan Poltawski
b8cf4be7a7
Merge branch 'MDL-59658-master' of git://github.com/junpataleta/moodle
2017-08-01 10:15:54 +01:00
David Monllao
266959a41e
Merge branch 'MDL-59613-master' of git://github.com/junpataleta/moodle
2017-08-01 10:29:39 +02:00
Dan Poltawski
2c34c10799
Merge branch 'MDL-30634-master' of git://github.com/Dave-B/moodle
2017-08-01 09:08:33 +01:00
David Monllao
71b917ace6
MDL-53492 hub: Fix remaining conflict
2017-08-01 10:03:31 +02:00
David Monllao
2c04945c58
Merge branch 'wip-MDL-53492-master' of git://github.com/marinaglancy/moodle
2017-08-01 09:20:57 +02:00
Jun Pataleta
3120ebab9d
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.
2017-08-01 15:09:34 +08:00
Andrew Nicols
5c5b130268
Merge branch 'MDL-58928-alt-attribute-enrolment-edit-delete-icons' of https://github.com/lucaboesch/moodle
2017-08-01 14:54:05 +08:00
Andrew Nicols
3ae7afcf12
Merge branch 'MDL-59518-master' of git://github.com/ankitagarwal/moodle
2017-08-01 13:44:16 +08:00
Andrew Nicols
3ccd1965f3
Merge branch 'MDL-59523-master' of git://github.com/ankitagarwal/moodle
2017-08-01 13:43:04 +08:00
Andrew Nicols
77c5325f81
Merge branch 'MDL-9367-master' of git://github.com/ankitagarwal/moodle
2017-08-01 13:39:38 +08:00
Adrian Greeve
0b79129078
MDL-59518 restore: Unit tests for restoring and dates
...
These unit tests check that the dates do not roll
forward when restoring a backup.
2017-08-01 11:05:58 +05:30
Adrian Greeve
3678380cbf
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.
2017-08-01 11:05:48 +05:30
Ankit Agarwal
0d14fcbc60
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.
2017-08-01 10:46:37 +05:30
Ankit Agarwal
cb416dbf7d
MDL-59523 course_reset: Roll dates when needed
2017-08-01 10:07:48 +05:30
David Monllao
85a9c0b1e5
Merge branch 'MDL-59299-master' of https://github.com/xow/moodle
2017-08-01 04:56:09 +02:00
Andrew Nicols
5283fa3329
Merge branch 'MDL-59473' of https://github.com/sytabaresa/moodle
2017-08-01 10:46:39 +08:00
Andrew Nicols
13822dca07
Merge branch 'MDL-28574-master' of https://github.com/xow/moodle
2017-08-01 09:59:59 +08:00
Luca Bösch
da15576180
MDL-58928 enrol: delete and edit icon alt attribute
2017-07-31 17:31:07 +02:00
David Monllao
a79e84e060
Merge branch 'wip-MDL-59496-master-3' of git://github.com/marinaglancy/moodle
2017-07-31 17:14:56 +02:00
Dan Poltawski
f4ba6def50
Merge branch 'MDL-59624-master' of git://github.com/jleyva/moodle
2017-07-31 15:54:32 +01:00
Jun Pataleta
4698e169e5
MDL-59613 course: Add dropdown menu for activity list
...
Part of MDL-59313.
2017-07-31 22:25:22 +08:00
Dan Poltawski
c2c941b6f2
MDL-59627 mod_data: fix incorrect use of sortorder
2017-07-31 14:28:39 +01:00
David Monllao
f82e86e9f7
Merge branch 'wip-MDL-59311-master' of git://github.com/marinaglancy/moodle
2017-07-31 14:45:35 +02:00
David Monllao
56b3a0a477
Merge branch 'MDL-59535-master' of git://github.com/lameze/moodle
2017-07-31 14:19:54 +02:00
David Monllao
549e57410f
Merge branch 'MDL-57546-master' of git://github.com/andrewnicols/moodle
2017-07-31 14:10:19 +02:00
David Monllao
707f9beae1
Merge branch 'MDL-59612-master' of git://github.com/junpataleta/moodle
2017-07-31 13:59:55 +02:00
Jun Pataleta
ed765cfad1
MDL-59612 course: Use action_link template for activity navigation
...
Part of MDL-59313.
2017-07-31 19:45:34 +08:00
David Monllao
7190f330b4
Merge branch 'MDL-59602_coursenav' of https://github.com/mrmark/moodle
2017-07-31 13:21:09 +02:00
Dan Poltawski
9ee4ab6330
Merge branch 'MDL-59619-master' of git://github.com/jleyva/moodle
2017-07-31 11:48:55 +01:00
Dan Poltawski
396b97b2fb
Merge branch 'MDL-59627-master' of git://github.com/jleyva/moodle
2017-07-31 11:44:56 +01:00
Dan Poltawski
6cc8b0a4a6
Merge branch 'MDL-59632_master' of git://github.com/dmonllao/moodle
2017-07-31 11:33:05 +01:00
David Monllao
726ad1bd08
Merge branch 'MDL-59511-master-oauthsysmail' of git://github.com/Dagefoerde/moodle
2017-07-31 11:46:30 +02:00
Dan Poltawski
23e1ce7d52
Merge branch 'wip-MDL-59476-master-2' of git://github.com/marinaglancy/moodle
2017-07-31 10:21:32 +01:00
John Okely
72e688d7ff
MDL-28574 webservices: Explain tokens you can edit but can't see
2017-07-31 15:35:23 +08:00
Andrew Nicols
63615f6116
Merge branch 'MDL-58196-master' of git://github.com/ankitagarwal/moodle
2017-07-31 15:17:49 +08:00
David Monllao
a3cb377374
Merge branch 'MDL-59649-master' of git://github.com/jleyva/moodle
2017-07-31 08:58:56 +02:00
David Monllao
634d0f8330
Merge branch 'MDL-58744-master' of https://github.com/jacac/moodle
2017-07-31 08:36:18 +02:00
Marina Glancy
5ac72c9c74
MDL-53492 registration: Moodle.net is more correct than Moodle.org
2017-07-31 14:31:12 +08:00
Marina Glancy
7d792aeee4
MDL-53492 registration: use https://moodle.net as hub url
2017-07-31 14:31:11 +08:00
Marina Glancy
505bbe7cd6
MDL-59496 registration: display unregistered warning consistently
2017-07-31 14:29:58 +08:00
Ankit Agarwal
49a84cec82
MDL-58196 availability: Fix UI for pass/fail config
...
For pass/fail setting to work properly, activities must have 'Require grade' completion set,
just make sure we don't allow activities without this setting to be set
2017-07-31 11:56:11 +05:30
Ankit Agarwal
0b3326b50e
MDL-58196 availability: Add appropriate dependencies in mform
2017-07-31 11:56:11 +05:30
Jun Pataleta
9651e491d8
MDL-59366 user: Create a unified filter for participants page
...
Part of MDL-59290.
2017-07-31 13:04:06 +08:00
Mark Nelson
1678181a56
MDL-59612 core: removed hard-coded check for referer in modules
...
See mod/upgrade.txt for explanation.
Part of MDL-59313.
2017-07-31 12:03:28 +08:00
Mark Nelson
585146f0ab
MDL-59612 core: edit 'frametop' layout so links display for LTI
...
Part of MDL-59313.
2017-07-31 12:03:28 +08:00
Mark Nelson
d8cb461529
MDL-59612 core: added previous and next links to activities
...
Part of MDL-59313.
2017-07-31 12:03:28 +08:00
Andrew Nicols
2653e0c8e1
Merge branch 'm34_MDL-59583_Fix_MariaDB_10d2d7_Breaking_Change' of https://github.com/scara/moodle
2017-07-31 11:37:45 +08:00
Andrew Nicols
722f67d5b2
MDL-59564 user: Whitespace fix
2017-07-31 11:35:45 +08:00