moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-07 18:06:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
55288 commits 37 branches 540 tags 1.3 GiB
Commit graph

12553 commits

Author SHA1 Message Date
Petr Skoda
6498b6190a MDL-33553 fix mod_data E_STRICT issue 2012-06-12 11:05:02 +02:00
Dan Poltawski
203d255116 Merge branch 'MDL-33393' of git://github.com/timhunt/moodle 
Conflicts:
	mod/quiz/lang/en/quiz.php
 2012-06-12 17:00:09 +08:00
Petr Skoda
f327b9c3f3 MDL-33204 use natural filename sorting when importing books form html 2012-06-12 10:59:58 +02:00
Ankit Agarwal
b0b30cb648 MDL-33123 book: Fixing numbering issue with hidden sub-chapters 2012-06-12 16:03:40 +08:00
Dan Poltawski
82fc6ae6e3 Merge branch 'MDL-33598-master-integration' of git://github.com/FMCorz/moodle 2012-06-12 15:57:58 +08:00
Dan Poltawski
760c063bc0 Merge branch 'wip-MDL-33446-master' of git://github.com/marinaglancy/moodle 2012-06-12 13:45:10 +08:00
Dan Poltawski
502be9a069 MDL-33572 - assign: fixed syntax probblem found immediately after integration 
Grr. shouldn't have escaped our review.
 2012-06-12 13:41:54 +08:00
Dan Poltawski
08f5648de3 Merge branch 'MDL-33572' of git://github.com/netspotau/moodle-mod_assign 2012-06-12 13:38:34 +08:00
Dan Poltawski
14507142a1 Merge branch 'w23_MDL-33543_m23_datastrict' of git://github.com/skodak/moodle 2012-06-12 13:36:15 +08:00
Dan Poltawski
8550d72d85 MDL-32937 - scorm: switch commenting style to // 2012-06-12 13:18:51 +08:00
Frederic Massart
db48ed64c7 MDL-33598 Messaging: students can change their assignment notification preferences 2012-06-12 13:10:43 +08:00
Dan Poltawski
91f0dd438a Merge branch 'master_MDL-32937' of git://github.com/danmarsden/moodle 2012-06-12 13:05:47 +08:00
Dan Poltawski
555099c666 Merge branch 'MDL-33400' of git://github.com/nebgor/moodle 2012-06-12 13:03:42 +08:00
Aparup Banerjee
7d22edb6b1 Merge branch 'master_MDL-33515' of git://github.com/danmarsden/moodle 2012-06-12 11:25:17 +08:00
Marina Glancy
c469b3963b MDL-33446 Editor form field can filter return types 
- Added possibility for editor form field to specify return_types (default FILE_INTERNAL | FILE_EXTERNAL | FILE_REFERENCE)
- For assignment, workshop, quiz essay submissions and form posts do not allow FILE_REFERENCE
- Fixed mod_resource return_types, reset them to default, because filemanager does not know how to work with FILE_EXTERNAL links
 2012-06-12 11:03:43 +08:00
Andrew Robert Nicols
0080872fc4 MDL-33608 Correct modulename_link for the label module 2012-06-11 12:41:25 +01:00
Aparup Banerjee
42fd396171 Merge branch 'MDL-33548' of git://github.com/timhunt/moodle 2012-06-11 13:55:20 +08:00
Aparup Banerjee
6b8b0b2e68 MDL-34400 Libraries : maintained naming rule by removing stray mod_ function and class prefixes from activity modules. 
This rule @ http://docs.moodle.org/dev/Activity_modules still stands for now.
 2012-06-11 13:34:47 +08:00
Christopher Tombleson
01b5936cd0 MDL-32937 Add drag and drop support to SCORM 2012-06-11 12:18:32 +12:00
Petr Skoda
8d475fe4fe MDL-33543 fix mod_data E_STRICT issue when adding fields with file size limits 2012-06-10 10:05:59 +02:00
Eloy Lafuente (stronk7)
997c7e2744 Merge branch 'MDL-33471' of git://github.com/timhunt/moodle 2012-06-08 17:08:18 +02:00
Tim Hunt
815fcecc40 MDL-33471 quiz cron: better mtrace output for overdue handling 2012-06-08 16:02:01 +01:00
Tim Hunt
4c7f377d9b MDL-33612 quiz: Improve page title 'Editing quiz' 
Include the quiz name in the title. Also, add two missing format_string
calls around $quiz->name.
 2012-06-08 11:47:03 +01:00
Dan Marsden
e099166635 MDL-33515 SCORM - attempts grading setting is confusing - last attempt is really last completed attempt. 2012-06-08 20:33:38 +12:00
Dan Poltawski
c9d7e6fa16 Merge branch 'MDL-33498' of git://github.com/netspotau/moodle-mod_assign 2012-06-08 13:39:17 +08:00
Jason Fowler
d508e71d4c MDL-33594 - Glossary - fixing portfolio exports 2012-06-08 13:32:44 +08:00
Dan Poltawski
b63084a58b MDL-33594 mod_data: use filelib rather than speciifc internal file 2012-06-08 13:31:31 +08:00
Dan Poltawski
e13388c1c0 MDL-32783 quiz overdue handling: improve lang string 
And remove a stray #
 2012-06-08 10:47:31 +08:00
Dan Poltawski
583c698ee1 Merge branch 'MDL-32783' of git://github.com/timhunt/moodle 2012-06-08 10:36:17 +08:00
Sam Hemelryk
5874cc6aab Merge branch 'MDL-32325-master' of git://github.com/FMCorz/moodle 2012-06-08 10:20:43 +12:00
Tim Hunt
a6866c7e9f MDL-32783 quiz overdue handling: enforce end of grace period 
The summary page was not enforcing the end of the grace period. If the
user had the summary page open, then they coudl still stubmit after the
end of the grace period.

Also, the editing form was not validating that the quiz grace period was
greater than quiz|graceperiodmin in the quiz configuration, and that
should be checked, so I added it.

I fear that processattempt.php is becoming very spaghetti-like with all
the timing rules, it really needs to be refactored, but not 2 weeks
before the 2.3 release. (When refactoring, we really need unit tests for
this.)
 2012-06-07 19:17:07 +01:00
Tim Hunt
d9552ab44f MDL-33393 quiz overdue handling: improve strings and add help 2012-06-07 17:33:46 +01:00
Dan Poltawski
901f49097a Merge branch 'MDL-33532' of git://github.com/timhunt/moodle 2012-06-07 22:23:38 +08:00
Dan Poltawski
3bc24f9aa7 Merge branch 'MDL-33517' of git://github.com/timhunt/moodle 2012-06-07 21:49:14 +08:00
Tim Hunt
7f5f384477 MDL-33532 quiz editing: let uses enter locale floats. 
So, for example, Croatian users can set the maximum grade to 65,5.
 2012-06-07 12:55:53 +01:00
Dan Poltawski
620ecd38d2 Merge branch 'wip-MDL-33482-master' of git://github.com/danpoltawski/moodle 2012-06-07 18:11:10 +08:00
Barbara Ramiro
89e00e91cd MDL-33482 Activity Chooser styled similar to Filepicker particularly the look and feel with drop shadow 2012-06-07 18:09:14 +08:00
Dan Poltawski
644495114e Merge branch 'MDL-33475' of git://github.com/netspotau/moodle-mod_assign 2012-06-07 17:33:39 +08:00
Dan Poltawski
a6eecb7c9d Merge branch 'MDL-33535-master-1' of git://git.luns.net.uk/moodle 2012-06-07 17:25:59 +08:00
Andrew Robert Nicols
7ccec1e2cf MDL-33535 Correct typo in glossary documentation link 2012-06-07 09:17:40 +01:00
Dan Poltawski
c9978ce67b Merge branch 'w23_MDL-33555_m23_assignfk' of git://github.com/skodak/moodle 2012-06-07 14:29:08 +08:00
Damyon Wiese
eba009ea63 MDL-33475: Fix javascript error when advanced grading is used in mod_assign 2012-06-07 10:52:05 +08:00
Damyon Wiese
2d8a9ce96c MDL-33572: Make the display of the "graded" status consistent in mod_assign 
Do not display "graded" when the grade is set to -1.
 2012-06-07 10:22:46 +08:00
Damyon Wiese
4913af936f MDL-33498: Correct use of unformat_float for mod_assign decimal grades 
This was affecting locales that use , instead of . in floating point numbers.
 2012-06-07 09:27:59 +08:00
Andreas Grabs
e7fc2ff42e MDL-27675 - Feedback module abuses data_submitted 2012-06-06 23:17:35 +02:00
Tim Hunt
ee326d5e7d MDL-33548 quiz manual grading: check the grade is in range. 
To do this nicely, I refactored some code out of the quiz manual grading
report.
 2012-06-06 20:21:33 +01:00
Tim Hunt
f02a91fc50 MDL-33517 quiz: revise timelimit help string. 
Thanks Helen.
 2012-06-06 19:24:48 +01:00
Petr Skoda
3269c859bf MDL-33555 fix invalid FK in mod_assign 
There is no need to upgrade DB because we create only indexes now.
 2012-06-06 10:54:40 +02:00
Dan Poltawski
de6a0dfd3d Merge branch 'MDL-33547' of git://github.com/netspotau/moodle-mod_assign 2012-06-06 16:09:15 +08:00
Damyon Wiese
509e59ca38 MDL-33547: Fix for mod_assign portfolio export for a list of files. 
This will fix any submission or feedback plugin using render_area_files
to show a list of files.
 2012-06-06 15:49:37 +08:00