mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-18 22:50:19 +01:00
Code Issues Projects Releases Wiki Activity
69,803 Commits 36 Branches 527 Tags
Commit Graph

69803 Commits

This Branch
This Branch
All Branches
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
Marina Glancy
3a58e7ebc5 MDL-45336 backup: moved the string from quiz to core 
AMOS BEGIN
 CPY [timetaken,mod_quiz],[timetaken,backup]
AMOS END
 2014-09-24 01:22:58 +02:00
Eloy Lafuente (stronk7)
011ff9f8fb MDL-47180 qformat_webct: whitespace cleanup 2014-09-24 00:56:40 +02:00
Eloy Lafuente (stronk7)
d50a73309b Merge branch 'MDL-47180' of git://github.com/jmvedrine/moodle 2014-09-24 00:40:40 +02:00
Jean-Michel Vedrine
129f3c5190 MDL-47180 qformat_webct: Import of calculated questions broken 2014-09-23 14:45:07 +02:00
Dan Poltawski
4bcf64b053 Merge branch 'MDL-47240-master' of https://github.com/sammarshallou/moodle 2014-09-23 10:57:00 +01:00
Sam Hemelryk
4356012960 Merge branch 'MDL-46811-master' of git://github.com/danpoltawski/moodle 2014-09-23 16:36:05 +12:00
Sam Hemelryk
7fca0ced0a Merge branch 'MDL-47244-master' of git://github.com/jethac/moodle 
Conflicts:
	theme/bootstrapbase/less/moodle/responsive.less
	theme/bootstrapbase/style/moodle.css
 2014-09-23 16:32:09 +12:00
Sam Hemelryk
b32e1778bb Merge branch 'wip-MDL-46937-master' of git://github.com/marinaglancy/moodle 2014-09-23 15:26:06 +12:00
Sam Hemelryk
be91dff8bb Merge branch 'MDL-47242-master' of git://github.com/jethac/moodle 
Conflicts:
	theme/bootstrapbase/style/moodle.css
 2014-09-23 12:23:08 +12:00
Eloy Lafuente (stronk7)
db6c48bfc1 Merge branch 'MDL-47182-master' of git://github.com/danpoltawski/moodle 2014-09-23 01:52:10 +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)
4922a1d46a Merge branch 'MDL-46523-master' of git://github.com/jethac/moodle 2014-09-23 01:40:50 +02:00
Eloy Lafuente (stronk7)
da483a72c8 Merge branch 'MDL-47269_master' of https://github.com/nadavkav/moodle 2014-09-23 01:28:29 +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
546acfbf67 Merge branch 'MDL-47238_guest' of https://github.com/andyjdavis/moodle 2014-09-22 16:13:20 +01:00
Dan Poltawski
e79420eaf1 Merge branch 'MDL-47276' of git://github.com/timhunt/moodle 2014-09-22 16:08:19 +01:00
Dan Poltawski
490263ec68 Merge branch 'MDL-47270-core-component-classmap-ordering' of https://github.com/mpetrowi/moodle 2014-09-22 16:03:50 +01:00
Dan Poltawski
bd75ef826e Merge branch 'wip-MDL-40356-master' of git://github.com/abgreeve/moodle 2014-09-22 15:02:51 +01:00
Dan Poltawski
96ab0104ea Merge branch 'MDL-40006' of git://github.com/timhunt/moodle 2014-09-22 11:55:47 +01:00
Dan Poltawski
aebe5eeea0 Merge branch 'MDL-10971_cloze_shuffle_fix' of git://github.com/timhunt/moodle 2014-09-22 11:39:42 +01:00
Dan Poltawski
4c5b60a72c Merge branch 'MDL-46991-master' of https://github.com/sammarshallou/moodle 2014-09-22 10:57:20 +01:00
Nadav Kavalerchik
f2ee054b52 MDL-47269 yui/src/dock: Invert dock reset blocks icon, in RTL mode 2014-09-22 11:41:17 +03:00
Andrew Davis
005fa74115 MDL-47238 core_user: added an error message if guests access user profiles and they aren't allowed to 2014-09-22 11:02:54 +08: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
markv
94999731ce MDL-10971 question type multianswer: Respect quiz shuffle option 2014-09-19 11:39:22 +01:00
sam marshall
eedf5a5a1c MDL-47240 Modinfo: Section info accesses nonexisting property groupingid 
This code wasn't actually used, so we should remove it.
 2014-09-18 16:38:22 +01:00
sam marshall
5176504d3f MDL-46991 Availability: Conditional dates not updated on restore 2014-09-18 16:37:53 +01:00
Tim Hunt
a7b0bd1331 MDL-47266 quiz: fix restore log message. 2014-09-18 11:04:28 +01:00
Marina Glancy
daad1b4b97 MDL-46937 modinfo: Allow course format to overwrite section availability 2014-09-18 16:18:22 +08:00
Dan Poltawski
272fec367f weekly release 2.8dev 2014-09-18 07:41:00 +01:00
Dan Poltawski
727a43391a Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install 2014-09-18 07:40:56 +01:00
Andrew Nicols
535364c8f5 MDL-46313 forum: Move discussiontoggle CSS to module 2014-09-18 10:42:55 +08:00
Matt Petro
be6f3c6e6b MDL-47270 core_component: make cache independent of filesystem ordering 2014-09-16 12:50:53 -04:00
Dan Poltawski
d5fcf4b42c MDL-47182 admin: warn about delayed scheduled tasks 
Rather than using module cron, use scheduled tasks to work out
if cron has been running recently.

This is not perfect, the admin could disble all tasks, or reschedule
them - but its not complex to compute.
 2014-09-16 17:49:23 +01:00
Eloy Lafuente (stronk7)
e1bb8035e6 Merge branch 'MDL-46613-master' of git://github.com/jleyva/moodle 2014-09-16 18:42:17 +02:00
Eloy Lafuente (stronk7)
d3921f07b8 Merge branch 'wip-MDL-47079-master' of git://github.com/marinaglancy/moodle 2014-09-16 17:57:19 +02:00
Juan Leyva
10f1cfc18c MDL-46613 grades ws: Fixed external function declaration 
Gradebook items with overridden grades was causing error as Web
Services response
 2014-09-16 10:06:21 +02:00
Damyon Wiese
ac7fac558e Merge branch 'MDL-47225-master' of git://github.com/andrewnicols/moodle 2014-09-16 15:15:57 +08:00
Damyon Wiese
ffd9e5d269 MDL-44257 Message: Update phpdocs for email_to_user function 2014-09-16 15:08:08 +08:00
Andrew Nicols
96671c8c38 MDL-47225 core: Tidy up component normalisation tests 2014-09-16 15:07:11 +08:00
Andrew Nicols
7ace328737 MDL-47225 core: Add ability to normalize component names 2014-09-16 15:06:46 +08:00
Damyon Wiese
c4006c851a Merge branch 'MDL-44257-master' of git://github.com/lameze/moodle 2014-09-16 14:58:48 +08:00