moodle.git
6 years agoMerge branch 'MDL-49425-master' of git://github.com/jleyva/moodle
Eloy Lafuente (stronk7) [Tue, 24 Mar 2015 23:39:39 +0000 (00:39 +0100)]
Merge branch 'MDL-49425-master' of git://github.com/jleyva/moodle

6 years agoMerge branch 'MDL-48499' of https://github.com/danielneis/moodle
Eloy Lafuente (stronk7) [Tue, 24 Mar 2015 21:00:07 +0000 (22:00 +0100)]
Merge branch 'MDL-48499' of https://github.com/danielneis/moodle

6 years agoMDL-48499 messages: Show which users have not received bulk messages
Daniel Neis Araujo [Thu, 4 Dec 2014 13:37:09 +0000 (11:37 -0200)]
MDL-48499 messages: Show which users have not received bulk messages

6 years agoMerge branch 'MDL-49262-master' of git://github.com/damyon/moodle
Dan Poltawski [Tue, 24 Mar 2015 15:29:59 +0000 (15:29 +0000)]
Merge branch 'MDL-49262-master' of git://github.com/damyon/moodle

6 years agoMerge branch 'MDL-49622' of https://github.com/stronk7/moodle
Dan Poltawski [Tue, 24 Mar 2015 15:15:44 +0000 (15:15 +0000)]
Merge branch 'MDL-49622' of https://github.com/stronk7/moodle

6 years agoMerge branch 'MDL-49354-master' of https://github.com/mtavella-netspot/moodle
Dan Poltawski [Tue, 24 Mar 2015 15:14:08 +0000 (15:14 +0000)]
Merge branch 'MDL-49354-master' of https://github.com/mtavella-netspot/moodle

6 years agoMerge branch 'master_MDL-49054' of git://github.com/danmarsden/moodle
Dan Poltawski [Tue, 24 Mar 2015 15:12:24 +0000 (15:12 +0000)]
Merge branch 'master_MDL-49054' of git://github.com/danmarsden/moodle

6 years agoMerge branch 'MDL-48918-master' of git://github.com/andrewnicols/moodle
Dan Poltawski [Tue, 24 Mar 2015 15:06:34 +0000 (15:06 +0000)]
Merge branch 'MDL-48918-master' of git://github.com/andrewnicols/moodle

6 years agoMerge branch 'MDL-48795' of https://github.com/apsdehal/moodle
Eloy Lafuente (stronk7) [Tue, 24 Mar 2015 14:44:37 +0000 (15:44 +0100)]
Merge branch 'MDL-48795' of https://github.com/apsdehal/moodle

6 years agoMerge branch 'wip-mdl-49374' of https://github.com/rajeshtaneja/moodle
Dan Poltawski [Tue, 24 Mar 2015 13:36:59 +0000 (13:36 +0000)]
Merge branch 'wip-mdl-49374' of https://github.com/rajeshtaneja/moodle

6 years agoMerge branch 'MDL-49070_scheduled' of https://github.com/andyjdavis/moodle
Dan Poltawski [Tue, 24 Mar 2015 13:33:38 +0000 (13:33 +0000)]
Merge branch 'MDL-49070_scheduled' of https://github.com/andyjdavis/moodle

6 years agoMDL-48969 block_quiz_results: disable on install
Dan Poltawski [Tue, 24 Mar 2015 12:15:11 +0000 (12:15 +0000)]
MDL-48969 block_quiz_results: disable on install

6 years agoMerge branch 'MDL-48969_m29v9' of https://github.com/sbourget/moodle
Dan Poltawski [Tue, 24 Mar 2015 11:48:44 +0000 (11:48 +0000)]
Merge branch 'MDL-48969_m29v9' of https://github.com/sbourget/moodle

6 years agoMerge branch 'wip_MDL-49631_29_utfregex' of https://github.com/skodak/moodle
Dan Poltawski [Tue, 24 Mar 2015 11:10:19 +0000 (11:10 +0000)]
Merge branch 'wip_MDL-49631_29_utfregex' of https://github.com/skodak/moodle

6 years agoMerge branch 'MDL-46746-master' of git://github.com/merrill-oakland/moodle
Dan Poltawski [Tue, 24 Mar 2015 11:04:04 +0000 (11:04 +0000)]
Merge branch 'MDL-46746-master' of git://github.com/merrill-oakland/moodle

Conflicts:
lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-min.js

6 years agoMDL-49444 phpunit: add missing suite definition
Dan Poltawski [Tue, 24 Mar 2015 11:00:27 +0000 (11:00 +0000)]
MDL-49444 phpunit: add missing suite definition

6 years agoMerge branch 'MDL-49565-master' of git://github.com/merrill-oakland/moodle
Dan Poltawski [Tue, 24 Mar 2015 09:57:12 +0000 (09:57 +0000)]
Merge branch 'MDL-49565-master' of git://github.com/merrill-oakland/moodle

6 years agoMerge branch 'MDL-49337-master' of git://github.com/jleyva/moodle
David Monllao [Tue, 24 Mar 2015 09:55:42 +0000 (17:55 +0800)]
Merge branch 'MDL-49337-master' of git://github.com/jleyva/moodle

Conflicts:
lib/db/services.php

6 years agoMDL-49337 webservices: Unit tests for mod_data_get_databases_by_courses
Juan Leyva [Thu, 5 Mar 2015 20:47:32 +0000 (21:47 +0100)]
MDL-49337 webservices: Unit tests for mod_data_get_databases_by_courses

6 years agoMDL-49337 webservices: Include the new WS in the mobile app service
Juan Leyva [Thu, 5 Mar 2015 15:52:08 +0000 (16:52 +0100)]
MDL-49337 webservices: Include the new WS in the mobile app service

6 years agoMDL-49337 webservices: mod_data services file definition
Juan Leyva [Thu, 5 Mar 2015 15:47:34 +0000 (16:47 +0100)]
MDL-49337 webservices: mod_data services file definition

6 years agoMDL-49337 webservices: New WS mod_data_get_databases_by_courses
Juan Leyva [Thu, 5 Mar 2015 15:25:50 +0000 (16:25 +0100)]
MDL-49337 webservices: New WS mod_data_get_databases_by_courses

6 years agoMerge branch 'MDL-49444-master' of git://github.com/jleyva/moodle
David Monllao [Tue, 24 Mar 2015 09:43:29 +0000 (17:43 +0800)]
Merge branch 'MDL-49444-master' of git://github.com/jleyva/moodle

6 years agoMerge branch 'wip_MDL-49327_2.9_guide_getinstance' of https://github.com/nixorv/moodle
Dan Poltawski [Tue, 24 Mar 2015 09:29:06 +0000 (09:29 +0000)]
Merge branch 'wip_MDL-49327_2.9_guide_getinstance' of https://github.com/nixorv/moodle

Conflicts:
grade/grading/form/guide/tests/guide_test.php

6 years agoMDL-49444 webservices: Added new function to the mobile service
Juan Leyva [Mon, 9 Mar 2015 12:15:15 +0000 (13:15 +0100)]
MDL-49444 webservices: Added new function to the mobile service

6 years agoMDL-49444 webservices: Tests for update_activity_completion_status
Juan Leyva [Mon, 9 Mar 2015 12:14:48 +0000 (13:14 +0100)]
MDL-49444 webservices: Tests for update_activity_completion_status

6 years agoMDL-49444 webservices: New WS update_activity_completion_status
Juan Leyva [Mon, 9 Mar 2015 12:14:25 +0000 (13:14 +0100)]
MDL-49444 webservices: New WS update_activity_completion_status

6 years agoMerge branch 'MDL-49558_master' of git://github.com/nadavkav/moodle
David Monllao [Tue, 24 Mar 2015 06:51:07 +0000 (14:51 +0800)]
Merge branch 'MDL-49558_master' of git://github.com/nadavkav/moodle

6 years agoMerge branch 'MDL-49430_m29v4' of git://github.com/sbourget/moodle
David Monllao [Tue, 24 Mar 2015 05:25:26 +0000 (13:25 +0800)]
Merge branch 'MDL-49430_m29v4' of git://github.com/sbourget/moodle

Conflicts:
mod/lesson/version.php

6 years agoMerge branch 'MDL-49470_master-refine' of git://github.com/dmonllao/moodle
David Monllao [Tue, 24 Mar 2015 04:02:33 +0000 (12:02 +0800)]
Merge branch 'MDL-49470_master-refine' of git://github.com/dmonllao/moodle

6 years agoMDL-49470 mod_lesson: Adding text space + unit test refinement
David Monllao [Tue, 24 Mar 2015 03:59:05 +0000 (11:59 +0800)]
MDL-49470 mod_lesson: Adding text space + unit test refinement

6 years agoMDL-49470 Lesson: Add page moved event
Stephen Bourget [Wed, 18 Mar 2015 18:40:14 +0000 (14:40 -0400)]
MDL-49470 Lesson: Add page moved event

Conflicts:
mod/lesson/version.php

6 years agoMerge branch 'MDL-49555-master' of git://github.com/FMCorz/moodle
David Monllao [Tue, 24 Mar 2015 03:00:15 +0000 (11:00 +0800)]
Merge branch 'MDL-49555-master' of git://github.com/FMCorz/moodle

6 years agoMerge branch 'MDL-47003-master' of git://github.com/merrill-oakland/moodle
David Monllao [Tue, 24 Mar 2015 02:17:28 +0000 (10:17 +0800)]
Merge branch 'MDL-47003-master' of git://github.com/merrill-oakland/moodle

6 years agoMerge branch 'MDL-48718-master' of git://github.com/jleyva/moodle
Eloy Lafuente (stronk7) [Tue, 24 Mar 2015 00:51:44 +0000 (01:51 +0100)]
Merge branch 'MDL-48718-master' of git://github.com/jleyva/moodle

6 years agoMerge branch 'MDL-43770-master' of https://github.com/lucisgit/moodle
Eloy Lafuente (stronk7) [Tue, 24 Mar 2015 00:38:15 +0000 (01:38 +0100)]
Merge branch 'MDL-43770-master' of https://github.com/lucisgit/moodle

6 years agoMerge branch 'wip-MDL-35482-master' of git://github.com/satrun77/moodle
Eloy Lafuente (stronk7) [Mon, 23 Mar 2015 23:39:12 +0000 (00:39 +0100)]
Merge branch 'wip-MDL-35482-master' of git://github.com/satrun77/moodle

6 years agoMerge branch 'MDL-32285_master' of https://github.com/nadavkav/moodle
Eloy Lafuente (stronk7) [Mon, 23 Mar 2015 23:30:16 +0000 (00:30 +0100)]
Merge branch 'MDL-32285_master' of https://github.com/nadavkav/moodle

6 years agoMDL-49327 marking guide: Added condition on definitionid.
Nikita Kalinin [Mon, 2 Mar 2015 18:35:48 +0000 (21:35 +0300)]
MDL-49327 marking guide: Added condition on definitionid.

6 years agoMerge branch 'wip_MDL-49327_2.9_guide_getinstance' of https://github.com/nixorv/moodle
Dan Poltawski [Mon, 23 Mar 2015 15:49:03 +0000 (15:49 +0000)]
Merge branch 'wip_MDL-49327_2.9_guide_getinstance' of https://github.com/nixorv/moodle

6 years agoMerge branch 'MDL-48443-master' of git://github.com/jleyva/moodle
Dan Poltawski [Mon, 23 Mar 2015 15:03:56 +0000 (15:03 +0000)]
Merge branch 'MDL-48443-master' of git://github.com/jleyva/moodle

6 years agoMerge branch 'wip-mdl-49432' of https://github.com/rajeshtaneja/moodle
Dan Poltawski [Mon, 23 Mar 2015 12:37:05 +0000 (12:37 +0000)]
Merge branch 'wip-mdl-49432' of https://github.com/rajeshtaneja/moodle

6 years agoMerge branch 'MDL-35280_m29v2' of https://github.com/sbourget/moodle
Dan Poltawski [Mon, 23 Mar 2015 11:25:55 +0000 (11:25 +0000)]
Merge branch 'MDL-35280_m29v2' of https://github.com/sbourget/moodle

6 years agoMerge branch 'master_MDL-48419' of https://github.com/danmarsden/moodle
Dan Poltawski [Mon, 23 Mar 2015 11:15:55 +0000 (11:15 +0000)]
Merge branch 'master_MDL-48419' of https://github.com/danmarsden/moodle

6 years agoMerge branch 'MDL-21201-master-feedback_anon' of https://github.com/DSI-Universite...
Dan Poltawski [Mon, 23 Mar 2015 11:03:28 +0000 (11:03 +0000)]
Merge branch 'MDL-21201-master-feedback_anon' of https://github.com/DSI-Universite-Rennes2/moodle

6 years agoMDL-13831 workshop: process gradepass only if set
Marina Glancy [Mon, 23 Mar 2015 08:52:20 +0000 (16:52 +0800)]
MDL-13831 workshop: process gradepass only if set

6 years agoMDL-48456 course: Using default max int value
David Monllao [Mon, 23 Mar 2015 07:16:18 +0000 (15:16 +0800)]
MDL-48456 course: Using default max int value

6 years agoMerge branch 'MDL-48456-master' of git://github.com/dkns/moodle
David Monllao [Mon, 23 Mar 2015 07:14:58 +0000 (15:14 +0800)]
Merge branch 'MDL-48456-master' of git://github.com/dkns/moodle

6 years agoMerge branch 'MDL-47002-master' of git://github.com/merrill-oakland/moodle
David Monllao [Mon, 23 Mar 2015 06:59:05 +0000 (14:59 +0800)]
Merge branch 'MDL-47002-master' of git://github.com/merrill-oakland/moodle

6 years agoMerge branch 'wip-MDL-27074-master' of git://github.com/marinaglancy/moodle
David Monllao [Mon, 23 Mar 2015 06:54:37 +0000 (14:54 +0800)]
Merge branch 'wip-MDL-27074-master' of git://github.com/marinaglancy/moodle

6 years agoMDL-49262 bootstrapbase: Lets use the standard jquery libraries
Damyon Wiese [Sun, 22 Feb 2015 07:27:32 +0000 (15:27 +0800)]
MDL-49262 bootstrapbase: Lets use the standard jquery libraries

We have jquery+amd support. Lets use it to bring back the standard bootstrap jquery plugins.

6 years agoMDL-49631 fix incorrect whitespace remplacements
Petr Skoda [Mon, 23 Mar 2015 04:28:10 +0000 (17:28 +1300)]
MDL-49631 fix incorrect whitespace remplacements

6 years agoMerge branch 'wip-MDL-13831-master' of git://github.com/marinaglancy/moodle
David Monllao [Mon, 23 Mar 2015 03:51:09 +0000 (11:51 +0800)]
Merge branch 'wip-MDL-13831-master' of git://github.com/marinaglancy/moodle

6 years agoMDL-13831 grades: allow to set gradepass in mod_form
Marina Glancy [Mon, 16 Mar 2015 06:57:33 +0000 (14:57 +0800)]
MDL-13831 grades: allow to set gradepass in mod_form

6 years agoMDL-13831 course: add gradepass field to mod_form
Gregory Faller [Wed, 11 Feb 2015 02:12:38 +0000 (12:42 +1030)]
MDL-13831 course: add gradepass field to mod_form

6 years agoMDL-27074 calendar: display group name for group events
Marina Glancy [Fri, 13 Mar 2015 07:38:21 +0000 (15:38 +0800)]
MDL-27074 calendar: display group name for group events

6 years agoMDL-49054 scorm: Remove some old debugging code.
Dan Marsden [Wed, 18 Mar 2015 07:14:51 +0000 (20:14 +1300)]
MDL-49054 scorm: Remove some old debugging code.

6 years agoMDL-48456 course: Increase timeout when deleting all courses in category
Daniel Kosinski [Wed, 18 Mar 2015 22:57:08 +0000 (23:57 +0100)]
MDL-48456 course: Increase timeout when deleting all courses in category

6 years agoMDL-49622 behat: better handling of profile and tags
Eloy Lafuente (stronk7) [Sun, 22 Mar 2015 10:39:53 +0000 (11:39 +0100)]
MDL-49622 behat: better handling of profile and tags

This solves some minor annoyances in the run.php script:

A) profile is checked properly, independently of everything else.
B) cli tags get precedence over profile tags.

Indicentally, this also causes run.php to support both profile and
tag in command line together. Previously the use of profile did
invalidate the use of tags.

6 years agoMDL-21201 Feedback: hide anonymous responses in recent activity reports
Julien Boulen [Thu, 26 Feb 2015 15:16:28 +0000 (16:16 +0100)]
MDL-21201 Feedback: hide anonymous responses in recent activity reports

6 years agoMDL-48443 webservices: Prevent duplicated user devices
Juan Leyva [Thu, 26 Feb 2015 11:07:08 +0000 (12:07 +0100)]
MDL-48443 webservices: Prevent duplicated user devices

6 years agoMDL-49425 webservices: Unit tests for the new settings
Juan Leyva [Tue, 17 Mar 2015 11:34:04 +0000 (12:34 +0100)]
MDL-49425 webservices: Unit tests for the new settings

6 years agoMDL-49425 webservices: New settings in core_get_site_info
Juan Leyva [Tue, 17 Mar 2015 11:33:40 +0000 (12:33 +0100)]
MDL-49425 webservices: New settings in core_get_site_info

New information returned:
Upload files size limit
User storage quota (userquota)
Whether the my files option is disabled (moodle/user:manageownfiles)

6 years agoMDL-48718 mod_imscp: imscp_export_contents unit tests
Juan Leyva [Tue, 17 Mar 2015 10:16:41 +0000 (11:16 +0100)]
MDL-48718 mod_imscp: imscp_export_contents unit tests

6 years agoMDL-48718 mod_imscp: imscp_export_contents function implemented
Juan Leyva [Thu, 26 Feb 2015 14:08:22 +0000 (15:08 +0100)]
MDL-48718 mod_imscp: imscp_export_contents function implemented

6 years agoMDL-49070 core_registration: removed now unused config setting
Andrew Davis [Fri, 20 Mar 2015 12:50:48 +0000 (20:50 +0800)]
MDL-49070 core_registration: removed now unused config setting

6 years agoMDL-43770 mod_choice: Add behat scenarios for 'include inactive' option
Tony Butler [Mon, 2 Mar 2015 14:41:05 +0000 (14:41 +0000)]
MDL-43770 mod_choice: Add behat scenarios for 'include inactive' option

6 years agoMDL-43770 core_behat: Pass additional params to enrol_user generator
Tony Butler [Mon, 2 Mar 2015 14:33:13 +0000 (14:33 +0000)]
MDL-43770 core_behat: Pass additional params to enrol_user generator

Include timestart, timeend and status.

6 years agoMDL-43770 mod_choice: Add option to include inactive users' responses
Tony Butler [Mon, 20 Jan 2014 12:10:34 +0000 (12:10 +0000)]
MDL-43770 mod_choice: Add option to include inactive users' responses

6 years agoMDL-43770 mod_choice: Exclude responses from inactive users
Tony Butler [Mon, 20 Jan 2014 11:35:12 +0000 (11:35 +0000)]
MDL-43770 mod_choice: Exclude responses from inactive users

6 years agoMDL-49327 marking guide: Added condition on definitionid.
Nikita Kalinin [Mon, 2 Mar 2015 18:35:48 +0000 (21:35 +0300)]
MDL-49327 marking guide: Added condition on definitionid.

6 years agoMDL-28526 glossary: extra time and memory for export/import
Marina Glancy [Fri, 20 Mar 2015 07:02:32 +0000 (15:02 +0800)]
MDL-28526 glossary: extra time and memory for export/import

6 years agoMDL-28526 glossary: preserve images across export/import
Marina Glancy [Fri, 13 Mar 2015 09:44:49 +0000 (17:44 +0800)]
MDL-28526 glossary: preserve images across export/import

6 years agoMDL-49070 core_registration: improved site registration scheduled task
Andrew Davis [Wed, 4 Feb 2015 08:19:00 +0000 (09:19 +0100)]
MDL-49070 core_registration: improved site registration scheduled task

6 years agoMDL-49374 behat: Get install or re-install error code after composer
Rajesh Taneja [Fri, 20 Mar 2015 05:18:24 +0000 (13:18 +0800)]
MDL-49374 behat: Get install or re-install error code after composer

After composer is installed make sure we just process only
install or re-install

6 years agoMDL-49432 behat: guzzle packages has been unified
Rajesh Taneja [Fri, 20 Mar 2015 04:00:06 +0000 (12:00 +0800)]
MDL-49432 behat: guzzle packages has been unified

Current version of goutte is pointing to old guzzle packages
guzzle/common, guzzle/stream, guzzle/parser and guzzle/http.
They have been unified to guzzlehttp/guzzle, so include it to avoid
using old packages

6 years agoMDL-48969 Block: Disable and migrate quiz_results block
Stephen Bourget [Tue, 17 Mar 2015 22:33:49 +0000 (18:33 -0400)]
MDL-48969 Block: Disable and migrate quiz_results block

6 years agoMDL-48969 Block: Implement a high scores block
Stephen Bourget [Thu, 19 Mar 2015 23:46:02 +0000 (19:46 -0400)]
MDL-48969 Block: Implement a high scores block

AMOS BEGIN
CPY [bestgrade,block_quiz_results],[bestgrade,block_activity_results]
CPY [bestgrades,block_quiz_results],[bestgrades,block_activity_results]
CPY
[bestgroupgrade,block_quiz_results],[bestgroupgrade,block_activity_resul
ts]
CPY
[bestgroupgrades,block_quiz_results],[bestgroupgrades,block_activity_res
ults]
CPY
[config_format_absolute,block_quiz_results],[config_format_absolute,bloc
k_activity_results]
CPY
[config_format_fraction,block_quiz_results],[config_format_fraction,bloc
k_activity_results]
CPY
[config_format_percentage,block_quiz_results],[config_format_percentage,
block_activity_results]
CPY
[config_grade_format,block_quiz_results],[config_grade_format,block_acti
vity_results]
CPY
[config_name_format,block_quiz_results],[config_name_format,block_activi
ty_results]
CPY
[config_names_anon,block_quiz_results],[config_names_anon,block_activity
_results]
CPY
[config_names_full,block_quiz_results],[config_names_full,block_activity
_results]
CPY
[config_names_id,block_quiz_results],[config_names_id,block_activity_res
ults]
CPY
[config_show_best,block_quiz_results],[config_show_best,block_activity_r
esults]
CPY
[config_show_worst,block_quiz_results],[config_show_worst,block_activity
_results]
CPY
[configuredtoshownothing,block_quiz_results],[configuredtoshownothing,bl
ock_activity_results]
CPY
[config_use_groups,block_quiz_results],[config_use_groups,block_activity
_results]
CPY
[error_nogroupsexist,block_quiz_results],[error_nogroupsexist,block_acti
vity_results]
CPY [worstgrade,block_quiz_results],[worstgrade,block_activity_results]
CPY
[worstgrades,block_quiz_results],[worstgrades,block_activity_results]
CPY
[worstgroupgrade,block_quiz_results],[worstgroupgrade,block_activity_res
ults]
CPY
[worstgroupgrades,block_quiz_results],[worstgroupgrades,block_activity_r
esults]
AMOS END

6 years agoMDL-32285 IMS-CP: Add "Continue" button to package parse failure
Nadav Kavalerchik [Tue, 17 Mar 2015 17:59:18 +0000 (19:59 +0200)]
MDL-32285 IMS-CP: Add "Continue" button to package parse failure

6 years agoMDL-49558 user grades: Fix range & percent grade display in RTL mode
Nadav Kavalerchik [Tue, 17 Mar 2015 18:57:43 +0000 (20:57 +0200)]
MDL-49558 user grades: Fix range & percent grade display in RTL mode

6 years agoMDL-35482 lesson: return to previous page after edit and page save
Mohamed Alsharaf [Thu, 1 Aug 2013 02:23:10 +0000 (14:23 +1200)]
MDL-35482 lesson: return to previous page after edit and page save

6 years agoweekly release 2.9dev
Eloy Lafuente (stronk7) [Thu, 19 Mar 2015 11:41:54 +0000 (12:41 +0100)]
weekly release 2.9dev

6 years agoMerge branch 'behat_parallel_extraopts' of https://github.com/tlevi/moodle
Eloy Lafuente (stronk7) [Thu, 19 Mar 2015 10:46:30 +0000 (11:46 +0100)]
Merge branch 'behat_parallel_extraopts' of https://github.com/tlevi/moodle

6 years agoMDL-48715 mod_lesson: completion rules must not be dependent
Jean-Michel Vedrine [Wed, 18 Mar 2015 09:10:48 +0000 (10:10 +0100)]
MDL-48715 mod_lesson: completion rules must not be dependent

6 years agoRevert "Merge branch 'MDL-49121_master_optimize_lesson_report' of https://github...
Dan Poltawski [Wed, 18 Mar 2015 09:22:21 +0000 (09:22 +0000)]
Revert "Merge branch 'MDL-49121_master_optimize_lesson_report' of https://github.com/SWiT/moodle"

This reverts commit 94d0be78407fe2e6abf5acee7c7decda7ab837c2, reversing
changes made to f51ef4d102530e2a7c618d54ff06725e6bf20f4d.

6 years agoRevert "MDL-49121 mod_lesson: Fixed typo in link creation"
Dan Poltawski [Wed, 18 Mar 2015 09:22:16 +0000 (09:22 +0000)]
Revert "MDL-49121 mod_lesson: Fixed typo in link creation"

This reverts commit feb8ca8c72dcf429d3c06df6587b57221ae615f4.

6 years agoMerge branch 'wip-mdl-49121' of git://github.com/rajeshtaneja/moodle
Dan Poltawski [Wed, 18 Mar 2015 08:21:22 +0000 (08:21 +0000)]
Merge branch 'wip-mdl-49121' of git://github.com/rajeshtaneja/moodle

6 years agoMDL-49121 mod_lesson: Fixed typo in link creation
Rajesh Taneja [Wed, 18 Mar 2015 07:30:24 +0000 (15:30 +0800)]
MDL-49121 mod_lesson: Fixed typo in link creation

6 years agoMDL-49445 behat: Change selector as underline tr has same string
Rajesh Taneja [Wed, 18 Mar 2015 02:30:22 +0000 (10:30 +0800)]
MDL-49445 behat: Change selector as underline tr has same string

6 years agoMDL-49430 Lesson: Add restarted and resumed events
Stephen Bourget [Wed, 18 Mar 2015 17:30:29 +0000 (13:30 -0400)]
MDL-49430 Lesson: Add restarted and resumed events

6 years agoMDL-49565 atto: Allow html comments in editor code
Eric Merrill [Wed, 18 Mar 2015 04:58:21 +0000 (00:58 -0400)]
MDL-49565 atto: Allow html comments in editor code

6 years agoMDL-46746 atto: Remove unnecessary filtering of unicode characters
Eric Merrill [Wed, 18 Mar 2015 04:41:58 +0000 (00:41 -0400)]
MDL-46746 atto: Remove unnecessary filtering of unicode characters

6 years agoMDL-47003 atto: Make code cleanup more targeted
Eric Merrill [Wed, 18 Mar 2015 04:35:07 +0000 (00:35 -0400)]
MDL-47003 atto: Make code cleanup more targeted

Apply different, stricter, code cleanup when we receive HTML (WYSIWYG)
paste events, but be more lax the rest of the time.

Also, update the regexes to be more targeted for specific code patterns
pasted from office packages.

6 years agoMDL-47002 atto: Improve paste behaviour to ensure propper cleanup
Eric Merrill [Wed, 18 Mar 2015 04:08:34 +0000 (00:08 -0400)]
MDL-47002 atto: Improve paste behaviour to ensure propper cleanup

Old code failed to clean the editor div which resulted in
undesirable code being being left in the div for editing. To properly
handel incoming code, we should try to intercept and clean before the
paste, or clean the entire editable div.

6 years agoMDL-49555 enrol_paypal: Only display icon if method available
info@ewallah.net [Wed, 18 Mar 2015 12:07:59 +0000 (13:07 +0100)]
MDL-49555 enrol_paypal: Only display icon if method available

6 years agoMDL-48419 mod_scorm: Check net script too agressive
Dan Marsden [Thu, 5 Feb 2015 08:37:19 +0000 (21:37 +1300)]
MDL-48419 mod_scorm: Check net script too agressive

in some cases high latency and network issues result in longer
than 2 sec responses from a server, increase this to avoid
excessive warnings.

6 years agoMDL-40990 mod_quiz: Changing upgrade process according to version
David Monllao [Wed, 18 Mar 2015 00:34:48 +0000 (08:34 +0800)]
MDL-40990 mod_quiz: Changing upgrade process according to version

6 years agoMerge branch 'MDL-48715' of git://github.com/jmvedrine/moodle
David Monllao [Wed, 18 Mar 2015 00:31:03 +0000 (08:31 +0800)]
Merge branch 'MDL-48715' of git://github.com/jmvedrine/moodle

6 years agoMerge branch 'MDL-40990' of git://github.com/timhunt/moodle
David Monllao [Wed, 18 Mar 2015 00:22:06 +0000 (08:22 +0800)]
Merge branch 'MDL-40990' of git://github.com/timhunt/moodle

6 years agoMDL-48715 mod_lesson: use only one field for time spent rule
Jean-Michel Vedrine [Tue, 17 Mar 2015 07:40:17 +0000 (08:40 +0100)]
MDL-48715 mod_lesson: use only one field for time spent rule