Commit graph

66579 commits

Author SHA1 Message Date
Petr Škoda
fd0e019286 MDL-42541 stop using events for porfolion cron 2014-02-13 12:09:24 +08:00
Andrew Nicols
2ab0238ff6 MDL-44042 Javascript: Handle moving to the top of the current section with keyboard 2014-02-13 10:11:00 +08:00
David Monllao
38f0b67b71 MDL-44037 behat: New feature -> publishing rubric templates
This patch automates MDLQA-1186; rubrics can be
shared as templates.
2014-02-12 16:28:42 +08:00
David Monllao
b408987d3e MDL-42404 behat: Covering MDL-39710 with behat features
I've contributed to a large an ugly scenario
in favour of performance as separating it in another
scenario or feature would add 3 or 4 minutes to the suite.
2014-02-12 16:07:46 +08:00
David Monllao
993f26bdd2 MDL-42404 behat: Adding feature to test reusing user's rubrics
Automates MDLQA-1187, teachers can reuse their
rubrics in other activity.
2014-02-12 16:07:46 +08:00
David Monllao
37fcfd9911 MDL-42404 behat: Adding rubrics step definitions 2014-02-12 16:07:46 +08:00
David Monllao
d57eda7278 MDL-42404 behat: Adding edit rubrics feature
Automates the following MDLQA-1185, MDLQA-1188
and MDLQA-1427. All of them related with the
expected outcomes after editing rubrics definitions
that were already used to grade students.
2014-02-12 16:07:44 +08:00
Petr Škoda
900b1bf7d1 MDL-43200 fix enrol_manual externallib tests 2014-02-12 16:01:34 +08:00
David Monllao
e39a7f886e MDL-42404 behat: Adding yui-dialog to dialogue selector 2014-02-12 15:42:05 +08:00
Sam Hemelryk
e52bbf07a8 Merge branch 'MDL-41644' of git://github.com/apsdehal/moodle 2014-02-12 09:24:06 +13:00
Sam Hemelryk
ae7befec1e Merge branch 'wip-mdl-43289' of git://github.com/rajeshtaneja/moodle 2014-02-12 09:21:54 +13:00
Petr Škoda
0d0514cf3b MDL-40921 mod_workshop: fix unit tests 2014-02-11 15:44:04 +08:00
Marina Glancy
c37c1c6c5d Merge branch '28567-27' of git://github.com/samhemelryk/moodle 2014-02-11 14:42:23 +08:00
Marina Glancy
3f1a513077 MDL-42505 whitespace correction 2014-02-11 14:36:41 +08:00
Marina Glancy
7480dbc5f2 Merge branch 'MDL-42505-Feedback-Inappropriate-use-of-fieldset-tags-around-cancel-button' of git://github.com/michael-milette/moodle 2014-02-11 14:13:39 +08:00
Andrew Nicols
aebc768f94 MDL-44079 Javascript: EditPDF editor should be modal 2014-02-11 12:18:52 +08:00
Andrew Nicols
bc0477392b MDL-44079 Javascript: Closing a tooltip should pass event details 2014-02-11 12:17:53 +08:00
Andrew Nicols
bf24abd221 MDL-44079 Javascript: Check whether a dialogue is focused before closing 2014-02-11 12:17:52 +08:00
Andrew Nicols
cb0f82ddf9 MDL-44055 mod_glossary: Add missing alternate name fields 2014-02-11 09:55:38 +08:00
Andrew Nicols
3047f140de MDL-44055 mod_quiz: Add missing alternate name fields 2014-02-11 09:55:38 +08:00
Sam Hemelryk
b73fd8608a Merge branch 'MDL-43941-master' of git://github.com/andrewnicols/moodle
Conflicts:
	course/yui/build/moodle-course-toolboxes/moodle-course-toolboxes-min.js
2014-02-11 14:10:52 +13:00
AMOS bot
8c36bd9245 Automatically generated installer lang files 2014-02-11 00:42:10 +00:00
Eloy Lafuente (stronk7)
16b2fc5913 Merge branch 'MDL-43338-master' of https://github.com/jamiepratt/moodle 2014-02-11 00:26:29 +01:00
Sam Hemelryk
696195afee Merge branch 'MDL-43994-im' of git://github.com/andrewnicols/moodle 2014-02-11 00:06:44 +01:00
Sam Hemelryk
39a0509b68 Merge branch 'MDL-43929' of git://github.com/timhunt/moodle 2014-02-11 08:27:35 +13:00
Eloy Lafuente (stronk7)
395988e433 Merge branch 'MDL-44053' of git://github.com/timhunt/moodle 2014-02-10 16:48:26 +01:00
Andrew Nicols
2f5c1441d7 MDL-43979 Javascript: Correct checking of attributes during dialogue init
Various dialogue attributes are optional and are provided by the parent and
not provided as attributes to the dialogue being initted.

As a result, if the setting is not provided during init, we were assuming
that the value would be false rather than checking the real attribute.
2014-02-10 22:00:43 +08:00
Marina Glancy
396548fad4 Merge branch '43977-27' of git://github.com/samhemelryk/moodle
Conflicts:
	theme/bootstrapbase/style/moodle.css
2014-02-10 18:15:57 +08:00
Adrian Greeve
d7f05ad40c MDL-43289 mod_assign: Creation of new submission events.
New events have been created for submission plugins. This is
part of the consistancy move by adding the same type of event through
all of the modules.

AMOS BEGIN
 MOV [event_submission_updated,mod_assign],[eventsubmissionupdated,mod_assign]
AMOS END
2014-02-10 12:36:01 +08:00
Sam Hemelryk
72d953e19e Merge branch 'MDL-44059-master' of git://github.com/ankitagarwal/moodle 2014-02-10 15:58:36 +13:00
Ankit Agarwal
807241b991 MDL-44059 libraries: Add a method to return html for row instead of just printing it 2014-02-10 10:44:20 +08:00
Sam Hemelryk
c9f5f0afd3 Merge branch 'wip_master_mdl-32724' of https://github.com/iarenaza/moodle 2014-02-10 15:26:05 +13:00
Sam Hemelryk
0527e02390 Merge branch 'MDL-43774_master' of https://github.com/totara/openbadges 2014-02-10 15:21:41 +13:00
Sam Hemelryk
52b7e8aa58 Merge branch 'MDL-43267-master-3' of git://github.com/andrewnicols/moodle 2014-02-10 14:53:51 +13:00
Andrew Nicols
26df91ca57 MDL-43941 Behat: Section visibility tests should not check if activities are visible
It should be possible for activities to be visible even when the section
they are in is hidden.

However, when a section is hidden, all activities in that section are also
then initially hidden. Therefore, this commit splits out the hidden test to
a new test so that the initial state of activities after hiding can still
be tested.
2014-02-10 09:36:05 +08:00
Andrew Nicols
db6e9aa8d3 MDL-43941 Course: Allow AJAX show/hide of activities in hidden and orphaned sections 2014-02-10 09:21:31 +08:00
Sam Hemelryk
1c8c3a6db1 Merge branch 'MDL-40938-27' of git://github.com/lazydaisy/moodle
Conflicts:
	theme/bootstrapbase/style/moodle.css
2014-02-10 14:16:12 +13:00
Sam Hemelryk
1cb3c0facc Merge branch 'MDL-43200' of git://github.com/apsdehal/moodle 2014-02-10 14:11:25 +13:00
Andrew Nicols
8892ec2b2d MDL-43994 Blocks: Hide the move icon when blocks are docked on Afterburner too 2014-02-10 08:50:29 +08:00
Sam Hemelryk
5e45f31d83 Merge branch 'MDL-42882-master' of git://github.com/danpoltawski/moodle 2014-02-10 13:12:57 +13:00
Sam Hemelryk
c6c9b1d799 MDL-44056 question: added new default property to unit tests 2014-02-10 12:56:36 +13:00
Mark Nelson
7ddb347cec MDL-40061 mod_data: replaced 'view all' add_to_log call with an event 2014-02-09 14:49:33 -08:00
Mark Nelson
b071cfd229 MDL-40061 mod_data: replaced 'view' add_to_log call with an event 2014-02-09 14:49:17 -08:00
Sam Hemelryk
e9eb744f6d Merge branch 'MDL-43684-master' of git://github.com/andrewnicols/moodle 2014-02-10 11:32:13 +13:00
Sam Hemelryk
f0c4d4d22e Merge branch 'MDL-44056' of git://github.com/timhunt/moodle 2014-02-10 11:30:12 +13:00
Sam Hemelryk
cda0ebf042 Merge branch 'MDL-43838_master' of git://github.com/dmonllao/moodle 2014-02-10 11:27:00 +13:00
Sam Hemelryk
f10418699d Merge branch 'MDL-43969-master' of git://github.com/andrewnicols/moodle 2014-02-10 09:48:19 +13:00
Sam Hemelryk
db00b9c882 Merge branch 'MDL-43992-master' of git://github.com/andrewnicols/moodle 2014-02-10 09:40:13 +13:00
Sam Hemelryk
872b051fa3 Merge branch 'MDL-44020-MASTER' of git://github.com/jleyva/moodle 2014-02-10 09:30:57 +13:00
Sam Hemelryk
52aa25fd41 Merge branch 'MDL-44046' of https://github.com/merrill-oakland/moodle 2014-02-10 09:28:08 +13:00