mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-17 14:10:08 +01:00
Code Issues Projects Releases Wiki Activity
70,619 Commits 36 Branches 527 Tags
Commit Graph

16014 Commits

Author SHA1 Message Date
Dan Poltawski
7e704313d2 Merge branch 'MDL-37707-master-fixup' of https://github.com/FMCorz/moodle 2014-10-02 09:48:25 +01:00
Dan Poltawski
be6779d0c4 Revert "MDL-32870 mod_lesson: added support for files to question answers and responses" 
This reverts commit d92f768baab86e95cafdfdbee1b54e5d2dbd055b.
 2014-10-02 09:09:16 +01:00
Frederic Massart
6849d15df5 MDL-37707 mod_assign: Prevent user from changing grouping in team submissions 2014-10-01 11:27:44 +08:00
Dan Poltawski
6315aa24f9 Merge branch 'MDL-46171-master-fix1' of http://github.com/damyon/moodle 2014-09-30 16:02:09 +01:00
Damyon Wiese
93c51a1d0a MDL-46171 assign: Fix for the update script on MySQL. 2014-09-30 21:16:24 +08:00
Dan Poltawski
f736c1b394 Merge branch '3034-28' of https://github.com/samhemelryk/moodle 2014-09-30 14:04:24 +01:00
Dan Poltawski
0645eb6866 Merge branch 'MDL-46171-master' of git://github.com/damyon/moodle 2014-09-30 08:03:40 +01:00
Marina Glancy
dc14212b61 MDL-46054 web_services: bug fix in core_user_get_users 
Thanks to Mikko Rantanen for the patch
 2014-09-29 16:03:17 +02:00
Sam Hemelryk
525b6ebeb9 Merge branch 'MDL-47033_master' of https://github.com/totara/openbadges 2014-09-29 15:18:03 +13:00
Sam Hemelryk
b87711a0dc Merge branch 'MDL-36929_new_discussions' of https://github.com/andyjdavis/moodle 2014-09-29 14:21:39 +13:00
Sam Hemelryk
e0533f2633 Merge branch 'MDL-37707-master' of git://github.com/FMCorz/moodle 2014-09-29 11:35:23 +13:00
Sam Hemelryk
51606b8e63 Merge branch 'MDL-47378-master' of git://github.com/danpoltawski/moodle 2014-09-29 11:19:06 +13:00
Jean-Michel Vedrine
d92f768baa MDL-32870 mod_lesson: added support for files to question answers and responses 2014-09-29 11:00:28 +13:00
Sam Hemelryk
50dfb7cf38 MDL-47252 mod_forum: fixed whitespace 2014-09-29 08:44:43 +13:00
Sam Hemelryk
a038c1e0a3 Merge branch 'MDL-47252-master' of git://github.com/gurgus/moodle 2014-09-29 08:43:51 +13:00
Andrew Davis
3f02391834 MDL-36929 mod_forum: added bolding of discussion titles on the recent activity page 2014-09-26 10:48:57 +08:00
Dan Poltawski
3f87d42707 NOBUG: Fixed SVG browser compatibility 2014-09-25 11:17:48 +01:00
Sam Hemelryk
cbb1677cb9 MDL-3034 mod_choice: minor tidy up 2014-09-25 14:03:52 +12:00
Michael Aherne
54bdf1d406 MDL-3034 choice Support multiple answers 2014-09-25 11:33:55 +12:00
Dan Poltawski
79cf14b327 MDL-47378 mod_assign: prevent debugging notice 
Parameters come out of get_user_preferences as strings.
 2014-09-24 15:41:04 +01:00
Pavel Sokolov
5ae56c6e44 MDL-37707 mod_assign: Prevent user from switching to and from team submissions 2014-09-24 16:07:01 +08:00
Damyon Wiese
c154b1f93d MDL-46171 assign: Peer review cleanups 
* Remove hardcoded table names
* Remove some code that was left in after debugging
* Add some comments about grades with no submission
* Set submission->latest to 0 on restore (it will get fixed later)
* Changed get_records_sql to get_recordset_sql in restore.
 2014-09-24 15:07:36 +08:00
Damyon Wiese
9e3eee671f MDL-46171 Assign: Always require a submission record if there is a grade 
Also - update unit tests to match the new expectations.
 2014-09-24 15:07:36 +08:00
Damyon Wiese
ad030ab4a5 MDL-46171 assign: And here is the benefit of the new column - simplify the SQL 2014-09-24 15:07:36 +08:00
Damyon Wiese
1523f9e0fb MDL-46171 Assign: Update code so latest field on assign_submission table is always set correctly 2014-09-24 15:07:36 +08:00
Damyon Wiese
587341138f MDL-46171 Assign: Add "latest" column + index to submission table. 2014-09-24 15:07:36 +08:00
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
Dave Cooper
12cf8140a2 MDL-47252 mod_forum: Ensure guest users can't subscribe to discussions 2014-09-23 10:52:55 +08:00
Jonathan Harker
81ba2632ed MDL-47316 mod_forum: Fix course overview performance 
make more efficient use of mod_info cache by processing courses
 sequentially.

Change-Id: I03b808c8a7efc42879ec2689fbd2a9fe7a8f1103
 2014-09-23 12:58:29 +12: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