Jerome Mouneyrac [Fri, 27 Sep 2013 06:47:12 +0000 (14:47 +0800)]
MDL-42023 assign: Edit PDF plugin - Jerome's contributions
Davo Smith [Fri, 27 Sep 2013 06:40:10 +0000 (14:40 +0800)]
MDL-42023 assign: Add Edit PDF plugin to core.
This plugin is heavily based on the uploadpdf plugin from
Davo Smith <git@davosmith.co.uk>. This is a fantastic plugin
that provides a great benefit for teachers marking assignments.
A big thankyou to Davo for writing the plugin and helping us to
get it integrated to core.
The plugin provides a pdf editing interface in the teachers browser
that lets them add comments and annotations to a students assignment
submission. The comment and annotations are then added to a pdf version
of the students submission which is send back to the student so they can
download it, or read it online.
This plugin has been primarily worked on by Damyon Wiese, Jerome Mouneyrac
and Barbara Ramiro. We have also had great feedback and suggestions from others
including the entire frontend team, Martin and Frederic Massart.
Sam Hemelryk [Wed, 2 Oct 2013 19:34:39 +0000 (08:34 +1300)]
Merge branch 'MDL-16464' of https://github.com/timhunt/moodle
Tim Hunt [Wed, 2 Oct 2013 09:16:22 +0000 (10:16 +0100)]
MDL-16464 qtype_multichoice: fix missed question -> questionid.
Marina Glancy [Wed, 2 Oct 2013 07:27:03 +0000 (17:27 +1000)]
Merge branch 'MDL-41241-master-fix2' of github.com:damyon/moodle
Damyon Wiese [Wed, 2 Oct 2013 07:21:11 +0000 (15:21 +0800)]
MDL-41241 Atto: Make searching for the anchor tag more reliable
Marina Glancy [Wed, 2 Oct 2013 07:01:12 +0000 (17:01 +1000)]
Merge branch 'MDL-42021-master-int' of git://github.com/FMCorz/moodle
Marina Glancy [Wed, 2 Oct 2013 06:54:59 +0000 (16:54 +1000)]
Merge branch 'MDL-40050-master' of git://github.com/FMCorz/moodle
Damyon Wiese [Wed, 2 Oct 2013 05:13:35 +0000 (13:13 +0800)]
MDL-41912 Atto: Min-height fix - div was too small by default.
Frederic Massart [Wed, 2 Oct 2013 05:10:45 +0000 (13:10 +0800)]
MDL-40050 webservice: Moving new events test file to right location
Frederic Massart [Wed, 2 Oct 2013 05:00:28 +0000 (13:00 +0800)]
MDL-40050 webservice: Remove token from events
Frederic Massart [Wed, 2 Oct 2013 02:45:28 +0000 (10:45 +0800)]
MDL-42021 enrol: Missing objectid in enrolment_deleted event
Marina Glancy [Tue, 1 Oct 2013 23:20:52 +0000 (09:20 +1000)]
Merge branch 'MDL-9873' of https://github.com/merrill-oakland/moodle
Sam Hemelryk [Tue, 1 Oct 2013 23:10:43 +0000 (12:10 +1300)]
MDL-41039 mod_quiz: version bump
Sam Hemelryk [Tue, 1 Oct 2013 23:10:08 +0000 (12:10 +1300)]
Merge branch 'MDL-41039-master' of git://github.com/FMCorz/moodle
Sam Hemelryk [Tue, 1 Oct 2013 22:36:16 +0000 (11:36 +1300)]
Merge branch 'MDL-41751-master' of git://github.com/jamiepratt/moodle
Eloy Lafuente (stronk7) [Tue, 1 Oct 2013 22:26:20 +0000 (00:26 +0200)]
Merge branch 'MDL-41798' of git://github.com/rwijaya/moodle
Eloy Lafuente (stronk7) [Tue, 1 Oct 2013 21:59:05 +0000 (23:59 +0200)]
Merge branch 'MDL-40047-master' of git://github.com/ankitagarwal/moodle
Sam Hemelryk [Tue, 1 Oct 2013 21:51:06 +0000 (10:51 +1300)]
MDL-40770 tinymce: fixed svg files included with moodle theme
Sam Hemelryk [Tue, 1 Oct 2013 21:52:03 +0000 (10:52 +1300)]
Merge branch 'MDL-40770-master' of git://github.com/phalacee/moodle
Eloy Lafuente (stronk7) [Tue, 1 Oct 2013 21:42:00 +0000 (23:42 +0200)]
Merge branch 'wip-MDL-40049-master-i' of git://github.com/abgreeve/moodle
Sam Hemelryk [Tue, 1 Oct 2013 21:36:56 +0000 (10:36 +1300)]
Merge branch 'MDL-42017_M26' of git://github.com/lazydaisy/moodle
Sam Hemelryk [Tue, 1 Oct 2013 21:27:54 +0000 (10:27 +1300)]
Merge branch 'MDL-41738' of https://github.com/Lightwork-Marking/moodle
rwijaya [Tue, 1 Oct 2013 08:42:04 +0000 (16:42 +0800)]
MDL-40829: courses heading: remove headerblock class from header and fix heading levels.
Also, changing h3 classname from name to categoryname.
Added note to theme/upgrade.txt to describe the heading level changes.
Eloy Lafuente (stronk7) [Tue, 1 Oct 2013 18:08:25 +0000 (20:08 +0200)]
Merge branch 'MDL-42021-master' of git://github.com/FMCorz/moodle
Sam Hemelryk [Tue, 1 Oct 2013 19:14:36 +0000 (08:14 +1300)]
Merge branch 'MDL-41878-master' of git://github.com/andrewnicols/moodle
Eloy Lafuente (stronk7) [Tue, 1 Oct 2013 18:01:33 +0000 (20:01 +0200)]
Merge branch 'mdl41996-master' of https://github.com/tlock/moodle
Eloy Lafuente (stronk7) [Tue, 1 Oct 2013 17:55:30 +0000 (19:55 +0200)]
Merge branch 'wip-MDL-41921-master' of git://github.com/marinaglancy/moodle
Eloy Lafuente (stronk7) [Tue, 1 Oct 2013 17:50:19 +0000 (19:50 +0200)]
Merge branch '41997-26' of git://github.com/samhemelryk/moodle
Eloy Lafuente (stronk7) [Tue, 1 Oct 2013 17:43:42 +0000 (19:43 +0200)]
Merge branch 'MDL-42004-master' of git://github.com/FMCorz/moodle
Eloy Lafuente (stronk7) [Tue, 1 Oct 2013 17:41:10 +0000 (19:41 +0200)]
Merge branch 'MDL-42001-master' of git://github.com/FMCorz/moodle
Eloy Lafuente (stronk7) [Tue, 1 Oct 2013 17:36:37 +0000 (19:36 +0200)]
Merge branch 'MDL-42003-master' of git://github.com/FMCorz/moodle
Eloy Lafuente (stronk7) [Tue, 1 Oct 2013 17:18:36 +0000 (19:18 +0200)]
Merge branch 'MDL-41752-master' of git://github.com/jamiepratt/moodle
Eloy Lafuente (stronk7) [Tue, 1 Oct 2013 13:59:06 +0000 (15:59 +0200)]
Merge branch 'w40_MDL-41999_m26_userpw' of https://github.com/skodak/moodle
Marina Glancy [Tue, 1 Oct 2013 10:49:03 +0000 (20:49 +1000)]
Merge branch 'MDL-32592-master' of git://github.com/danpoltawski/moodle
Marina Glancy [Tue, 1 Oct 2013 10:42:37 +0000 (20:42 +1000)]
Merge branch 'MDL-39653-master' of git://github.com/danpoltawski/moodle
Petr Škoda [Tue, 1 Oct 2013 07:23:42 +0000 (09:23 +0200)]
MDL-41999 fix setting of USER in chat
Nadav Kavalerchik [Sun, 18 Aug 2013 19:35:44 +0000 (22:35 +0300)]
MDL-41264 Themes: Right align Tabs on Wiki page, when in RTL mode (theme/clean)
Marina Glancy [Tue, 1 Oct 2013 04:45:14 +0000 (14:45 +1000)]
Merge branch 'MDL-41989-master' of git://github.com/phalacee/moodle
Sam Hemelryk [Tue, 1 Oct 2013 04:06:16 +0000 (17:06 +1300)]
MDL-41398 bootstrap: added a maintenance layout
Marina Glancy [Tue, 1 Oct 2013 04:21:50 +0000 (14:21 +1000)]
Merge branch 'MDL-41912-master' of git://github.com/FMCorz/moodle
Damyon Wiese [Tue, 1 Oct 2013 03:58:15 +0000 (11:58 +0800)]
MDL-41241 Atto: Fix merge conflict (add extra param to add_toolbar_button)
Sam Hemelryk [Tue, 17 Sep 2013 20:21:32 +0000 (08:21 +1200)]
MDL-41828 mod: fixed navbar when adding modules to a course
Sam Hemelryk [Tue, 1 Oct 2013 03:20:57 +0000 (16:20 +1300)]
MDL-41900 events: avoid new debug call within unit tests
Andrew Nicols [Wed, 18 Sep 2013 23:19:46 +0000 (00:19 +0100)]
MDL-41878 JavaScript: Add an alias for Moodle in the YUI loader
Adrian Greeve [Thu, 19 Sep 2013 05:39:44 +0000 (13:39 +0800)]
MDL-40049 mod_choice: Replaced old add_to_log calls with event triggers.
Also added a generator for unit tests.
Ankit Agarwal [Tue, 1 Oct 2013 02:13:20 +0000 (10:13 +0800)]
MDL-40047 chat: Fix classname typo in generator tests
Ankit Agarwal [Fri, 20 Sep 2013 05:58:22 +0000 (13:58 +0800)]
MDL-40047 events: Replace add_to_logs with new events in feedback
Ankit Agarwal [Tue, 24 Sep 2013 09:47:31 +0000 (17:47 +0800)]
MDL-40047 events: Add unit tests for feedback events
Ankit Agarwal [Tue, 24 Sep 2013 07:57:07 +0000 (15:57 +0800)]
MDL-40047 feedback: Add a test generator for feedback
Ankit Agarwal [Fri, 20 Sep 2013 05:56:41 +0000 (13:56 +0800)]
MDL-40047 events: Add events related to feedback responses
Adding following events related to feedback responses:-
/mod_feedback/event/response_deleted
/mod_feedback/event/response_submitted
/mod_feedback/event/instances_list_viewed
/mod_feedback/event/course_module_viewed
Sam Hemelryk [Tue, 1 Oct 2013 01:50:53 +0000 (14:50 +1300)]
Merge branch 'MDL-41995_master' of https://github.com/markn86/moodle
Sam Hemelryk [Tue, 1 Oct 2013 01:35:49 +0000 (14:35 +1300)]
Merge branch 'MDL-41900-m' of git://github.com/micaherne/moodle
Sam Hemelryk [Tue, 1 Oct 2013 01:06:28 +0000 (14:06 +1300)]
Merge branch 'MDL-41933' of https://github.com/merrill-oakland/moodle
Sam Hemelryk [Tue, 1 Oct 2013 00:58:17 +0000 (13:58 +1300)]
Merge branch 'MDL-41241-master' of git://github.com/damyon/moodle
Conflicts:
lib/editor/atto/plugins/link/yui/build/moodle-atto_link-button/moodle-atto_link-button-debug.js
lib/editor/atto/plugins/link/yui/build/moodle-atto_link-button/moodle-atto_link-button-min.js
lib/editor/atto/plugins/link/yui/build/moodle-atto_link-button/moodle-atto_link-button.js
lib/editor/atto/plugins/link/yui/src/button/js/button.js
Sam Hemelryk [Tue, 1 Oct 2013 00:45:18 +0000 (13:45 +1300)]
Merge branch 'MDL-41894-master' of git://github.com/ankitagarwal/moodle
Sam Hemelryk [Tue, 1 Oct 2013 00:37:44 +0000 (13:37 +1300)]
Merge branch 'MDL-41228_master' of https://github.com/totara/openbadges
Eloy Lafuente (stronk7) [Tue, 1 Oct 2013 00:14:23 +0000 (02:14 +0200)]
Merge branch 'w40_MDL-41707_m26_exttests' of https://github.com/skodak/moodle
Marina Glancy [Tue, 1 Oct 2013 00:01:17 +0000 (10:01 +1000)]
Merge branch '41988-26' of git://github.com/samhemelryk/moodle
Eloy Lafuente (stronk7) [Mon, 30 Sep 2013 23:52:53 +0000 (01:52 +0200)]
Merge branch 'MDL-41962-master' of git://github.com/FMCorz/moodle
Sam Hemelryk [Mon, 30 Sep 2013 23:07:22 +0000 (12:07 +1300)]
Merge branch 'MDL-41926_master' of git://github.com/dmonllao/moodle
Sam Hemelryk [Mon, 30 Sep 2013 22:18:14 +0000 (11:18 +1300)]
Merge branch 'wip-MDL-37559-m26-showshortname' of git://github.com/henesnarfel/moodle
Sam Hemelryk [Mon, 30 Sep 2013 22:05:59 +0000 (11:05 +1300)]
Merge branch 'MDL-40572_master' of https://github.com/totara/openbadges
Sam Hemelryk [Thu, 26 Sep 2013 01:31:52 +0000 (13:31 +1200)]
MDL-41988 behat: improvements to spin
Sam Hemelryk [Mon, 30 Sep 2013 21:17:13 +0000 (10:17 +1300)]
Merge branch 'wip-MDL-32773-master' of git://github.com/marinaglancy/moodle
Conflicts:
theme/bootstrapbase/style/moodle.css
Sam Hemelryk [Mon, 30 Sep 2013 21:14:04 +0000 (10:14 +1300)]
Merge branch 'wip-MDL-41676-master' of git://github.com/marinaglancy/moodle
Sam Hemelryk [Mon, 30 Sep 2013 20:54:26 +0000 (09:54 +1300)]
Merge branch 'MDL-37973' of https://github.com/merrill-oakland/moodle
Eloy Lafuente (stronk7) [Mon, 30 Sep 2013 19:55:41 +0000 (21:55 +0200)]
Merge branch 'MDL-40050-master' of git://github.com/FMCorz/moodle
Eloy Lafuente (stronk7) [Mon, 30 Sep 2013 14:01:38 +0000 (16:01 +0200)]
Merge branch 'MDL-26408-master' of git://github.com/danpoltawski/moodle
Marina Glancy [Mon, 30 Sep 2013 08:04:38 +0000 (18:04 +1000)]
Merge branch 'MDL-12403-master' of git://github.com/danpoltawski/moodle
Marina Glancy [Mon, 30 Sep 2013 07:57:30 +0000 (17:57 +1000)]
Merge branch 'MDL-41885-master' of git://github.com/danpoltawski/moodle
Conflicts:
mod/upgrade.txt
Mark Nielsen [Tue, 27 Aug 2013 16:11:44 +0000 (09:11 -0700)]
MDL-40248 mod: Allow xxx_get_types() to use default display
* Added new constant: MOD_SUBTYPE_NO_CHILDREN
* When MOD_SUBTYPE_NO_CHILDREN is returned from xxx_get_types()
then default display is used for activity chooser.
* Updated mod/upgrade.txt
* Removed dead code from navigationlib.php instead of updating
it for new behavior of xxx_get_types
* Updated lib/upgrade.txt
Marina Glancy [Mon, 30 Sep 2013 06:09:40 +0000 (16:09 +1000)]
Merge branch 'MDL-41954-workshop-zero-variance' of git://github.com/mudrd8mz/moodle
Sam Hemelryk [Mon, 30 Sep 2013 03:34:51 +0000 (16:34 +1300)]
Merge branch 'MDL-16464' of git://github.com/timhunt/moodle
Sam Hemelryk [Mon, 30 Sep 2013 03:15:53 +0000 (16:15 +1300)]
Merge branch 'MDL-41227_dd' of https://github.com/andyjdavis/moodle
Conflicts:
course/yui/toolboxes/toolboxes.js
Sam Hemelryk [Mon, 30 Sep 2013 02:51:08 +0000 (15:51 +1300)]
NOBUG fixed up whitespace
Sam Hemelryk [Mon, 30 Sep 2013 02:42:03 +0000 (15:42 +1300)]
Merge branch 'wip-MDL-33416-master' of git://github.com/marinaglancy/moodle
Sam Hemelryk [Sun, 29 Sep 2013 23:09:50 +0000 (12:09 +1300)]
Merge branch 'master_MDL-41848' of git://github.com/danmarsden/moodle
Sam Hemelryk [Sun, 29 Sep 2013 22:55:19 +0000 (11:55 +1300)]
Merge branch 'w40_MDL-41176_m26_useredit' of https://github.com/skodak/moodle
Sam Hemelryk [Sun, 29 Sep 2013 22:10:21 +0000 (11:10 +1300)]
NOBUG: rebuilt bootstrap CSS
Sam Hemelryk [Sun, 29 Sep 2013 21:48:36 +0000 (10:48 +1300)]
Merge branch 'MDL-33569_M26' of git://github.com/lazydaisy/moodle
Sam Hemelryk [Sun, 29 Sep 2013 21:38:11 +0000 (10:38 +1300)]
Merge branch 'MDL-41888-master' of git://github.com/jamiepratt/moodle
Sam Hemelryk [Thu, 26 Sep 2013 04:24:50 +0000 (16:24 +1200)]
MDL-41997 cache: dummy store now uses static acceleration for session + request
Sam Hemelryk [Thu, 26 Sep 2013 04:18:47 +0000 (16:18 +1200)]
MDL-41997 cache: added unit tests for disabled stores
Paul Charsley [Fri, 20 Sep 2013 07:05:30 +0000 (19:05 +1200)]
MDL-41738 added web service function mod_assign_set_user_flags
Mary Evans [Sun, 29 Sep 2013 00:40:40 +0000 (01:40 +0100)]
MDL-42017 theme_afterburner: Additional improvements to make afterburner fully responsive.
Mary Evans [Sat, 28 Sep 2013 15:26:01 +0000 (16:26 +0100)]
MDL-33569 theme_bootsrapbase: adding re-compiled style/moodle.css
Mary Evans [Sat, 28 Sep 2013 14:07:22 +0000 (15:07 +0100)]
MDL-33569 themes: Labels create extra margin below content.
Jamie Pratt [Fri, 27 Sep 2013 06:50:12 +0000 (13:50 +0700)]
MDL-41751 changes to api of question_response_analyser
and code refactoring and clean up.
Tim Hunt [Mon, 23 Sep 2013 18:34:15 +0000 (19:34 +0100)]
MDL-16464 remove multichoice answers field.
This field is not used, but sometimes causes errors when we try to
instert a value that is too long to fit. Therefore remove it.
At the same time, rename tables and columns to match the coding
guidelines.
Jamie Pratt [Wed, 25 Sep 2013 06:27:55 +0000 (13:27 +0700)]
MDL-41752 question statistics class moved and improved
quiz_question_statistics_stats renamed to question_statistics_calculator
separate class question_statistics used to store calculated stats
and api changed, also code generally cleaned up.
Rossiani Wijaya [Wed, 25 Sep 2013 16:07:27 +0000 (00:07 +0800)]
MDL-41798 imscp module: fix heading levels.
Petr Škoda [Fri, 27 Sep 2013 08:51:38 +0000 (10:51 +0200)]
MDL-41999 warn developers to not use $USER->password directly
Petr Škoda [Fri, 27 Sep 2013 08:51:13 +0000 (10:51 +0200)]
MDL-41999 do not use $USER->password directly
Petr Škoda [Tue, 24 Sep 2013 19:11:10 +0000 (21:11 +0200)]
MDL-41707 allow custom location of external test files used from unit tests
Marina Glancy [Fri, 27 Sep 2013 05:32:27 +0000 (15:32 +1000)]
MDL-41942 course: Allow course listings to work with caches disabled
Petr Škoda [Mon, 23 Sep 2013 19:15:59 +0000 (21:15 +0200)]
MDL-41176 do not set description and pw fields in $USER when editing own profile
Petr Škoda [Mon, 23 Sep 2013 19:15:19 +0000 (21:15 +0200)]
MDL-41176 make sure fresh full user record is used when mailing email confirmation
Petr Škoda [Mon, 23 Sep 2013 18:54:55 +0000 (20:54 +0200)]
MDL-41176 fix obvious bugs and typos in new user API
Marina Glancy [Fri, 27 Sep 2013 02:50:28 +0000 (12:50 +1000)]
MDL-41921 mod_url: less restrictions on URL field
Restoring functionality from 2.4 accidentally removed in MDL-34311
