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

12718 commits

Author SHA1 Message Date
Rossiani Wijaya
b15ef0b058 MDL-33121 Book Module: Fixed documentation header 2012-06-13 15:25:23 +08:00
Dan Poltawski
2333058eb0 Merge branch 'MDL-33691' of git://github.com/netspotau/moodle-mod_assign 2012-06-13 15:24:42 +08:00
Dan Poltawski
1904310572 Merge branch 'MDL-33608-master-1' of git://git.luns.net.uk/moodle 2012-06-13 14:02:05 +08:00
Ankit Agarwal
09b46f0e13 MDL-33645 assign: Teachers should not be allowed to change grades if it is overridden in the gradebook 2012-06-13 13:20:54 +08:00
Marina Glancy
0b2bfbd1c6 MDL-33550 Correctly process situation when file reference source is missing 
- do not die with fatal error if source file in moodle internal repository is missing;
- moved code duplication for moodle repositories into class repository (functions send_file, get_reference_details, get_file_by_reference, get_file_reference);
- update file status after repository::sync_external_file so we know that it is missing (or not missing anymore). Do not run this function more than once for file within one request;
- display readable name for Private Files and Server files with the new format;
- display broken icon in filemanager if we know that source is missing, display information (for admin) where it was located before: see repository::get_reference_details() and extending classes;
- removed unnecessary queries in stored_file::sync_external_file();
- syncronize files before displaying it's size in mod_resource, do not query  directly
 2012-06-13 12:11:06 +08:00
Dan Poltawski
9379a9190d Merge branch 'MDL-33576-2' of git://github.com/netspotau/moodle-mod_assign 2012-06-13 11:28:39 +08:00
Sam Hemelryk
7cbd6d8353 Merge branch 'MDL-33675-master-1' of git://git.luns.net.uk/moodle 2012-06-13 15:24:07 +12:00
Damyon Wiese
571cc0b7d2 MDL-33691: The grading table is showing "graded" for assignments with a NULL grade 2012-06-13 11:01:37 +08:00
Dan Poltawski
38569ad3a2 Merge branch 'master_MDL-32937' of git://github.com/danmarsden/moodle 2012-06-13 10:12:21 +08:00
Damyon Wiese
e7ade405eb MDL-33576: If grade set to "No grade" in mod_assign hide inputs for quickgrading 2012-06-13 08:55:02 +08:00
Dan Marsden
cb6782d4a5 MDL-32937 SCORM: better lang for dnd interface 2012-06-13 09:59:11 +12:00
Andrew Robert Nicols
8635302e54 MDL-33675 Add updated help texts for modules to appear in activity chooser 2012-06-12 13:38:17 +01:00
Eloy Lafuente (stronk7)
2903a92b29 Merge branch 'MDL-33123-master' of git://github.com/ankitagarwal/moodle 2012-06-12 12:33:54 +02:00
Tim Hunt
7ead73c106 MDL-33611 quiz: improve help string 
Thanks to Helen and Michelle. Who would have thought that 124 words
would require such a team effort!
 2012-06-12 10:38:47 +01:00
Dan Poltawski
8409bd51f4 Merge branch 'MDL-33612' of git://github.com/timhunt/moodle 2012-06-12 17:38:25 +08:00
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