Commit Graph

489 Commits

Author SHA1 Message Date
Sam Hemelryk 09d83a4038 MDL-47183 post-integration fixes
* Fixed typo with context_module::instance
* Fixed use of $mod->get_context()
2014-10-28 15:50:17 +13:00
Andrew Nicols ac4f596acd MDL-47183: viewhiddenactivities should use the module context
Thanks to Paulo Matos for the forum part of this change.
2014-10-06 12:22:09 +08:00
Tim Hunt 63e5416f5b MDL-45618 Fix @since PHPdoc tags. 2014-05-20 15:03:34 +08:00
Marina Glancy f094167bef MDL-45486 Bump all versions to planned release 2014-05-09 10:50:39 +08:00
Eloy Lafuente (stronk7) 538bf99ece MDL-45486 Bump all versions to planned release
This bumps all versions to planned 2.7 release
(2014051200) version and all the dependencies to
current 2.7rc2 (2014050800)
2014-05-09 02:12:28 +02:00
Sam Hemelryk a5f4213939 MDL-45248 course: fixed assumptions when logging a course view 2014-04-28 08:12:35 +12:00
Sam Hemelryk 0a293483e8 MDL-39833 format: tidied up API improvement to allow for future backport 2014-04-09 10:09:44 +12:00
Sam Hemelryk da98185a58 Merge branch 'MDL-39833' of https://github.com/shashirepo/moodle 2014-04-09 10:09:02 +12:00
sam marshall 00c832d7a1 MDL-44070 Conditional availability enhancements (8): display
Includes theme and renderer changes required for the new feature.
There are two parts: style required for the display as part of the
course page (when showing the list of conditions for an activity),
and style required for the settings form.

This change supports both the bootstrapbase theme (which was the
main theme used during development) and the old base theme.
2014-04-07 20:11:56 +01:00
shashirepo 600be271c6 MDL-39833 course: require token change
MDL-39833 course: require token change
2014-04-05 12:29:47 +05:30
Dan Poltawski dc88f6699d Revert "MDL-43852 Filters Fixed naked-OR conditions."
While the patch worked as intended, we discovered some other concerns
about use of this setting in testing.

This reverts commit 840c1c554d.
2014-03-06 09:03:19 +08:00
Gordon Bateson 840c1c554d MDL-43852 Filters Fixed naked-OR conditions. 2014-02-28 23:55:17 +01:00
Andrew Nicols af64bc6179 MDL-33099 Javascript: Deprecate the ajaxenabled function 2014-02-17 14:11:21 +08:00
Eloy Lafuente (stronk7) 845e11407f Merge branch 'wip-MDL-41384-master' of git://github.com/marinaglancy/moodle 2014-02-04 10:11:42 +01:00
Marina Glancy 93c9a86dea MDL-43821 completion: fix bug in section completion progress
Thanks to Shane Dye for the provided patch
2014-01-31 16:56:43 +08:00
Marina Glancy 7456c96766 MDL-41384 course: do not show debugging message if $COURSE contains format options
before showing debugging message make sure that field exists in database and not only in the object
2014-01-31 16:56:30 +08:00
Dan Poltawski 33c6c949e5 Merge branch 'MDL-43534-master' of git://github.com/andrewnicols/moodle 2014-01-08 11:56:53 +08:00
Dan Poltawski 73ee2fda6b MDL-41690 course: remove use of deprecated functions 2014-01-06 10:45:59 +08:00
Andrew Nicols b4ab504574 MDL-43534 Course: Remove deprecated functions from course/renderer
This function was deprecated in 2.4 and was due for removal in 2.6.

Removing as per deprecation policy.
2014-01-02 11:35:33 +08:00
Jason Fowler d9308a07e8 MDL-43083 Course: Swapping the edit/cog for the right size icon 2013-11-27 15:06:25 +08:00
Renaat Debleu 6382c482c8 MDL-42795 course: fixed param course in sql
course_sections has course field and not courseid, hence replaced it with course.
2013-11-11 10:24:09 +08:00
Eloy Lafuente (stronk7) f39c82ebed MDL-42701 Bump all versions near 2.6 release 2013-11-05 02:36:00 +01:00
Frederic Massart be99db5b96 MDL-22669 course: Display section number for orphaned activities 2013-10-28 14:44:08 +08:00
Marina Glancy 33c4c3a363 Merge branch 'MDL-41252-master' of git://github.com/mouneyrac/moodle 2013-10-24 14:15:05 +11:00
Jerome Mouneyrac 9f66c7c80a MDL-41252 Simple changes to main course page to improve accessibility - original patch of Nate Baxley 2013-10-08 16:53:06 +08:00
Frederic Massart eb665c34ef MDL-41611 mod_quiz: Offer to return to course when supported 2013-10-04 18:21:56 +08:00
Frederic Massart d9203fb775 MDL-41611 format_singleactivity: Only hide unnecessary elements 2013-10-04 18:21:13 +08:00
Frederic Massart 640ef17790 MDL-41611 format_singleactivity: Ignore unsupported modules 2013-10-04 18:21:13 +08:00
rwijaya faf6010b10 MDL-40829: courses heading: remove headerblock class from header and fix heading levels.
Also, changing h3 classname from name to categoryname.
    Added note to theme/upgrade.txt to describe the heading level changes.
2013-10-02 09:46:26 +13:00
Dan Poltawski 1d49a5cdc6 Revert "MDL-40829: courses heading: remove 'headerblock' class from header and fix heading levels"
This reverts commit 278d64572d.

Conflicts:
	theme/bootstrapbase/style/moodle.css
2013-09-12 19:21:43 +08:00
Rossiani Wijaya 278d64572d MDL-40829: courses heading: remove 'headerblock' class from header and fix heading levels 2013-09-10 17:09:38 +08:00
Jason Fowler 2e2d0f75dd MDL-40833 Course - Single topic pages need h3 for section heading 2013-09-04 15:39:27 +08:00
Damyon Wiese f6c2af867f Merge branch 'master_MDL-40122' of git://github.com/danmarsden/moodle
Conflicts:
	lib/db/upgrade.php
	version.php
2013-08-27 13:16:55 +08:00
Dan Marsden 3d1808c6e2 MDL-40122 SCORM: replace SCORM course format with singleactivity 2013-08-21 20:26:06 +12:00
Damyon Wiese bbb483b259 MDL-36002 Drag and Drop: Improvements to keyboard drag and drop
List of fixes:
* Add a simulated drag start event to fix problems with block drag and drop that
  were expecting it.
* Add an access-hidden title for the General section in a course format. This
  is used to provide the text for the drop region (better than the first activity in the section)
* Changed the text in the list to 'Move to "General"' instead of 'Move after General'. This
  makes more sense for activities when you have a list of activities and sections together.
2013-08-15 16:15:32 +08:00
Sam Hemelryk fe33106bb1 Merge branch 'MDL-40955-m' of git://github.com/andrewnicols/moodle
Conflicts:
	course/format/upgrade.txt
2013-08-06 12:49:28 +12:00
Andrew Nicols 9ce4fa2fd4 MDL-40955 Course: Add a new renderer to give a complete course module 2013-07-31 11:14:05 +01:00
Sam Hemelryk e5de4933b0 MDL-39814 frontend: redeveloped overlay to correct tab-flow
Also:
 * fixed zindex issue + spinner placement
 * added notes to course format and theme upgrade texts
 * fixed behat tests after action menu changes
2013-07-30 16:15:19 +12:00
Dan Poltawski 82d1dc3f17 Merge branch 'wip-MDL-40121-master' of git://github.com/marinaglancy/moodle 2013-07-22 14:36:29 +08:00
Petr Škoda bd3b3bba9f MDL-40220 use new core_component::get_plugin_list() 2013-07-16 22:36:11 +02:00
Marina Glancy 6619945b06 MDL-40121 Support old activities with subtypes 2013-07-15 21:42:04 +10:00
Marina Glancy 28c61e0aa2 MDL-40121 Added plugin format_singleactivity 2013-07-15 21:41:31 +10:00
Ruslan Kabalin f81d63553e MDL-33546: course: Fix current week hightlighting after dragging the section 2013-06-18 13:01:18 +10:00
Sam Hemelryk 540a8f8499 Merge branch 'MDL-40109_master' of git://github.com/dmonllao/moodle 2013-06-18 11:08:45 +12:00
Dan Poltawski 3873f6aa60 Merge branch 'MDL-39449' of git://github.com/timhunt/moodle 2013-06-11 14:09:12 +08:00
David Monllao af248633f5 MDL-40109 format_weeks: Removing extra space 2013-06-10 13:30:10 +08:00
Eloy Lafuente (stronk7) 32ce8b6803 Merge branch 'wip-MDL-21097-master' of git://github.com/marinaglancy/moodle 2013-06-05 01:43:03 +02:00
Eloy Lafuente (stronk7) 79452da1c8 Merge branch 'MDL-39723-master' of git://github.com/sammarshallou/moodle 2013-06-04 17:47:45 +02:00
Eloy Lafuente (stronk7) aed9401e14 MDL-39764 style: phpdoc changed to inline comments 2013-06-04 01:41:58 +02:00
Gareth J Barnard 86f590b45f MDL-39764 course_format: Allow courses to have numsections > maxsections. 2013-06-03 23:36:32 +01:00