moodle.git
7 years agoMerge branch 'm29_MDL-49628a' of https://github.com/totara/moodle
Dan Poltawski [Tue, 2 Jun 2015 12:54:01 +0000 (13:54 +0100)]
Merge branch 'm29_MDL-49628a' of https://github.com/totara/moodle

7 years agoMerge branch 'MDL-49323-master' of git://github.com/nmoller/moodle
Dan Poltawski [Tue, 2 Jun 2015 12:23:37 +0000 (13:23 +0100)]
Merge branch 'MDL-49323-master' of git://github.com/nmoller/moodle

7 years agoMerge branch 'MDL-50155' of https://github.com/andrewhancox/moodle
Dan Poltawski [Tue, 2 Jun 2015 11:08:24 +0000 (12:08 +0100)]
Merge branch 'MDL-50155' of https://github.com/andrewhancox/moodle

7 years agoMDL-30960 version: bump for new setting
Dan Poltawski [Tue, 2 Jun 2015 10:47:43 +0000 (11:47 +0100)]
MDL-30960 version: bump for new setting

7 years agoMerge branch 'MDL-30960_master' of https://github.com/danielneis/moodle
Dan Poltawski [Tue, 2 Jun 2015 10:42:10 +0000 (11:42 +0100)]
Merge branch 'MDL-30960_master' of https://github.com/danielneis/moodle

7 years agoMDL-26501 mod_glossary: fixes to tabs management
Marina Glancy [Mon, 6 Apr 2015 13:37:01 +0000 (21:37 +0800)]
MDL-26501 mod_glossary: fixes to tabs management

7 years agoMDL-26501 mod_glossary: Allow to specify visible tabs
Nivedita Setru [Sun, 29 Mar 2015 17:56:40 +0000 (18:56 +0100)]
MDL-26501 mod_glossary: Allow to specify visible tabs

7 years agoMerge branch 'MDL-36957-master' of git://github.com/FMCorz/moodle
Dan Poltawski [Tue, 2 Jun 2015 10:07:57 +0000 (11:07 +0100)]
Merge branch 'MDL-36957-master' of git://github.com/FMCorz/moodle

7 years agoMerge branch 'MDL-46927_master' of git://github.com/markn86/moodle
Dan Poltawski [Tue, 2 Jun 2015 08:03:43 +0000 (09:03 +0100)]
Merge branch 'MDL-46927_master' of git://github.com/markn86/moodle

7 years agoMDL-46927 core_files: fixed issue with system course restores
Mark Nelson [Mon, 11 May 2015 04:29:41 +0000 (21:29 -0700)]
MDL-46927 core_files: fixed issue with system course restores

When clicking on 'Restore' next to a file in the 'Course
backup area' in the system context the message 'Sorry,
the requested file could not be found' was displayed.
This fix adds missing functionality to the class
'file_info_context_system' so that the file information
is correctly returned.

7 years agoMDL-49323 mod_assign: Fixed numeric validation in grade form.
Nelson Moller [Mon, 1 Jun 2015 14:54:12 +0000 (10:54 -0400)]
MDL-49323 mod_assign: Fixed numeric validation in grade form.

The behat test for another decimal separator was incorporated.

7 years agoMerge branch 'MDL-29771' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Mon, 1 Jun 2015 14:13:18 +0000 (16:13 +0200)]
Merge branch 'MDL-29771' of git://github.com/timhunt/moodle

7 years agoMerge branch 'MDL-50341' of git://github.com/timhunt/moodle
Dan Poltawski [Mon, 1 Jun 2015 14:03:23 +0000 (15:03 +0100)]
Merge branch 'MDL-50341' of git://github.com/timhunt/moodle

7 years agoMDL-50322 forum: add basic split post behat coverage
Dan Poltawski [Mon, 1 Jun 2015 13:50:00 +0000 (14:50 +0100)]
MDL-50322 forum: add basic split post behat coverage

Also bump version for autoloading new class.

7 years agoMerge branch 'MDL-50322-master' of git://github.com/mastnym/moodle
Dan Poltawski [Mon, 1 Jun 2015 12:49:57 +0000 (13:49 +0100)]
Merge branch 'MDL-50322-master' of git://github.com/mastnym/moodle

7 years agoMerge branch 'MDL-50140_master' of https://github.com/jinhofer/moodle
Dan Poltawski [Mon, 1 Jun 2015 12:34:18 +0000 (13:34 +0100)]
Merge branch 'MDL-50140_master' of https://github.com/jinhofer/moodle

7 years agoMerge branch 'MDL-50304_master' of https://github.com/jinhofer/moodle
Dan Poltawski [Mon, 1 Jun 2015 12:21:54 +0000 (13:21 +0100)]
Merge branch 'MDL-50304_master' of https://github.com/jinhofer/moodle

7 years agoMerge branch 'MDL-46479-master' of git://github.com/ankitagarwal/moodle
Dan Poltawski [Mon, 1 Jun 2015 11:36:25 +0000 (12:36 +0100)]
Merge branch 'MDL-46479-master' of git://github.com/ankitagarwal/moodle

7 years agoMDL-50406 less: build css
Dan Poltawski [Mon, 1 Jun 2015 11:01:34 +0000 (12:01 +0100)]
MDL-50406 less: build css

7 years agoMerge branch 'MDL-50406_master' of git://github.com/nadavkav/moodle
Dan Poltawski [Mon, 1 Jun 2015 10:42:22 +0000 (11:42 +0100)]
Merge branch 'MDL-50406_master' of git://github.com/nadavkav/moodle

7 years agoMerge branch 'MDL-50309_master' of git://github.com/markn86/moodle
Dan Poltawski [Mon, 1 Jun 2015 09:25:48 +0000 (10:25 +0100)]
Merge branch 'MDL-50309_master' of git://github.com/markn86/moodle

7 years agoMerge branch 'MDL-49707-master' of git://github.com/ankitagarwal/moodle
Dan Poltawski [Mon, 1 Jun 2015 09:09:06 +0000 (10:09 +0100)]
Merge branch 'MDL-49707-master' of git://github.com/ankitagarwal/moodle

7 years agoMDL-49707 inbound: localpart should be < 15
Ankit Agarwal [Wed, 27 May 2015 07:49:45 +0000 (13:19 +0530)]
MDL-49707 inbound: localpart should be < 15

7 years agoMDL-29771 interactive behaviour: better state text in try again state
Tim Hunt [Sun, 31 May 2015 20:09:55 +0000 (21:09 +0100)]
MDL-29771 interactive behaviour: better state text in try again state

Before it just said 'Not complete'. It is more helpful to show the number
of tries remaining in this state as well.

7 years agoMDL-50341 quiz statistics: non-attempted questions broke first-try stats
Tim Hunt [Sun, 31 May 2015 12:34:06 +0000 (13:34 +0100)]
MDL-50341 quiz statistics: non-attempted questions broke first-try stats

For behaviours that allow multiple tries, and when the teacher had chosen to
generate statistics for the first tries only, and when a student had not
attempted one question, then an error occurred. It should have been classified
as no response.

7 years agoMDL-50406 Messages: Right align messages menu box, in RTL mode.
Nadav Kavalerchik [Fri, 29 May 2015 17:45:54 +0000 (20:45 +0300)]
MDL-50406 Messages: Right align messages menu box, in RTL mode.

7 years agoMDL-50322 mod_forum: Added validation when spliting discussions
Martin Mastny [Tue, 26 May 2015 05:16:02 +0000 (13:16 +0800)]
MDL-50322 mod_forum: Added validation when spliting discussions

7 years agoMDL-50304 atto/plugins/table: Fixed _addRowAfter function
jinhofer [Wed, 20 May 2015 21:42:23 +0000 (16:42 -0500)]
MDL-50304 atto/plugins/table: Fixed _addRowAfter function

7 years agoMDL-50140 grade/import: Added CSH buttons to import grades
jinhofer [Mon, 18 May 2015 14:44:37 +0000 (09:44 -0500)]
MDL-50140 grade/import: Added CSH buttons to import grades

CSH buttons have been added to CSV Import as well as Paste
from spreadsheet in the following areas:
Encoding, Separator (csv only), Verbose, Preview, Map to,
and Map from.

The heading of Import CSV had a CSH button added as well.

All CSH buttons were given associated language strings.

7 years agoMDL-50309 core_upgrade: fixed undefined '$customusermenuitems' notice
Mark Nelson [Thu, 28 May 2015 04:27:54 +0000 (21:27 -0700)]
MDL-50309 core_upgrade: fixed undefined '$customusermenuitems' notice

7 years agoweekly on-sync release 3.0dev
David Monllao [Thu, 28 May 2015 03:38:09 +0000 (11:38 +0800)]
weekly on-sync release 3.0dev

7 years agoMerge branch 'MDL-50373' of git://github.com/timhunt/moodle
David Monllao [Thu, 28 May 2015 01:27:30 +0000 (09:27 +0800)]
Merge branch 'MDL-50373' of git://github.com/timhunt/moodle

7 years agoMDL-50373 questions: random Qs must not pick deleted or sub- questions
Tim Hunt [Wed, 27 May 2015 18:50:05 +0000 (19:50 +0100)]
MDL-50373 questions: random Qs must not pick deleted or sub- questions

This was a regression caused by MDL-6340. I missed the necessary
    AND parent = 0 AND hidden = 0
in one query of the question table.

7 years agoMerge branch 'wip-mdl-49806' of https://github.com/rajeshtaneja/moodle
Eloy Lafuente (stronk7) [Wed, 27 May 2015 10:20:50 +0000 (12:20 +0200)]
Merge branch 'wip-mdl-49806' of https://github.com/rajeshtaneja/moodle

7 years agoMDL-46479 enrol_plugin: Final deprecation of instance_deletable()
Ankit Agarwal [Tue, 26 May 2015 07:12:46 +0000 (12:42 +0530)]
MDL-46479 enrol_plugin: Final deprecation of instance_deletable()

7 years agoMDL-50330 blog: Make other users blogs accessible
David Monllao [Wed, 27 May 2015 06:03:34 +0000 (14:03 +0800)]
MDL-50330 blog: Make other users blogs accessible

7 years agoMerge branch 'MDL-50340-master' of git://github.com/ankitagarwal/moodle
David Monllao [Wed, 27 May 2015 03:58:22 +0000 (11:58 +0800)]
Merge branch 'MDL-50340-master' of git://github.com/ankitagarwal/moodle

7 years agoMerge branch 'wip-mdl-49772' of git://github.com/rajeshtaneja/moodle
David Monllao [Wed, 27 May 2015 03:50:01 +0000 (11:50 +0800)]
Merge branch 'wip-mdl-49772' of git://github.com/rajeshtaneja/moodle

7 years agoMDL-49772 behat: Removed optimization as it's not required
Rajesh Taneja [Wed, 27 May 2015 03:20:48 +0000 (11:20 +0800)]
MDL-49772 behat: Removed optimization as it's not required

This api is called very few times in behat
initilisation process, so such optimization
is an over engineer. Hence removing it.

7 years agoMDL-49806 behat: Ensure user is marked complete before runnning cron
Rajesh Taneja [Tue, 26 May 2015 07:48:54 +0000 (15:48 +0800)]
MDL-49806 behat: Ensure user is marked complete before runnning cron

7 years agoMerge branch 'MDL-49611' of git://github.com/srynot4sale/moodle-fixes
David Monllao [Wed, 27 May 2015 00:49:23 +0000 (08:49 +0800)]
Merge branch 'MDL-49611' of git://github.com/srynot4sale/moodle-fixes

7 years agoMerge branch 'wip-mdl-49772' of https://github.com/rajeshtaneja/moodle
Eloy Lafuente (stronk7) [Tue, 26 May 2015 16:48:03 +0000 (18:48 +0200)]
Merge branch 'wip-mdl-49772' of https://github.com/rajeshtaneja/moodle

7 years agoMerge branch 'wip-MDL-50191-master' of https://github.com/marinaglancy/moodle
Eloy Lafuente (stronk7) [Tue, 26 May 2015 16:19:42 +0000 (18:19 +0200)]
Merge branch 'wip-MDL-50191-master' of https://github.com/marinaglancy/moodle

7 years agoMerge branch 'MDL-50318-master-courseresources' of git://github.com/mudrd8mz/moodle
Dan Poltawski [Tue, 26 May 2015 12:05:16 +0000 (13:05 +0100)]
Merge branch 'MDL-50318-master-courseresources' of git://github.com/mudrd8mz/moodle

7 years agoMerge branch 'MDL-49787_email_attachments_symlink_fix' of https://github.com/iamandre...
Dan Poltawski [Tue, 26 May 2015 11:57:12 +0000 (12:57 +0100)]
Merge branch 'MDL-49787_email_attachments_symlink_fix' of https://github.com/iamandrew/moodle

7 years agoMerge branch 'MDL-49776-master' of git://github.com/lameze/moodle
Dan Poltawski [Tue, 26 May 2015 10:53:34 +0000 (11:53 +0100)]
Merge branch 'MDL-49776-master' of git://github.com/lameze/moodle

7 years agoMerge branch 'MDL-49560-master' of git://github.com/gurgus/moodle
Dan Poltawski [Tue, 26 May 2015 10:33:26 +0000 (11:33 +0100)]
Merge branch 'MDL-49560-master' of git://github.com/gurgus/moodle

7 years agoMerge branch 'MDL-50271-master' of git://github.com/jleyva/moodle
Dan Poltawski [Tue, 26 May 2015 10:31:38 +0000 (11:31 +0100)]
Merge branch 'MDL-50271-master' of git://github.com/jleyva/moodle

7 years agoMerge branch 'MDL-50344-master' of git://github.com/ankitagarwal/moodle
David Monllao [Tue, 26 May 2015 09:29:22 +0000 (17:29 +0800)]
Merge branch 'MDL-50344-master' of git://github.com/ankitagarwal/moodle

7 years agoMerge branch 'MDL-48664-master' of git://github.com/jethac/moodle
David Monllao [Tue, 26 May 2015 06:45:34 +0000 (14:45 +0800)]
Merge branch 'MDL-48664-master' of git://github.com/jethac/moodle

7 years agoMerge branch 'MDL-46550-master' of git://github.com/ankitagarwal/moodle
David Monllao [Tue, 26 May 2015 04:28:59 +0000 (12:28 +0800)]
Merge branch 'MDL-46550-master' of git://github.com/ankitagarwal/moodle

7 years agoMerge branch 'MDL-50289-master-notes' of git://github.com/mudrd8mz/moodle
David Monllao [Tue, 26 May 2015 04:23:03 +0000 (12:23 +0800)]
Merge branch 'MDL-50289-master-notes' of git://github.com/mudrd8mz/moodle

7 years agoMDL-48664 output: change paging_bar to not use non-breaking spaces
Jetha Chan [Tue, 26 May 2015 04:13:14 +0000 (12:13 +0800)]
MDL-48664 output: change paging_bar to not use non-breaking spaces

7 years agoMDL-30960 messages: add option to set authtype
Daniel Neis [Wed, 13 May 2015 21:06:21 +0000 (18:06 -0300)]
MDL-30960 messages: add option to set authtype

7 years agoMerge branch 'MDL-50313-master-featureidnumber' of git://github.com/mudrd8mz/moodle
Dan Poltawski [Mon, 25 May 2015 12:54:04 +0000 (13:54 +0100)]
Merge branch 'MDL-50313-master-featureidnumber' of git://github.com/mudrd8mz/moodle

7 years agoMerge branch 'MDL-50321-master-modupgradetxt' of git://github.com/mudrd8mz/moodle
Dan Poltawski [Mon, 25 May 2015 11:30:34 +0000 (12:30 +0100)]
Merge branch 'MDL-50321-master-modupgradetxt' of git://github.com/mudrd8mz/moodle

7 years agoMerge branch 'MDL-40592_master' of https://github.com/nadavkav/moodle
Dan Poltawski [Mon, 25 May 2015 11:28:38 +0000 (12:28 +0100)]
Merge branch 'MDL-40592_master' of https://github.com/nadavkav/moodle

7 years agoMerge branch 'MDL-49493-master' of git://github.com/mastnym/moodle
Dan Poltawski [Mon, 25 May 2015 11:00:44 +0000 (12:00 +0100)]
Merge branch 'MDL-49493-master' of git://github.com/mastnym/moodle

7 years agoMDL-50289 notes: No navigation to notes if the feature is disabled
David Mudrák [Mon, 25 May 2015 10:28:49 +0000 (12:28 +0200)]
MDL-50289 notes: No navigation to notes if the feature is disabled

7 years agoMerge branch 'wip-MDL-49572-master' of git://github.com/marinaglancy/moodle
David Monllao [Mon, 25 May 2015 09:54:00 +0000 (17:54 +0800)]
Merge branch 'wip-MDL-49572-master' of git://github.com/marinaglancy/moodle

7 years agoMDL-50285 gradereport_user: Grade categories calculate wrong with suspended users...
Damien Bezborodov [Fri, 15 May 2015 03:36:04 +0000 (13:06 +0930)]
MDL-50285 gradereport_user: Grade categories calculate wrong with suspended users (Student's view)

7 years agoMerge branch 'wip-MDL-50330-master' of git://github.com/abgreeve/moodle
David Monllao [Mon, 25 May 2015 08:37:06 +0000 (16:37 +0800)]
Merge branch 'wip-MDL-50330-master' of git://github.com/abgreeve/moodle

7 years agoMDL-49560 webservice: avoid recursion in soap
Marina Glancy [Thu, 2 Apr 2015 07:42:51 +0000 (15:42 +0800)]
MDL-49560 webservice: avoid recursion in soap

Thanks to El Leonidych for providing a patch

7 years agoMDL-50344 restore: Make restore file required
Ankit Agarwal [Mon, 25 May 2015 05:56:26 +0000 (11:26 +0530)]
MDL-50344  restore: Make restore file required

7 years agoMDL-50340 adminstration: Fix restore course links
Ankit Agarwal [Mon, 25 May 2015 05:41:20 +0000 (11:11 +0530)]
MDL-50340 adminstration: Fix restore course links

7 years agoMDL-49776 mod_lti: Set parameter in privacy check
spvickers [Tue, 7 Apr 2015 17:42:35 +0000 (18:42 +0100)]
MDL-49776 mod_lti: Set parameter in privacy check

Moved sending of the lis_result_sourcedid parameter to within the block
which checks that grades are being accepted for the link.

7 years agoMDL-49493 backup: Implemented missing methods for anonymous backup
Martin Mastny [Fri, 15 May 2015 06:24:20 +0000 (14:24 +0800)]
MDL-49493 backup: Implemented missing methods for anonymous backup

7 years agoMDL-50271 webservices: Allow to load multiple themes in WS_SERVER mode
Juan Leyva [Tue, 19 May 2015 11:18:30 +0000 (13:18 +0200)]
MDL-50271 webservices: Allow to load multiple themes in WS_SERVER mode

7 years agoMDL-50330 blog: Behat test for blog visibility.
Adrian Greeve [Fri, 22 May 2015 08:13:03 +0000 (16:13 +0800)]
MDL-50330 blog: Behat test for blog visibility.

7 years agoMDL-40592 assign/grading: Display default user picture, if none is set.
Nadav Kavalerchik [Sat, 16 Aug 2014 14:23:29 +0000 (17:23 +0300)]
MDL-40592 assign/grading: Display default user picture, if none is set.

7 years agoMDL-50330 blog: Fixed fatal error accessing blogs.
Adrian Greeve [Fri, 22 May 2015 07:34:09 +0000 (15:34 +0800)]
MDL-50330 blog: Fixed fatal error accessing blogs.

7 years agoMDL-50321 docs: Add info about deprecated method into mod/upgrade.txt
David Mudrák [Thu, 21 May 2015 16:03:26 +0000 (18:03 +0200)]
MDL-50321 docs: Add info about deprecated method into mod/upgrade.txt

This was forgotten in MDL-49101.

7 years agoMDL-50318 course: Fix the URL of embedded images at resources overview
David Mudrák [Thu, 21 May 2015 15:18:05 +0000 (17:18 +0200)]
MDL-50318 course: Fix the URL of embedded images at resources overview

Not only mod_resource instances are listed here. All modules that
declare their FEATURE_MOD_ARCHETYPE as MOD_ARCHETYPE_RESOURCE (well, all
but those without own view page, such as mod_label) are listed. So we
must use the real plugin name when rendering the intro field.

7 years agoMDL-50313 docs: Fix the documentation for the FEATURE_IDNUMBER constant
David Mudrák [Thu, 21 May 2015 12:03:59 +0000 (14:03 +0200)]
MDL-50313 docs: Fix the documentation for the FEATURE_IDNUMBER constant

The constant is used by course/moodleform_mod.php to decide whether the
field 'ID number' (cmidnumber) should be included in the common module
settings section of the activity settings form. Activity modules that do
not use grades (such as the Label) can explicitly return false when
checking for this feature support. By default, all activity modules are
supposed to support it.

7 years agoweekly on-sync release 3.0dev
Eloy Lafuente (stronk7) [Thu, 21 May 2015 10:38:13 +0000 (12:38 +0200)]
weekly on-sync release 3.0dev

7 years agoMDL-49772 behat: Added support to updatestep file by parallel run
Rajesh Taneja [Tue, 7 Apr 2015 08:39:04 +0000 (16:39 +0800)]
MDL-49772 behat: Added support to updatestep file by parallel run

7 years agoMDL-50191 cohorts: check manage cap to display hide icon
Marina Glancy [Mon, 11 May 2015 08:40:52 +0000 (16:40 +0800)]
MDL-50191 cohorts: check manage cap to display hide icon

7 years agoMerge branch 'MDL-50277-master' of git://github.com/andrewnicols/moodle
Eloy Lafuente (stronk7) [Wed, 20 May 2015 09:04:56 +0000 (11:04 +0200)]
Merge branch 'MDL-50277-master' of git://github.com/andrewnicols/moodle

7 years agoMDL-49572 cache: correctly purge cache on event
Marina Glancy [Tue, 24 Mar 2015 03:10:16 +0000 (11:10 +0800)]
MDL-49572 cache: correctly purge cache on event

7 years agoMerge branch 'wip-mdl-49061' of git://github.com/rajeshtaneja/moodle
David Monllao [Wed, 20 May 2015 02:18:11 +0000 (10:18 +0800)]
Merge branch 'wip-mdl-49061' of git://github.com/rajeshtaneja/moodle

7 years agoMDL-49061 behat: Fixed input name to use full activity name
Rajesh Taneja [Wed, 20 May 2015 02:07:26 +0000 (10:07 +0800)]
MDL-49061 behat: Fixed input name to use full activity name

7 years agoMDL-50277 Javascript: Hardcode nodejs dependencies
Andrew Nicols [Wed, 20 May 2015 01:41:15 +0000 (09:41 +0800)]
MDL-50277 Javascript: Hardcode nodejs dependencies

In order to produce a consistent build across the board, we must hardcode
several package versions. We must additionally specify compatible
versions for any sub-dependency that we have a requirement upon.

In this instance, the only sub-dependency which has an effect upon the
overall output is grunt-contrib-uglify's dependency upon uglify-js.

Since change in uglify-js may lead to changes in the generated output, we
must specify a fixed version of that dependency. That version must be
compatible with the dependency signature for grunt-contrib-uglify or the
dependency manager will just download a different version.

This issue also bumps the version of uglify-js to a version which changes
the output. This is the latest version at time of commit.

7 years agoMerge branch 'wip-mdl-50259' of https://github.com/rajeshtaneja/moodle
Eloy Lafuente (stronk7) [Tue, 19 May 2015 16:02:34 +0000 (18:02 +0200)]
Merge branch 'wip-mdl-50259' of https://github.com/rajeshtaneja/moodle

7 years agoMerge branch 'wip-MDL-49061-master' of https://github.com/marinaglancy/moodle
Dan Poltawski [Tue, 19 May 2015 14:00:26 +0000 (15:00 +0100)]
Merge branch 'wip-MDL-49061-master' of https://github.com/marinaglancy/moodle

7 years agoMerge branch 'wip-mdl-50203' of https://github.com/rajeshtaneja/moodle
Dan Poltawski [Tue, 19 May 2015 11:38:56 +0000 (12:38 +0100)]
Merge branch 'wip-mdl-50203' of https://github.com/rajeshtaneja/moodle

7 years agoMDL-49611 completion: Update dangling err_nocriteria lang strings
Aaron Barnes [Tue, 19 May 2015 10:41:19 +0000 (22:41 +1200)]
MDL-49611 completion: Update dangling err_nocriteria lang strings

7 years agoMerge branch 'MDL-50276-master' of git://github.com/ankitagarwal/moodle
Andrew Nicols [Tue, 19 May 2015 07:43:28 +0000 (15:43 +0800)]
Merge branch 'MDL-50276-master' of git://github.com/ankitagarwal/moodle

7 years agoMerge branch 'wip-mdl-50116' of https://github.com/rajeshtaneja/moodle
Dan Poltawski [Tue, 19 May 2015 07:27:49 +0000 (08:27 +0100)]
Merge branch 'wip-mdl-50116' of https://github.com/rajeshtaneja/moodle

7 years agoMDL-50259 behat: Use strict activity name checking
Rajesh Taneja [Mon, 18 May 2015 07:03:57 +0000 (15:03 +0800)]
MDL-50259 behat: Use strict activity name checking

contains might select wrong activity
so using strict activity text checking

7 years agoMDL-50276 forums: Add a new line in forum emails
Ankit Agarwal [Tue, 19 May 2015 06:14:39 +0000 (11:44 +0530)]
MDL-50276 forums: Add a new line in forum emails

7 years agoMDL-50116 behat: Fixed xpath for selecting table row
Rajesh Taneja [Tue, 19 May 2015 05:32:32 +0000 (13:32 +0800)]
MDL-50116 behat: Fixed xpath for selecting table row

7 years agoMerge branch 'MDL-50169' of https://github.com/sk-unikent/moodle
Eloy Lafuente (stronk7) [Tue, 19 May 2015 00:03:07 +0000 (02:03 +0200)]
Merge branch 'MDL-50169' of https://github.com/sk-unikent/moodle

7 years agoMerge branch 'MDL-50280' of https://github.com/sk-unikent/moodle
Eloy Lafuente (stronk7) [Mon, 18 May 2015 23:43:06 +0000 (01:43 +0200)]
Merge branch 'MDL-50280' of https://github.com/sk-unikent/moodle

7 years agoMDL-48467 atto: Clean the textarea during submission when in HTML mode
Eric Merrill [Fri, 27 Mar 2015 17:37:35 +0000 (13:37 -0400)]
MDL-48467 atto: Clean the textarea during submission when in HTML mode

7 years agoMerge branch 'MDL-50197' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Mon, 18 May 2015 22:35:35 +0000 (00:35 +0200)]
Merge branch 'MDL-50197' of git://github.com/timhunt/moodle

7 years agoMerge branch 'MDL-50245' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Mon, 18 May 2015 22:32:58 +0000 (00:32 +0200)]
Merge branch 'MDL-50245' of git://github.com/timhunt/moodle

7 years agoMerge branch 'MDL-49949-master' of git://github.com/mastnym/moodle
Dan Poltawski [Mon, 18 May 2015 14:32:56 +0000 (15:32 +0100)]
Merge branch 'MDL-49949-master' of git://github.com/mastnym/moodle

7 years agoMerge branch 'MDL-49764_master' of https://github.com/jinhofer/moodle
Dan Poltawski [Mon, 18 May 2015 14:28:48 +0000 (15:28 +0100)]
Merge branch 'MDL-49764_master' of https://github.com/jinhofer/moodle

7 years agoMDL-50280 WebCT import scripts don't always clean up
Skylar Kelty [Mon, 18 May 2015 14:25:18 +0000 (15:25 +0100)]
MDL-50280 WebCT import scripts don't always clean up

7 years agoMDL-50155 core: Move and rename common settings config page
Andrew Hancox [Thu, 14 May 2015 15:33:19 +0000 (16:33 +0100)]
MDL-50155 core: Move and rename common settings config page

AMOS BEGIN
CPY [commonsettings,admin],[commonactivitysettings,admin]
AMOS END