moodle.git
9 years agoMerge branch 'MDL-34250_23' of github.com:stronk7/moodle into MOODLE_23_STABLE
Eloy Lafuente (stronk7) [Tue, 28 Aug 2012 18:44:49 +0000 (20:44 +0200)]
Merge branch 'MDL-34250_23' of github.com:stronk7/moodle into MOODLE_23_STABLE

9 years agoMDL-34250 navigation: Always look for correct parent context.
Eloy Lafuente (stronk7) [Tue, 28 Aug 2012 18:37:46 +0000 (20:37 +0200)]
MDL-34250 navigation: Always look for correct parent context.

Conflicts:
lib/navigationlib.php

9 years agoMDL-25492 bb6 import: bump version after big changes.
Eloy Lafuente (stronk7) [Tue, 28 Aug 2012 18:15:18 +0000 (20:15 +0200)]
MDL-25492 bb6 import: bump version after big changes.

9 years agoMerge branch 'MDL-25492_23' of git://github.com/jmvedrine/moodle into MOODLE_23_STABLE
Eloy Lafuente (stronk7) [Tue, 28 Aug 2012 18:08:19 +0000 (20:08 +0200)]
Merge branch 'MDL-25492_23' of git://github.com/jmvedrine/moodle into MOODLE_23_STABLE

9 years agoMerge branch 'MDL-34192_23' of git://github.com/stronk7/moodle into MOODLE_23_STABLE
Eloy Lafuente (stronk7) [Tue, 28 Aug 2012 12:44:30 +0000 (14:44 +0200)]
Merge branch 'MDL-34192_23' of git://github.com/stronk7/moodle into MOODLE_23_STABLE

9 years agoMDL-34192 mod_assign: prevent ambiguous column use for Oracle.
Eloy Lafuente (stronk7) [Tue, 28 Aug 2012 12:16:15 +0000 (14:16 +0200)]
MDL-34192 mod_assign: prevent ambiguous column use for Oracle.

Credit goes to Raymond Antonio from NetSpot.

9 years agoMerge branch 'MDL-31837_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE
Aparup Banerjee [Tue, 28 Aug 2012 09:04:19 +0000 (17:04 +0800)]
Merge branch 'MDL-31837_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE

9 years agoMerge branch 'MDL-32464_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE
Aparup Banerjee [Tue, 28 Aug 2012 08:54:31 +0000 (16:54 +0800)]
Merge branch 'MDL-32464_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE

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

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

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

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

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

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

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

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

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

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

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

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

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

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:49:27 +0000 (20:49 +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-34996 - Improve help text for Feedback dependancies
Andreas Grabs [Fri, 24 Aug 2012 21:07:17 +0000 (23:07 +0200)]
MDL-34996 - Improve help text for Feedback dependancies

9 years agoMDL-32464 qformat multianswer: fix missing include.
Tim Hunt [Fri, 24 Aug 2012 13:19:27 +0000 (14:19 +0100)]
MDL-32464 qformat multianswer: fix missing include.

Also, add a sample file that can be used for testing, and add a unit
test to verify this is working.

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-25492 Blackboard V6+ question import is broken.
Jean-Michel Vedrine [Sat, 11 Aug 2012 19:00:54 +0000 (21:00 +0200)]
MDL-25492 Blackboard V6+ question import is broken.

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-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 agoMDL-31837 numerical tolerance: better handling of very small tolerances.
Tim Hunt [Mon, 20 Aug 2012 11:46:32 +0000 (12:46 +0100)]
MDL-31837 numerical tolerance: better handling of very small tolerances.

The changes between Moodle 1.9 and 2.1 made the marking of very small
answers like 10^-20 almost impossible. This change fixes it.

This fix is almost entirely due the the careful research of Pierre
Pichet, who carefully testing various proposals, and worked out that
this one seemed best.

9 years agoweekly release 2.3.1+
Eloy Lafuente (stronk7) [Thu, 23 Aug 2012 17:25:40 +0000 (19:25 +0200)]
weekly release 2.3.1+

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

9 years agoAutomatically generated installer lang files
AMOS bot [Thu, 23 Aug 2012 00:34:21 +0000 (00:34 +0000)]
Automatically generated installer lang files

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 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-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 agoMerge branch 'MDL-34444' of git://github.com/danpoltawski/moodle into MOODLE_23_STABLE
Eloy Lafuente (stronk7) [Wed, 22 Aug 2012 09:14:38 +0000 (11:14 +0200)]
Merge branch 'MDL-34444' of git://github.com/danpoltawski/moodle into MOODLE_23_STABLE

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 agoMerge branch 'MDL-34444' of git://github.com/danpoltawski/moodle into MOODLE_23_STABLE
Eloy Lafuente (stronk7) [Wed, 22 Aug 2012 08:49:30 +0000 (10:49 +0200)]
Merge branch 'MDL-34444' of git://github.com/danpoltawski/moodle into MOODLE_23_STABLE

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 agoMerge branch 'MDL-34444' of git://github.com/danpoltawski/moodle into MOODLE_23_STABLE
Eloy Lafuente (stronk7) [Wed, 22 Aug 2012 06:40:02 +0000 (08:40 +0200)]
Merge branch 'MDL-34444' of git://github.com/danpoltawski/moodle into MOODLE_23_STABLE

9 years agoMerge branch 'w34_MDL-34864_m23_enrolcat' of git://github.com/skodak/moodle into...
Dan Poltawski [Wed, 22 Aug 2012 06:28:03 +0000 (14:28 +0800)]
Merge branch 'w34_MDL-34864_m23_enrolcat' of git://github.com/skodak/moodle into MOODLE_23_STABLE

9 years agoMDL-34864 fix role names regression
Petr Škoda [Wed, 22 Aug 2012 06:08:24 +0000 (08:08 +0200)]
MDL-34864 fix role names regression

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

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_23' of git://github.com/aolley/moodle into MOODLE_23_STABLE
Dan Poltawski [Wed, 22 Aug 2012 01:52:58 +0000 (09:52 +0800)]
Merge branch 'MDL-34870_23' of git://github.com/aolley/moodle into MOODLE_23_STABLE

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

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

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

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

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

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

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_23' of git://github.com/rlorenzo/moodle into MOODLE_23_STABLE
Eloy Lafuente (stronk7) [Tue, 21 Aug 2012 23:50:19 +0000 (01:50 +0200)]
Merge branch 'MDL-34866_23' of git://github.com/rlorenzo/moodle into MOODLE_23_STABLE

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 'w34_MDL-34893_m23_phpunitparams' of git://github.com/skodak/moodle...
Eloy Lafuente (stronk7) [Tue, 21 Aug 2012 19:18:44 +0000 (21:18 +0200)]
Merge branch 'w34_MDL-34893_m23_phpunitparams' of git://github.com/skodak/moodle into MOODLE_23_STABLE

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 [Tue, 21 Aug 2012 11:05:52 +0000 (12:05 +0100)]
MDL-34733 quiz 'secure' mode: finish review link broken in previews

Here, we use a nasty hack to fix the problem on stable branches without
an API change.

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

9 years agoMerge branch 'MDL-32705_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE
Dan Poltawski [Tue, 21 Aug 2012 04:37:54 +0000 (12:37 +0800)]
Merge branch 'MDL-32705_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE

9 years agoMerge branch 'MDL-34569_accessibility_m23' of git://github.com/rwijaya/moodle into...
Dan Poltawski [Tue, 21 Aug 2012 04:35:14 +0000 (12:35 +0800)]
Merge branch 'MDL-34569_accessibility_m23' of git://github.com/rwijaya/moodle into MOODLE_23_STABLE

9 years agoMerge branch 'w34_MDL-34901_m23_useraccess' of git://github.com/skodak/moodle into...
Dan Poltawski [Tue, 21 Aug 2012 04:02:25 +0000 (12:02 +0800)]
Merge branch 'w34_MDL-34901_m23_useraccess' of git://github.com/skodak/moodle into MOODLE_23_STABLE

9 years agoMerge branch 'MDL-34742-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE
Dan Poltawski [Tue, 21 Aug 2012 03:59:30 +0000 (11:59 +0800)]
Merge branch 'MDL-34742-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE

9 years agoMDL-34808 qformat_examview - increment version
Dan Poltawski [Tue, 21 Aug 2012 03:05:58 +0000 (11:05 +0800)]
MDL-34808 qformat_examview - increment version

9 years agoMerge branch 'MDL-34808_23' of git://github.com/jmvedrine/moodle into MOODLE_23_STABLE
Dan Poltawski [Tue, 21 Aug 2012 03:00:49 +0000 (11:00 +0800)]
Merge branch 'MDL-34808_23' of git://github.com/jmvedrine/moodle into MOODLE_23_STABLE

9 years agoMDL-34887: Add hyperlinks to names in the Assignment's grading table
Raymond Wijaya [Fri, 17 Aug 2012 04:34:16 +0000 (12:34 +0800)]
MDL-34887: Add hyperlinks to names in the Assignment's grading table

9 years agoMDL-34738 qformat_blackboard - increment version number
Dan Poltawski [Tue, 21 Aug 2012 01:55:50 +0000 (09:55 +0800)]
MDL-34738 qformat_blackboard - increment version number

9 years agoMerge branch 'MDL-34738_23' of git://github.com/jmvedrine/moodle into MOODLE_23_STABLE
Dan Poltawski [Tue, 21 Aug 2012 01:42:12 +0000 (09:42 +0800)]
Merge branch 'MDL-34738_23' of git://github.com/jmvedrine/moodle into MOODLE_23_STABLE

9 years agoMerge branch 'MDL-34941-MOODLE_23_STABLE' of https://github.com/mouneyrac/moodle...
Eloy Lafuente (stronk7) [Tue, 21 Aug 2012 00:43:10 +0000 (02:43 +0200)]
Merge branch 'MDL-34941-MOODLE_23_STABLE' of https://github.com/mouneyrac/moodle into MOODLE_23_STABLE

9 years agoMerge branch 'w34_MDL-34912_m23_description' of git://github.com/skodak/moodle into...
Eloy Lafuente (stronk7) [Tue, 21 Aug 2012 00:39:58 +0000 (02:39 +0200)]
Merge branch 'w34_MDL-34912_m23_description' of git://github.com/skodak/moodle into MOODLE_23_STABLE

9 years agoMerge branch 'MDL-34889_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE
Eloy Lafuente (stronk7) [Tue, 21 Aug 2012 00:25:28 +0000 (02:25 +0200)]
Merge branch 'MDL-34889_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE

9 years agoMerge branch 'MDL-34810_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE
Eloy Lafuente (stronk7) [Mon, 20 Aug 2012 23:36:36 +0000 (01:36 +0200)]
Merge branch 'MDL-34810_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE

9 years agoMerge branch 'MDL-29847_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE
Eloy Lafuente (stronk7) [Mon, 20 Aug 2012 23:28:50 +0000 (01:28 +0200)]
Merge branch 'MDL-29847_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE

9 years agoMerge branch 'MDL-31957-m23' of git://github.com/sammarshallou/moodle into MOODLE_23_...
Eloy Lafuente (stronk7) [Mon, 20 Aug 2012 23:23:05 +0000 (01:23 +0200)]
Merge branch 'MDL-31957-m23' of git://github.com/sammarshallou/moodle into MOODLE_23_STABLE

9 years agoMerge branch 'w34_MDL-34959_m23_gmapsv3' of git://github.com/skodak/moodle into MOODL...
Eloy Lafuente (stronk7) [Mon, 20 Aug 2012 18:30:27 +0000 (20:30 +0200)]
Merge branch 'w34_MDL-34959_m23_gmapsv3' of git://github.com/skodak/moodle into MOODLE_23_STABLE

9 years agoMerge branch 'w34_MDL-34868_m23_gmapsv2' of git://github.com/skodak/moodle into MOODL...
Eloy Lafuente (stronk7) [Mon, 20 Aug 2012 18:18:03 +0000 (20:18 +0200)]
Merge branch 'w34_MDL-34868_m23_gmapsv2' of git://github.com/skodak/moodle into MOODLE_23_STABLE

9 years agoMerge branch 'MDL-34756-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE
Eloy Lafuente (stronk7) [Mon, 20 Aug 2012 14:35:20 +0000 (16:35 +0200)]
Merge branch 'MDL-34756-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE

9 years agoMerge branch 'MDL-28531-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE
Eloy Lafuente (stronk7) [Mon, 20 Aug 2012 14:28:21 +0000 (16:28 +0200)]
Merge branch 'MDL-28531-23' of git://github.com/FMCorz/moodle into MOODLE_23_STABLE

9 years agoMDL-34529: Fixed ordering of course sections when performing import/restore by adding...
Jason Ilicic [Wed, 25 Jul 2012 00:50:16 +0000 (10:20 +0930)]
MDL-34529: Fixed ordering of course sections when performing import/restore by adding the sort parameter.

9 years agoMDL-34372: Fix query in backup_cron_helper so it works on Postgres 8.3
Nathan Mares [Tue, 17 Jul 2012 09:37:06 +0000 (19:37 +1000)]
MDL-34372: Fix query in backup_cron_helper so it works on Postgres 8.3

Amended by stronk7@moodle.org to use uppercase SQL keywords.

9 years agoMDL-34808 load sample xml file from fixtures in tests
Jean-Michel Vedrine [Mon, 20 Aug 2012 08:44:34 +0000 (10:44 +0200)]
MDL-34808 load sample xml file from fixtures in tests

9 years agoMerge branch 'MDL-33362-m23' of git://github.com/ankitagarwal/moodle into MOODLE_23_S...
Dan Poltawski [Mon, 20 Aug 2012 08:01:21 +0000 (16:01 +0800)]
Merge branch 'MDL-33362-m23' of git://github.com/ankitagarwal/moodle into MOODLE_23_STABLE

9 years agoMerge branch 'MDL-34779-m23' of git://github.com/ankitagarwal/moodle into MOODLE_23_S...
Dan Poltawski [Mon, 20 Aug 2012 07:59:00 +0000 (15:59 +0800)]
Merge branch 'MDL-34779-m23' of git://github.com/ankitagarwal/moodle into MOODLE_23_STABLE

9 years agoMDL-34738 load sample dat file in tests
Jean-Michel Vedrine [Mon, 20 Aug 2012 07:41:02 +0000 (09:41 +0200)]
MDL-34738 load sample dat file in tests

9 years agoMDL-34779 settings: Updating lang string corrposnding to the fullnamedisplay setting
Michael de Raadt [Tue, 14 Aug 2012 03:44:20 +0000 (11:44 +0800)]
MDL-34779 settings: Updating lang string corrposnding to the fullnamedisplay setting

9 years agoMerge branch 'w34_MDL-34873_m23_tagstrict' of git://github.com/skodak/moodle into...
Dan Poltawski [Mon, 20 Aug 2012 07:21:26 +0000 (15:21 +0800)]
Merge branch 'w34_MDL-34873_m23_tagstrict' of git://github.com/skodak/moodle into MOODLE_23_STABLE

9 years agoMerge branch 'MDL-34957_M23' of git://github.com/lazydaisy/moodle into MOODLE_23_STABLE
Dan Poltawski [Mon, 20 Aug 2012 06:23:28 +0000 (14:23 +0800)]
Merge branch 'MDL-34957_M23' of git://github.com/lazydaisy/moodle into MOODLE_23_STABLE

9 years agoMerge branch 'MDL-34937_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE
Dan Poltawski [Mon, 20 Aug 2012 06:19:30 +0000 (14:19 +0800)]
Merge branch 'MDL-34937_23' of git://github.com/timhunt/moodle into MOODLE_23_STABLE

9 years agoMDL-34377: Fix: assignments overview page shows a unset due date as Epoch and counts...
Raymond Wijaya [Thu, 16 Aug 2012 06:31:39 +0000 (14:31 +0800)]
MDL-34377: Fix: assignments overview page shows a unset due date as Epoch and counts draft submissions

9 years agoMDL-33362 book: Parse links to book modules from 1.9 backups
Ankit Agarwal [Thu, 16 Aug 2012 03:58:26 +0000 (11:58 +0800)]
MDL-33362 book: Parse links to book modules from 1.9 backups

9 years agoMerge branch 'MDL-34535-m23' of git://github.com/ankitagarwal/moodle into MOODLE_23_S...
Dan Poltawski [Mon, 20 Aug 2012 04:06:56 +0000 (12:06 +0800)]
Merge branch 'MDL-34535-m23' of git://github.com/ankitagarwal/moodle into MOODLE_23_STABLE

9 years agoMerge branch 'wip-MDL-31810-stable23' of git://github.com/phalacee/moodle into MOODLE...
Dan Poltawski [Mon, 20 Aug 2012 04:01:32 +0000 (12:01 +0800)]
Merge branch 'wip-MDL-31810-stable23' of git://github.com/phalacee/moodle into MOODLE_23_STABLE

9 years agoMerge branch 'wip-mdl-31734-m23' of git://github.com/rajeshtaneja/moodle into MOODLE_...
Dan Poltawski [Mon, 20 Aug 2012 03:57:21 +0000 (11:57 +0800)]
Merge branch 'wip-mdl-31734-m23' of git://github.com/rajeshtaneja/moodle into MOODLE_23_STABLE