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
7d9e0b066e
Merge branch 'MDL-59382-int-fix-1' of github.com:ryanwyllie/moodle
2017-08-03 14:53:25 +08:00
6cb580713b
MDL-59382 calendar: fix editing event duration
2017-08-03 06:45:19 +00:00
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
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
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
b2af37058d
MDL-59382 calendar: CiBoT fix
2017-08-03 09:36:56 +08:00
c6de3bd68f
Merge branch 'MDL-59382-master-4' of git://github.com/ryanwyllie/moodle
2017-08-03 09:31:44 +08:00
d6942fb5ba
MDL-59382 calendar: fix CiBoT warnings
2017-08-03 01:07:01 +00:00
2ec50fe3fd
MDL-59583 dml: fixed NULL values w/ MariaDB 10.2.7+
2017-08-03 00:13:03 +02:00
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
a965ae38ef
MDL-59612 core: apply filters to activity names
...
Part of MDL-59313.
2017-08-02 16:55:03 +08:00
22d44a63af
MDL-59382 calendar: fix course id for site event
2017-08-02 07:52:21 +00:00
63dd75229b
MDL-59382 theme: bring the date picker forward
2017-08-02 07:52:20 +00:00
3862bcfaa3
MDL-59382 theme_bootstrapbase: proper handling of large modals
2017-08-02 07:52:20 +00:00
705eea84d1
MDL-59382 core: make CiBoT happy.
2017-08-02 07:52:20 +00:00
c448e19bff
MDL-59382 core_calendar: fix behat failures
2017-08-02 07:52:20 +00:00
9bed446559
Merge branch 'MDL-57259-master' of git://github.com/ryanwyllie/moodle
2017-08-02 13:39:23 +08:00
7934986284
MDL-59644 core_output: fix font awesome mapping for lock icons
2017-08-02 13:37:03 +08:00
bf0ffc9c3a
Merge branch 'MDL-59602-master' of https://github.com/andrewnicols/moodle
2017-08-02 07:04:33 +02:00
3d4739ab64
MDL-59602 enrol: Correct course name for restored course
2017-08-02 13:02:29 +08:00
b4a4fa6a4c
MDL-59602 course: Use course navigation for course nav test
2017-08-02 12:55:54 +08:00
81170930c2
MDL-59382 core_calendar: change behat step
2017-08-02 04:47:43 +00:00
aa0912258d
MDL-59382 calendar: add modal to create and update events
2017-08-02 04:47:43 +00:00
6103fd2efe
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.
2017-08-02 04:47:43 +00:00
159a2bc1fe
MDL-59382 theme_boost: add title block to modal template
2017-08-02 04:47:43 +00:00
8e02018f1c
MDL-59382 calendar: fix event mapper and exporter
2017-08-02 04:47:42 +00:00
6973baa31e
MDL-59382 form: fix name in template context
2017-08-02 04:47:42 +00:00
a50768b97f
MDL-59382 javascript: template context can be given to modal factory
2017-08-02 04:47:42 +00:00
4defa05fdc
MDL-59382 javascript: fix large styling for modals
2017-08-02 04:47:42 +00:00
74eedb28b3
MDL-57259 external: fix page url debug in fragment loading
2017-08-02 04:47:41 +00:00
cacc04006f
MDL-57259 external: fix page url debug in fragment loading
2017-08-02 03:37:32 +00:00
71fac459b6
Merge branch 'MDL-55364-master-fix' of https://github.com/xow/moodle
2017-08-02 10:51:05 +08:00
2b2ae405f0
Merge branch 'wip-MDL-59523-master-fix' of git://github.com/abgreeve/moodle
2017-08-02 10:47:52 +08:00
9c89d3aec1
MDL-55364 forum: Combine user picture and user name rows
2017-08-02 10:27:47 +08:00
39b8357c5a
MDL-59523 course_reset: Added date update message when resetting.
2017-08-02 10:09:29 +08:00
2a2f7b6493
Merge branch 'MDL-55364-master' of https://github.com/xow/moodle
2017-08-01 11:34:18 +01:00
e3a2d7a473
Merge branch 'MDL-59366-master' of git://github.com/junpataleta/moodle
2017-08-01 10:36:14 +01:00
b8cf4be7a7
Merge branch 'MDL-59658-master' of git://github.com/junpataleta/moodle
2017-08-01 10:15:54 +01:00
266959a41e
Merge branch 'MDL-59613-master' of git://github.com/junpataleta/moodle
2017-08-01 10:29:39 +02:00
2c34c10799
Merge branch 'MDL-30634-master' of git://github.com/Dave-B/moodle
2017-08-01 09:08:33 +01:00
71b917ace6
MDL-53492 hub: Fix remaining conflict
2017-08-01 10:03:31 +02:00
2c04945c58
Merge branch 'wip-MDL-53492-master' of git://github.com/marinaglancy/moodle
2017-08-01 09:20:57 +02:00
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
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
3ae7afcf12
Merge branch 'MDL-59518-master' of git://github.com/ankitagarwal/moodle
2017-08-01 13:44:16 +08:00
3ccd1965f3
Merge branch 'MDL-59523-master' of git://github.com/ankitagarwal/moodle
2017-08-01 13:43:04 +08:00
77c5325f81
Merge branch 'MDL-9367-master' of git://github.com/ankitagarwal/moodle
2017-08-01 13:39:38 +08:00
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
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
Mark Nelson