85503 Commits

Author SHA1 Message Date
Andrew Nicols
c9d781d207 Merge branch 'MDL-59665_master' of git://github.com/dmonllao/moodle 2017-08-07 13:53:19 +08:00
Andrew Nicols
36f207ec43 Merge branch 'MDL-59662-errors-typo' of https://github.com/lucaboesch/moodle 2017-08-07 13:34:42 +08:00
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
Andrew Nicols
aca995a2f4 Merge branch 'MDL-59206-master' of git://github.com/damyon/moodle 2017-08-07 11:35:26 +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
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
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
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
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
Ryan Wyllie
aa0912258d MDL-59382 calendar: add modal to create and update events 2017-08-02 04:47:43 +00:00
Ryan Wyllie
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
Ryan Wyllie
159a2bc1fe MDL-59382 theme_boost: add title block to modal template 2017-08-02 04:47:43 +00:00
Ryan Wyllie
8e02018f1c MDL-59382 calendar: fix event mapper and exporter 2017-08-02 04:47:42 +00:00
Ryan Wyllie
6973baa31e MDL-59382 form: fix name in template context 2017-08-02 04:47:42 +00:00
Ryan Wyllie
a50768b97f MDL-59382 javascript: template context can be given to modal factory 2017-08-02 04:47:42 +00:00
Ryan Wyllie
4defa05fdc MDL-59382 javascript: fix large styling for modals 2017-08-02 04:47:42 +00:00
Ryan Wyllie
74eedb28b3 MDL-57259 external: fix page url debug in fragment loading 2017-08-02 04:47:41 +00:00
Ryan Wyllie
cacc04006f MDL-57259 external: fix page url debug in fragment loading 2017-08-02 03:37:32 +00:00
Andrew Nicols
71fac459b6 Merge branch 'MDL-55364-master-fix' of https://github.com/xow/moodle 2017-08-02 10:51:05 +08:00
Andrew Nicols
2b2ae405f0 Merge branch 'wip-MDL-59523-master-fix' of git://github.com/abgreeve/moodle 2017-08-02 10:47:52 +08:00
John Okely
9c89d3aec1 MDL-55364 forum: Combine user picture and user name rows 2017-08-02 10:27:47 +08:00
Adrian Greeve
39b8357c5a MDL-59523 course_reset: Added date update message when resetting. 2017-08-02 10:09:29 +08:00
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