4209 Commits

Author SHA1 Message Date
Eloy Lafuente (stronk7)
71fa28477b Merge branch 'MDL-44620_master' of git://github.com/dmonllao/moodle 2014-06-03 18:11:28 +02:00
Eloy Lafuente (stronk7)
17c9a3ccbf Merge branch 'MDL-34737-master' of git://github.com/andrewnicols/moodle 2014-06-02 11:53:33 +02:00
Marina Glancy
3e6adca945 MDL-45688 added missing library requirement 2014-05-24 18:33:00 +08:00
Andrew Nicols
b791ee3d89 MDL-34737 Course: Modchooser should use coursebase to determine the section class 2014-05-22 12:30:32 +08:00
Sam Hemelryk
37d39fe348 MDL-44711 course: fixed navigation expansion in course tests 2014-05-21 20:58:16 +12:00
Tim Hunt
5bcfd504df MDL-45618 Fix @since PHPdoc tags. 2014-05-19 17:03:04 +01:00
David Monllao
d46979ec3a MDL-44620 behat: Automates MDLQA-6
- MDLQA-6: By default, a new course contains a news
forum in which only teachers can post and subscription
is forced
2014-05-13 17:24:33 +07: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
Marina Glancy
90ce5afd81 Merge branch 'MDL-45201-master' of git://github.com/ankitagarwal/moodle 2014-05-07 13:06:17 +08:00
Marina Glancy
88c0e2f374 MDL-45357 events: unittest correction, event description change 2014-05-06 17:13:37 +08:00
Dan Poltawski
4644e7d067 Merge branch 'MDL-45376-master' of https://github.com/sammarshallou/moodle 2014-05-06 11:16:32 +08:00
Ankit Agarwal
2b34a377ea MDL-45201 recent_activity: Fix set type notice in recent activity form 2014-05-05 13:29:51 +08:00
sam marshall
1710973161 MDL-45376 Completion: Form locking is still not working right
On submit of the form, it called 'freeze' on the completion-related
fields (even though they shouldn't have been frozen because you
already clicked the unlock button).
2014-05-01 18:08:46 +01:00
Dan Poltawski
066f0395a6 Merge branch 'MDL-45365-master' of git://github.com/damyon/moodle 2014-05-01 14:52:02 +08:00
Damyon Wiese
6a20bfa06d MDL-45365 Courselib unit tests: cmid -> instanceid confusion
Yet again an instanceid is being passed instead of a cmid.
2014-05-01 14:00:40 +08:00
Petr Skoda
3373120f60 MDL-43557 fix assertion for course section event description 2014-04-30 11:44:56 +08:00
Mark Nelson
02a5a4b2ff MDL-43557 events: fixed minor issues in existing events 2014-04-29 19:16:11 -07:00
Marina Glancy
00cb2f0010 Merge branch 'MDL-27459-master' of git://github.com/sammarshallou/moodle 2014-04-30 09:55:25 +08:00
sam marshall
97c3c2c2cc MDL-27459 Completion: When ratings off, disallow grade completion
For activities that use ratings, there is no grade unless ratings
are enabled. The completion system still lets you select 'complete
when user gets a grade', which leads to later errors.

This change simply disables the 'completion on grade' field if
ratings are enabled for the activity, but not turned on in the form.
2014-04-29 10:28:34 +01:00
Sam Hemelryk
48dba530c6 Merge branch 'MDL-45229-master' of git://github.com/FMCorz/moodle 2014-04-29 08:40:16 +12:00
Marina Glancy
c6b4a7f4a2 Merge branch 'MDL-44627-master' of git://github.com/lameze/moodle 2014-04-28 12:43:37 +08:00
Simey Lameze
9e533215bd MDL-44627 events: Triggering event course module updated actions. 2014-04-28 12:11:24 +08:00
Frederic Massart
1f6988bb3b MDL-45229 event: Trigger event when section visibility changes 2014-04-28 11:27:47 +08:00
Frederic Massart
be9fb21191 MDL-45229 event: Validate sectionnum in course_section_updated 2014-04-28 11:27:44 +08:00
Sam Hemelryk
a5f4213939 MDL-45248 course: fixed assumptions when logging a course view 2014-04-28 08:12:35 +12:00
Sam Hemelryk
8ddcb3ff8c Merge branch 'MDL-45124-master' of git://github.com/andrewnicols/moodle 2014-04-24 11:03:15 +12:00
Petr Skoda
dce7ec41e9 MDL-45219 add course recent_activity_viewed event 2014-04-23 11:53:36 +08:00
Andrew Nicols
d2782804cb MDL-45124 dndupload: Lowercase types when comparing
IE helpfull uses a mixed-case version of 'Text' which fails the string
comparison. All other browsers use lowercase for their mime-types.
2014-04-22 16:08:26 +08:00
Petr Skoda
f49151c30b MDL-41185 cleanup course viewed events
Thanks Marina for spotting some of the issues.
2014-04-21 18:12:53 +08:00
Adrian Greeve
68a7235889 MDL-41185 events: Added events for different course view pages 2014-04-21 17:39:18 +08:00
Sam Hemelryk
e97b942223 Merge branch 'MDL-40908_master' of https://github.com/markn86/moodle 2014-04-09 11:26:33 +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
Marina Glancy
158379e173 MDL-40907 events: additional legacy logging for module update/add events" 2014-04-08 13:45:13 +08:00
Marina Glancy
957944dca8 MDL-40907 events: view list of resources in course 2014-04-08 13:45:09 +08:00
Damyon Wiese
515fe565f6 Merge branch 'MDL-44070-master' of https://github.com/sammarshallou/moodle
Conflicts:
	theme/bootstrapbase/less/moodle/forms.less
	theme/bootstrapbase/style/moodle.css
	version.php
2014-04-08 13:30:41 +08:00
Damyon Wiese
1e16a58525 Merge branch 'wip-MDL-22999-m27' of https://github.com/jamesmcq/moodle 2014-04-08 10:09:21 +08:00
Dan Poltawski
3a047312b6 Merge branch '42317-27' of git://github.com/samhemelryk/moodle
Conflicts:
	theme/bootstrapbase/style/moodle.css
2014-04-08 09:22:38 +08:00
James McQuillan
597662335d MDL-22999 core_grades: Added ability to configure maximum grade value both globally and for each graded-activity. 2014-04-07 16:02:37 -04: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
sam marshall
400c0fd229 MDL-44070 Conditional availability enhancements (7): forms
Changes to the module and section editing forms to use the new
fields and JavaScript.
2014-04-07 20:11:52 +01:00
sam marshall
8d1f33e122 MDL-44070 Conditional availability enhancements (6): core changes
Changes core code to use new API instead of the old one when
checking user access to activities and sections.

Includes changes to other libraries that are necessary after
adding the availability system and removing old conditional tables
etc.
2014-04-07 20:11:48 +01:00
Damyon Wiese
e017c50bcf Merge branch 'wip-MDL-40843-master' of git://github.com/marinaglancy/moodle 2014-04-07 16:57:06 +08:00
Damyon Wiese
2aa476bbc8 Merge branch 'wip-MDL-43021-master' of git://github.com/marinaglancy/moodle 2014-04-07 15:19:11 +08:00
Sam Hemelryk
566889aaa8 MDL-42317 output: reviewed standard/base layouts and converted where a better option was available 2014-04-06 15:57:32 +12:00
shashirepo
600be271c6 MDL-39833 course: require token change
MDL-39833 course: require token change
2014-04-05 12:29:47 +05:30
Marina Glancy
e19c086c36 MDL-40843 recent_activity: corrections to grouping and user fields 2014-04-04 16:52:01 +08:00
Mark Nelson
d999407125 MDL-40908 core_tag: created an 'item_untagged' event 2014-04-03 20:26:22 -07:00
Marina Glancy
e13016850c MDL-43021 course: corrections to the shortname and idnumber uniqueness validation 2014-04-03 11:07:01 +08:00