Commit graph

55562 commits

Author SHA1 Message Date
Dan Poltawski
06c548c783 Merge branch 'w33_MDL-34741_m24_yui2in3' of git://github.com/skodak/moodle 2012-08-14 15:33:10 +08:00
Aparup Banerjee
6a9718f254 Merge branch 'wip-MDL-34748-master' of git://github.com/marinaglancy/moodle 2012-08-14 15:29:42 +08:00
Aparup Banerjee
1474543a20 Merge branch 'MDL-34563_accessibility' of git://github.com/rwijaya/moodle 2012-08-14 14:34:19 +08:00
Rossiani Wijaya
24a0e85934 MDL-34563 - change plural strings and removed colon for accesshide label 2012-08-14 13:59:45 +08:00
Aparup Banerjee
9fe8a6e02f Merge branch 'MDL-34565_accessibility' of git://github.com/rwijaya/moodle 2012-08-14 13:53:19 +08:00
Dan Poltawski
16f1d5010e Merge branch 'MDL-34728' of git://github.com/timhunt/moodle 2012-08-14 13:28:49 +08:00
Dan Poltawski
10e0769283 Merge branch 'MDL-34793' of git://github.com/merrill-oakland/moodle 2012-08-14 13:25:25 +08:00
Eric Merrill
8c0cf5be66 MDL-34793 mod_assign Fix rendering error that causes student view to break in some cases.
When feedback is switched on for a assignment, and the teacher enters a grade through the gradebook, the student
view would become broken, throwing a coding error. Added check that $status->grade is not empty before passing
to assign_feedback_XXX::is_empty(), as that function expects an object.
2012-08-14 00:41:50 -04:00
Dan Poltawski
2776d5b114 Merge branch 'MDL-34807' of git://github.com/timhunt/moodle 2012-08-14 12:07:59 +08:00
Dan Poltawski
78145050c6 Merge branch 'w33_MDL-33041_m24_tinymceplugins' of git://github.com/skodak/moodle 2012-08-14 11:58:05 +08:00
Aparup Banerjee
060eaca70e Merge branch 'MDL-32344_master' of git://github.com/dmonllao/moodle 2012-08-14 10:55:49 +08:00
David Monllao
f813321718 MDL-32344 blog Replacing tables for div containers 2012-08-14 10:47:17 +08:00
Petr Škoda
43552bd2c3 MDL-33041 fix tabs in all tinymce files except those we update from upstream
The moodleimage plugin is a fork of standard advimage plugin,
the spellchecker is a fork of https://github.com/tinymce/tinymce_spellchecker_php.
2012-08-13 14:13:46 +02:00
Petr Škoda
8ccb3ce861 MDL-33041 improve our tinymce plugin loader docs 2012-08-13 14:13:09 +02:00
Tim Hunt
75d86b6fbc MDL-34807 question bank: navigation loses place.
The symptom is that where we are now is not shown in the settings
navigation. However, the underlying cause is that question/edit.php is
doing some crazy thing of its own to build $PAGE->url, rather than using
the one returned by question_edit_setup.

Not that this patch itentionally removes the returnurl param. It was
added as part of a big change MDL-20276, which I think just got this
detail wrong. That variable is never used.
2012-08-13 11:13:25 +01:00
Tim Hunt
bef9ab0ad5 MDL-34728 forms: woy for other JS to trigger disableIf update.
This was discovered while working on MDL-32705. If some JavaScript (for
example a select all/none link) changes the state of some form fields,
then the disabledIf state of other form elements does not automatically
update.

The existing form JS was so well encapsulated that this was impossible.
This change pokes a hole in the encapsulation, and provides an API
    M.form.updateFormState(formid);
that other bits of JS code can call when necessary.
2012-08-13 11:13:06 +01:00
Rossiani Wijaya
01f8e80def MDL-34563 accessibility compliance for data module: Add forform input text and select tag 2012-08-13 15:13:07 +08:00
Rossiani Wijaya
73b2ddddaa MDL-34565: change to plural strings 2012-08-13 15:12:34 +08:00
Rossiani Wijaya
d1881bec56 MDL-34565 accessibility compliance for forum module: Add forform input text and select tag 2012-08-13 15:12:34 +08:00
Dan Poltawski
0523293c39 Merge branch 'MDL-34820' of git://github.com/lazydaisy/moodle 2012-08-13 12:30:48 +08:00
Marina Glancy
7355640aed MDL-34748 repository_filesystem: Sort files by title by default 2012-08-13 11:58:58 +08:00
Aparup Banerjee
b567fcfb50 Merge branch 'w33_MDL-34851_m24_enrolledsince' of git://github.com/skodak/moodle 2012-08-13 11:03:43 +08:00
Aparup Banerjee
b039a627b2 Merge branch 'w33_MDL-34852_m24_enroledit' of git://github.com/skodak/moodle 2012-08-13 11:02:43 +08:00
Dan Poltawski
2b1ddbb8af Merge branch 'MDL-34446-master' of git://github.com/sammarshallou/moodle 2012-08-13 10:44:11 +08:00
Dan Poltawski
26a306be07 Merge branch 'MDL-34376' of git://github.com/merrill-oakland/moodle 2012-08-13 10:33:09 +08:00
Dan Poltawski
3f9d0afcff Merge branch 'MDL-34835_master' of git://github.com/lazydaisy/moodle 2012-08-13 10:20:19 +08:00
Aparup Banerjee
2cfd8f9427 Merge branch 'MDL-34337-master' of git://github.com/ankitagarwal/moodle 2012-08-13 10:16:03 +08:00
Aparup Banerjee
e9b5490e29 Merge branch 'MDL-34336-master' of git://github.com/ankitagarwal/moodle 2012-08-13 10:10:15 +08:00
Dan Poltawski
93d73cd8be Merge branch 'MDL-34543' of git://github.com/merrill-oakland/moodle 2012-08-13 10:03:33 +08:00
Petr Škoda
4389d18e74 MDL-34851 show enrolment date if there is no start and end of active enrolment
This should help when enrol plugin does not set any start or end of enrolment validity.
2012-08-12 20:46:00 +02:00
Petr Škoda
e8f4b30638 MDL-33734 remove unused session code
Credit goes to Davo Smith, thanks!
2012-08-12 14:25:18 +02:00
Petr Škoda
4c04933b99 MDL-34852 allow editing of manual/self enrolments times and show time enrolled 2012-08-12 14:15:09 +02:00
Petr Škoda
a33e740789 MDL-34741 improve inline docs 2012-08-12 12:01:10 +02:00
Petr Škoda
e0a5793d8f MDL-34741 remove deprecated M.yui.loader 2012-08-12 11:41:25 +02:00
Petr Škoda
2de3515fcc MDL-34741 use 2in3 in mod_survey 2012-08-11 20:40:11 +02:00
Petr Škoda
69ccc32d4f MDL-34741 use 2in3 in mod_chat 2012-08-11 20:40:11 +02:00
Petr Škoda
82e7d74ece MDL-34741 use 2in3 in static JS 2012-08-11 20:40:10 +02:00
Petr Škoda
99a91bbad1 MDL-34741 remove unused legacy course files code 2012-08-11 20:40:10 +02:00
Petr Škoda
3993f027db MDL-34741 use 2in3 in comments 2012-08-11 20:40:10 +02:00
Petr Škoda
a8c7ff1aeb MDL-34741 remove old unused restore JS code 2012-08-11 20:40:10 +02:00
Petr Škoda
f387bb9bb7 MDL-34741 use 2in3 in mod_quiz 2012-08-11 20:40:09 +02:00
Petr Škoda
7b66b651da MDL-34741 use 2in3 in question bank 2012-08-11 20:40:09 +02:00
Petr Škoda
69878a382f MDL-34741 use 2in3 in portfolio download 2012-08-11 20:40:09 +02:00
Petr Škoda
70039658c8 MDL-34741 use 2in3 in report_completion 2012-08-11 20:40:08 +02:00
Petr Škoda
5bb40d1ebd MDL-34741 use 2in3 in report_progress 2012-08-11 20:40:08 +02:00
Petr Škoda
11263805b3 MDL-34741 use 2in3 in tags 2012-08-11 20:40:08 +02:00
Petr Škoda
1a59e7151a MDL-34741 use 2in3 in forms 2012-08-11 20:40:07 +02:00
Petr Škoda
e3c1d655f8 MDL-34741 use 2in3 in groups UI 2012-08-11 20:40:07 +02:00
Petr Škoda
b8b4f65b9c MDL-34741 use 2in3 in gradebook 2012-08-11 20:40:07 +02:00
Petr Škoda
1a92858d80 MDL-34741 use 2in3 in mod_scorm 2012-08-11 20:40:06 +02:00