12982 Commits

Author SHA1 Message Date
Dan Poltawski
709d684341 Merge branch 'MDL-36064' of git://github.com/netspotau/moodle-mod_assign 2012-10-30 12:14:40 +08:00
Sam Hemelryk
e118ad21c9 Merge branch 'MDL-34274-master' of git://github.com/ankitagarwal/moodle 2012-10-30 16:00:45 +13:00
Dan Poltawski
752a3f14be Merge branch 'wip-mdl-35910' of git://github.com/rajeshtaneja/moodle 2012-10-30 10:00:11 +08:00
Dan Poltawski
e76cc8f4c0 Merge branch 'MDL-36135-evaluators' of git://github.com/mudrd8mz/moodle 2012-10-30 09:37:03 +08:00
Sam Hemelryk
a9ab988e43 Merge branch 'WIP-MDL-36070-master' of git://github.com/nadavkav/moodle 2012-10-30 13:02:24 +13:00
Dan Poltawski
506263cfee Merge branch 'WIP-MDL-36033-master' of git://github.com/nadavkav/moodle 2012-10-29 14:59:45 +08:00
Dan Poltawski
3aa721e035 Merge branch 'MDL-34399' of git://github.com/timhunt/moodle 2012-10-29 12:18:01 +08:00
Dan Poltawski
6954e44169 Merge branch 'MDL-36086-workshop' of git://github.com/mudrd8mz/moodle 2012-10-29 12:11:51 +08:00
Tim Hunt
32953f37b6 MDL-34399 quiz cleanup: remove ugly question/page number hack
It used to be necessary to store the question number and question page
by adding them as random extra fields on the question object (but
I can no longer remember what that reason was). Now it is possible
to store this sensibly in the quiz_attempt object, which is much
cleaner, so do that.
2012-10-26 11:58:25 +08:00
Tim Hunt
204ceaa389 MDL-34399 quiz cleanup: remove never used function.
This got added during the Moodle 2.0 files API conversion, but was
always part of a failed experiemnt, so should have been deleted
long ago. It was never actually used.
2012-10-26 11:58:03 +08:00
Eloy Lafuente (stronk7)
827b294ca8 MDL-35297 book: replay some steps lost when book landed to core
This commit replays, conditionally, all the upgrade steps from
MOODLE_19_STABLE to MOODLE_23_STABLE in the mod_book activity. That
guarentees that any site using the mod_book before landing to core,
no matter if it was the latest or an outdated one will upgrade
perfectly to the expected current version.

As a general rule, everytime one contrib plugin lands to core, its
complete upgrade code must be kept, at least until the core version
that introduced it, is out completely from the upgrade requirement
conditions.

In this case, with the missing upgrade code being added to 2.4, it
will be safe to delete the upgrade steps once 2.5 (or upwards) become
a requirement. Never always.
2012-10-21 17:36:37 +08:00
David Mudrák
462b4c128c MDL-36086 Fix SQL parameters array 2012-10-20 00:25:27 +08:00
David Mudrák
4f11517667 MDL-36135 Give the grading evaluation methods control over their settings forms
From now on, the evaluator's method get_settings_form() should return a
subclass of workshop_evaluation_settings_form. The evaluation subplugins
are expected to use the define_sub() method to add their own fields into
the base form, although they can override the main define() method, too.

The former interface workshop_evaluation has been refactored into a
superclass with abstract methods which seems to be more robust.

Oh, by the way, I'm in Perth - yay!

AMOS BEGIN
 MOV [settings,workshopeval_best],[evaluationsettings,mod_workshop]
AMOS END
2012-10-20 00:17:13 +08:00
David Mudrák
a93dc3ecb7 MDL-36135 Display the workshop grading evaluation method chooser
Teachers can now choose the actual grading evaluation method to use
during the grading evaluation phase. The workshopeval_best is still used
as the default one (this may be made configurable later, although there
is no big benefit of it).
2012-10-20 00:17:13 +08:00
Nadav Kavalerchik
f12117250d MDL-36033 - Left align Numeric value fields in Calculated and Numeric question, when in RTL mode 2012-10-19 10:24:03 +02:00
Nadav Kavalerchik
ad01d8f57b MDL-36070 - Points label hides UP and Down ordering arrows and Delete Icon on Quiz edit page, in RTL mode (theme/standard) 2012-10-19 10:16:26 +02:00
Rajesh Taneja
7212740691 MDL-35910 Assignment 2.2: Fixed included files in assignment zip.
If Marking button is enabled, assignment is open and is not finalized, then don't add file to zip
2012-10-19 16:07:19 +08:00
Sam Hemelryk
2ea4312a23 MDL-31683 mod_assign: Fixed up whitespace and cap check changes as required 2012-10-17 11:17:53 +08:00
Sam Hemelryk
7e5c720495 Merge branch 'MDL-31683' of git://github.com/Lightwork-Marking/moodle 2012-10-17 10:57:36 +08:00
Paul Charsley
1378838eca MDL-31683 added mod_assign_get_assignments web service function 2012-10-17 13:21:44 +13:00
Sam Hemelryk
f7de90a74a MDL-33857 fixed up whitespace 2012-10-16 13:32:34 +08:00
Sam Hemelryk
2bbf03ce3b Merge branch 'wip-MDL-33857-master' of git://github.com/marinaglancy/moodle 2012-10-16 13:31:44 +08:00
Dan Poltawski
5f7ac316fb MDL-21801 - mod_lesson: version bump
To reflect the new (ppt-less) state
2012-10-16 10:30:45 +08:00
Dan Poltawski
399fd63052 Merge branch 'MDL-21801_b' of git://github.com/rwijaya/moodle 2012-10-16 10:29:49 +08:00
Sam Hemelryk
efd6156e4d Merge branch 'MDL-35726' of git://github.com/netspotau/moodle-mod_assign 2012-10-16 10:16:26 +08:00
Sam Hemelryk
ee17d12db1 Merge branch 'wip-MDL-25275-master' of git://github.com/abgreeve/moodle 2012-10-16 10:11:04 +08:00
Damyon Wiese
f42010d10d MDL-35711: Minor comment formatting fixes. 2012-10-16 10:08:36 +08:00
Ruslan Kabalin
184a5ef9e5 MDL-35711 mod_assign Trigger submission event when submit button click is not requred 2012-10-16 10:08:32 +08:00
Dan Poltawski
eb214fdb4e MDL-35710 - mod_assign: bump version for new events 2012-10-16 10:04:59 +08:00
Dan Poltawski
eed6cd1987 Merge branch 'MDL-35710' of git://github.com/netspotau/moodle-mod_assign 2012-10-16 10:01:46 +08:00
Damyon Wiese
e197970021 MDL-36064: Assignment revert to draft causes error with Team assignment changes 2012-10-16 09:49:29 +08:00
Dan Poltawski
f186ad1f90 Merge branch 'wip-MDL-35339-master' of git://github.com/marinaglancy/moodle 2012-10-15 17:19:44 +08:00
Aparup Banerjee
dd55ec309b MDL-35418 fixed up whitespaces 2012-10-15 16:36:45 +08:00
Aparup Banerjee
43d333cb58 Merge branch 'master_MDL-35418' of git://github.com/danmarsden/moodle 2012-10-15 16:36:38 +08:00
Dan Poltawski
317db10e5d Merge branch 'wip-MDL-35895-master' of git://github.com/marinaglancy/moodle 2012-10-15 16:07:24 +08:00
Dan Marsden
d83566565c MDL-35418 SCORM: always set children param even if empty. Always set incomplete param 2012-10-15 19:25:01 +13:00
Dan Marsden
995e322e75 MDL-35418 SCORM: remove dumb function, include sequencinglib.php as scorm_13lib.php still calls some of the functions. 2012-10-15 19:25:01 +13:00
Dan Marsden
92be6fa471 MDL-35418 SCORM: coding guideline tidy - removes a few unused vars as well. 2012-10-15 19:25:01 +13:00
Mayank Gupa
41e205cd8e MDL-35418 SCORM: Improve SCORM 2004 support
GSOC project to improve SCORM 2004 support, includes MDL-32835 rewrite scorm_get_toc
2012-10-15 19:25:01 +13:00
Marina Glancy
7f4550529a MDL-35895 Correctly build return to course link in book module 2012-10-15 14:17:36 +08:00
Marina Glancy
722e6ba947 MDL-35339 Deprecate add_mod_to_section(), create new function course_add_cm_to_section()
Function add_mod_to_section() has very confusing arguments when object  looks like record from
table course_modules but field ->section refers to relative section number (course_sections.section).
In table course_modules the field section refers to course_sections.id.
Also add_mod_to_section() does not update table course_modules and does not call rebuild_course_cache()
which developer can forget to do afterwards.

- Added function course_add_cm_to_section()
- In the core code add_mod_to_section() is replaced with course_add_cm_to_section()
- Function add_mod_to_section() is deprecated
2012-10-15 14:08:13 +08:00
Marina Glancy
71a56e08c8 MDL-35339 avoid using get_all_sections(), get_all_mods() and field section.sequence directly 2012-10-15 14:08:13 +08:00
Dan Poltawski
6bea7da1ab Merge branch 'wip-MDL-35661-master' of git://github.com/marinaglancy/moodle 2012-10-15 13:31:10 +08:00
Damyon Wiese
26af81027f MDL-35726: Use a different form identifier for each form when using "Save and next"
This prevents a bug where the next student feedback will default to the values that
were on the last submitted form. This is a similar case to having multiple instances
of the same form on the same page - each one needs a unique identifier to distinguish
between them. In this case I include the $rownum which changes as you go to each student
in the list.
2012-10-12 12:03:40 +08:00
Damyon Wiese
1defeabf2c MDL-35710: Minor comment formatting fixes 2012-10-12 08:45:15 +08:00
Ruslan Kabalin
c14685e80f MDL-35710 mod_assign Add submission_editable paramenter to event object
This will allow to keep assessable_submitted event object structure consistent
throughout the system, while particular modules could define own parameters
within params variable.

This module defines submission_editable parameter to reflect if user can edit
submission before assessment has been done.
2012-10-12 08:40:42 +08:00
Ruslan Kabalin
f04523f07e MDL-35710 mode_assign Make submission event trigger name more precise 2012-10-12 08:40:42 +08:00
Ankit Agarwal
0f357885b2 MDL-34274 book: adding restore log rules for the new actions 2012-10-11 13:32:00 +08:00
Ankit Agarwal
d3bf90ae04 MDL-34274 book: Adding ability to log chapter updates 2012-10-11 11:46:15 +08:00
Ankit Agarwal
131688cf94 MDL-34274 book: Adding ability to log chapter view and chapter print 2012-10-11 11:46:15 +08:00