moodle.git
9 years agoMerge branch 'w35_MDL-34955_m24_tinycefinal' of git://github.com/skodak/moodle
Aparup Banerjee [Tue, 28 Aug 2012 07:10:35 +0000 (15:10 +0800)]
Merge branch 'w35_MDL-34955_m24_tinycefinal' of git://github.com/skodak/moodle

9 years agoMerge branch 'w35_MDL-34878_m24_tinymcebuttons' of git://github.com/skodak/moodle
Aparup Banerjee [Tue, 28 Aug 2012 07:00:26 +0000 (15:00 +0800)]
Merge branch 'w35_MDL-34878_m24_tinymcebuttons' of git://github.com/skodak/moodle

9 years agoMerge branch 'w35_MDL-34877_m24_tinymcesettings' of git://github.com/skodak/moodle
Aparup Banerjee [Tue, 28 Aug 2012 05:56:15 +0000 (13:56 +0800)]
Merge branch 'w35_MDL-34877_m24_tinymcesettings' of git://github.com/skodak/moodle

9 years agoMDL-34549 added IGNORE_MISSING to context call for bc
Aparup Banerjee [Tue, 28 Aug 2012 04:29:17 +0000 (12:29 +0800)]
MDL-34549 added IGNORE_MISSING to context call for bc

9 years agoMerge branch 'MDL-34549-master' of git://github.com/ankitagarwal/moodle
Aparup Banerjee [Tue, 28 Aug 2012 03:45:11 +0000 (11:45 +0800)]
Merge branch 'MDL-34549-master' of git://github.com/ankitagarwal/moodle

9 years agoMerge branch 'w35_MDL-35052_m24_disabledenrol' of git://github.com/skodak/moodle
Aparup Banerjee [Tue, 28 Aug 2012 03:35:24 +0000 (11:35 +0800)]
Merge branch 'w35_MDL-35052_m24_disabledenrol' of git://github.com/skodak/moodle

9 years agoMerge branch 'w35_MDL-35060_m24_sesstest' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Tue, 28 Aug 2012 00:27:34 +0000 (02:27 +0200)]
Merge branch 'w35_MDL-35060_m24_sesstest' of git://github.com/skodak/moodle

9 years agoMerge branch 'wip-MDL-34310-master' of git://github.com/marinaglancy/moodle
Eloy Lafuente (stronk7) [Mon, 27 Aug 2012 18:12:18 +0000 (20:12 +0200)]
Merge branch 'wip-MDL-34310-master' of git://github.com/marinaglancy/moodle

9 years agoMerge branch 'MDL-34306' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Mon, 27 Aug 2012 18:06:19 +0000 (20:06 +0200)]
Merge branch 'MDL-34306' of git://github.com/timhunt/moodle

9 years agoMerge branch 'MDL-34406_fullname' of git://github.com/andyjdavis/moodle
Eloy Lafuente (stronk7) [Mon, 27 Aug 2012 18:03:01 +0000 (20:03 +0200)]
Merge branch 'MDL-34406_fullname' of git://github.com/andyjdavis/moodle

9 years agoMerge branch 'MDL-34430' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Mon, 27 Aug 2012 16:50:29 +0000 (18:50 +0200)]
Merge branch 'MDL-34430' of git://github.com/timhunt/moodle

9 years agoMerge branch 'MDL-34993' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Mon, 27 Aug 2012 16:35:23 +0000 (18:35 +0200)]
Merge branch 'MDL-34993' of git://github.com/timhunt/moodle

9 years agoMerge branch 'master_MDL-34994' of git://github.com/danmarsden/moodle
Eloy Lafuente (stronk7) [Mon, 27 Aug 2012 16:17:55 +0000 (18:17 +0200)]
Merge branch 'master_MDL-34994' of git://github.com/danmarsden/moodle

9 years agoMerge branch 'w35_MDL-35072_m24_mancleanup' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Mon, 27 Aug 2012 16:07:24 +0000 (18:07 +0200)]
Merge branch 'w35_MDL-35072_m24_mancleanup' of git://github.com/skodak/moodle

9 years agoMerge branch 'MDL-35026' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Mon, 27 Aug 2012 15:53:59 +0000 (17:53 +0200)]
Merge branch 'MDL-35026' of git://github.com/timhunt/moodle

9 years agoMerge branch 'MDL-35003' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Mon, 27 Aug 2012 15:50:55 +0000 (17:50 +0200)]
Merge branch 'MDL-35003' of git://github.com/timhunt/moodle

9 years agoMDL-35072 fix bogus left enrol join
Petr Škoda [Mon, 27 Aug 2012 15:19:07 +0000 (17:19 +0200)]
MDL-35072 fix bogus left enrol join

Credit goes to Eloy, thanks.

9 years agoMerge branch 'MDL-35023' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Mon, 27 Aug 2012 14:32:30 +0000 (16:32 +0200)]
Merge branch 'MDL-35023' of git://github.com/timhunt/moodle

9 years agoMerge branch 'MDL-35038' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Mon, 27 Aug 2012 14:24:17 +0000 (16:24 +0200)]
Merge branch 'MDL-35038' of git://github.com/timhunt/moodle

9 years agoMerge branch 'MDL-35048' of git://github.com/lazydaisy/moodle
Eloy Lafuente (stronk7) [Mon, 27 Aug 2012 14:20:19 +0000 (16:20 +0200)]
Merge branch 'MDL-35048' of git://github.com/lazydaisy/moodle

9 years agoMerge branch 'MDL-35055' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Mon, 27 Aug 2012 14:16:14 +0000 (16:16 +0200)]
Merge branch 'MDL-35055' of git://github.com/timhunt/moodle

9 years agoMerge branch 'w35_MDL-35061_m24_enrolfields' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Mon, 27 Aug 2012 13:58:19 +0000 (15:58 +0200)]
Merge branch 'w35_MDL-35061_m24_enrolfields' of git://github.com/skodak/moodle

9 years agoMerge branch 'MDL-31633-master' of git://github.com/ankitagarwal/moodle
Aparup Banerjee [Mon, 27 Aug 2012 09:26:14 +0000 (17:26 +0800)]
Merge branch 'MDL-31633-master' of git://github.com/ankitagarwal/moodle

9 years agoMerge branch 'MDL-34907' of git://github.com/raymondAntonio/moodle
Aparup Banerjee [Mon, 27 Aug 2012 09:07:46 +0000 (17:07 +0800)]
Merge branch 'MDL-34907' of git://github.com/raymondAntonio/moodle

9 years agoMerge branch 'MDL-35004' of git://github.com/raymondAntonio/moodle
Aparup Banerjee [Mon, 27 Aug 2012 08:56:03 +0000 (16:56 +0800)]
Merge branch 'MDL-35004' of git://github.com/raymondAntonio/moodle

9 years agoMerge branch 'MDL-34936-master-1' of git://github.com/andrewnicols/moodle
Aparup Banerjee [Mon, 27 Aug 2012 06:20:15 +0000 (14:20 +0800)]
Merge branch 'MDL-34936-master-1' of git://github.com/andrewnicols/moodle

9 years agoMerge branch 'MDL-34996_master' of git://github.com/grabs/moodle
Aparup Banerjee [Mon, 27 Aug 2012 05:46:40 +0000 (13:46 +0800)]
Merge branch 'MDL-34996_master' of git://github.com/grabs/moodle

9 years agoMDL-34429 fixed whitespace.
Aparup Banerjee [Mon, 27 Aug 2012 04:07:15 +0000 (12:07 +0800)]
MDL-34429 fixed whitespace.

9 years agoMerge branch 'wip-MDL-34429-master' of git://github.com/abgreeve/moodle
Aparup Banerjee [Mon, 27 Aug 2012 04:04:45 +0000 (12:04 +0800)]
Merge branch 'wip-MDL-34429-master' of git://github.com/abgreeve/moodle

9 years agoMerge branch 'MDL-32386b' of git://github.com/srynot4sale/moodle
Aparup Banerjee [Mon, 27 Aug 2012 03:30:44 +0000 (11:30 +0800)]
Merge branch 'MDL-32386b' of git://github.com/srynot4sale/moodle

9 years agoMDL-32386 completion: Fix incorrect method parameters
Aaron Barnes [Fri, 20 Jul 2012 01:40:42 +0000 (13:40 +1200)]
MDL-32386 completion: Fix incorrect method parameters

9 years agoMDL-35048 theme_formal_white: removed p {margin:0} from style/formal_white.css which...
Mary Evans [Sun, 26 Aug 2012 19:02:15 +0000 (20:02 +0100)]
MDL-35048 theme_formal_white: removed p {margin:0} from style/formal_white.css which was causing a regression in some areas of theme

9 years agoMDL-35072 coding style cleanup in enrol_manual
Petr Škoda [Sun, 26 Aug 2012 14:37:49 +0000 (16:37 +0200)]
MDL-35072 coding style cleanup in enrol_manual

9 years agoMDL-35052 show all enrolled users in enrol UI included those enrolled via disabled...
Petr Škoda [Sat, 25 Aug 2012 11:29:28 +0000 (13:29 +0200)]
MDL-35052 show all enrolled users in enrol UI included those enrolled via disabled plugins

9 years agoMDL-35061 add more custom fields for enrol instances
Petr Škoda [Sat, 25 Aug 2012 09:45:20 +0000 (11:45 +0200)]
MDL-35061 add more custom fields for enrol instances

This delays the splitting of plugin specific enrol info from shared enrol table.

9 years agoMDL-34306 gift question format: allow import of general feedback
Tim Hunt [Thu, 12 Jul 2012 18:11:06 +0000 (19:11 +0100)]
MDL-34306 gift question format: allow import of general feedback

This change introduces #### as a separator for general feedback. You need
to add ####General feedback goes here as the last thing inside the {...}.
For example

// question: 123  name: Shortanswer
::Shortanswer::Which is the best animal?{
    =Frog#Good!
    =%50%Cat#What is it with Moodlers and cats?
    =%0%*#Completely wrong
    ####Here is some general feedback!
}

Note that this change is not entirely backwards compatible. It will break
any existing GIFT file where the character sequence #### us used between the
{} as part of the question. This seems highly unlikely.

9 years agoMDL-35060 remove unused session test file
Petr Škoda [Sat, 25 Aug 2012 08:14:38 +0000 (10:14 +0200)]
MDL-35060 remove unused session test file

9 years agoMDL-34996 - Improve help text for Feedback dependancies
Andreas Grabs [Fri, 24 Aug 2012 21:08:55 +0000 (23:08 +0200)]
MDL-34996 - Improve help text for Feedback dependancies

9 years agoMDL-34936 Warn if the sectioncache property is missing in a get_fast_modinfo call
Andrew Robert Nicols [Thu, 16 Aug 2012 19:58:12 +0000 (20:58 +0100)]
MDL-34936 Warn if the sectioncache property is missing in a get_fast_modinfo call

9 years agoMDL-35055 question import: slight error with the Match grades option.
Tim Hunt [Fri, 24 Aug 2012 14:34:20 +0000 (15:34 +0100)]
MDL-35055 question import: slight error with the Match grades option.

Even in the 'Error if grade not listed case', it was applying a small
tolerance. In the case of a fuzzy match, it was returning the inexact
grade from the import file, rather than the precise grade that Moodle
was expecting.

That causes problems when the editing form is displayed, because the
value from the database does not match any of the available options, so
the grade is changed to 0%.

9 years agoMDL-34955 fix missing string
Petr Škoda [Tue, 21 Aug 2012 07:35:26 +0000 (09:35 +0200)]
MDL-34955 fix missing string

9 years agoMDL-34955 add full TinyMCE subplugin management
Petr Škoda [Sat, 18 Aug 2012 16:55:33 +0000 (18:55 +0200)]
MDL-34955 add full TinyMCE subplugin management

9 years agoMDL-34878 add custom TinyMCE toolbar setting
Petr Škoda [Sat, 18 Aug 2012 14:26:27 +0000 (16:26 +0200)]
MDL-34878 add custom TinyMCE toolbar setting

9 years agoMDL-34877 add tinymce subplugin setting support
Petr Škoda [Sat, 18 Aug 2012 13:21:37 +0000 (15:21 +0200)]
MDL-34877 add tinymce subplugin setting support

Includes migration of spell related settings to spellchecker plugin.

9 years agoMDL-31633 grades: Fixing incorrect redirect when trying to edit grade letters from...
Ankit Agarwal [Tue, 21 Aug 2012 03:28:27 +0000 (11:28 +0800)]
MDL-31633 grades: Fixing incorrect redirect when trying to edit grade letters from admin settings

9 years agoMDL-35004: Fix 'can not create a new instance of the assignment module with no comple...
Raymond Wijaya [Wed, 22 Aug 2012 04:47:53 +0000 (12:47 +0800)]
MDL-35004: Fix 'can not create a new instance of the assignment module with no completion setting'

9 years agoMDL-34907: Add a missing string that triggers Javascript error in assignment upgrade...
Raymond Wijaya [Mon, 20 Aug 2012 06:04:29 +0000 (14:04 +0800)]
MDL-34907: Add a missing string that triggers Javascript error in assignment upgrade tool

9 years agoMDL-34310 display grading method description inside render_preview
Marina Glancy [Fri, 24 Aug 2012 03:51:20 +0000 (11:51 +0800)]
MDL-34310 display grading method description inside render_preview

This way we can use the function gradingform_controller::render_preview() to display a preview for students in different modules
without worrying on gradingform-specific options on whether to display description for students or not

9 years agoMDL-34549 libraries: Changing strictness of context::instance_by_id() when required
Ankit Agarwal [Tue, 21 Aug 2012 07:02:40 +0000 (15:02 +0800)]
MDL-34549 libraries: Changing strictness of context::instance_by_id() when required

9 years agoMDL-34549 libraries: Replace get_context_instance_by_id() by context::instance_by_id()
Ankit Agarwal [Tue, 21 Aug 2012 06:20:30 +0000 (14:20 +0800)]
MDL-34549 libraries: Replace get_context_instance_by_id() by context::instance_by_id()

9 years agoMDL-35042 blocks: Allow HTML block advanced setting to be toggled
Aaron Barnes [Fri, 24 Aug 2012 00:05:52 +0000 (12:05 +1200)]
MDL-35042 blocks: Allow HTML block advanced setting to be toggled

9 years agoMDL-34406 message: removed an unnecessary string creation
Andrew Davis [Fri, 17 Aug 2012 03:28:56 +0000 (11:28 +0800)]
MDL-34406 message: removed an unnecessary string creation

9 years agoMDL-34430 qtype essay: upgrade from MDL-31393 needs a progress bar.
Tim Hunt [Wed, 22 Aug 2012 21:02:48 +0000 (22:02 +0100)]
MDL-34430 qtype essay: upgrade from MDL-31393 needs a progress bar.

9 years agoMDL-35038 quiz reports: clarify the API changes docs.
Tim Hunt [Thu, 23 Aug 2012 17:26:43 +0000 (18:26 +0100)]
MDL-35038 quiz reports: clarify the API changes docs.

Also re-organise the file to put the most recent changes at the top.

9 years agoMDL-35038 quiz reports: document the API changes in 2.3.
M Kassaei [Thu, 23 Aug 2012 16:58:56 +0000 (17:58 +0100)]
MDL-35038 quiz reports: document the API changes in 2.3.

9 years agoMDL-35026 qtype multianswer: misnamed string.
Tim Hunt [Thu, 23 Aug 2012 10:37:51 +0000 (11:37 +0100)]
MDL-35026 qtype multianswer: misnamed string.

AMOS BEGIN
 MOV [questionnadded,qtype_multianswer],[questionsadded,qtype_multianswer]
AMOS END

9 years agoMDL-35023 qtype calculated: fix strict syntax problem.
Tim Hunt [Thu, 23 Aug 2012 10:16:24 +0000 (11:16 +0100)]
MDL-35023 qtype calculated: fix strict syntax problem.

9 years agoMDL-35003 questions: remove stray full stop after correct answer.
Tim Hunt [Thu, 23 Aug 2012 10:53:47 +0000 (11:53 +0100)]
MDL-35003 questions: remove stray full stop after correct answer.

In a few situations, this full stop makes things a bit more grammatical,
but there are many other situations where it causes problems. So, on
balance we will remove it.

9 years agoMDL-34993 questions: convert numeric fields to float on load.
Tim Hunt [Tue, 21 Aug 2012 13:11:13 +0000 (14:11 +0100)]
MDL-34993 questions: convert numeric fields to float on load.

NUMBER(X,Y) typically come back from the DB as strings. If you don't
convert them to float, then when you display them, it appears as
1.0000000, which is not normally what you want.

Also, increase the size of the field on the edit form, so if you
question does have default mark 0.1234567, you can see that!

9 years agoweekly release 2.4dev
Eloy Lafuente (stronk7) [Thu, 23 Aug 2012 17:26:37 +0000 (19:26 +0200)]
weekly release 2.4dev

9 years agoMerge branch 'install_master' of git://git.moodle.cz/moodle-install
Eloy Lafuente (stronk7) [Thu, 23 Aug 2012 17:18:22 +0000 (19:18 +0200)]
Merge branch 'install_master' of git://git.moodle.cz/moodle-install

9 years agoMDL-31957 Course reset: Add missing global
Eloy Lafuente (stronk7) [Thu, 23 Aug 2012 00:04:13 +0000 (02:04 +0200)]
MDL-31957 Course reset: Add missing global

9 years agoMerge branch 'MDL-34738_fixup' of git://github.com/jmvedrine/moodle
Eloy Lafuente (stronk7) [Wed, 22 Aug 2012 14:36:53 +0000 (16:36 +0200)]
Merge branch 'MDL-34738_fixup' of git://github.com/jmvedrine/moodle

9 years agoMDL-34738 fix for the problem found during testing : dat files not accepted on some...
Jean-Michel Vedrine [Wed, 22 Aug 2012 13:19:54 +0000 (15:19 +0200)]
MDL-34738 fix for the problem found during testing : dat files not accepted on some servers

9 years agoMDL-34444 - actually display the title, just don't link it..
Dan Poltawski [Wed, 22 Aug 2012 09:10:38 +0000 (17:10 +0800)]
MDL-34444 - actually display the title, just don't link it..

Don't worry, i'm going on holiday, so i'll be away from this git repo
for a while to prevent any more mess.

9 years agoMDL-34444 course - don't show to 'unavaibile' sections title
Dan Poltawski [Wed, 22 Aug 2012 08:38:15 +0000 (16:38 +0800)]
MDL-34444 course - don't show to 'unavaibile' sections title

Instead we just show the availability info in the index page,
this makes the navigation etc much simpler.

9 years agoRevert "MDL-34444 course: show section availability info"
Dan Poltawski [Wed, 22 Aug 2012 08:37:36 +0000 (16:37 +0800)]
Revert "MDL-34444 course: show section availability info"

Turns out this change was just wrong, we shouldn't be allowing linking
to unaavilable sections. Just show the availability information on the
'index page'

This reverts commit 87a31bb5d8fedd4447cf99cef13c5dd367c3ea3e.

9 years agoMDL-34444 course: Dont display links to hidden sections
Dan Poltawski [Wed, 1 Aug 2012 02:29:44 +0000 (10:29 +0800)]
MDL-34444 course: Dont display links to hidden sections

This is what happens when you dont use the navigation api

9 years agoMDL-34444 course: show section availability info
Dan Poltawski [Wed, 1 Aug 2012 02:28:36 +0000 (10:28 +0800)]
MDL-34444 course: show section availability info

When available, rather than a capability error.

9 years agoMerge branch 'MDL-35000' of git://github.com/timhunt/moodle
Dan Poltawski [Wed, 22 Aug 2012 02:25:26 +0000 (10:25 +0800)]
Merge branch 'MDL-35000' of git://github.com/timhunt/moodle

9 years agoMDL-34853 tests - fix broken phpunit test
Dan Poltawski [Wed, 22 Aug 2012 02:13:52 +0000 (10:13 +0800)]
MDL-34853 tests - fix broken phpunit test

9 years agoMDL-34870 enrol_cohort - don't need to do useless work
Dan Poltawski [Wed, 22 Aug 2012 02:00:37 +0000 (10:00 +0800)]
MDL-34870 enrol_cohort - don't need to do useless work

9 years agoMerge branch 'MDL-34870' of git://github.com/aolley/moodle
Dan Poltawski [Wed, 22 Aug 2012 01:52:48 +0000 (09:52 +0800)]
Merge branch 'MDL-34870' of git://github.com/aolley/moodle

9 years agoMerge branch 'MDL-34853' of local stronk7 repo.
Eloy Lafuente (stronk7) [Wed, 22 Aug 2012 01:41:14 +0000 (03:41 +0200)]
Merge branch 'MDL-34853' of local stronk7 repo.

(originally w34_MDL-34853_m24_durationsetting @ git://github.com/skodak/moodle.git)

9 years agoMDL-34853 code style fixes
Eloy Lafuente (stronk7) [Wed, 22 Aug 2012 01:08:40 +0000 (03:08 +0200)]
MDL-34853 code style fixes

9 years agoMerge branch 'MDL-34733' of git://github.com/timhunt/moodle
Dan Poltawski [Wed, 22 Aug 2012 01:16:10 +0000 (09:16 +0800)]
Merge branch 'MDL-34733' of git://github.com/timhunt/moodle

9 years agoMDL-34853 use new duration setting type in enrol_paypal
Petr Škoda [Tue, 14 Aug 2012 12:36:26 +0000 (14:36 +0200)]
MDL-34853 use new duration setting type in enrol_paypal

9 years agoMDL-34853 use new duration setting type in enrol_self
Petr Škoda [Tue, 14 Aug 2012 12:36:39 +0000 (14:36 +0200)]
MDL-34853 use new duration setting type in enrol_self

9 years agoMDL-34853 add new admin setting for duration (time in seconds)
Petr Škoda [Tue, 14 Aug 2012 12:06:20 +0000 (14:06 +0200)]
MDL-34853 add new admin setting for duration (time in seconds)

9 years agoMDL-34853 add weeks unit to forms element duration
Petr Škoda [Tue, 14 Aug 2012 12:33:52 +0000 (14:33 +0200)]
MDL-34853 add weeks unit to forms element duration

9 years agoMDL-34853 use new duration setting type in enrol_manual
Petr Škoda [Tue, 14 Aug 2012 12:35:42 +0000 (14:35 +0200)]
MDL-34853 use new duration setting type in enrol_manual

9 years agoMerge branch 'wip-mdl-32759-warning' of git://github.com/rajeshtaneja/moodle
Eloy Lafuente (stronk7) [Wed, 22 Aug 2012 00:33:34 +0000 (02:33 +0200)]
Merge branch 'wip-mdl-32759-warning' of git://github.com/rajeshtaneja/moodle

9 years agoMerge branch 'MDL-34702' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Wed, 22 Aug 2012 00:10:22 +0000 (02:10 +0200)]
Merge branch 'MDL-34702' of git://github.com/timhunt/moodle

9 years agoMerge branch 'MDL-34795' of git://github.com/srynot4sale/moodle
Eloy Lafuente (stronk7) [Wed, 22 Aug 2012 00:04:47 +0000 (02:04 +0200)]
Merge branch 'MDL-34795' of git://github.com/srynot4sale/moodle

9 years agoMerge branch 'w34_MDL-34864_m24_enrolcat' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Tue, 21 Aug 2012 23:58:13 +0000 (01:58 +0200)]
Merge branch 'w34_MDL-34864_m24_enrolcat' of git://github.com/skodak/moodle

9 years agoMerge branch 'w34_MDL-34776_m24_notinsql' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Tue, 21 Aug 2012 23:55:34 +0000 (01:55 +0200)]
Merge branch 'w34_MDL-34776_m24_notinsql' of git://github.com/skodak/moodle

9 years agoMDL-34866 whitespace fix
Eloy Lafuente (stronk7) [Tue, 21 Aug 2012 23:48:45 +0000 (01:48 +0200)]
MDL-34866 whitespace fix

9 years agoMerge branch 'MDL-34866' of git://github.com/rlorenzo/moodle
Eloy Lafuente (stronk7) [Tue, 21 Aug 2012 23:47:20 +0000 (01:47 +0200)]
Merge branch 'MDL-34866' of git://github.com/rlorenzo/moodle

9 years agoMDL-34994 mod_choice: fix restore of user responses - use correct optionid
Dan Marsden [Tue, 21 Aug 2012 21:01:54 +0000 (09:01 +1200)]
MDL-34994 mod_choice: fix restore of user responses - use correct optionid

9 years agoMerge branch 'MDL-34899b' of git://github.com/srynot4sale/moodle
Eloy Lafuente (stronk7) [Tue, 21 Aug 2012 20:24:20 +0000 (22:24 +0200)]
Merge branch 'MDL-34899b' of git://github.com/srynot4sale/moodle

9 years agoMerge branch 'w34_MDL-34893_m24_phpunitparams' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Tue, 21 Aug 2012 19:18:15 +0000 (21:18 +0200)]
Merge branch 'w34_MDL-34893_m24_phpunitparams' of git://github.com/skodak/moodle

9 years agoMDL-35000 quiz: Complete activity report broken by bad require.
Tim Hunt [Tue, 21 Aug 2012 16:58:29 +0000 (17:58 +0100)]
MDL-35000 quiz: Complete activity report broken by bad require.

Fix the stupid error that caused this. Also, make all the other
require_once calls in the file consistent.

9 years agoMDL-34733 quiz 'secure' mode: finish review link broken in previews
Tim Hunt [Mon, 13 Aug 2012 12:48:22 +0000 (13:48 +0100)]
MDL-34733 quiz 'secure' mode: finish review link broken in previews

This fix a small API change in mod_quiz_renderer::finish_review_link.
At least the required change is an improvement, since it gives the
renderer more flexibility.

9 years agoMerge branch 'w34_MDL-34876_m24_tinymceuninstall' of git://github.com/skodak/moodle
Dan Poltawski [Tue, 21 Aug 2012 07:44:46 +0000 (15:44 +0800)]
Merge branch 'w34_MDL-34876_m24_tinymceuninstall' of git://github.com/skodak/moodle

9 years agoMDL-34876 improve coding style
Petr Škoda [Tue, 21 Aug 2012 07:40:10 +0000 (09:40 +0200)]
MDL-34876 improve coding style

9 years agoMDL-34648 - increment version number
Dan Poltawski [Tue, 21 Aug 2012 06:40:51 +0000 (14:40 +0800)]
MDL-34648 - increment version number

9 years agoMerge branch 'MDL-34648-master' of git://github.com/FMCorz/moodle
Dan Poltawski [Tue, 21 Aug 2012 06:39:54 +0000 (14:39 +0800)]
Merge branch 'MDL-34648-master' of git://github.com/FMCorz/moodle

9 years agoMerge branch 'MDL-34691_assign_overdue_by' of https://github.com/SWiT/moodle
Dan Poltawski [Tue, 21 Aug 2012 06:36:41 +0000 (14:36 +0800)]
Merge branch 'MDL-34691_assign_overdue_by' of https://github.com/SWiT/moodle

9 years agoMerge branch 'wip-mdl-34293' of git://github.com/rajeshtaneja/moodle
Dan Poltawski [Tue, 21 Aug 2012 05:56:58 +0000 (13:56 +0800)]
Merge branch 'wip-mdl-34293' of git://github.com/rajeshtaneja/moodle

9 years ago MDL-34293 Themes: Added tbody to flexible table
Rajesh Taneja [Tue, 21 Aug 2012 05:50:38 +0000 (13:50 +0800)]
 MDL-34293 Themes: Added tbody to flexible table