Commit Graph

89847 Commits

Author SHA1 Message Date
David Monllao c2118c8902 Merge branch 'wip-MDL-57456-master' of git://github.com/marinaglancy/moodle 2017-04-19 15:42:29 +08:00
Simey Lameze 5252d2835f MDL-58642 mod_glossary: add mapping for minus icon 2017-04-19 15:01:28 +08:00
Andrew Nicols 07e5b34c95 Merge branch 'MDL-58536-master' of git://github.com/ryanwyllie/moodle 2017-04-19 13:50:28 +08:00
Ryan Wyllie 4671ae6374 MDL-58520 block_myoverview: change display name to Course overview
Change the display name of the my overview block to Course overview to
match the block it is replacing (and the UX prototype).

The use of "My" is no longer recommended when naming things in Moodle.
2017-04-19 05:47:40 +00:00
Ryan Wyllie 5f6ff89549 MDL-58536 block_myoverview: use moodle user timezone for midnight calc
Pass the user's midnight timestamp to the javascript to ensure that a
user's timezone is respected when calculating the categories the events
should be placed in on the event list.
2017-04-19 05:38:25 +00:00
Jun Pataleta 089810fb06 MDL-58538 repository_onedrive: Use image_url() instead of pix_url() 2017-04-19 12:29:22 +08:00
Jun Pataleta 088598ba28 MDL-58538 core: Set proper PHP Documentation for pix_url()
Add @deprecated tag for theme_config::pix_url(). Add PHPDoc block for
renderer_base::pix_url().
2017-04-19 12:29:19 +08:00
Andrew Nicols 442908a100 Merge branch 'MDL-58138-master-v2' of git://github.com/snake/moodle 2017-04-19 11:53:40 +08:00
Jake Dallimore 273d310601 MDL-58138 completion: Fixes for a number of small issues. 2017-04-19 11:41:57 +08:00
Ryan Wyllie d6c25e5c7d MDL-58621 block_myoverview: align course icon when no progress 2017-04-19 03:30:44 +00:00
David Monllao ac0553aa64 Merge branch 'MDL-54901' of git://github.com/stronk7/moodle 2017-04-19 11:30:03 +08:00
Ryan Wyllie 5cb960c6b4 MDL-58621 block_myoverview: don't display course start and end dates 2017-04-19 03:08:17 +00:00
Marina Glancy 32b93ea7f8 MDL-58138 completion: changes after rebasing
The defaults for the completion have been changed in MDL-55611
2017-04-19 08:56:11 +08:00
Marina Glancy 61167c16d0 MDL-58460 mod_data: work with bulk completion API
Part of MDL-58138 epic
2017-04-19 08:56:11 +08:00
Jake Dallimore d233adbb77 MDL-58460 completion: add callbacks to mod_data for bulk completion
Part of MDL-58138 epic
2017-04-19 08:56:11 +08:00
Marina Glancy 6445f17bfc MDL-58408 completion: can not require grade if grading is not available
Part of MDL-58138 epic
2017-04-19 08:56:11 +08:00
Jake Dallimore 22002ed74b MDL-58138 completion: consolidate bulk edit notifications to single call
Part of MDL-58138 epic
2017-04-19 08:56:11 +08:00
Jake Dallimore 5976f85c95 MDL-58138 completion: move new lang strings to the completion lang file
Part of MDL-58138 epic
2017-04-19 08:56:11 +08:00
Jake Dallimore 59d9c851f8 MDL-58138 completion: conditional state buttons and css fixes
Part of MDL-58138 epic
2017-04-19 08:56:11 +08:00
Jake Dallimore 6b3b9c1d02 MDL-58138 completion: rebase on font-awesome changes.
Part of MDL-58138 epic
2017-04-19 08:56:11 +08:00
Jake Dallimore b17ee68202 MDL-58138 completion: Assorted linting fixes.
Part of MDL-58138 epic
2017-04-19 08:56:11 +08:00
Jake Dallimore 8db355c58f MDL-58138 tests: unit and behat tests covering bulk and default tabs
Part of MDL-58138 epic
2017-04-19 08:56:11 +08:00
Marina Glancy a64a9f9ce4 MDL-58267 completion: style and capabilities cleanup
Part of MDL-58138 epic
2017-04-19 08:54:35 +08:00
Marina Glancy 7f53e8aa22 MDL-58267 completion: allow to set default activity completion
Part of MDL-58138 epic
2017-04-19 08:54:35 +08:00
Marina Glancy 06cdda468a MDL-58139 completion: bulk update completion
Part of MDL-58138 epic
2017-04-19 08:52:57 +08:00
Marina Glancy 0cbc248dd3 MDL-58140 completion: access control refinements
Part of MDL-58138 epic
2017-04-19 08:52:57 +08:00
Adrian Greeve 6e60511953 MDL-58140 completion: Added form change checker.
Part of MDL-58138 epic
2017-04-19 08:52:57 +08:00
Adrian Greeve e8a71f8509 MDL-58140 completion: Default completion page.
Part of MDL-58138 epic
2017-04-19 08:52:57 +08:00
Adrian Greeve 0b6208018f MDL-58140 completion: Added bulk activity completion page.
Part of MDL-58138 epic
2017-04-19 08:52:57 +08:00
Jake Dallimore b54bcddda4 MDL-58190 completion: callbacks to get completion rule descriptions
- Activities can have their custom completion rules added to cm_info
through the get_coursemodule_info callback.
- Descriptions of a modules active completion rules can be fetched using
the component callback mod_xxx_get_completion_active_rule_descriptions
which takes in a cm_info object and returns an array of strings.

Part of MDL-58138 epic
2017-04-19 08:52:57 +08:00
David Monllao afa5a3d7d2 Merge branch 'MDL-58624-master' of git://github.com/ankitagarwal/moodle 2017-04-19 07:14:43 +08:00
David Monllao 6778792008 Merge branch 'MDL-58631-master-authdoc' of git://github.com/mudrd8mz/moodle 2017-04-19 06:20:41 +08:00
David Monllao 80362f64db Merge branch 'MDL-58096-master' of git://github.com/StudiUM/moodle 2017-04-19 05:17:50 +08:00
David Monllao 2b4bafc6c2 Merge branch 'MDL-58625-master' of git://github.com/danpoltawski/moodle 2017-04-19 03:50:44 +08:00
Gilles-Philippe Leblanc dfbc82ec5f MDL-58096 reports: Add SQL required by preload_from_record() 2017-04-18 15:40:00 -04:00
Dan Poltawski 9c1889810a Merge branch 'wip-MDL-58502-master' of git://github.com/marinaglancy/moodle 2017-04-18 19:48:35 +01:00
Dan Poltawski 385e2fc839 Merge branch 'MDL-58526_m33v2' of https://github.com/sbourget/moodle 2017-04-18 19:47:04 +01:00
Dan Poltawski c4642d14a7 Merge branch 'MDL-58463-master' of git://github.com/junpataleta/moodle 2017-04-18 18:53:51 +01:00
David Monllao 3fa64904cd Merge branch 'MDL-58116-master' of https://github.com/barrasroger/moodle-1 2017-04-19 00:49:41 +08:00
David Monllao fc394ded2a Merge branch 'MDL-58566-master' of git://github.com/junpataleta/moodle 2017-04-19 00:43:02 +08:00
AMOS bot b7c942e3a7 Automatically generated installer lang files 2017-04-19 00:04:23 +08:00
David Mudrák b45193ca12 MDL-51932 workshop: Improve UX for teachers on switching workshop phases
The icon itself has been found insufficient, teachers did not realize it
was used to switch the phase. Its semantics is even less intuitive in
Boost when we do not show it on course outline any more.

So this patch starts to display the information that has been present
for assistive technologies only. As a side effect, I spotted there was a
bug that caused the id attribute "mod_workshop-userplancurrenttasks"
was used for all titles (not only the current one) so it did not
really serve the purpose well.
2017-04-18 18:00:59 +02:00
Dan Poltawski 10422a5545 Merge branch 'MDL-58629' of git://github.com/stronk7/moodle 2017-04-18 16:54:33 +01:00
Dan Poltawski 6bf6a54b75 Merge branch 'MDL-58618-master' of https://github.com/xow/moodle 2017-04-18 16:47:31 +01:00
Dan Poltawski c7b7d67295 Merge branch 'MDL-58374-master-ltierrorlog' of git://github.com/mudrd8mz/moodle 2017-04-18 16:46:12 +01:00
Dan Poltawski 06fcba4bd9 Merge branch 'MDL-58603-master' of git://github.com/ankitagarwal/moodle 2017-04-18 16:45:09 +01:00
David Mudrák 1cb5c7b31f MDL-58631 auth: Clarify documentation of changes in loginpage_idp_list()
This should clarify the new 'iconurl' key returned by the auth plugin's
loginpage_idp_list() method.
2017-04-18 17:00:40 +02:00
Gilles-Philippe Leblanc 6a54bd292c MDL-58096 reports: Optimize database request 2017-04-18 10:59:41 -04:00
Dan Poltawski 34702e22e6 MDL-58625 behat: update tool_lp data generator 2017-04-18 12:51:13 +01:00
Dan Poltawski 6d14355ce8 on-demand release 3.3dev+ 2017-04-18 12:34:50 +01:00