moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-11 20:06:46 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
62030 commits 37 branches 544 tags 1.3 GiB
Commit graph

13972 commits

Author SHA1 Message Date
Dan Poltawski
21a6714fc9 Merge branch 'MDL-39265-master-int' of git://github.com/FMCorz/moodle 2013-04-30 15:49:41 +01:00
Dan Poltawski
2e521b3d56 Merge branch 'MDL-39368-master-int' of git://github.com/FMCorz/moodle 2013-04-30 14:35:28 +01:00
Dan Poltawski
4410509d0b Merge branch 'MDL-35385_chat' of git://github.com/andyjdavis/moodle 2013-04-30 14:07:55 +01:00
Dan Poltawski
f8a14f7bcc Merge branch 'MDL-39405-master-int' of git://github.com/FMCorz/moodle 2013-04-30 09:16:31 +01:00
Frederic Massart
9b108a8606 MDL-39265 feedback: Language string improvements 
AMOS BEGIN
 MOV [multiple_submit,mod_feedback],[multiplesubmit,mod_feedback]
 MOV [emailnotification_help,mod_feedback],[email_notification_help,mod_feedback]
AMOS END
 2013-04-30 15:58:44 +08:00
Dan Poltawski
7a286a0d6d Merge branch 'MDL-39415-master' of git://github.com/damyon/moodle 2013-04-30 08:34:16 +01:00
Frederic Massart
7ce746f7cf MDL-39405 wiki: Reformat forms for better usability 2013-04-30 14:05:54 +08:00
Damyon Wiese
767421c36c Merge branch 'MDL-37966' of git://github.com/jonof/moodle 2013-04-30 12:26:47 +08:00
Damyon Wiese
4969053f25 Merge branch 'MDL-39246' of git://github.com/timhunt/moodle 2013-04-30 12:02:36 +08:00
David Monllao
550d842e3c MDL-39232 behat Normalize feature tags according to component names 2013-04-30 11:54:47 +08:00
Damyon Wiese
18de52db64 MDL-39415 Assign: Fix error on saving settings 
When alwaysshowdescription checkbox is unchecked the form cant be saved.

This is a regression from when the element was changed from a
selectyesno to a checkbox.
 2013-04-30 11:44:22 +08:00
Adrian Greeve
f7a00e9dbf MDL-39040 - mod_data: Database description available in single view tab. 2013-04-30 09:06:02 +08:00
AL Rachels
15d5885f84 MDL-39040 - mod_data: Database description available in add entry tab. 2013-04-30 09:06:01 +08:00
Andrew Davis
dc514c1a0b MDL-35385 mod_chat: made sure no message popups display within the chat window 2013-04-30 09:01:00 +08:00
Frederic Massart
09faedd129 MDL-39265 feedback: Reformat module settings form 2013-04-30 08:33:20 +08:00
Sam Hemelryk
2a03b6dafe Merge branch 'MDL-39366-master-int' of git://github.com/FMCorz/moodle 2013-04-30 10:38:38 +12:00
Sam Hemelryk
0f540591df Merge branch 'MDL-39303_master' of https://github.com/markn86/moodle 2013-04-30 10:08:20 +12:00
Sam Hemelryk
a91f5ccb86 Merge branch 'MDL-39365-master' of git://github.com/ankitagarwal/moodle 2013-04-30 09:36:50 +12:00
Frederic Massart
b0b79f8ab2 MDL-39368 url: Remove advanced parameters from settings form 2013-04-29 19:27:53 +08:00
Frederic Massart
9cf26d0890 MDL-39368 url: Renaming sections of the settings form 2013-04-29 19:27:47 +08:00
Ankit Agarwal
d8d0b8b390 MDL-39363 scorm: Accept 0 as a valid score 2013-04-29 16:53:15 +08:00
Mark Nelson
34e2987118 MDL-39303 mod_forum: prevent user from submitting when post threshold reached 2013-04-29 14:44:04 +08:00
Ankit Agarwal
325c730ba1 MDL-39365 scorm reports: Return correct track count 2013-04-29 13:26:09 +08:00
Frederic Massart
b5472cb856 MDL-39367 resource: An admin cannot decide which settings are advanced 2013-04-29 11:10:38 +08:00
Damyon Wiese
50cc49ba04 Merge branch 'MDL-38440-master' of git://github.com/mouneyrac/moodle 2013-04-29 11:01:57 +08:00
Frederic Massart
f7224e6027 MDL-39367 resource: Reformat resource settings page 2013-04-29 10:58:29 +08:00
Sam Hemelryk
5745360915 Merge branch 'MDL-39192_master' of https://github.com/markn86/moodle 2013-04-29 10:54:07 +12:00
Tim Hunt
a35ce08493 MDL-39246 quiz timer: compute a more accurate stop time. 2013-04-26 11:55:18 +01:00
Jerome Mouneyrac
487bc1b627 MDL-38440 WebService get_contents doesn't return the full text of labels 2013-04-26 15:13:03 +08:00
Frederic Massart
b9e6341579 MDL-39366 book: Section appearance in book module settings 2013-04-26 13:42:19 +08:00
Frederic Massart
d756d3fbcd MDL-39270 lesson: Reformat module settings form 2013-04-26 10:28:52 +08:00
Dan Poltawski
68265ee2d6 Merge branch 'MDL-34403' of https://github.com/mpetrowi/moodle 2013-04-25 12:49:38 +01:00
Matt Petro
f5f3658480 MDL-34403 mod quiz: fix error during enrolment 2013-04-24 15:00:06 -04:00
Dan Poltawski
f1b0908b8a MDL-38597 forum: fix incompetent programmer error ;-) 
Shameful, Fred!
 2013-04-24 10:02:41 +01:00
Dan Poltawski
6f0fdc9bb2 Merge branch 'MDL-38597-master-int' of git://github.com/FMCorz/moodle 2013-04-24 09:57:22 +01:00
Dan Poltawski
c1ae8606bd Merge branch 'MDL-38572-master' of git://github.com/FMCorz/moodle 2013-04-24 09:53:25 +01:00
Dan Poltawski
9da8c53295 Merge branch 'MDL-39219_scorm_ie7' of git://github.com/davosmith/moodle 2013-04-24 09:08:23 +01:00
Dan Poltawski
e6c91f99ec Merge branch 'MDL-38892' of git://github.com/rwijaya/moodle 2013-04-24 08:16:37 +01:00
Mark Nelson
eaa8f5ad53 MDL-39192 mod_forum: do not need to check the posting threshold when editing a post 2013-04-24 14:00:34 +08:00
Rossiani Wijaya
819b1de681 MDL-38892 data module: Fixed action setType to use PARAM_ALPHANUM 2013-04-24 13:49:09 +08:00
Davo Smith
c23ff8e3a5 MDL-39219 mod_scorm - make sure YUI JSON module is loaded 2013-04-23 18:58:09 +01:00
Dan Poltawski
88dbfc453e Merge branch 'MDL-39296-master' of git://github.com/ankitagarwal/moodle 2013-04-23 12:50:44 +01:00
Frederic Massart
fbe9f668b2 MDL-38597 forum: Reformat the module settings form 2013-04-23 14:52:09 +08:00
Ankit Agarwal
647a3fc81c MDL-39296 scorm reports: Fix undefined variables in graphs report 2013-04-23 12:03:00 +08:00
Rossiani Wijaya
2e0ba150b3 MDL-38892 data module: Fixed setType warning 2013-04-23 09:57:58 +08:00
Dan Poltawski
fe5bb43ae5 Merge branch 'MDL-39264-master-int' of git://github.com/FMCorz/moodle 2013-04-22 17:23:43 +01:00
Dan Poltawski
83a9917314 MDL-37514 mod_quiz: fix trailing whitespace 2013-04-22 14:20:58 +01:00
Alex Leontiev
bd166e618f MDL-37514 module.js: fix .js for auto quiz submission in preview mode 
The issue: when we attempt the quiz as teacher/admin and timer is up,
quiz is not submitted, even though "Open attempts are submitted
automatically" is set. I've changed the javascript for a timer,
responsible for submission, removing the special behaviour in case of
preview mode. Note, that when the admin/teacher is taking a quiz, the
"preview" mode is automatically switched on.

It is a bit strange, since in the javascript there was clearly no
expressed intention to really submit quiz in preview, even when timer
hits. It does not really seem like a accidental bug, rather it looks
like some misunderstanding. Worse still, it may happen that I did not
understand the intentions of previous editor and ruined some
functionality. Because of this, and the fact that this is my first bug,
I would like to ask about the peer review! Please, see my comments in
bug discussion for the testing steps.

Conflicts:
	mod/quiz/module.js
 2013-04-22 14:13:53 +01:00
Dan Poltawski
e65dfc0275 Merge branch 'MDL-39186' of git://github.com/timhunt/moodle 2013-04-22 13:05:53 +01:00
Dan Poltawski
8c82b67ef0 Merge branch 'MDL-38603-workshop-form' of git://github.com/mudrd8mz/moodle 2013-04-22 12:47:10 +01:00