Sam Hemelryk [Sun, 8 Sep 2013 23:12:56 +0000 (11:12 +1200)]
Merge branch 'MDL-38794' of https://github.com/prateeksachan/moodle
Sam Hemelryk [Sun, 8 Sep 2013 22:54:11 +0000 (10:54 +1200)]
Merge branch 'MDL-41417_master' of https://github.com/markn86/moodle
Sam Hemelryk [Sun, 8 Sep 2013 22:48:13 +0000 (10:48 +1200)]
Merge branch 'MDL-29378-survey' of git://github.com/mudrd8mz/moodle
Sam Hemelryk [Sun, 8 Sep 2013 22:19:00 +0000 (10:19 +1200)]
Merge branch 'w37_MDL-28094_m26_subdirs' of https://github.com/skodak/moodle
Sam Hemelryk [Sun, 8 Sep 2013 20:58:44 +0000 (08:58 +1200)]
Merge branch 'MDL-41460-master' of https://github.com/FMCorz/moodle
Eloy Lafuente (stronk7) [Sat, 7 Sep 2013 12:20:07 +0000 (14:20 +0200)]
weekly release 2.6dev
Eloy Lafuente (stronk7) [Sat, 7 Sep 2013 12:13:55 +0000 (14:13 +0200)]
Merge branch 'install_master' of git://git.moodle.org/moodle-install
Petr Škoda [Sun, 25 Aug 2013 13:24:19 +0000 (15:24 +0200)]
MDL-28094 fix subdirs support in module intro editor
Petr Škoda [Sun, 25 Aug 2013 13:10:27 +0000 (15:10 +0200)]
MDL-28094 keep subdirs in content upgraded from 1.x
Petr Škoda [Sun, 25 Aug 2013 13:09:39 +0000 (15:09 +0200)]
MDL-28094 add function that detects if subdirs used and fix subdirs option in form editor
Dan Poltawski [Sat, 7 Sep 2013 01:45:07 +0000 (09:45 +0800)]
MDL-41623 rss: clean output rss content
Eloy Lafuente (stronk7) [Fri, 6 Sep 2013 00:45:16 +0000 (02:45 +0200)]
MDL-41623 ensure all rss links are valid urls.
AMOS bot [Sat, 7 Sep 2013 00:43:06 +0000 (00:43 +0000)]
Automatically generated installer lang files
Mark Nelson [Fri, 6 Sep 2013 04:40:15 +0000 (12:40 +0800)]
MDL-41417 course: allow the use of duplicated idnumbers if they existed before fix
Francis Devine [Wed, 4 Sep 2013 09:21:41 +0000 (21:21 +1200)]
MDL-41417 course: prevent duplicate idnumbers being used when updating a course
AMOS bot [Fri, 6 Sep 2013 00:47:46 +0000 (00:47 +0000)]
Automatically generated installer lang files
AMOS bot [Fri, 6 Sep 2013 00:47:45 +0000 (00:47 +0000)]
Merge branch 'master' into install_master
Frederic Massart [Tue, 3 Sep 2013 13:26:15 +0000 (21:26 +0800)]
MDL-41460 core_component: Validate cache against version.php
Dan Poltawski [Thu, 5 Sep 2013 06:42:31 +0000 (14:42 +0800)]
Merge branch 'install_master' of git://git.moodle.org/moodle-install
Dan Poltawski [Thu, 5 Sep 2013 05:34:14 +0000 (13:34 +0800)]
weekly release 2.6dev
Dan Poltawski [Thu, 5 Sep 2013 02:34:11 +0000 (10:34 +0800)]
Merge branch 'wip-MDL-41369-fix2' of git://github.com/marinaglancy/moodle
Marina Glancy [Thu, 5 Sep 2013 02:29:29 +0000 (12:29 +1000)]
MDL-41369 Behat tests updated because of fixed messaging navigation
Mark Nelson [Wed, 4 Sep 2013 16:37:51 +0000 (00:37 +0800)]
MDL-40924 badges: added a print_error call to prevent PHP notices when no badges are found
David Mudrák [Wed, 4 Sep 2013 22:01:42 +0000 (00:01 +0200)]
MDL-29378 Code cleanup in the Survey module
While working on the issue, I spotted these two places that were worth of
fixing. The first one is a trivial reminiscence of a previous refactoring,
after which both branches of the if() statement became equal.
The second one is actually a typo as in theory it could generate unexpected
input fields with the name like qPP1. Luckily this never happened due to the
way how survey questions are hardcoded (there are no questions with the type 2
that would require two answers to their subquestions).
David Mudrák [Wed, 4 Sep 2013 21:52:06 +0000 (23:52 +0200)]
MDL-29378 Fix the form display in the Survey/COLLES P+A module
In MDL-7501, we stopped using rowspanning cells in the form table due to
accessibility. That had introduced a regression so in the COLLES P+A survey,
all the rows were displayed with the same background colour. This patch returns
the previous behaviour that each couple of items can be distinguished by the
background colour.
Also, there is no need to display "I prefer that" and "I found that" as a small
text any more. It had made sense in rowspanning layout but not after MDL-7501
was fixed.
And finally, as all items are enumerated now sequentially, there are actually
48 lines, each couple covering one question in two variants. I think it's
correct to reflect this in the description of the form so the text was slightly
amended.
David Mudrák [Wed, 4 Sep 2013 21:42:35 +0000 (23:42 +0200)]
MDL-29378 Fix regression in the Survey/COLLES P+A module
This basically reverts the commit
5196df589b0fbcead4a0943c8e7b227f8a98c897 that
I believe was a result of misunderstanding of how question type field is
(ab)used in the Survey module. As it took significant time to get familiar with
the overall logic of questions and their processing in the module, I left my
findings in added inline comments. The point is that it is $question->type that
matters. Types of questions listed as subquestions in the multi field is
irrelevant in that case (and all have it set to 1 IIRC).
This patch re-enables the "COLLES (Preferred and Actual)" survey type that did
not work at all due to regression.
Dan Poltawski [Wed, 4 Sep 2013 08:59:20 +0000 (16:59 +0800)]
Merge branch 'MDL-41568_master-fix_behat' of git://github.com/dmonllao/moodle
David Monllao [Wed, 4 Sep 2013 07:16:59 +0000 (15:16 +0800)]
MDL-41568 lang: Fix behat features after changes
Marina Glancy [Wed, 4 Sep 2013 06:40:01 +0000 (16:40 +1000)]
MDL-41369 Pass viewing argument to more message screens
Damyon Wiese [Wed, 4 Sep 2013 04:24:54 +0000 (12:24 +0800)]
Merge branch 'MDL-41485-master' of git://github.com/ankitagarwal/moodle
Damyon Wiese [Wed, 4 Sep 2013 03:45:07 +0000 (11:45 +0800)]
Merge branch 'wip-mdl-41456' of git://github.com/rajeshtaneja/moodle
Dan Poltawski [Wed, 4 Sep 2013 03:09:30 +0000 (11:09 +0800)]
Merge branch 'wip-MDL-41369-master' of git://github.com/marinaglancy/moodle
Dan Poltawski [Wed, 4 Sep 2013 02:38:10 +0000 (10:38 +0800)]
Merge branch 'wip-mdl-41418' of git://github.com/rajeshtaneja/moodle
Dan Poltawski [Wed, 4 Sep 2013 02:33:33 +0000 (10:33 +0800)]
Merge branch 'wip-MDL-41395-master' of git://github.com/marinaglancy/moodle
Damyon Wiese [Wed, 4 Sep 2013 01:44:05 +0000 (09:44 +0800)]
MDL-28579 scorm: Fix broken unit tests
Damyon Wiese [Wed, 4 Sep 2013 01:00:48 +0000 (09:00 +0800)]
Merge branch 'master_MDL-28579' of git://github.com/danmarsden/moodle
Eloy Lafuente (stronk7) [Tue, 3 Sep 2013 23:11:54 +0000 (01:11 +0200)]
MDL-41267 fix phpunit tests
Eloy Lafuente (stronk7) [Tue, 3 Sep 2013 23:08:37 +0000 (01:08 +0200)]
Merge branch 'w36_MDL-41267_m26_toolsubplugins' of https://github.com/skodak/moodle
Conflicts:
lib/upgrade.txt
Eloy Lafuente (stronk7) [Tue, 3 Sep 2013 23:01:19 +0000 (01:01 +0200)]
Merge branch 'MDL-41146-master' of git://github.com/sammarshallou/moodle
Dan Marsden [Thu, 22 Aug 2013 22:17:22 +0000 (10:17 +1200)]
MDL-28579 SCORM: use filemanager instead of old file picker
Eloy Lafuente (stronk7) [Tue, 3 Sep 2013 18:38:53 +0000 (20:38 +0200)]
Merge branch 'MDL-40566_master' of git://github.com/dmonllao/moodle
Eloy Lafuente (stronk7) [Tue, 3 Sep 2013 13:12:19 +0000 (15:12 +0200)]
Merge branch 'MDL-41568-en_fix' of git://github.com/mudrd8mz/moodle
Helen Foster [Tue, 3 Sep 2013 10:31:35 +0000 (12:31 +0200)]
MDL-41568 Merge English strings from the en_fix language pack
Marina Glancy [Tue, 3 Sep 2013 09:23:44 +0000 (19:23 +1000)]
MDL-41395 Improved phpdocs for coursecatlib.php
Sam Hemelryk [Thu, 22 Aug 2013 20:29:52 +0000 (08:29 +1200)]
MDL-41395 improved phpdoc's for coursecatlib.php
Damyon Wiese [Tue, 3 Sep 2013 08:18:36 +0000 (16:18 +0800)]
Merge branch 'mdl26_MDL-41403_backup_reduce_memory_usage' of https://github.com/brki/moodle
Damyon Wiese [Tue, 3 Sep 2013 08:09:29 +0000 (16:09 +0800)]
Merge branch 'MDL-41348' of git://github.com/timhunt/moodle
Dan Poltawski [Tue, 3 Sep 2013 08:05:38 +0000 (16:05 +0800)]
Merge branch 'mdl41304-master' of git://github.com/tlock/moodle
Damyon Wiese [Tue, 3 Sep 2013 08:02:47 +0000 (16:02 +0800)]
Merge branch 'MDL-29954-master' of git://github.com/danpoltawski/moodle
Jason Fowler [Tue, 3 Sep 2013 06:12:51 +0000 (14:12 +0800)]
MDL-35925 filepicker - Fixing behat tests
Damyon Wiese [Tue, 3 Sep 2013 07:33:25 +0000 (15:33 +0800)]
Merge branch 'wip-MDL-23044-master' of git://github.com/marinaglancy/moodle
Damyon Wiese [Tue, 3 Sep 2013 07:16:42 +0000 (15:16 +0800)]
Merge branch 'wip-mdl-41413-int' of git://github.com/rajeshtaneja/moodle
Marina Glancy [Tue, 3 Sep 2013 07:00:29 +0000 (17:00 +1000)]
MDL-23044 Use Files API functions in filesystem cron
Rajesh Taneja [Mon, 26 Aug 2013 03:00:10 +0000 (11:00 +0800)]
MDL-41413 Events: replaced course_deleted event handler with observer
Rajesh Taneja [Mon, 26 Aug 2013 02:46:37 +0000 (10:46 +0800)]
MDL-41413 Events: replaced role_unassigned event handler with observer
Rajesh Taneja [Mon, 26 Aug 2013 02:38:28 +0000 (10:38 +0800)]
MDL-41413 Events: replaced role_assigned event handler with observer
Damyon Wiese [Tue, 3 Sep 2013 06:49:42 +0000 (14:49 +0800)]
Merge branch 'MDL-37564' of https://github.com/nebgor/moodle
Damyon Wiese [Tue, 3 Sep 2013 06:35:58 +0000 (14:35 +0800)]
Merge branch 'MDL-33472-master' of git://github.com/danpoltawski/moodle
Damyon Wiese [Tue, 3 Sep 2013 06:25:43 +0000 (14:25 +0800)]
Merge branch 'm26_MDL-29218_plugin_init_not_blocking_when_false' of https://github.com/scara/moodle
Damyon Wiese [Tue, 3 Sep 2013 06:13:00 +0000 (14:13 +0800)]
Merge branch 'MDL-32690_restoreMissingAssignment_master' of https://github.com/moodlerooms/moodle
Dan Poltawski [Tue, 3 Sep 2013 06:10:02 +0000 (14:10 +0800)]
Merge branch 'MDL-41440_master' of https://github.com/markn86/moodle
Dan Poltawski [Tue, 3 Sep 2013 04:58:27 +0000 (12:58 +0800)]
Merge branch 'w36_MDL-41255_m26_changepw' of https://github.com/skodak/moodle
Dan Poltawski [Tue, 3 Sep 2013 04:27:26 +0000 (12:27 +0800)]
Merge branch 'MDL-41428-master' of git://github.com/FMCorz/moodle
Dan Poltawski [Tue, 3 Sep 2013 03:48:45 +0000 (11:48 +0800)]
Merge branch 'wip-MDL-41179-master' of git://github.com/marinaglancy/moodle
Dan Poltawski [Tue, 3 Sep 2013 02:59:51 +0000 (10:59 +0800)]
MDL-41256 course tests: improve robustness
* Fail if an exception isn't recieved
* Don't allow the possibility of an undefined variable being tested
Dan Poltawski [Tue, 3 Sep 2013 02:51:27 +0000 (10:51 +0800)]
Merge branch 'MDL-41256-master' of https://github.com/mackensen/moodle
Dan Poltawski [Tue, 3 Sep 2013 02:40:28 +0000 (10:40 +0800)]
Merge branch 'wip-MDL-41317-master' of git://github.com/marinaglancy/moodle
David Monllao [Tue, 6 Aug 2013 06:43:56 +0000 (14:43 +0800)]
MDL-40566 behat: Update features using the new options
David Monllao [Tue, 6 Aug 2013 05:37:27 +0000 (13:37 +0800)]
MDL-40566 behat: Adding info about the deprecated attr.
David Monllao [Tue, 6 Aug 2013 05:36:48 +0000 (13:36 +0800)]
MDL-40566 behat: Moving from behat_command to behat_selectors
David Monllao [Tue, 6 Aug 2013 05:35:36 +0000 (13:35 +0800)]
MDL-40566 behat: Adding behat_selectors
Class that manages moodle selectors transition
to behat default selectors.
Dan Poltawski [Tue, 3 Sep 2013 02:06:38 +0000 (10:06 +0800)]
Merge branch 'MDL-40214_master' of https://github.com/markn86/moodle
Dan Poltawski [Tue, 3 Sep 2013 01:55:08 +0000 (09:55 +0800)]
MDL-31890 version bump
(and trailing whitespace fix)
Dan Poltawski [Tue, 3 Sep 2013 01:53:22 +0000 (09:53 +0800)]
Merge branch 'wip-MDL-31890-master' of git://github.com/marinaglancy/moodle
Damyon Wiese [Tue, 3 Sep 2013 01:35:16 +0000 (09:35 +0800)]
Merge branch 'w36_MDL-20045_m26_customlevels' of https://github.com/skodak/moodle
Dan Marsden [Thu, 22 Aug 2013 21:40:22 +0000 (09:40 +1200)]
MDL-28579 SCORM: coding guideline fixes
Matteo Scaramuccia [Mon, 26 Aug 2013 21:35:39 +0000 (23:35 +0200)]
MDL-29218 Repository: fixed a typo in the PHPDoc
Matteo Scaramuccia [Mon, 26 Aug 2013 21:32:21 +0000 (23:32 +0200)]
MDL-29218 Repository: $pname, get rid of all the useless code
More details in the Tracker.
Matteo Scaramuccia [Sun, 9 Jun 2013 10:19:54 +0000 (12:19 +0200)]
MDL-29218 Repository: Hide the repo if repository::plugin_init returns false
Eloy Lafuente (stronk7) [Mon, 2 Sep 2013 14:56:50 +0000 (16:56 +0200)]
Merge branch 'MDL-38190-master' of git://github.com/sammarshallou/moodle
Conflicts:
backup/import.php
theme/bootstrapbase/style/moodle.css
Dan Poltawski [Mon, 2 Sep 2013 09:32:08 +0000 (17:32 +0800)]
Merge branch '41214-26' of git://github.com/samhemelryk/moodle
Conflicts:
lib/yui/build/moodle-core-notification-dialogue/moodle-core-notification-dialogue-min.js
Dan Poltawski [Mon, 2 Sep 2013 09:25:27 +0000 (17:25 +0800)]
Merge branch 'MDL-41149-master' of git://github.com/damyon/moodle
Dan Poltawski [Mon, 2 Sep 2013 09:22:14 +0000 (17:22 +0800)]
Merge branch 'MDL-41402_master-fix-langstr' of git://github.com/dmonllao/moodle
David Monllao [Mon, 2 Sep 2013 09:04:04 +0000 (17:04 +0800)]
MDL-41402 tool_generator: Changing plugin name according to the new feature
Dan Poltawski [Mon, 2 Sep 2013 08:32:58 +0000 (16:32 +0800)]
MDL-41402 tool_generator: increment version
Dan Poltawski [Mon, 2 Sep 2013 08:28:27 +0000 (16:28 +0800)]
MDL-41402 tool_generator: fix whitespace
Dan Poltawski [Mon, 2 Sep 2013 08:27:46 +0000 (16:27 +0800)]
Merge branch 'MDL-41402_master' of git://github.com/dmonllao/moodle
David Monllao [Mon, 26 Aug 2013 09:23:21 +0000 (17:23 +0800)]
MDL-41402 tool_generator: Adding maketestsite script
Uses maketestcourse.php to set up
a test site.
David Monllao [Mon, 26 Aug 2013 09:19:22 +0000 (17:19 +0800)]
MDL-41402 tool_generator: Refactoring backend class
Moving it to course_backend keeping generic
methods and attributes in backend class.
AMOS BEGIN
MOV [size_0,tool_generator],[coursesize_0,tool_generator]
MOV [size_1,tool_generator],[coursesize_1,tool_generator]
MOV [size_2,tool_generator],[coursesize_2,tool_generator]
MOV [size_3,tool_generator],[coursesize_3,tool_generator]
MOV [size_4,tool_generator],[coursesize_4,tool_generator]
MOV [size_5,tool_generator],[coursesize_5,tool_generator]
AMOS END
Dan Poltawski [Mon, 2 Sep 2013 08:21:48 +0000 (16:21 +0800)]
Merge branch 'MDL-41399_master-remove_test' of git://github.com/dmonllao/moodle
Rajesh Taneja [Mon, 19 Aug 2013 09:03:39 +0000 (17:03 +0800)]
MDL-39961 Events: Replace Legacy events - User
This change includes:
* Added user_updated event, replacing old event
* Added user_created event, replacing old event
* Added user_deleted event, replacing old event
* Added user_loggedout event, replacing old event
* Added user_enrolment_created event, replacing old event
* Added user_enrolment_deleted event, replacing old event
* Added user_enrolment_updated event, replacing old event
David Monllao [Mon, 2 Sep 2013 07:55:18 +0000 (15:55 +0800)]
MDL-41399 tool_generator: Removing unit test
Removing dodgy database reset in the
middle of a test as sequences reset
is not allowed.
Damyon Wiese [Mon, 2 Sep 2013 07:26:26 +0000 (15:26 +0800)]
Merge branch 'wip-MDL-41231-master' of git://github.com/abgreeve/moodle
Dan Poltawski [Mon, 2 Sep 2013 07:23:05 +0000 (15:23 +0800)]
Merge branch 'MDL-35925-master' of git://github.com/phalacee/moodle
Conflicts:
lib/yui/build/moodle-core-notification-dialogue/moodle-core-notification-dialogue-min.js
Damyon Wiese [Mon, 2 Sep 2013 07:02:12 +0000 (15:02 +0800)]
Merge branch 'MDL-41259_master' of https://github.com/nitzo/moodle
Damyon Wiese [Mon, 2 Sep 2013 06:56:49 +0000 (14:56 +0800)]
Merge branch 'MDL-41516-m' of git://github.com/andrewnicols/moodle
Dan Poltawski [Mon, 2 Sep 2013 06:10:28 +0000 (14:10 +0800)]
Merge branch 'MDL-36093-master' of github.com:StudiUM/moodle
Dan Poltawski [Mon, 2 Sep 2013 05:58:53 +0000 (13:58 +0800)]
MDL-40676 tests: fix null byte test.
Yuliya Bozhko [Mon, 2 Sep 2013 05:41:09 +0000 (13:41 +0800)]
MDL-40712 badges: Display recipient information
Yuliya Bozhko [Mon, 2 Sep 2013 05:37:15 +0000 (13:37 +0800)]
MDL-40924 badges: Add caching to external badges