Commit graph

56380 commits

Author SHA1 Message Date
David Monllao
ce7382c959 MDL-30370 mod_forum - Removing duplicate seleted field in the DB query
Credit to Iñigo Zendegi
2012-08-15 17:03:07 +08:00
Rossiani Wijaya
38befbef7a MDL-34565 - remove duplicate labeling 2012-08-15 16:21:25 +08: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
AMOS bot
1f4e661fd1 Automatically generated installer lang files 2012-08-15 00:31:32 +00: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
Rex Lorenzo
1f09018af7 MDL-34866 - Make "course display" default a site configurable option
* Moved COURSE_DISPLAY_SINGLEPAGE and COURSE_DISPLAY_MULTIPAGE constants from courselib to moodlelib.php
* Using course display constants in course default admin setting page
2012-08-14 12:12:14 -07: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
Frederic Massart
928928490d MDL-34872 Backup: Backup does not fail when a user is deleted 2012-08-14 17:28:31 +08:00
Adrian Greeve
941c251304 MDL-34429 - lib - Changed the log downloads to use the new CSV class. 2012-08-14 16:03:21 +08: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
Ankit Agarwal
194ab42205 MDL-34535 message: userto should use is_number instead of is_init 2012-08-14 14:41:00 +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
Adam Olley
238a7b3ae0 MDL-34870: Prevent cohort enrol sync when updating course record 2012-08-14 13:56:44 +09:30
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
Rajesh Taneja
dea75f643d MDL-32759 Assignment: Grades will not be scaled for new assignment module, and added warning message for user 2012-08-14 11:23:33 +08:00
Rajesh Taneja
daaf84ec44 MDL-32759 Assignment 2.2: Changing grade for existing assignments will show warning that grades will not be scaled 2012-08-14 11:23:33 +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
Paul Charsley
3a2b8bb09d Merge branch 'master' of https://github.com/moodle/moodle 2012-08-14 14:00:51 +12:00
Rex Lorenzo
79e250dbdc MDL-34866 - Make "course display" default a site configurable option 2012-08-13 16:24:12 -07: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