15885 Commits

Author SHA1 Message Date
Marina Glancy
cf10649795 MDL-45336 lesson: copied used strings from quiz
AMOS BEGIN
 CPY [false,mod_quiz],[false,mod_lesson]
 CPY [fractionsaddwrong,mod_quiz],[fractionsaddwrong,mod_lesson]
 CPY [fractionsnomax,mod_quiz],[fractionsnomax,mod_lesson]
 CPY [notenoughsubquestions,mod_quiz],[notenoughsubquestions,mod_lesson]
 CPY [true,mod_quiz],[true,mod_lesson]
AMOS END
2014-09-24 01:22:59 +02:00
Marina Glancy
e0c22222b6 MDL-45336 questionbank: use core strings instead of quiz
AMOS BEGIN
 CPY [categories,mod_quiz],[categories,question]
 CPY [unusedcategorydeleted,mod_quiz],[unusedcategorydeleted,question]
 CPY [export,mod_quiz],[export,core_question]
 CPY [import,mod_quiz],[import,core_question]
AMOS END
2014-09-24 01:22:59 +02:00
Marina Glancy
8766d1981c MDL-45336 qtype_numerical: use own strings instead of mod_quiz
These strings have already been copied from mod_quiz to qtype_numerical but
in the qtype_numerical plugin code the translations from mod_quiz were used.
Even though the strings were already present we copy the translations.

AMOS BEGIN
 CPY [invalidnumericanswer,mod_quiz],[invalidnumericanswer,qtype_numerical]
 CPY [multiplier,mod_quiz],[qtype_numerical]
 CPY [invalidnumerictolerance,mod_quiz],[qtype_numerical]
AMOS END
2014-09-24 01:22:59 +02:00
Marina Glancy
5a0221f7c0 MDL-45336 question: moved used string from quiz plugin
AMOS BEGIN
 MOV [erroritemappearsmorethanoncewithdifferentweight,quiz_statistics],[erroritemappearsmorethanoncewithdifferentweight,question]
AMOS END
2014-09-24 01:22:58 +02:00
Marina Glancy
5639baa843 MDL-45336 scorm: copied used string from quiz
AMOS BEGIN
 CPY [deleteselected,quiz_overview],[deleteselected,mod_scorm]
AMOS END
2014-09-24 01:22:58 +02:00
Marina Glancy
634a5c0b81 MDL-45336 choice: removed unused code
function prepare_choice_show_results() is never called with the 5th argument,
forming of html has been moved to the renderer in MDL-20508, when function
choice_show_results() was transformed into prepare_choice_show_results() but
not all code was deleted from the funciton.
2014-09-24 01:22:58 +02:00
Eloy Lafuente (stronk7)
ec2ee188fc Merge branch 'MDL-46313-master' of git://github.com/andrewnicols/moodle 2014-09-23 01:48:21 +02:00
Eloy Lafuente (stronk7)
44af6d53a7 Merge branch 'MDL-47266' of git://github.com/timhunt/moodle 2014-09-23 01:12:16 +02:00
Tim Hunt
358f31672b MDL-37998 quiz settings: disableif rules should account for overrides.
Some form fields are disabled if only one attempt is allowed. However,
there may be an override allowing some students more attempts. We need
to account for that possiblity when setting up the disabled if rules.

Note the disabledIf is good for usability on this complex form, which is
why I don't just want to get rid of them.
2014-09-22 16:23:38 +01:00
Dan Poltawski
e79420eaf1 Merge branch 'MDL-47276' of git://github.com/timhunt/moodle 2014-09-22 16:08:19 +01:00
Tim Hunt
129a45687c MDL-47276 quiz: change default for When time expires for new installs 2014-09-19 21:59:46 +01:00
Tim Hunt
0d4075d514 MDL-40006 searchableselector does not work in IE or Safari.
This fix is a horrible hack, but one I have used for years in tool_editrolesbycap
https://github.com/moodleou/moodle-tool_editrolesbycap/blob/master/yui/capabilityformfield/capabilityformfield.js
and it seems to be reliable.

As an added bonus, I removed the use of YUI2 here.

Also, I fixed the related button in quiz to be GET not POST.
2014-09-19 21:59:34 +01:00
Tim Hunt
a7b0bd1331 MDL-47266 quiz: fix restore log message. 2014-09-18 11:04:28 +01:00
Andrew Nicols
535364c8f5 MDL-46313 forum: Move discussiontoggle CSS to module 2014-09-18 10:42:55 +08:00
Matt Staroste
8af594ac87 MDL-46313 mod_forum: Replace subscription status icons 2014-09-16 11:23:52 +08:00
Dan Poltawski
5ce0af436d Merge branch 'MDL-46195' of git://github.com/timhunt/moodle 2014-09-15 16:07:05 +01:00
Dan Poltawski
ffd24d9a61 Merge branch 'wip-MDL-47187-master' of git://github.com/marinaglancy/moodle 2014-09-15 11:08:24 +01:00
Damyon Wiese
db074792b9 Merge branch 'MDL-46944-master-lti-iframe' of git://github.com/schmod/moodle 2014-09-15 15:08:31 +08:00
Andrew Schmadel
a73b1ba23f MDL-46844 Embed LTI External Tools with an IFrame
Clears up weird browser issues that occur when embedding content with an
`<object>` tag.
2014-09-10 09:17:07 -04:00
Marina Glancy
5b460d65cc MDL-47187 assign: fixed timing unittest failure 2014-09-10 11:58:00 +08:00
Andrew Nicols
83daad5ac9 MDL-47107 mod_forum: is_subscribed $cm input does not need to be a cm_info 2014-09-10 10:00:00 +08:00
Eloy Lafuente (stronk7)
a02aef0c7c Merge branch 'MDL-47107-master' of git://github.com/andrewnicols/moodle 2014-09-09 02:15:26 +02:00
Marina Glancy
7fde166775 Merge branch 'MDL-44304-master' of git://github.com/damyon/moodle 2014-09-08 12:57:34 +08:00
Tim Hunt
38cde336ca MDL-46195 Fix fractionsaddwrong string component in lesson & qformat_webct.
I know. You should not refer to strings from other plugins, but

* qformat_webct is importing multichoice questions in that bit of code.
  I suppose a pedant would say that qformat_webct should declare dependencies
  on all the qtypes it relies on, but that would be silly.

* Lesson should be using the question engine, rather than doing its own thing.
2014-09-06 20:20:58 +01:00
Andrew Nicols
4238983e2a MDL-47107 mod_forum Optimise forum subscription checks
Supply a coursemodule where relevant to the forum subscription checks.
2014-09-05 15:06:15 +08:00
Marina Glancy
1f20801c35 Merge branch 'master_MDL-46639' of git://github.com/danmarsden/moodle 2014-09-03 16:58:25 +08:00
Dan Marsden
46e990a4ef MDL-46639 SCORM: incorrect setting of launch param, it is done in scorm_parse_aicc 2014-09-03 20:18:55 +12:00
Eloy Lafuente (stronk7)
9bdb64681f Merge branch 'MDL-39929' of https://github.com/bostelm/moodle 2014-09-03 00:13:53 +02:00
sam marshall
78f753acea MDL-44725 Availability: Replace groupmembersonly - feedback (16)
There is one point where it restricted the list of users. I have
fixed this and also altered the (only) script that calls that function
so that it obtains a cm_info $cm rather than the old sort.

There were previously no Behat tests at all in this module. In order
to be confident that I didn't break it, I have implemented a Behat
test (which should also be useful in general as it does go through
other pages on the way to get to the relevant one).
2014-09-02 20:54:35 +08:00
Marina Glancy
ed2ecd3e35 MDL-44725 workshop: correct module generation in unittests (15) 2014-09-02 13:03:37 +01:00
sam marshall
45ab2d9ab6 MDL-44725 Availability: Replace groupmembersonly - workshop (12)
The availability restrictions that apply to user lists (group, grouping)
now apply in workshop:

* In user lists.
* When randomly allocating users (also now works as expected if you use
  group mode and a grouping with the activity).
2014-09-02 13:03:31 +01:00
sam marshall
c13ac85db8 MDL-44725 Availability: Replace groupmembersonly - assign (10)
Updated code to restrict list of users. Also includes changes to
ensure that a cm_info object is available (required for availability
checks).

There is a tweak to upgradelib to reflect the different fields used.
(Note that upgradelib is not used during upgrade, but only when
converting assignments from the old assignment module.)
2014-09-02 13:03:27 +01:00
sam marshall
c234c34085 MDL-44725 Availability: Replace groupmembersonly - quiz overrides (9)
This only affects the quiz overrides form, as groupmembersonly was
not used elsewhere. The change simply restricts the list of users
shown when selecting somebody for overrides.

Some additional code is needed to (efficiently) load the $cm object
as a cm_info so that the availability API can be used on it.
2014-09-02 13:03:23 +01:00
sam marshall
914027baf8 MDL-44725 Availability: Replace groupmembersonly - glossary (8)
No change to actual module, only unit tests.
2014-09-02 13:03:21 +01:00
sam marshall
9c85baa8c5 MDL-44725 Availability: Replace groupmembersonly - FEATURE_xx (6)
Remove old FEATURE_GROUPMEMBERSONLY as no longer required.
2014-09-02 13:03:17 +01:00
sam marshall
061e6b2864 MDL-44725 Availability: Replace groupmembersonly - upgrade, core (1)
* Upgrades existing data so that the groupmembersonly option is
  replaced with equivalent data for the new availability API.
* Removes the database field and admin setting used for
  groupmembersonly.
* Changes core modinfo library to remove/deprecate groupmembersonly
  data and functions.
* Changes other core library files to remove groupmembersonly
  references.

Includes deprecation of several functions, listed in lib/upgrade.txt.
2014-09-02 13:03:07 +01:00
Henning Bostelmann
7faf78cbae MDL-39929 Assignment: provide file upload area for assignment description 2014-09-02 11:02:16 +01:00
Michael de Raadt
8f2e80600b MDL-46619 Forum: link to the discussion only if users cannot see posts. 2014-09-02 10:06:35 +08:00
Michael de Raadt
b53b69c134 MDL-46619 Forum: only output last poster's name if user can view it. 2014-09-02 10:06:23 +08:00
Marina Glancy
d0143e0061 Merge branch 'MDL-45952_master2' of git://github.com/Syxton/moodle 2014-09-02 09:58:24 +08:00
Eloy Lafuente (stronk7)
f9f715de75 Merge branch 'MDL-46633' of https://github.com/shashirepo/moodle 2014-09-02 02:12:14 +02:00
Damyon Wiese
2dbbc58dad Merge branch 'MDL-46852-master' of git://github.com/FMCorz/moodle 2014-09-01 16:16:08 +08:00
Marina Glancy
7dc74ce75f Merge branch 'MDL-46451_restoreError' of git://github.com/moodlerooms/moodle 2014-09-01 16:05:51 +08:00
Damyon Wiese
c8336b9733 Merge branch 'MDL-46911' of https://github.com/bostelm/moodle 2014-09-01 15:42:01 +08:00
Damyon Wiese
e0e23395dd Merge branch 'master_MDL-46961' of https://github.com/danmarsden/moodle 2014-09-01 15:27:41 +08:00
Marina Glancy
181435d483 Merge branch 'master_MDL-46639' of git://github.com/danmarsden/moodle 2014-09-01 14:36:09 +08:00
Marina Glancy
c1780a3d0b Merge branch 'MDL-46539-fix-28' of https://github.com/jmarthaler/moodle 2014-09-01 14:36:04 +08:00
Frederic Massart
5fbebc3c18 MDL-46852 mod_lesson: More accurate comparison of shortanswer answers 2014-09-01 14:24:23 +08:00
Damyon Wiese
e698e24f1a Merge branch 'wip-MDL-39233-master' of git://github.com/marinaglancy/moodle 2014-09-01 13:35:50 +08:00
Damyon Wiese
37728346fb MDL-46619 Forum: whitespace fixes 2014-09-01 11:34:41 +08:00