Damyon Wiese
79ed4d8475
MDL-31341: Add custom completion rule to assignment: 'submit'
2012-08-17 09:05:40 +08:00
Petr Škoda
e4945f5f54
MDL-34852 do not use frozen date select field because it is ugly
2012-08-16 10:17:06 +08:00
Petr Škoda
3f038004e6
MDL-34852 add missing timecreated form data
2012-08-16 10:16:14 +08:00
Dan Poltawski
b6582000f5
Merge branch 'MDL-34905' of git://github.com/timhunt/moodle
2012-08-15 17:53:55 +08:00
Tim Hunt
4be550c57d
MDL-34905 quiz: missing global $DB;
...
This code normally only runs when JS is disabled, which is why this was
not noticed before.
2012-08-15 10:25:25 +01:00
Aparup Banerjee
6e12c2156e
MDL-22773 Database : fixed whitespace.
2012-08-15 10:04:24 +08:00
Aparup Banerjee
dbf2c5bfef
Merge branch 'MDL-22773' of git://github.com/bostelm/moodle
2012-08-15 10:01:46 +08:00
Eloy Lafuente (stronk7)
50b9b2e552
Merge branch 'MDL-34583' of git://github.com/netspotau/moodle-mod_assign
2012-08-15 03:35:34 +02:00
Eloy Lafuente (stronk7)
7ccede7af8
Merge branch 'MDL-34862' of git://github.com/timhunt/moodle
2012-08-15 03:30:56 +02:00
Dan Poltawski
9e586967a6
MDL-34539 course - allow negative section numbers
...
This gives course format authors more flexibility.
Thanks to Itamar Tzadok for the suggestion.
2012-08-15 03:26:26 +02:00
Eloy Lafuente (stronk7)
92f2403bf3
Merge branch 'master_MDL-34593_add_extra_plugin_param_to_get_form_elements_module' of git://github.com/kanikagoyal/moodle
2012-08-15 03:18:58 +02:00
Eloy Lafuente (stronk7)
4998a013aa
Merge branch 'MDL-34885' of git://github.com/timhunt/moodle
2012-08-15 03:16:16 +02:00
Damyon Wiese
1cf98c021e
MDL-34583: Assignment upgrade loses comments from onlinetext and offline assignment types.
2012-08-15 08:50:47 +08:00
Eloy Lafuente (stronk7)
717cabb7a4
Merge branch 'MDL-25347_master' of git://github.com/dmonllao/moodle
2012-08-15 02:03:52 +02:00
Sam Hemelryk
0bb0f086ac
Merge branch 'MDL-33640_master' of git://github.com/MaxThrax/moodle
2012-08-15 11:48:40 +12:00
Sam Hemelryk
c52c034064
Merge branch 'MDL-33531_master' of git://github.com/dmonllao/moodle
2012-08-15 11:24:45 +12:00
Eloy Lafuente (stronk7)
6b80e18a8b
Merge branch 'MDL-34745' of git://github.com/danpoltawski/moodle
2012-08-15 01:22:49 +02:00
Eloy Lafuente (stronk7)
1135ae4908
Merge branch 'MDL-29192' of git://github.com/danpoltawski/moodle
2012-08-15 01:16:48 +02:00
Eloy Lafuente (stronk7)
76b97631b0
Merge branch 'MDL-25012' of git://github.com/danpoltawski/moodle
...
Conflicts:
lib/db/upgrade.php
version.php
2012-08-15 00:41:04 +02:00
Eloy Lafuente (stronk7)
267c898bfd
Merge branch 'w33_MDL-34782_m24_mysqlunsigned' of git://github.com/skodak/moodle
2012-08-14 23:09:30 +02:00
Dan Poltawski
1c1246ec28
MDL-34829 course - allow directly linked sections to work.
...
Even if not in single section mode.
2012-08-14 22:56:36 +02:00
Eloy Lafuente (stronk7)
92886a8e14
Merge branch 'MDL-34783-master-1' of git://git.luns.net.uk/moodle
2012-08-14 22:45:06 +02:00
Tim Hunt
6d3b1e1f9d
MDL-34885 phpunit: better cygwin detection.
...
For some reason, on my computer, $_SERVER['SHELL'] was not set, so I
changed the test to also consider $_SERVER['TERM']. This now works for
me.
2012-08-14 14:06:24 +01:00
Henning Bostelmann
4f304eeb3d
MDL-22773 Database module export: include internal fields
...
Fields included:
* User details (fullname, username, email)
* Time added/modified
* Approval status
2012-08-14 11:14:07 +01:00
Aparup Banerjee
50f0c35dd3
Merge branch 'master_MDL-34382_add_new_option_to_flag_modules_that_support_plagiarism_plugins' of git://github.com/kanikagoyal/moodle
2012-08-14 15:48:19 +08:00
Dan Poltawski
3542e01a0c
MDL-34741 yui - version bump for 2in3 and upgrade.txt note
2012-08-14 15:33:32 +08:00
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
Tim Hunt
4c16e191e1
MDL-34862 question preview: improve preview ownership check.
...
Users should only be able to access their own quetion preview. In the
past, for reasons I can no longer remember, this was enforced
using the session. It is much better to set the question_usage to belong
to the user's context.
2012-08-13 16:53:15 +01:00
Kanika Goyal
67fbfe8b54
MDL-34593: Plagiarism API - add extra plgin param to get_form_elements_module
2012-08-13 20:31:45 +05:30
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
Kanika Goyal
50da4ddd56
MDL-34382: Plagiarism API - add new option to flag modules that support the use of plagiarism plugins
2012-08-13 11:02:34 +05:30
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