Commit graph

60238 commits

Author SHA1 Message Date
Marina Glancy
a32f163dfd MDL-38147 do not use DB->sql_length because it does not work on MSSQL 2013-03-27 16:07:29 +11:00
Aparup Banerjee
8963212472 Merge branch 'MDL-38632' of git://github.com/stronk7/moodle 2013-03-27 13:07:10 +08:00
Damyon Wiese
ddeea94a35 Merge branch 'MDL-38736-master' of git://github.com/danpoltawski/moodle 2013-03-27 12:17:47 +08:00
Damyon Wiese
5df15f2524 MDL-38717 Admin: Change setType for email to PARAM_EMAIL 2013-03-27 12:11:06 +08:00
Damyon Wiese
1b393ce91d Merge branch 'MDL-38717-master' of git://github.com/danpoltawski/moodle 2013-03-27 11:57:14 +08:00
Aparup Banerjee
cf457c2169 Merge branch 'MDL-38659' of git://github.com/stronk7/moodle 2013-03-27 10:38:31 +08:00
Dan Poltawski
8bd1829310 MDL-38736 mod_choice: fix missing param type 2013-03-27 10:19:57 +08:00
Damyon Wiese
0e2ca62e86 MDL-35876: Whitespace, indenting and more verbose upgrade.txt 2013-03-27 10:16:09 +08:00
Dan Poltawski
f6343982e1 MDL-38717 admin: missing setType on email 2013-03-27 10:14:35 +08:00
Damyon Wiese
df9bdfb000 Merge branch 'wip-MDL-35876-master' of git://github.com/phalacee/moodle
Conflicts:
	lib/upgrade.txt
2013-03-27 10:06:30 +08:00
Eloy Lafuente (stronk7)
3b597dd4ee Merge branch 'wip-mdl-38543' of git://github.com/deraadt/moodle 2013-03-27 02:00:02 +01:00
Eloy Lafuente (stronk7)
49ef0c56ef Merge branch 'MDL-38552-master' of git://github.com/FMCorz/moodle 2013-03-27 01:51:35 +01:00
Eloy Lafuente (stronk7)
381ffd46fc Merge branch 'MDL-38566-master' of git://github.com/FMCorz/moodle
Conflicts:
	theme/base/style/core.css
2013-03-27 01:49:10 +01:00
Eloy Lafuente (stronk7)
18ceea60af Merge branch 'MDL-38484_master' of git://github.com/dmonllao/moodle 2013-03-27 00:47:32 +01:00
Eloy Lafuente (stronk7)
2477bb29cc Merge branch 'MDL-38531_master' of git://github.com/dmonllao/moodle 2013-03-27 00:46:05 +01:00
Eloy Lafuente (stronk7)
64a807ae44 Merge branch 'MDL-38483_master' of git://github.com/dmonllao/moodle 2013-03-27 00:43:19 +01:00
Eloy Lafuente (stronk7)
cf140de945 Merge branch 'MDL-38557' of git://github.com/timhunt/moodle
Conflicts:
	lib/db/upgrade.php
	version.php
2013-03-26 23:38:07 +01:00
Eloy Lafuente (stronk7)
b741fac308 Merge branch 'MDL-38651' of git://github.com/timhunt/moodle 2013-03-26 23:27:16 +01:00
Eloy Lafuente (stronk7)
d89eed6fca Merge branch 'MDL-38647' of git://github.com/timhunt/moodle 2013-03-26 23:22:25 +01:00
Eloy Lafuente (stronk7)
45679e3a9e Merge branch 'w13_MDL-38589_m25_pear' of git://github.com/skodak/moodle 2013-03-26 23:14:24 +01:00
Eloy Lafuente (stronk7)
e01812b333 Merge branch 'w13_MDL-37783_m12_testinfo' of git://github.com/skodak/moodle 2013-03-26 23:13:33 +01:00
Eloy Lafuente (stronk7)
8ef5dc58ea Merge branch 'MDL-38563-master-int' of git://github.com/FMCorz/moodle 2013-03-26 23:10:11 +01:00
Eloy Lafuente (stronk7)
4efcfaa3ae Merge branch 'w13_MDL-37742_m25_dirtyoracle' of git://github.com/skodak/moodle
Conflicts:
	lib/upgrade.txt
2013-03-26 23:04:48 +01:00
David Mudrák
5106aab30c MDL-38733 Fix the workshop rubric CSS 2013-03-26 22:32:07 +01:00
Petr Škoda
e788339786 MDL-37742 add debugging message when $DB->sql_empty() used 2013-03-26 22:12:17 +01:00
Eric Merrill
c9deaa8e79 MDL-25631 backup Decoupling legacy files from course config settigs. If they are present, they will be restored. 2013-03-26 17:01:55 -04:00
David Mudrák
e36942b716 MDL-37602 Include the overall feedback in the workshop backup and restore 2013-03-26 21:33:22 +01:00
David Mudrák
77d746a2f5 MDL-37602 Clean up and improve the overall feedback rendering
In order to use the overall feedback in assessments of example
submissions and in the assessment form preview, significant improvements
in the rendering machinery were done.

Workshop class provides two new methods overall_feedback_content_options()
and overall_feedback_attachment_options() as they are needed at various
scripts and libraries.

Overall feedback is displayed as a part of the workshop_assessment_form
only if the form is in editable mode (not frozen). If the form is
displayed in read-only (frozen) mode, the caller is expected to render
the overall feedback and list of attachments (the editor and filemanager
elements do not support frozen mode). To do so, the renderable
workshop_assessment now loads overall feedback data and provides two new
methods get_overall_feedback_content() and
get_overall_feedback_attachments() to be used by the renderer.

Renderable workshop_submission, workshop_assessment and related classes
now accept the workshop instance as the first parameter in their
constructors. This way, these renderable classes have access to the
workshop API.

In the future, the rendering of submission files should be improved in
the same way as is done in this patch (i.e. moving the logic and data
preparation out of the renderer into the renderable classes).
2013-03-26 21:25:46 +01:00
David Mudrák
88e79d8adb MDL-37602 Add support for browsing the overall feedback files 2013-03-26 21:25:45 +01:00
David Mudrák
05837ba355 MDL-37602 Serve files embedded or attached to the overall feedback 2013-03-26 21:25:45 +01:00
David Mudrák
c6a793d5a2 MDL-37602 Put the overall feedback fields to the bottom of the assessment form
The assessment form can be displayed as editable or read-only (frozen).
Neither the editor element nor the filemanager element support
displaying frozen content themselves so we need to pre-format and inject
static texts.

The list of attachments should be ideally generated by the renderer and
probably improved a bit - just quick and dirty solution must be enough
for now though (2.5 coding freeze is just behind the corner...).

AMOS BEGIN
 CPY [submissionattachment,mod_workshop],[feedbackauthorattachment,mod_workshop]
AMOS END
2013-03-26 21:25:00 +01:00
Eloy Lafuente (stronk7)
2ac738f8ed Merge branch 'w13_MDL-37782_m25_testtrans' of git://github.com/skodak/moodle 2013-03-26 16:09:06 +01:00
Eloy Lafuente (stronk7)
0d377c8d56 Merge branch 'w13_MDL-38671_m25_adodb' of git://github.com/skodak/moodle 2013-03-26 16:07:12 +01:00
Eloy Lafuente (stronk7)
cf20e809aa Merge branch 'MDL-38582' of git://github.com/timhunt/moodle 2013-03-26 16:03:37 +01:00
Eloy Lafuente (stronk7)
6341d977a3 MDL-38659 environment: fix incorrect feedback messages 2013-03-26 15:34:50 +01:00
Eloy Lafuente (stronk7)
d9b9ef5d4e MDL-38659 environment: verify feedback matches levels 2013-03-26 15:34:06 +01:00
Eloy Lafuente (stronk7)
38495379a8 Merge branch 'MDL-38719' 2013-03-26 13:37:13 +01:00
Eloy Lafuente (stronk7)
caa30cd625 MDL-38719 forms: detectMissingSetType() handle of repetitions.
It seems that formslib, for repetition, relies in the type
especified by the main (non existent at the end) element, instead
of assingning a type to each repetition.

Surely a result of storing types apart from elements. :-(

With the patch, detectMissingSetType() will detect
repeated elements (name containing '[') and will
perform the verification against that main element type.
2013-03-26 13:28:47 +01:00
Eloy Lafuente (stronk7)
f35f07e9f7 MDL-38719 forms: add some missing types.
This just adds some missing types to different places
causing phpunit tests to fail.
2013-03-26 12:13:40 +01:00
Aparup Banerjee
3a7e4a80ad MDL-38564 fixed whitespace 2013-03-26 17:22:22 +08:00
Frederic Massart
c55cd6ac64 MDL-38691 form: Styling for show more/less toggle 2013-03-26 17:20:58 +08:00
Aparup Banerjee
be0eacf883 Merge branch 'MDL-38564-master' of git://github.com/ankitagarwal/moodle 2013-03-26 17:20:01 +08:00
Aparup Banerjee
d54bc60b33 Merge branch 'w13_MDL-38672_m25_purifier' of git://github.com/skodak/moodle 2013-03-26 17:12:18 +08:00
Barbara Ramiro
83284dc962 MDL-38691 usability: More/less icons 2013-03-26 17:08:15 +08:00
Dan Poltawski
1f0cd6ee98 MDL-38712 mod_glossary: fix missing PARAM type 2013-03-26 17:05:10 +08:00
Dan Poltawski
e380d57fb6 MDL-38711 qtype_multianswer: missing setType param 2013-03-26 16:57:01 +08:00
Dan Poltawski
7c69ab5dc7 MDL-38713 course: correctly set visibleold on mod creation
Remove uncessary set of visibleold in the form
2013-03-26 16:27:38 +08:00
Ankit Agarwal
bf6b3c7a8a MDL-38564 Adding unit tests for the functions compare_activities_by_time_asc() and compare_activities_by_time_desc() 2013-03-26 16:12:01 +08:00
Damyon Wiese
0231f91d86 Merge branch 'w13_MDL-38673_m25_flowplayer' of git://github.com/skodak/moodle 2013-03-26 16:11:47 +08:00
Frederic Massart
a59bbb6e12 MDL-38611 page: Reformat settings form 2013-03-26 15:40:24 +08:00