mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-06 16:59:56 +01:00
Code Issues Projects Releases Wiki Activity
55,617 Commits 36 Branches 523 Tags
Commit Graph

55617 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tim Hunt
607b0a705f MDL-34118 question backup: API improvement following Eloy's review. 2012-08-17 13:15:41 +01:00
Juergen Zimmer
895d364bcf MDL-34118 question backup: fixes for usage prefixes in backups. 2012-08-17 11:15:11 +01:00
Tim Hunt
3e3ae0ee11 MDL-34118 question backup: a mod can use usages in different ways. 
An activity module might want to use question_usages in different ways.
We should suppport this, because it lets people make interesting
activities.

At the moment, the backup and restore code does not support this,
because it uses fixed element names for the question_usage element and
its children. This fix changes things so that a prefix can be appended
to all the element names.
 2012-08-17 11:13:10 +01:00
Eloy Lafuente (stronk7)
c92d6f417c weekly release 2.4dev 2012-08-16 17:27:40 +02:00
Eloy Lafuente (stronk7)
0e6da6f7df Merge branch 'install_master' of git://git.moodle.cz/moodle-install 2012-08-16 17:21:33 +02:00
Eric Merrill
710f1a344f MDL-34376 mod_assign Fixing flaw in previous commit with not defining . 2012-08-16 10:05:26 -04:00
sam marshall
007bf47f10 MDL-34446 Fix bugs in previous commit 2012-08-16 14:37:11 +08:00
Rossiani Wijaya
1b2bd9768d MDL-34563 - change string firstname to lastname and add accesshide class 2012-08-16 14:16:57 +08:00
Rossiani Wijaya
3a5543d43b MDL-34563 - removed double labeling and add label for input text 2012-08-16 14:15:13 +08:00
Aparup Banerjee
01ac783fb8 Merge branch 'MDL-34565_accessibility' of git://github.com/rwijaya/moodle 2012-08-16 11:51:23 +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
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
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