Commit graph

60509 commits

Author SHA1 Message Date
Eloy Lafuente (stronk7)
c4b39661b9 Merge branch 'MDL-38517-m' of https://github.com/andrewnicols/moodle 2013-03-27 21:43:30 +01:00
Eloy Lafuente (stronk7)
a8cdbbe053 Merge branch 'MDL-38471-m' of https://github.com/andrewnicols/moodle 2013-03-27 18:50:34 +01:00
Andrew Robert Nicols
2c0b7d164c MDL-38756 JavaScript: Handle missing jsrev during installation
During installation, jsrev is unset so unavailable for the cache checks.
The installation sets the initial jsrev value and this is updated
periodically, unless it is set to -1 for JS developer.

During installation, we shouldn't really use any caches so if jsrev is
unset, then we should act as though it is set to developer.
2013-03-27 13:13:01 +00:00
David Monllao
2d9cbe8807 MDL-38477 behat: New test
According to MDLQA-16, teachers can edit
or delete any forum post.
2013-03-27 16:51:01 +08:00
David Monllao
22d56e46f1 MDL-38476 behat: New test
According to MDLQA-9, in a single
simple discussion forum only teachers
can start discussions.
2013-03-27 16:49:59 +08:00
David Monllao
a394e57849 MDL-38475 behat: New test
According to MDLQA-5, students can choose
from 4 discussion display options and their
choice is remembered.
2013-03-27 16:47:56 +08:00
David Monllao
68834d4a0d MDL-38475 behat: Step definition to reply a discussion 2013-03-27 16:47:55 +08:00
David Monllao
9449cf8e11 MDL-38439 behat: New test
According to MDLQA-3, a teacher can
set one of 3 possible options for
tracking read forum posts.
2013-03-27 16:46:41 +08:00
David Monllao
e6cb6aed64 MDL-38437 behat: Behat feature for mod_forum
Basic add an activity, MDLQA-2 (students
can edit or delete their forum posts within
a set time limit).
2013-03-27 16:45:01 +08:00
David Monllao
279d86943b MDL-38437 behat: Step definition to add a discussion 2013-03-27 16:45:01 +08:00
David Monllao
b918f9f7bf MDL-38499 behat: Steps definitions for section visibility management 2013-03-27 16:00:54 +08:00
Dan Poltawski
37836c19fb MDL-38738 portfolio: missing PARAM_TEXT 2013-03-27 15:57:35 +08:00
David Monllao
8ec8a05851 MDL-38499 behat: New test
The show/hide section icon functions
correctly. According to MDLQA-1579,
MDLQA-1580, MDLQA-1581, MDLQA-1582
and MDLQA-1583.
2013-03-27 15:57:19 +08:00
David Monllao
4069c4e73f MDL-38486 behat: New test
Section highlighting can be turned off
correctly using the toggle highlighting
icon. According to MDLQA-1591, MDLQA-1592,
MDLQA-1593, MDLQA-1594 and MDLQA-1595
2013-03-27 15:46:03 +08:00
David Monllao
18c84063e3 MDL-38486 behat: Course's topics highlighting steps definitions 2013-03-27 15:46:03 +08:00
Damyon Wiese
604a8ed4e5 Merge branch 'wip-MDL-38147-master' of git://github.com/marinaglancy/moodle 2013-03-27 14:11:27 +08:00
Marina Glancy
0a02b80cda MDL-38147 fixed bug with windows PHP different function behaviour 2013-03-27 17:06:27 +11:00
Marina Glancy
5e71c37ea9 MDL-38147 added comments for SQL-based course search that might not work on some DB 2013-03-27 17:05:51 +11:00
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