7ece4a0798
Merge branch 'rubric' of github.com:mudrd8mz/moodle into rubric
2011-10-13 22:45:30 +02:00
20c207ab21
Merge branch 'master' into rubric
...
Conflicts:
lib/db/upgrade.php
2011-10-13 22:42:47 +02:00
3bf7ef29a5
MDL-29481: filling rubric by teacher, first steps
2011-10-13 16:27:33 +08:00
6798c63e20
Added form element grading and integrated it with grading_controller
2011-10-12 15:01:53 +08:00
18e6298c7b
Added validation to grading form, implemented methods in advanced grading to return form contents and process and return the final grade
2011-10-12 11:48:06 +08:00
d87ef08598
Merge branch 'MDL-29447' of git://github.com/timhunt/moodle
2011-10-11 10:25:33 +13:00
c676af9f72
MDL-29564 Assignment: whitespace fix
2011-10-10 13:08:48 +02:00
1216ab39d1
Merge branch 'MDL-16553' of git://github.com/bostelm/moodle
2011-10-10 17:56:14 +13:00
19f7391c50
MDL-29564 Assignment: Fixed a fatal error caused by a missing include
2011-10-10 11:54:53 +13:00
fba356f375
MDL-29483 Initial draft of advanced grading support in the Assignment module
2011-10-08 01:02:31 +02:00
db3543428f
MDL-16553 Assignment, student view: show response files when no grade available
2011-10-07 23:22:31 +01:00
c9b8a78951
MDL-29690 fix usage of select all/deselect all in choice reports
2011-10-07 21:41:35 +13:00
73f5ebea0c
Merge branch 'wip-MDL-28615-master-squashed' of git://github.com/samhemelryk/moodle
2011-10-05 10:54:05 +08:00
202c2032fa
Merge branch 'MDL-28469' of git://github.com/timhunt/moodle
2011-10-05 01:13:57 +02:00
a161d96f3a
MDL-28615 forum: Fixed up a couple of minor regressions
2011-10-05 11:08:50 +13:00
8dd9ccf475
MDL-29447 quiz course reset does not reset the quiz_grades table.
...
Thank to Jean-Michel Vedrine for working out the basic idea of the fix.
2011-10-04 22:47:44 +01:00
a361676b22
Merge branch 'MDL-27857-assignment-portfolio' of git://github.com/mudrd8mz/moodle
2011-10-04 12:42:32 +02:00
0870a06899
Merge branch 'MDL-29621_master_wip' of git://github.com/grabs/moodle
2011-10-04 17:54:00 +13:00
6fdcc0d44f
MDL-28615 forum: Fixed missing context regression
2011-10-04 16:37:16 +13:00
2bbe5979cb
Merge branch 'MDL-28725_wiki_section2' of git://github.com/andyjdavis/moodle
2011-10-04 16:21:16 +13:00
c72cf85f17
Merge branch 'MDL-29511' of git://github.com/timhunt/moodle
2011-10-04 01:11:20 +02:00
eefebc2edb
Merge branch 'MDL-29570' of git://github.com/timhunt/moodle
2011-10-03 21:42:28 +02:00
af26e3453a
MDL-29621 - XHTML not welformed when creating Feedback questions
2011-10-03 18:40:16 +02:00
e07cccfc25
MDL-28469 quiz settings pages should be pagelayout admin.
2011-10-03 16:38:34 +01:00
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
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
6d3ae9103c
MDL-26486 Lesson : fixed whitespace
2011-10-03 16:00:24 +08:00
b735bd19cc
Merge branch 'MDL-26486' of git://github.com/rwijaya/moodle
2011-10-03 15:37:50 +08:00
c04b01f46f
MDL-27640 rating: altered the return url provided by mod_data to ratings
2011-10-03 15:17:27 +08:00
1bbe222d53
Merge branch 'MDL-29296' of git://github.com/rwijaya/moodle
2011-10-03 17:08:21 +13:00
61ab8f0749
MDL-28615 forum: Revised enrol_sharing_course to use the new enrol_get_shared_courses and fixed permission checking in forum_user_can_see_post
2011-10-03 11:23:30 +13:00
c3584ad683
MDL-29511 Fix problems on the quiz review questions page found while investigating this bug.
2011-09-29 21:46:39 +01:00
72bbb091a4
MDL-29570 Quiz editing page displays the wrong time in the status line sometimes.
2011-09-29 09:06:11 +01:00
1323bf5597
MDL-28725 wiki: added urlencode around the section variable when it is being used to construct URLs
2011-09-29 14:57:28 +08:00
41017112cf
MDL-28725 wiki: added missing string
...
AMOS BEGIN
CPY [invalidsection,core_admin],[invalidsection,mod_wiki]
AMOS END
2011-09-29 14:57:28 +08:00
4b71542394
MDL-28615 mod_forum: Fixed the users page that shows all of the users posts
2011-09-29 14:20:58 +13:00
c90ba16f51
MDL-26486 lesson mod: fixed grade report error on matching and shortanswers questions
2011-09-28 11:34:14 +08:00
260316ce48
Merge branch 'MDL-29230' of git://github.com/rwijaya/moodle
2011-09-27 14:52:00 +08:00
df1ed7d435
Merge branch 'MDL-25241_forum_search_ratings' of git://github.com/andyjdavis/moodle
2011-09-27 11:18:17 +08:00
87eca3192f
Merge branch 'MDL-28424' of git://github.com/timhunt/moodle.git with changes
2011-09-27 11:24:02 +13:00
e135797586
Merge branch 'w38_MDL-29401_m22_frankenstyle' of git://github.com/skodak/moodle
2011-09-27 00:00:20 +02:00
1a8ab39b3c
Merge branch 'MDL-29427' of git://github.com/timhunt/moodle
2011-09-26 21:47:40 +02:00
0343553fbc
MDL-29296 lesson mod: fixed regression for continue button on last lesson page.
2011-09-26 16:41:49 +08:00
94f59561ad
Merge branch 'MDL-29464' of git://github.com/timhunt/moodle
2011-09-26 14:32:52 +08:00
32da08a2e2
Merge branch 'MDL-29428' of git://github.com/timhunt/moodle
2011-09-26 14:03:54 +13:00
809dae3461
Merge branch 'MDL-29336-numerrors-mapping' of git://github.com/mudrd8mz/moodle
2011-09-26 12:37:12 +13:00
aff24313be
MDL-29401 introduce new frankenstyle PARAM types
...
New PARAM_COMPONENT, PARAM_AREA and PARAM_PLUGIN + fixing of hopefully all current incorrect parameter types. This should help with diagnosing of incorrectly named 3rd party plugins too.
2011-09-25 09:59:55 +02:00
2497d0273d
MDL-29190 - XHTML not well formed in show_nonrespondents.php
2011-09-23 18:56:47 +02:00
6d84e82f3a
MDL-29230 lesson_module: fixed question's answer to have 0 value.
2011-09-23 14:02:46 +08:00
79a46626d3
MDL-29427 quiz nav: information items should should have a state tooltip
2011-09-22 18:12:43 +01:00
David Mudrak