Dan Poltawski [Mon, 6 Aug 2012 02:06:15 +0000 (10:06 +0800)]
Merge branch 'MDL-34405_master' of git://github.com/kordan/moodle
Dan Poltawski [Mon, 6 Aug 2012 01:58:36 +0000 (09:58 +0800)]
Merge branch 'master_MDL-34131_add_plagiarism_api_support_for_new_online_assignment' of git://github.com/kanikagoyal/moodle
Dan Poltawski [Mon, 6 Aug 2012 01:45:46 +0000 (09:45 +0800)]
Merge branch 'w32_MDL-34585_m24_blogfiles' of git://github.com/skodak/moodle
Sam Hemelryk [Mon, 6 Aug 2012 01:36:44 +0000 (13:36 +1200)]
Merge branch 'wip-MDL-34074-master' of git://github.com/abgreeve/moodle
Dan Poltawski [Mon, 6 Aug 2012 01:25:24 +0000 (09:25 +0800)]
MDL-28486 - tests: fix broken youtube tests
Sam Hemelryk [Mon, 6 Aug 2012 00:05:21 +0000 (12:05 +1200)]
Merge branch 'MDL-34708' of git://github.com/nebgor/moodle
Sam Hemelryk [Sun, 5 Aug 2012 23:59:07 +0000 (11:59 +1200)]
Merge branch 'MDL-28486-master-2' of git://git.luns.net.uk/moodle
Sam Hemelryk [Sun, 5 Aug 2012 23:46:26 +0000 (11:46 +1200)]
Merge branch 'MDL-34658-master' of git://github.com/grabs/moodle
Sam Hemelryk [Sun, 5 Aug 2012 23:35:33 +0000 (11:35 +1200)]
Merge branch 'MDL-34670-master' of git://github.com/grabs/moodle
Sam Hemelryk [Sun, 5 Aug 2012 23:05:24 +0000 (11:05 +1200)]
Merge branch 'MDL-34645' of git://github.com/aolley/moodle
Sam Hemelryk [Sun, 5 Aug 2012 22:59:10 +0000 (10:59 +1200)]
Merge branch 'MDL-34647' of git://github.com/aolley/moodle
Aparup Banerjee [Sun, 5 Aug 2012 15:27:31 +0000 (23:27 +0800)]
MDL-34708 Forms library : Fixed incorrect calendar day displayed across timezones. Credit to Matthew Davidson and team at rose-hulman.edu.
Andreas Grabs [Thu, 2 Aug 2012 21:03:26 +0000 (23:03 +0200)]
MDL-34670 - undefined variable in feedback templates
Andreas Grabs [Thu, 2 Aug 2012 22:22:57 +0000 (00:22 +0200)]
MDL-34658 - Saving failed because missing or false values
Petr Škoda [Thu, 2 Aug 2012 15:40:50 +0000 (17:40 +0200)]
MDL-34701 remove root from yui MODULE pattern definition
The problem was that the root was breaking internal group handling in YUI loader for some reason. Without the root pattern property everything seems to work fine again.
Petr Škoda [Thu, 2 Aug 2012 14:49:19 +0000 (16:49 +0200)]
MDL-34701 import latest YUI 3.6.0
Petr Škoda [Tue, 31 Jul 2012 14:02:54 +0000 (16:02 +0200)]
MDL-34585 fix broken blog file access control
Dan Poltawski [Thu, 2 Aug 2012 06:38:14 +0000 (14:38 +0800)]
weekly release 2.4dev
Adrian Greeve [Fri, 27 Jul 2012 01:37:33 +0000 (09:37 +0800)]
MDL-34074 - lib - Creation of a csv upload class which is FRC 4180 compliant and the alteration of various files around Moodle to use this class.
Aparup Banerjee [Wed, 1 Aug 2012 09:09:54 +0000 (17:09 +0800)]
MDL-31288 Assignment : fixed requiresubmission setting states
Petr Škoda [Wed, 1 Aug 2012 06:30:28 +0000 (08:30 +0200)]
MDL-34368 fix another validuntil condition
Aparup Banerjee [Wed, 1 Aug 2012 01:34:31 +0000 (09:34 +0800)]
MDL-31288 assignment : shifted upgrade block to after 2.3 upgrade line.
Aparup Banerjee [Wed, 1 Aug 2012 01:30:34 +0000 (09:30 +0800)]
Merge branch 'MDL-31288-POST23' of git://github.com/netspotau/moodle-mod_assign
Dan Poltawski [Wed, 1 Aug 2012 01:05:32 +0000 (09:05 +0800)]
MDL-34599 mod_quiz: optional $thispage & $nextpage
The previous change making the params required was a regression.
Sam Hemelryk [Wed, 1 Aug 2012 00:35:19 +0000 (12:35 +1200)]
Merge branch 'MDL-29909-master' of https://github.com/mackensen/moodle
Kanika Goyal [Tue, 31 Jul 2012 16:36:25 +0000 (22:06 +0530)]
MDL-34131: Plagiarism API - add support for plagiarism api to new online assignment type
Dan Poltawski [Tue, 31 Jul 2012 09:46:13 +0000 (17:46 +0800)]
Merge branch 'MDL-32791' of git://github.com/timhunt/moodle
Dan Poltawski [Tue, 31 Jul 2012 09:42:19 +0000 (17:42 +0800)]
Merge branch 'MDL-34599' of git://github.com/timhunt/moodle
Rossiani Wijaya [Fri, 27 Jul 2012 10:13:16 +0000 (18:13 +0800)]
MDL-34556 accessibility compliance for course: Add forform input text and select tag
Rossiani Wijaya [Fri, 27 Jul 2012 10:13:06 +0000 (18:13 +0800)]
MDL-34555 accessibility compliance for calendar: Add forform input text and select tag
Rossiani Wijaya [Fri, 27 Jul 2012 10:12:57 +0000 (18:12 +0800)]
MDL-34554 accessibility compliance for blocks: Add forform input text and select tag
Rossiani Wijaya [Fri, 27 Jul 2012 10:12:47 +0000 (18:12 +0800)]
MDL-34553 accessibility compliance for authentication: Add forform input text and select tag
Rossiani Wijaya [Fri, 27 Jul 2012 10:11:35 +0000 (18:11 +0800)]
MDL-34552 accessibility compliance for admin: Add forform input text and select tag
Aparup Banerjee [Tue, 31 Jul 2012 07:30:38 +0000 (15:30 +0800)]
MDL-34650 added MDLs to todo comment and deprecation comment.
(also triggering an amos script here for the other MDL-34650 commit)
AMOS BEGIN
CPY [minute,form],[minute,core]
CPY [month,form],[month,core]
CPY [options,editor],[options,core]
CPY [selectacourse,backup],[selectacourse,core]
AMOS END
Dan Poltawski [Tue, 31 Jul 2012 06:44:34 +0000 (14:44 +0800)]
MDL-34460 - fix syntax error I introduced.
doh.
Aparup Banerjee [Tue, 31 Jul 2012 05:23:42 +0000 (13:23 +0800)]
MDL-34650 typo correction
Aparup Banerjee [Tue, 31 Jul 2012 05:19:47 +0000 (13:19 +0800)]
Merge branch 'MDL-34650' of git://github.com/rwijaya/moodle
Sam Hemelryk [Tue, 31 Jul 2012 04:57:32 +0000 (16:57 +1200)]
Merge branch 'MDL-34526_master' of git://github.com/lazydaisy/moodle
Conflicts:
theme/canvas/config.php
Mary Evans [Sun, 29 Jul 2012 20:42:04 +0000 (21:42 +0100)]
MDL-34528 theme_canvas: Removed redundent exclude stylesheet configurations from CANVAS theme
Sam Hemelryk [Tue, 31 Jul 2012 04:30:05 +0000 (16:30 +1200)]
Merge branch 'MDL-32499_master' of git://github.com/dmonllao/moodle
Sam Hemelryk [Tue, 31 Jul 2012 04:19:01 +0000 (16:19 +1200)]
Merge branch 'MDL-32931_master' of git://github.com/dmonllao/moodle
Sam Hemelryk [Tue, 31 Jul 2012 04:16:14 +0000 (16:16 +1200)]
Merge branch 'MDL-32827-master' of git://github.com/ankitagarwal/moodle
Rossiani Wijaya [Tue, 31 Jul 2012 04:07:16 +0000 (12:07 +0800)]
MDL-34650 - accessibility compliance: Add <label> for form input text and select tag
Dan Poltawski [Tue, 31 Jul 2012 04:01:49 +0000 (12:01 +0800)]
Merge branch 'MDL-25953-master' of git://github.com/FMCorz/moodle
Dan Poltawski [Tue, 31 Jul 2012 03:22:07 +0000 (11:22 +0800)]
Merge branch 'w31_MDL-17830_m24_zipresult' of git://github.com/skodak/moodle
Dan Poltawski [Tue, 31 Jul 2012 03:10:29 +0000 (11:10 +0800)]
Merge branch 'MDL-34624' of git://github.com/lazydaisy/moodle
Dan Poltawski [Tue, 31 Jul 2012 02:42:55 +0000 (10:42 +0800)]
Merge branch 'MDL-34532' of git://github.com/timhunt/moodle
Dan Poltawski [Tue, 31 Jul 2012 02:31:41 +0000 (10:31 +0800)]
Merge branch 'MDL-34255' of git://github.com/rwijaya/moodle
Ankit Agarwal [Tue, 31 Jul 2012 02:28:32 +0000 (10:28 +0800)]
MDL-32827 calendar: update eventtype of broken event in bulk instead of doing it one by one
Jerome Mouneyrac [Fri, 22 Jun 2012 08:48:51 +0000 (16:48 +0800)]
MDL-33869 user_get_user_details: add support for 'Show user identity' fields set by administrator
Crafton Williams [Thu, 21 Jun 2012 17:59:21 +0000 (12:59 -0500)]
MDL-33869 user_get_user_details: allow return of idnumber
Dan Poltawski [Tue, 31 Jul 2012 02:06:57 +0000 (10:06 +0800)]
Merge branch 'master_MDL-34440' of git://github.com/danmarsden/moodle
Adam Olley [Sat, 28 Jul 2012 04:40:54 +0000 (14:10 +0930)]
MDL-34647: admintool: uploaduser enrolments now obey enrolperiod directive
Adam Olley [Tue, 31 Jul 2012 01:14:48 +0000 (10:44 +0930)]
MDL-34645: enrol_manual: enrolment init to pass default duration setting
Dan Poltawski [Tue, 31 Jul 2012 01:11:48 +0000 (09:11 +0800)]
Merge branch 'MDL-34483' of git://github.com/timhunt/moodle
Sam Hemelryk [Tue, 31 Jul 2012 00:43:44 +0000 (12:43 +1200)]
Merge branch 'MDL-34494_master' of git://github.com/kordan/moodle
Sam Hemelryk [Tue, 31 Jul 2012 00:05:38 +0000 (12:05 +1200)]
Merge branch 'MDL-29007-master-3' of git://git.luns.net.uk/moodle
Sam Hemelryk [Tue, 31 Jul 2012 00:00:53 +0000 (12:00 +1200)]
Merge branch 'MDL-28568_noncontact_warning' of git://github.com/andyjdavis/moodle
Tim Hunt [Fri, 27 Jul 2012 11:18:10 +0000 (12:18 +0100)]
MDL-34483 qformat_examview: Commit example file.
Supplied by Rick Jerz.
Fred Woolard [Mon, 30 Jul 2012 08:04:55 +0000 (20:04 +1200)]
MDL-34440 Site registration failing with mysqli
Nathan Mares [Tue, 17 Jul 2012 09:11:57 +0000 (19:11 +1000)]
MDL-34368: Fix broken query in so tokens are correctly checked against the linked service
Dan Poltawski [Mon, 30 Jul 2012 07:23:27 +0000 (15:23 +0800)]
Merge branch 'wip-MDL-34465-master' of git://github.com/abgreeve/moodle
Dan Poltawski [Mon, 30 Jul 2012 07:14:27 +0000 (15:14 +0800)]
Merge branch 'MDL-34467-master' of git://github.com/ankitagarwal/moodle
Dan Poltawski [Mon, 30 Jul 2012 07:06:59 +0000 (15:06 +0800)]
Merge branch 'wip-MDL-34469-master' of git://github.com/abgreeve/moodle
Dan Poltawski [Mon, 30 Jul 2012 07:02:01 +0000 (15:02 +0800)]
Merge branch 'MDL-34466_master' of git://github.com/dmonllao/moodle
Adrian Greeve [Tue, 24 Jul 2012 02:26:39 +0000 (10:26 +0800)]
MDL-34469 - lib - replacement of the deprecated get_context_instance and get_context_by_id functions (group 15)
Dan Poltawski [Mon, 30 Jul 2012 06:55:50 +0000 (14:55 +0800)]
MDL-34464 - mod_feedback: remove mistaken ignore_missing
Dan Poltawski [Mon, 30 Jul 2012 06:48:33 +0000 (14:48 +0800)]
Merge branch 'MDL-34464_master' of git://github.com/dmonllao/moodle
Dan Poltawski [Mon, 30 Jul 2012 06:26:19 +0000 (14:26 +0800)]
MDL-34460 - remove uncessary context retrival
spotted during review
Dan Poltawski [Mon, 30 Jul 2012 06:18:54 +0000 (14:18 +0800)]
Merge branch 'MDL-34460-master-integration' of git://github.com/FMCorz/moodle
Dan Poltawski [Mon, 30 Jul 2012 06:04:46 +0000 (14:04 +0800)]
Merge branch 'MDL-34507-master' of git://github.com/FMCorz/moodle
Dan Poltawski [Mon, 30 Jul 2012 05:55:43 +0000 (13:55 +0800)]
Merge branch 'MDL-34589' of git://github.com/timhunt/moodle
Dan Poltawski [Mon, 30 Jul 2012 05:52:11 +0000 (13:52 +0800)]
Merge branch 'MDL-34513-WIP-MyMobile_rtl_support' of git://github.com/nadavkav/moodle
Dan Poltawski [Mon, 30 Jul 2012 05:46:22 +0000 (13:46 +0800)]
Merge branch 'MDL-33537_master' of git://github.com/dmonllao/moodle
Dan Poltawski [Mon, 30 Jul 2012 05:34:20 +0000 (13:34 +0800)]
Merge branch 'master_MDL-32227_add_plagiarism_api_support_to_workshop' of git://github.com/kanikagoyal/moodle
Dan Poltawski [Mon, 30 Jul 2012 05:14:53 +0000 (13:14 +0800)]
Merge branch 'w31_MDL-34616_m24_tinymceresize' of git://github.com/skodak/moodle
Dan Poltawski [Mon, 30 Jul 2012 04:35:05 +0000 (12:35 +0800)]
Merge branch 'w31_MDL-34538_m24_validatefloats' of git://github.com/skodak/moodle
Dan Poltawski [Mon, 30 Jul 2012 04:15:39 +0000 (12:15 +0800)]
Merge branch 'MDL-31509' of git://github.com/timhunt/moodle
Dan Poltawski [Mon, 30 Jul 2012 04:09:20 +0000 (12:09 +0800)]
Merge branch 'MDL-34433-master-1' of git://git.luns.net.uk/moodle
Dan Poltawski [Mon, 30 Jul 2012 04:05:14 +0000 (12:05 +0800)]
Merge branch 'wip-mdl-34239' of git://github.com/rajeshtaneja/moodle
Dan Poltawski [Mon, 30 Jul 2012 03:57:26 +0000 (11:57 +0800)]
Merge branch 'MDL-34519_course_reset_patch' of git://github.com/rlorenzo/moodle
Conflicts:
course/reset.php
Mary Evans [Sun, 29 Jul 2012 20:31:47 +0000 (21:31 +0100)]
MDL-34526 theme_canvas: incorporating MDL-34528 - Remove redundent exclude stylesheet configurations from CANVAS theme
Mary Evans [Sun, 29 Jul 2012 16:51:05 +0000 (17:51 +0100)]
MDL-34526 theme_canvas: added custommenu + enabled dock + defined block-regions in frontpage.php & general.php
Petr Škoda [Sun, 29 Jul 2012 14:09:18 +0000 (16:09 +0200)]
MDL-17830 fix zip_packer return status add debugging for invalid files and dirs
kordan [Sun, 29 Jul 2012 13:55:23 +0000 (15:55 +0200)]
MDL-34405 theme_formal_white: added background for quiz overview
kordan [Sun, 29 Jul 2012 13:27:09 +0000 (15:27 +0200)]
MDL-34494 theme_formal_white: replaced old style core_renderer::MAIN_CONTENT_TOKEN with $OUTPUT->main_content()
Mary Evans [Sun, 29 Jul 2012 13:23:19 +0000 (14:23 +0100)]
MDL-34624 theme_base: added background color to style/admin.css for role edit default
Petr Škoda [Sun, 29 Jul 2012 12:48:23 +0000 (14:48 +0200)]
MDL-34616 fix editor resizing regression
Tim Hunt [Thu, 26 Jul 2012 09:07:09 +0000 (10:07 +0100)]
MDL-34532 quiz reports: error when showing users without attempts.
We were not checking if attempt state was null before trying to convert it to a string.
Tim Hunt [Fri, 27 Jul 2012 17:06:24 +0000 (18:06 +0100)]
MDL-31509 quiz outcomes: let people associate quizzes with outcomes.
The quiz does not really support outcomes, but even so in 1.9 you could
select outcomes on the quiz edit form, and apparently this was useful to
some people, therefore we should re-enable it.
Petr Škoda [Fri, 27 Jul 2012 16:44:41 +0000 (18:44 +0200)]
MDL-34538 fix PARAM_FLOAT validation
Petr Škoda [Fri, 27 Jul 2012 16:42:18 +0000 (18:42 +0200)]
MDL-34538 add float validation tests
Tim Hunt [Fri, 27 Jul 2012 15:38:14 +0000 (16:38 +0100)]
MDL-32791 quiz db: clean up garbage data that was causing problems.
Melinda Kraft reported having rows in their quiz_question_instances
table which caused various problems. These rows are meaningless, so I
have done a DB upgrade step to clean them up, which should deal with the
bad side-effets they were causing.
Nadav Kavalerchik [Tue, 24 Jul 2012 09:53:43 +0000 (12:53 +0300)]
MDL-34513 - RTL Theme fixes for Moodle 2 (theme/mymobile)
+ Right align frontpage course list
+ right align activity and resource titles
+ Two Columns on/off slider fix
+ Right align content in Blocks
+ Fix checkbox question types in quiz
+ Right align titles of fields in Forms
+ minor ui tweaks
Jean-Michel Vedrine [Fri, 27 Jul 2012 11:11:41 +0000 (12:11 +0100)]
MDL-34483 qformat_examview: handle more questions.
These fixes come from testing with the example file supplied by Rick
Jerz.
Tim Hunt [Fri, 27 Jul 2012 10:42:03 +0000 (11:42 +0100)]
MDL-34599 quiz attempts: more robust if page number out of range.
Rather than throwing an exception, we should just show the first/last
page of the quiz if the page number is out-of-range.
Damyon Wiese [Wed, 6 Jun 2012 06:30:14 +0000 (14:30 +0800)]
MDL-31288: New feature: Assignment submission statements
Ankit Agarwal [Fri, 27 Jul 2012 06:27:09 +0000 (14:27 +0800)]
MDL-34467 glossary: Changing strictness of new context_xxx::instances() calls
Rajesh Taneja [Tue, 24 Jul 2012 02:18:15 +0000 (10:18 +0800)]
MDL-34239 Blog: Editing blog associated with module will be keep it's association
Ankit Agarwal [Fri, 27 Jul 2012 05:27:36 +0000 (13:27 +0800)]
MDL-34467 page: Repalce all instances of get_context_instanc() with respective context_XXX::instance()