moodle.git
9 years agoMDL-42812 mod_quiz: Fixed up a syntax error for additional name fields.
Adrian Greeve [Tue, 12 Nov 2013 07:46:45 +0000 (15:46 +0800)]
MDL-42812 mod_quiz: Fixed up a syntax error for additional name fields.

9 years agoMerge branch 'w46_MDL-42503_m26_stringfilters' of https://github.com/skodak/moodle
Damyon Wiese [Tue, 12 Nov 2013 06:22:28 +0000 (14:22 +0800)]
Merge branch 'w46_MDL-42503_m26_stringfilters' of https://github.com/skodak/moodle

9 years agoMDL-42684 TinyMCE: Correct widths on screens with narrow fieldsets
Jason Fowler [Mon, 11 Nov 2013 04:42:54 +0000 (12:42 +0800)]
MDL-42684 TinyMCE: Correct widths on screens with narrow fieldsets

9 years agoMerge branch 'wip-MDL-42762-master' of git://github.com/abgreeve/moodle
Sam Hemelryk [Tue, 12 Nov 2013 05:53:08 +0000 (13:53 +0800)]
Merge branch 'wip-MDL-42762-master' of git://github.com/abgreeve/moodle

9 years agoMerge branch 'wip-MDL-41158-master-two' of git://github.com/abgreeve/moodle
Sam Hemelryk [Tue, 12 Nov 2013 05:20:12 +0000 (13:20 +0800)]
Merge branch 'wip-MDL-41158-master-two' of git://github.com/abgreeve/moodle

9 years agoMerge branch 'MDL-42276_master' of https://github.com/markn86/moodle
Marina Glancy [Tue, 12 Nov 2013 04:11:19 +0000 (15:11 +1100)]
Merge branch 'MDL-42276_master' of https://github.com/markn86/moodle

9 years agoMDL-42804 Database - SQL keywords should be uppercase.
Damyon Wiese [Tue, 12 Nov 2013 04:04:11 +0000 (12:04 +0800)]
MDL-42804 Database - SQL keywords should be uppercase.

9 years agoMDL-42804 data_mod: fix alternate name warning for deleting an entry
rwijaya [Mon, 11 Nov 2013 08:10:30 +0000 (16:10 +0800)]
MDL-42804 data_mod: fix alternate name warning for deleting an entry

9 years agoMerge branch 'MDL-42824-master-int' of git://github.com/FMCorz/moodle
Marina Glancy [Tue, 12 Nov 2013 04:00:57 +0000 (15:00 +1100)]
Merge branch 'MDL-42824-master-int' of git://github.com/FMCorz/moodle

9 years agoMerge branch 'MDL-42540' of git://github.com/timhunt/moodle
Marina Glancy [Tue, 12 Nov 2013 03:47:54 +0000 (14:47 +1100)]
Merge branch 'MDL-42540' of git://github.com/timhunt/moodle

9 years agoMerge branch 'MDL-42215_lang' of https://github.com/andyjdavis/moodle
Sam Hemelryk [Tue, 12 Nov 2013 03:34:39 +0000 (11:34 +0800)]
Merge branch 'MDL-42215_lang' of https://github.com/andyjdavis/moodle

9 years agoMDL-42812 libraries: Update username_load_fields_from_object to add the prefix to...
Adrian Greeve [Mon, 11 Nov 2013 09:18:16 +0000 (17:18 +0800)]
MDL-42812 libraries: Update username_load_fields_from_object to add the prefix to everything.

9 years agoMDL-42810 ActionMenu: Hide the ActionMenu when clicking on primary links
Andrew Nicols [Mon, 11 Nov 2013 08:27:50 +0000 (16:27 +0800)]
MDL-42810 ActionMenu: Hide the ActionMenu when clicking on primary links

9 years agoMDL-41158 mod_workshop: Workshop submission alternate name field fix.
Adrian Greeve [Tue, 6 Aug 2013 09:23:38 +0000 (17:23 +0800)]
MDL-41158 mod_workshop: Workshop submission alternate name field fix.

9 years agoMerge branch 'MDL-42809-master' of git://github.com/andrewnicols/moodle
Marina Glancy [Tue, 12 Nov 2013 02:34:01 +0000 (13:34 +1100)]
Merge branch 'MDL-42809-master' of git://github.com/andrewnicols/moodle

9 years agoMerge branch 'MDL-42573-master' of git://github.com/danpoltawski/moodle
Eloy Lafuente (stronk7) [Tue, 12 Nov 2013 02:27:22 +0000 (03:27 +0100)]
Merge branch 'MDL-42573-master' of git://github.com/danpoltawski/moodle

9 years agoMDL-42812 libraries: Update username_load_fields_from_object to add the prefix to...
Adrian Greeve [Mon, 11 Nov 2013 09:18:16 +0000 (17:18 +0800)]
MDL-42812 libraries: Update username_load_fields_from_object to add the prefix to everything.

9 years agoMDL-42276 core_group: added behat tests to automate group actions
Mark Nelson [Fri, 25 Oct 2013 10:04:45 +0000 (18:04 +0800)]
MDL-42276 core_group: added behat tests to automate group actions

1. Added new step definitions to check if an element exists or does not exist in another.
2. Added new step definitions to check if an element is readonly or is not readonly.
3. Automated testing for MDLQA-1812 and MDLQA-1813.

Added behat test for deleting groups/groupings with and without the
'moodle/course:changeidnumber' capability.

4. Automated MDLQA-2105.

Added behat test for creating groups/groupings without the
'moodle/course:changeidnumber' capability.

5. Automated MDLQA-2238 and MDLQA-2335.

Added behat test for updating groups/groupings with and without the
'moodle/course:changeidnumber' capability.

9 years agoMerge branch '42806-26' of git://github.com/samhemelryk/moodle
Damyon Wiese [Tue, 12 Nov 2013 02:02:09 +0000 (10:02 +0800)]
Merge branch '42806-26' of git://github.com/samhemelryk/moodle

9 years agoMDL-42824 backup: Typo in description of setting backup_general_questionbank
Frederic Massart [Tue, 12 Nov 2013 00:51:44 +0000 (08:51 +0800)]
MDL-42824 backup: Typo in description of setting backup_general_questionbank

9 years agoMerge branch 'MDL-41775_master' of git://github.com/grabs/moodle
Marina Glancy [Tue, 12 Nov 2013 00:23:51 +0000 (11:23 +1100)]
Merge branch 'MDL-41775_master' of git://github.com/grabs/moodle

9 years agoMerge branch 'MDL-40481' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Mon, 11 Nov 2013 23:38:35 +0000 (00:38 +0100)]
Merge branch 'MDL-40481' of git://github.com/timhunt/moodle

9 years agoMDL-42503 treat $CFG->filterall as a real cache flag - verify during cache resets
Petr Škoda [Wed, 23 Oct 2013 18:20:56 +0000 (20:20 +0200)]
MDL-42503 treat $CFG->filterall as a real cache flag - verify during cache resets

9 years agoMerge branch '42805-26' of git://github.com/samhemelryk/moodle
Marina Glancy [Mon, 11 Nov 2013 10:48:39 +0000 (21:48 +1100)]
Merge branch '42805-26' of git://github.com/samhemelryk/moodle

9 years agoNOBUG: convert tabs to whitespaces
Marina Glancy [Mon, 11 Nov 2013 10:34:48 +0000 (21:34 +1100)]
NOBUG: convert tabs to whitespaces

9 years agoMerge branch 'MDL-42043-master' of git://github.com/FMCorz/moodle
Marina Glancy [Mon, 11 Nov 2013 10:10:47 +0000 (21:10 +1100)]
Merge branch 'MDL-42043-master' of git://github.com/FMCorz/moodle

9 years agoMDL-42783 Course: Improve accessiblity of various course actions
Andrew Nicols [Fri, 8 Nov 2013 08:24:50 +0000 (16:24 +0800)]
MDL-42783 Course: Improve accessiblity of various course actions

9 years agoMerge branch 'MDL-42081-phpunitfix' of git://github.com/mouneyrac/moodle
Marina Glancy [Mon, 11 Nov 2013 09:55:19 +0000 (20:55 +1100)]
Merge branch 'MDL-42081-phpunitfix' of git://github.com/mouneyrac/moodle

9 years agoMerge branch 'wip-mdl-42754' of https://github.com/rajeshtaneja/moodle
Damyon Wiese [Mon, 11 Nov 2013 09:25:30 +0000 (17:25 +0800)]
Merge branch 'wip-mdl-42754' of https://github.com/rajeshtaneja/moodle

9 years agoMDL-42754 Messages: Fixed typo
Rajesh Taneja [Mon, 11 Nov 2013 09:20:26 +0000 (17:20 +0800)]
MDL-42754 Messages: Fixed typo

9 years agoMDL-42806 block_mentees: can only be docked if it has a valid title set.
Sam Hemelryk [Mon, 11 Nov 2013 09:18:23 +0000 (17:18 +0800)]
MDL-42806 block_mentees: can only be docked if it has a valid title set.

9 years agoMerge branch 'MDL-42803-master' of git://github.com/ankitagarwal/moodle
Damyon Wiese [Mon, 11 Nov 2013 09:16:51 +0000 (17:16 +0800)]
Merge branch 'MDL-42803-master' of git://github.com/ankitagarwal/moodle

9 years agoMDL-41392 course: management checkbox accessibility improvement
Sam Hemelryk [Mon, 11 Nov 2013 07:54:44 +0000 (15:54 +0800)]
MDL-41392 course: management checkbox accessibility improvement

9 years agoMDL-41392 course: management accessibility tweaking
Sam Hemelryk [Mon, 11 Nov 2013 09:09:44 +0000 (17:09 +0800)]
MDL-41392 course: management accessibility tweaking

9 years agoMDL-42806 dock: check title exists before using it
Sam Hemelryk [Mon, 11 Nov 2013 08:51:06 +0000 (16:51 +0800)]
MDL-42806 dock: check title exists before using it

9 years agoMDL-42805 dock: fixed {} appearing in undock icon title
Sam Hemelryk [Mon, 11 Nov 2013 08:26:12 +0000 (16:26 +0800)]
MDL-42805 dock: fixed {} appearing in undock icon title

9 years agoMDL-42081 fix file_storage phpunit tests following adding new stamp files on fresh...
Jerome Mouneyrac [Mon, 11 Nov 2013 08:01:32 +0000 (16:01 +0800)]
MDL-42081 fix file_storage phpunit tests following adding new stamp files on fresh install

9 years agoMDL-42809 ActionMenu: Increase specifity of hide on select selector
Andrew Nicols [Mon, 11 Nov 2013 07:33:08 +0000 (15:33 +0800)]
MDL-42809 ActionMenu: Increase specifity of hide on select selector

9 years agoMerge branch 'wip-mdl-42795' of https://github.com/rajeshtaneja/moodle
Sam Hemelryk [Mon, 11 Nov 2013 06:10:21 +0000 (14:10 +0800)]
Merge branch 'wip-mdl-42795' of https://github.com/rajeshtaneja/moodle

9 years agoMDL-42803 behat: Fix random behat errors in CI
Ankit Agarwal [Mon, 11 Nov 2013 02:51:41 +0000 (10:51 +0800)]
MDL-42803 behat: Fix random behat errors in CI

9 years agoMerge branch 'wip-MDL-40612-master-one' of git://github.com/abgreeve/moodle
Sam Hemelryk [Mon, 11 Nov 2013 05:10:44 +0000 (13:10 +0800)]
Merge branch 'wip-MDL-40612-master-one' of git://github.com/abgreeve/moodle

9 years agoMDL-42699 Bootstrap tinymce css. Whitespace fix.
Damyon Wiese [Mon, 11 Nov 2013 04:40:21 +0000 (12:40 +0800)]
MDL-42699 Bootstrap tinymce css. Whitespace fix.

9 years agoMDL-42699 TinyMCE: adding padding to editor content in clean
Jason Fowler [Thu, 7 Nov 2013 01:58:56 +0000 (09:58 +0800)]
MDL-42699 TinyMCE: adding padding to editor content in clean

9 years agoMerge branch 'MDL-42683-master-2' of git://github.com/mouneyrac/moodle
Marina Glancy [Mon, 11 Nov 2013 04:02:48 +0000 (15:02 +1100)]
Merge branch 'MDL-42683-master-2' of git://github.com/mouneyrac/moodle

Conflicts:
mod/assign/feedback/editpdf/yui/build/moodle-assignfeedback_editpdf-editor/moodle-assignfeedback_editpdf-editor-min.js

9 years agoMerge branch 'MDL-42081-master-nomerge2' of git://github.com/mouneyrac/moodle
Marina Glancy [Mon, 11 Nov 2013 04:02:01 +0000 (15:02 +1100)]
Merge branch 'MDL-42081-master-nomerge2' of git://github.com/mouneyrac/moodle

9 years agoMDL-42081 EditPDF: Add default stamp images
Jerome Mouneyrac [Mon, 11 Nov 2013 03:39:27 +0000 (11:39 +0800)]
MDL-42081 EditPDF: Add default stamp images

9 years agoMDL-40612 libraries: Tidy up and improvement of the code for additional name fields.
Adrian Greeve [Wed, 30 Oct 2013 06:41:59 +0000 (14:41 +0800)]
MDL-40612 libraries: Tidy up and improvement of the code for additional name fields.

Includes an update to get_all_user_name_fields() and the inclusion of set_user_name_object()

9 years agoMDL-40612 libraries: Unit test expansion for get_all_user_name_fields()
Adrian Greeve [Wed, 30 Oct 2013 06:41:33 +0000 (14:41 +0800)]
MDL-40612 libraries: Unit test expansion for get_all_user_name_fields()

and the inclusion of tests for set_user_name_object()

9 years agoMerge branch 'wip-mdl-42754' of https://github.com/rajeshtaneja/moodle
Damyon Wiese [Mon, 11 Nov 2013 02:41:40 +0000 (10:41 +0800)]
Merge branch 'wip-mdl-42754' of https://github.com/rajeshtaneja/moodle

9 years agoMDL-42795 course: fixed param course in sql
Renaat Debleu [Mon, 11 Nov 2013 02:19:46 +0000 (10:19 +0800)]
MDL-42795 course: fixed param course in sql

course_sections has course field and not courseid, hence replaced it with course.

9 years agoMerge branch 'MDL-39923_master' of https://github.com/totara/openbadges
Damyon Wiese [Mon, 11 Nov 2013 02:17:07 +0000 (10:17 +0800)]
Merge branch 'MDL-39923_master' of https://github.com/totara/openbadges

Conflicts:
version.php

9 years agoMDL-36224 LTI: Whitespace fix
Damyon Wiese [Mon, 11 Nov 2013 02:04:10 +0000 (10:04 +0800)]
MDL-36224 LTI: Whitespace fix

9 years agoMerge branch 'MDL-36224-master' of git://github.com/damyon/moodle
Damyon Wiese [Mon, 11 Nov 2013 01:57:36 +0000 (09:57 +0800)]
Merge branch 'MDL-36224-master' of git://github.com/damyon/moodle

9 years agoMDL-41775 mod_feedback - Input fields are shown with a fixed width on bootstrap based...
Andreas Grabs [Fri, 8 Nov 2013 09:42:49 +0000 (10:42 +0100)]
MDL-41775 mod_feedback - Input fields are shown with a fixed width on bootstrap based themes

9 years agoMerge branch 'MDL-42772-master' of git://github.com/FMCorz/moodle
Damyon Wiese [Fri, 8 Nov 2013 08:15:17 +0000 (16:15 +0800)]
Merge branch 'MDL-42772-master' of git://github.com/FMCorz/moodle

9 years agoMerge branch 'MDL-42743' of git://github.com/timhunt/moodle
Dan Poltawski [Fri, 8 Nov 2013 08:08:20 +0000 (16:08 +0800)]
Merge branch 'MDL-42743' of git://github.com/timhunt/moodle

9 years agoMerge branch 'wip-mdl-42777' of https://github.com/rajeshtaneja/moodle
Dan Poltawski [Fri, 8 Nov 2013 08:05:06 +0000 (16:05 +0800)]
Merge branch 'wip-mdl-42777' of https://github.com/rajeshtaneja/moodle

9 years agoMerge branch 'wip-MDL-40883-master' of git://github.com/marinaglancy/moodle
Dan Poltawski [Fri, 8 Nov 2013 07:32:11 +0000 (15:32 +0800)]
Merge branch 'wip-MDL-40883-master' of git://github.com/marinaglancy/moodle

9 years agoMDL-42777 courses: Added behat to test ajax on course view page
Rajesh Taneja [Fri, 8 Nov 2013 06:44:04 +0000 (14:44 +0800)]
MDL-42777 courses: Added behat to test ajax on course view page

9 years agoMDL-36224 LTI: Fix up docs, add plugininfo class and create subplugin folder.
Damyon Wiese [Fri, 8 Nov 2013 06:26:49 +0000 (14:26 +0800)]
MDL-36224 LTI: Fix up docs, add plugininfo class and create subplugin folder.

9 years agoMDL-36224: Improving lti_get_types
Mark Nielsen [Fri, 26 Apr 2013 23:00:33 +0000 (16:00 -0700)]
MDL-36224: Improving lti_get_types

If there are no LTI source plugins that
need to be added to the activity chooser
menu, then fallback to the default
activity chooser display.

9 years agoMDL-36224: Minor updates to LTI
Mark Nielsen [Tue, 27 Nov 2012 17:26:01 +0000 (09:26 -0800)]
MDL-36224: Minor updates to LTI

* No debug display on service.php
* Send a 400 header on error

9 years agoMDL-36224: Adding subplugins.php
Chris Scribner [Mon, 29 Oct 2012 14:49:17 +0000 (10:49 -0400)]
MDL-36224: Adding subplugins.php

9 years agoMDL-36224: Add support for pluggable extensions to add new LTI services
Chris Scribner [Mon, 29 Oct 2012 14:10:50 +0000 (10:10 -0400)]
MDL-36224: Add support for pluggable extensions to add new LTI services

9 years agoMDL-42777 courses: removed unneeded category check
Rajesh Taneja [Fri, 8 Nov 2013 05:59:15 +0000 (13:59 +0800)]
MDL-42777 courses: removed unneeded category check

On course view manage page, JS was not getting initalised as category-listing
is not visible, initialiseCourses is doing unnessary check for category as
it takes care of empty category so it should not return on empty category

9 years agoMDL-42772 upgrade: Force alternate fields in session user
Frederic Massart [Fri, 8 Nov 2013 03:11:08 +0000 (11:11 +0800)]
MDL-42772 upgrade: Force alternate fields in session user

9 years agoMerge branch 'MDL-42775-master' of git://github.com/danpoltawski/moodle
Marina Glancy [Fri, 8 Nov 2013 05:37:55 +0000 (16:37 +1100)]
Merge branch 'MDL-42775-master' of git://github.com/danpoltawski/moodle

9 years agoMDL-42043 theme: Use $theme instead of $OUTPUT for pix_url()
Frederic Massart [Fri, 8 Nov 2013 05:15:23 +0000 (13:15 +0800)]
MDL-42043 theme: Use $theme instead of $OUTPUT for pix_url()

9 years agoMDL-42684 TinyMCE: Including details of patch in moodle-readme.txt
Jason Fowler [Fri, 8 Nov 2013 04:48:53 +0000 (12:48 +0800)]
MDL-42684 TinyMCE: Including details of patch in moodle-readme.txt

9 years agoMDL-42684 TinyMCE: make tinymce start at full width
Jason Fowler [Thu, 7 Nov 2013 06:55:10 +0000 (14:55 +0800)]
MDL-42684 TinyMCE: make tinymce start at full width

9 years agoMDL-42775 dml: remove invalid unit test assertion
Dan Poltawski [Fri, 8 Nov 2013 04:23:40 +0000 (12:23 +0800)]
MDL-42775 dml: remove invalid unit test assertion

9 years agoMDL-42762 administration: Fixed additional names section from being missing.
Adrian Greeve [Fri, 8 Nov 2013 04:05:53 +0000 (12:05 +0800)]
MDL-42762 administration: Fixed additional names section from being missing.

When an additional name field is not enabled in the admin settings the
text box should still be available to fill out in a section further down
the page (Additional names).

9 years agoMDL-42679 Scorm: Remove stale yui shifted css files.
Damyon Wiese [Fri, 8 Nov 2013 03:54:48 +0000 (11:54 +0800)]
MDL-42679 Scorm: Remove stale yui shifted css files.

9 years agoMerge branch 'w46_MDL-42769_m26_admineditor' of https://github.com/skodak/moodle
Damyon Wiese [Fri, 8 Nov 2013 03:43:10 +0000 (11:43 +0800)]
Merge branch 'w46_MDL-42769_m26_admineditor' of https://github.com/skodak/moodle

9 years agoMerge branch 'MDL-42679-master' of git://github.com/andrewnicols/moodle
Damyon Wiese [Fri, 8 Nov 2013 03:23:00 +0000 (11:23 +0800)]
Merge branch 'MDL-42679-master' of git://github.com/andrewnicols/moodle

9 years agoMerge branch 'MDL-41586-master' of git://github.com/ankitagarwal/moodle
Marina Glancy [Fri, 8 Nov 2013 03:13:24 +0000 (14:13 +1100)]
Merge branch 'MDL-41586-master' of git://github.com/ankitagarwal/moodle

9 years agoMDL-42704 quiz statistics: make test more tolerant
Dan Poltawski [Fri, 8 Nov 2013 03:09:46 +0000 (11:09 +0800)]
MDL-42704 quiz statistics: make test more tolerant

9 years agoMerge branch 'MDL-42704-master' of git://github.com/jamiepratt/moodle
Dan Poltawski [Fri, 8 Nov 2013 03:11:28 +0000 (11:11 +0800)]
Merge branch 'MDL-42704-master' of git://github.com/jamiepratt/moodle

9 years agoMerge branch 'MDL-42760-master' of git://github.com/mouneyrac/moodle
Marina Glancy [Fri, 8 Nov 2013 03:10:41 +0000 (14:10 +1100)]
Merge branch 'MDL-42760-master' of git://github.com/mouneyrac/moodle

9 years agoMDL-42666 repository_boxnet: fix broken version
Dan Poltawski [Fri, 8 Nov 2013 03:02:35 +0000 (11:02 +0800)]
MDL-42666 repository_boxnet: fix broken version

The last commit here looked like Fred had broken the version,
but it was my mistake. I owe Fred a beer at the next available
opportunity.

9 years agoMDL-41586 libaries: Fix issues with scale in sqlsrv libraries
Ankit Agarwal [Fri, 8 Nov 2013 02:49:35 +0000 (10:49 +0800)]
MDL-41586 libaries: Fix issues with scale in sqlsrv libraries

0 is a valid value
null is the default scale we set in other DBs

9 years agoMDL-40883 ddl: unittest for objects name length
Marina Glancy [Fri, 8 Nov 2013 02:17:47 +0000 (13:17 +1100)]
MDL-40883 ddl: unittest for objects name length

9 years agoMDL-42660 TinyMCE: Ensure upgrade is only performed when possible
Jason Fowler [Thu, 7 Nov 2013 23:22:59 +0000 (07:22 +0800)]
MDL-42660 TinyMCE: Ensure upgrade is only performed when possible

Conflicts:

lib/editor/tinymce/db/upgrade.php

9 years agoMDL-40883 ddl: make sure object name never exceeds max length
Marina Glancy [Fri, 8 Nov 2013 00:58:35 +0000 (11:58 +1100)]
MDL-40883 ddl: make sure object name never exceeds max length

Many thanks to Ray Bon for finding the problem

9 years agoMerge branch 'MDL-40975-editinstructions' of git://github.com/andrewnicols/moodle
Damyon Wiese [Fri, 8 Nov 2013 00:45:11 +0000 (08:45 +0800)]
Merge branch 'MDL-40975-editinstructions' of git://github.com/andrewnicols/moodle

9 years agoMDL-42769 use only text area editor before install completed
Petr Škoda [Thu, 7 Nov 2013 22:51:59 +0000 (23:51 +0100)]
MDL-42769 use only text area editor before install completed

9 years agoMDL-42704 quiz statistics : SQL Errors under MSSQL
Jamie Pratt [Thu, 7 Nov 2013 10:28:58 +0000 (17:28 +0700)]
MDL-42704 quiz statistics : SQL Errors under MSSQL

9 years agoMDL-42743 improve wording of the CBM summary on quiz review
Tim Hunt [Wed, 6 Nov 2013 12:32:30 +0000 (12:32 +0000)]
MDL-42743 improve wording of the CBM summary on quiz review

9 years agoMDL-41615 question: fix unit tests
Dan Poltawski [Thu, 7 Nov 2013 10:10:55 +0000 (18:10 +0800)]
MDL-41615 question: fix unit tests

Heading levels have been changed.

9 years agoMDL-42540 quiz manual grading should have setType
Tim Hunt [Thu, 7 Nov 2013 09:44:24 +0000 (09:44 +0000)]
MDL-42540 quiz manual grading should have setType

9 years agoMerge branch 'MDL-42737-master' of git://github.com/andrewnicols/moodle
Dan Poltawski [Thu, 7 Nov 2013 09:21:54 +0000 (17:21 +0800)]
Merge branch 'MDL-42737-master' of git://github.com/andrewnicols/moodle

9 years agoMerge branch 'MDL-41615_c' of git://github.com/rwijaya/moodle
Dan Poltawski [Thu, 7 Nov 2013 09:17:32 +0000 (17:17 +0800)]
Merge branch 'MDL-41615_c' of git://github.com/rwijaya/moodle

Conflicts:
theme/bootstrapbase/style/moodle.css

9 years agoMDL-39923 badges: Fix unit tests
Yuliya [Thu, 7 Nov 2013 08:44:15 +0000 (21:44 +1300)]
MDL-39923 badges: Fix unit tests

9 years agoMDL-40975 Course: Ensure that editinstructions line up with activity rename again
Andrew Nicols [Thu, 7 Nov 2013 08:46:34 +0000 (16:46 +0800)]
MDL-40975 Course: Ensure that editinstructions line up with activity rename again

9 years agoMerge branch 'MDL-42748-master' of git://github.com/andrewnicols/moodle
Marina Glancy [Thu, 7 Nov 2013 08:31:52 +0000 (19:31 +1100)]
Merge branch 'MDL-42748-master' of git://github.com/andrewnicols/moodle

Conflicts:
theme/bootstrapbase/style/moodle.css

9 years agoMerge branch 'MDL-42668-master' of git://github.com/FMCorz/moodle
Damyon Wiese [Thu, 7 Nov 2013 08:20:53 +0000 (16:20 +0800)]
Merge branch 'MDL-42668-master' of git://github.com/FMCorz/moodle

9 years agoMDL-42760 EditPDF: sometimes the dropdown or search comment appear below the editpdf
Jerome Mouneyrac [Thu, 7 Nov 2013 08:11:51 +0000 (16:11 +0800)]
MDL-42760 EditPDF: sometimes the dropdown or search comment appear below the editpdf

9 years agoMDL-42679 mod_scorm: Include gallery-sm-treeview for https support
Andrew Nicols [Thu, 7 Nov 2013 03:02:19 +0000 (11:02 +0800)]
MDL-42679 mod_scorm: Include gallery-sm-treeview for https support

9 years agoMDL-42666 repository_boxnet: Do not run the upgrade multiple times
Frederic Massart [Thu, 7 Nov 2013 06:50:50 +0000 (14:50 +0800)]
MDL-42666 repository_boxnet: Do not run the upgrade multiple times

9 years agoMDL-42668 portfolio_boxnet: Do not run upgrade multiple times
Frederic Massart [Thu, 7 Nov 2013 07:35:21 +0000 (15:35 +0800)]
MDL-42668 portfolio_boxnet: Do not run upgrade multiple times