mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-15 13:10:08 +01:00
Code Issues Projects Releases Wiki Activity
49,484 Commits 36 Branches 523 Tags
Commit Graph

49484 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
David Mudrak
b7a6bb9ba8 MDL-29480 Adding new fields into grading_definitions 2011-10-07 22:43:02 +02:00
David Mudrak
2c86d85daf MDL-29480 Making the upgrade.php in sync with recent install.xml 2011-10-07 22:07:55 +02:00
David Mudrak
e8004aadc8 Merge remote branch 'origin/master' into rubric 
Conflicts:
	lib/db/install.xml
	lib/db/upgrade.php
	version.php
 2011-10-07 22:01:38 +02:00
Eloy Lafuente (stronk7)
9086337415 weekly release 2.2dev 2011-10-07 00:09:23 +02:00
Eloy Lafuente (stronk7)
943c662d62 fix permissions 2011-10-07 00:07:15 +02:00
Eloy Lafuente (stronk7)
897015a0eb Merge branch 'install_master' of git://github.com/amosbot/moodle 2011-10-07 00:04:52 +02:00
AMOS bot
3529863465 Automatically generated installer lang files 2011-10-06 00:55:31 +00:00
David Mudrak
afc766a238 MDL-29480 Allow null values for format fields 
When inserting a record without the associated text, it does not make
sense to force format to be set. And using any hard-coded default is
tricky.
 2011-10-05 18:29:21 +02:00
Aparup Banerjee
80f01595af MDL-29089 gradebook: fixed incorrect precision 2011-10-05 15:14:27 +08:00
Aparup Banerjee
73f5ebea0c Merge branch 'wip-MDL-28615-master-squashed' of git://github.com/samhemelryk/moodle 2011-10-05 10:54:05 +08:00
David Mudrak
3e43eff5dc MDL-29479 Improved gradingform_controller base class 2011-10-05 03:51:41 +02:00
David Mudrak
8cd65f1657 MDL-29479 It is now possible to set the active method to null (simple direct grading) 2011-10-05 03:50:12 +02:00
David Mudrak
fb13a1484d MDL-29479 Improved grading manager factory function 2011-10-05 03:49:21 +02:00
Eloy Lafuente (stronk7)
202c2032fa Merge branch 'MDL-28469' of git://github.com/timhunt/moodle 2011-10-05 01:13:57 +02:00
Eloy Lafuente (stronk7)
7eaca44932 Merge branch 'wip-MDL-25697-master' of git://github.com/samhemelryk/moodle 2011-10-05 01:10:03 +02:00
Sam Hemelryk
a161d96f3a MDL-28615 forum: Fixed up a couple of minor regressions 2011-10-05 11:08:50 +13:00
Eloy Lafuente (stronk7)
cec6a15b99 Merge branch 'MDL-29644' of git://github.com/timhunt/moodle 2011-10-04 23:34:15 +02:00
Tim Hunt
77d0f5f07b MDL-29644 qtype multianswer, hints lost doing Moodle XML export. 
This commit also includes a lot of useful tidying up of some of the unit
test helper code. I turned out that I could not use all the helper code
in my new tests, but despite that it will be useful in the future, so I
am committing it here.
 2011-10-04 22:23:58 +01:00
Aparup Banerjee
2fbc708186 Merge branch 'MDL-29089_grade_history_missing_columns2' of git://github.com/andyjdavis/moodle.git (resolved version.php conflicts) 2011-10-05 02:46:38 +08:00
Eloy Lafuente (stronk7)
a361676b22 Merge branch 'MDL-27857-assignment-portfolio' of git://github.com/mudrd8mz/moodle 2011-10-04 12:42:32 +02:00
Eloy Lafuente (stronk7)
66f7705daa Merge branch 'MDL-29548' of git://github.com/timhunt/moodle 2011-10-04 12:31:34 +02:00
Tim Hunt
7529f9e944 MDL-29548 allow message plugins to control message 
defaults.

At the moment, each message_provider can specify defaults for
each message output, to say whether that message output should be
used for this type of message:
http://docs.moodle.org/dev/Messaging_2.0#Adding_new_message_type.

If the message provider does not set a default, this change allows
the message output to set the default.
 2011-10-04 11:23:52 +01:00
Eloy Lafuente (stronk7)
cdee9bd4f6 Merge branch 'MDL-19575-master' of git://github.com/ankitagarwal/moodle 2011-10-04 12:12:08 +02:00
Tim Hunt
f0bfd964ba MDL-29520 question engine: work-around bad MySQL delete performance. 
This is a temporary fix, until the new API from MDL-29589 is available.

(amended to fix comments)
 2011-10-04 12:03:41 +02:00
Tim Hunt
7042a252c5 MDL-29571 questions: improve class=accesshide screen-reader hints. 
This changes the hint that comes before the question text. There are
unit tests to verify the new behaviour.

(amended to fix comments)
 2011-10-04 11:50:56 +02:00
Tim Hunt
9d1658a07e MDL-29571 qtype description refactor unit test code a bit. 2011-10-04 11:50:12 +02:00
Sam Hemelryk
0870a06899 Merge branch 'MDL-29621_master_wip' of git://github.com/grabs/moodle 2011-10-04 17:54:00 +13:00
Sam Hemelryk
6fdcc0d44f MDL-28615 forum: Fixed missing context regression 2011-10-04 16:37:16 +13:00
Sam Hemelryk
2bbe5979cb Merge branch 'MDL-28725_wiki_section2' of git://github.com/andyjdavis/moodle 2011-10-04 16:21:16 +13:00
Sam Hemelryk
66d216c574 Merge branch 'wip-mdl-25937-disableif' of git://github.com/rajeshtaneja/moodle 2011-10-04 15:52:57 +13:00
Eloy Lafuente (stronk7)
c72cf85f17 Merge branch 'MDL-29511' of git://github.com/timhunt/moodle 2011-10-04 01:11:20 +02:00
Eloy Lafuente (stronk7)
38697ad4aa Merge branch 'MDL-29216' of git://github.com/timhunt/moodle 2011-10-03 22:52:55 +02:00
Eloy Lafuente (stronk7)
92c9bc6127 Merge branch 'MDL-29341' of git://github.com/timhunt/moodle 2011-10-03 22:50:18 +02:00
David Mudrak
9b8550f8d9 MDL-29479 Grading method plugins can extend module settings block 
As a part of this, new class grading_controller is introduced and bunch
of smaller changes was done here and there.
 2011-10-03 22:26:53 +02:00
David Mudrak
f25a5a32b8 MDL-29479 Introducing a new capability moodle/grade:managegradingforms 2011-10-03 22:26:52 +02:00
David Mudrak
6440286719 MDL-29479 Active grading method can be set for the given area 2011-10-03 22:26:52 +02:00
David Mudrak
8a4acb3aca MDL-29479 Cosmetic rename of some methods in grading manager API 2011-10-03 22:26:52 +02:00
David Mudrak
6c9e506ca5 MDL-29479 List of available grading methods returned properly 2011-10-03 22:26:52 +02:00
David Mudrak
f59f488a36 MDL-29480 Introducing new rubric plugin 2011-10-03 22:26:51 +02:00
Eloy Lafuente (stronk7)
eefebc2edb Merge branch 'MDL-29570' of git://github.com/timhunt/moodle 2011-10-03 21:42:28 +02:00
Andreas Grabs
af26e3453a MDL-29621 - XHTML not welformed when creating Feedback questions 2011-10-03 18:40:16 +02:00
Tim Hunt
e07cccfc25 MDL-28469 quiz settings pages should be pagelayout admin. 2011-10-03 16:38:34 +01:00
Rajesh Taneja
63d5c4ac85 MDL-25937 Forms Library: Filepicker will respect disable if 2011-10-03 16:26:21 +08:00
David Mudrak
fd04c5bd87 MDL-27857 Export to portfolio support in the assignment module improved 
Portfolio API code in the assignment module expected that the current
user is the author of the submission. Therefore the "Export to
portfolio" button did not work when the submission was viewed by a
teacher (eg at the page with the list of all submissions in the Advanced
upload assignment).

This patch introduces a new callback argument 'submissionid' that holds
explicit ID of the submission the export deals with. With it available,
we do not need to expect the current user is the author of the
submission.

The patch also cleans some strings used for portfolio callback
exceptions.
 2011-10-03 10:15:39 +02:00
David Mudrak
d3996e0705 MDL-27857 Typo in the phpDocs fixed 2011-10-03 10:15:38 +02:00
David Mudrak
b777c798b0 MDL-27857 Assignment does not use form tag to render portfolio export control widget 
When this code was used as a part of the grading screen, the default
PORTFOLIO_ADD_FULL_FORM widget led to nested form elements. This patch replaces
the form widget with a plain text link that can be embedded safely.
 2011-10-03 10:15:38 +02:00
Aparup Banerjee
6d3ae9103c MDL-26486 Lesson : fixed whitespace 2011-10-03 16:00:24 +08:00
Aparup Banerjee
b735bd19cc Merge branch 'MDL-26486' of git://github.com/rwijaya/moodle 2011-10-03 15:37:50 +08:00
Andrew Davis (andyjdavis)
c04b01f46f MDL-27640 rating: altered the return url provided by mod_data to ratings 2011-10-03 15:17:27 +08:00
Aparup Banerjee
9928cc8aa2 MDL-29541 Administration : fixed whitespace 2011-10-03 14:01:17 +08:00