moodle.git
7 years agoRevert "Merge branch 'm28_MDL-46431' of https://github.com/totara/moodle"
Dan Poltawski [Wed, 30 Jul 2014 08:00:58 +0000 (09:00 +0100)]
Revert "Merge branch 'm28_MDL-46431' of https://github.com/totara/moodle"

This reverts commit 14a3ccc96da2c23fd5c34167d02e1323fb01d113, reversing
changes made to 4709708d4889e12f0f4a621ceaacb80c4cde6c51.

7 years agoRevert "Merge branch 'MDL-46523-master' of git://github.com/jethac/moodle"
Marina Glancy [Wed, 30 Jul 2014 07:28:55 +0000 (15:28 +0800)]
Revert "Merge branch 'MDL-46523-master' of git://github.com/jethac/moodle"

This reverts commit 68373c7821f48b13bf4bffa5e1160fd5d0b3b3d2, reversing
changes made to 62d61619e80523e13b6f570fd9e130659c0a0d2e.

7 years agoMDL-44116 Atto: Improve new accessibility sniffs.
Damyon Wiese [Wed, 30 Jul 2014 04:06:20 +0000 (12:06 +0800)]
MDL-44116 Atto: Improve new accessibility sniffs.

Check for empty text it row, column headers and captions on tables.
Link to "Entire document" text instead of repeating the entire document if the text is long and has no headings.

7 years agoMerge branch 'MDL-46591-master' of git://github.com/danpoltawski/moodle
Dan Poltawski [Tue, 29 Jul 2014 15:32:52 +0000 (16:32 +0100)]
Merge branch 'MDL-46591-master' of git://github.com/danpoltawski/moodle

7 years agoMDL-46591 filter_tex: improved string
Dan Poltawski [Tue, 29 Jul 2014 15:11:02 +0000 (16:11 +0100)]
MDL-46591 filter_tex: improved string

Thanks to German Valero for noticing this and Matteo Scaramuccia, Daniel
Thies and Helen Foser for refining it.

7 years agoMerge branch 'MDL-46236' of git://github.com/nobelium/moodle
Dan Poltawski [Tue, 29 Jul 2014 11:04:29 +0000 (12:04 +0100)]
Merge branch 'MDL-46236' of git://github.com/nobelium/moodle

7 years agoMerge branch 'MDL-46456' of https://github.com/aolley/moodle
Dan Poltawski [Tue, 29 Jul 2014 10:57:47 +0000 (11:57 +0100)]
Merge branch 'MDL-46456' of https://github.com/aolley/moodle

7 years agoMerge branch 'wip-MDL-46338-master' of git://github.com/marinaglancy/moodle
Dan Poltawski [Tue, 29 Jul 2014 07:50:37 +0000 (08:50 +0100)]
Merge branch 'wip-MDL-46338-master' of git://github.com/marinaglancy/moodle

7 years agoMerge branch 'wip-MDL-34189-master' of git://github.com/marinaglancy/moodle
Sam Hemelryk [Tue, 29 Jul 2014 04:15:24 +0000 (16:15 +1200)]
Merge branch 'wip-MDL-34189-master' of git://github.com/marinaglancy/moodle

7 years agoMerge branch 'MDL-46465_chat_style' of git://github.com/andyjdavis/moodle
Marina Glancy [Tue, 29 Jul 2014 04:10:34 +0000 (12:10 +0800)]
Merge branch 'MDL-46465_chat_style' of git://github.com/andyjdavis/moodle

7 years agoMerge branch 'm28_MDL-46325' of git://github.com/totara/moodle
Marina Glancy [Tue, 29 Jul 2014 03:58:24 +0000 (11:58 +0800)]
Merge branch 'm28_MDL-46325' of git://github.com/totara/moodle

7 years agoMerge branch 'MDL-43908-master' of https://github.com/lucisgit/moodle
Sam Hemelryk [Tue, 29 Jul 2014 03:50:50 +0000 (15:50 +1200)]
Merge branch 'MDL-43908-master' of https://github.com/lucisgit/moodle

7 years agoMerge branch 'MDL-45041' of git://github.com/jleyva/moodle
Sam Hemelryk [Tue, 29 Jul 2014 03:47:13 +0000 (15:47 +1200)]
Merge branch 'MDL-45041' of git://github.com/jleyva/moodle

7 years agoMerge branch 'MDL-46460' of git://github.com/jleyva/moodle
Sam Hemelryk [Tue, 29 Jul 2014 03:44:31 +0000 (15:44 +1200)]
Merge branch 'MDL-46460' of git://github.com/jleyva/moodle

7 years agoMDL-46338 enrol_self: Icon should indicate enrolment availability
Marina Glancy [Tue, 29 Jul 2014 01:50:22 +0000 (09:50 +0800)]
MDL-46338 enrol_self: Icon should indicate enrolment availability

7 years agoMerge branch 'MDL-44116-master' of git://github.com/damyon/moodle
Sam Hemelryk [Mon, 28 Jul 2014 21:37:44 +0000 (09:37 +1200)]
Merge branch 'MDL-44116-master' of git://github.com/damyon/moodle

7 years agoMerge branch 'MDL-45044-master' of https://github.com/dthies/moodle
Sam Hemelryk [Mon, 28 Jul 2014 20:46:49 +0000 (08:46 +1200)]
Merge branch 'MDL-45044-master' of https://github.com/dthies/moodle

7 years agoMerge branch 'MDL-46446_rating_style' of https://github.com/andyjdavis/moodle
Sam Hemelryk [Mon, 28 Jul 2014 20:42:56 +0000 (08:42 +1200)]
Merge branch 'MDL-46446_rating_style' of https://github.com/andyjdavis/moodle

7 years agoMerge branch 'MDL-46206-master' of git://github.com/jethac/moodle
Dan Poltawski [Mon, 28 Jul 2014 16:25:04 +0000 (17:25 +0100)]
Merge branch 'MDL-46206-master' of git://github.com/jethac/moodle

7 years agoMerge branch 'MDL-45594_master' of git://github.com/markn86/moodle
Dan Poltawski [Mon, 28 Jul 2014 11:54:15 +0000 (12:54 +0100)]
Merge branch 'MDL-45594_master' of git://github.com/markn86/moodle

7 years agoMerge branch 'wip-MDL-46503-master' of git://github.com/marinaglancy/moodle
Dan Poltawski [Mon, 28 Jul 2014 11:49:13 +0000 (12:49 +0100)]
Merge branch 'wip-MDL-46503-master' of git://github.com/marinaglancy/moodle

7 years agoMerge branch 'master_MDL-45715' of https://github.com/danmarsden/moodle
Dan Poltawski [Mon, 28 Jul 2014 11:47:30 +0000 (12:47 +0100)]
Merge branch 'master_MDL-45715' of https://github.com/danmarsden/moodle

7 years agoMerge branch 'm28_MDL-46431' of https://github.com/totara/moodle
Dan Poltawski [Mon, 28 Jul 2014 11:01:24 +0000 (12:01 +0100)]
Merge branch 'm28_MDL-46431' of https://github.com/totara/moodle

7 years agoMerge branch 'MDL-46459' of git://github.com/jleyva/moodle
Dan Poltawski [Mon, 28 Jul 2014 10:59:02 +0000 (11:59 +0100)]
Merge branch 'MDL-46459' of git://github.com/jleyva/moodle

7 years agoMerge branch 'MDL-46463_rss_style' of https://github.com/andyjdavis/moodle
Dan Poltawski [Mon, 28 Jul 2014 10:52:09 +0000 (11:52 +0100)]
Merge branch 'MDL-46463_rss_style' of https://github.com/andyjdavis/moodle

7 years agoMerge branch 'MDL-46433-master' of git://github.com/lameze/moodle
Dan Poltawski [Mon, 28 Jul 2014 10:49:37 +0000 (11:49 +0100)]
Merge branch 'MDL-46433-master' of git://github.com/lameze/moodle

7 years agoMerge branch 'MDL-46504_master' of git://github.com/dmonllao/moodle
Dan Poltawski [Mon, 28 Jul 2014 09:45:17 +0000 (10:45 +0100)]
Merge branch 'MDL-46504_master' of git://github.com/dmonllao/moodle

7 years agoMerge branch 'MDL-46397' of git://github.com/nobelium/moodle
Dan Poltawski [Mon, 28 Jul 2014 09:41:05 +0000 (10:41 +0100)]
Merge branch 'MDL-46397' of git://github.com/nobelium/moodle

7 years agoMerge branch 'MDL-46523-master' of git://github.com/jethac/moodle
Marina Glancy [Mon, 28 Jul 2014 08:00:48 +0000 (16:00 +0800)]
Merge branch 'MDL-46523-master' of git://github.com/jethac/moodle

7 years agoMDL-46523 navigation: add body class when logged in as other role
Jetha Chan [Fri, 25 Jul 2014 02:57:42 +0000 (10:57 +0800)]
MDL-46523 navigation: add body class when logged in as other role

7 years agoMDL-34189 cohorts: Allow admin/manager to see all cohorts on one page
Marina Glancy [Tue, 22 Jul 2014 09:05:06 +0000 (17:05 +0800)]
MDL-34189 cohorts: Allow admin/manager to see all cohorts on one page

7 years agoMDL-46397 mod_scorm : binding cmi values with scoid
Nobelium [Mon, 28 Jul 2014 05:37:21 +0000 (05:37 +0000)]
MDL-46397 mod_scorm : binding cmi values with scoid

7 years agoMDL-46465 mod_chat: assorted coding style fixes
Andrew Davis [Wed, 23 Jul 2014 01:58:29 +0000 (09:58 +0800)]
MDL-46465 mod_chat: assorted coding style fixes

7 years agoMerge branch 'wip_MDL-46449_m28_loginblock' of https://github.com/skodak/moodle
Sam Hemelryk [Mon, 28 Jul 2014 01:25:13 +0000 (13:25 +1200)]
Merge branch 'wip_MDL-46449_m28_loginblock' of https://github.com/skodak/moodle

7 years agoMerge branch 'MDL-46272-master' of https://github.com/lucisgit/moodle
Sam Hemelryk [Mon, 28 Jul 2014 01:07:27 +0000 (13:07 +1200)]
Merge branch 'MDL-46272-master' of https://github.com/lucisgit/moodle

7 years agoMerge branch 'MDL-43390_master' of git://github.com/dmonllao/moodle
Sam Hemelryk [Mon, 28 Jul 2014 00:22:40 +0000 (12:22 +1200)]
Merge branch 'MDL-43390_master' of git://github.com/dmonllao/moodle

7 years agoMerge branch 'wip-MDL-46525-master' of git://github.com/marinaglancy/moodle
Sam Hemelryk [Mon, 28 Jul 2014 00:13:44 +0000 (12:13 +1200)]
Merge branch 'wip-MDL-46525-master' of git://github.com/marinaglancy/moodle

7 years agoMerge branch 'MDL-8501-master' of git://github.com/FMCorz/moodle
Sam Hemelryk [Mon, 28 Jul 2014 00:10:03 +0000 (12:10 +1200)]
Merge branch 'MDL-8501-master' of git://github.com/FMCorz/moodle

7 years agoMerge branch 'MDL-46506-master' of git://github.com/damyon/moodle
Sam Hemelryk [Sun, 27 Jul 2014 20:46:03 +0000 (08:46 +1200)]
Merge branch 'MDL-46506-master' of git://github.com/damyon/moodle

7 years agoMerge branch 'MDL-46207-master' of git://github.com/damyon/moodle
Sam Hemelryk [Sun, 27 Jul 2014 20:37:42 +0000 (08:37 +1200)]
Merge branch 'MDL-46207-master' of git://github.com/damyon/moodle

7 years agoMDL-46236 mod_scorm : Setting lauch options for scorm in popup
Nobelium [Sat, 26 Jul 2014 14:46:25 +0000 (14:46 +0000)]
MDL-46236 mod_scorm : Setting lauch options for scorm in popup

7 years agoMDL-45041 Web Service: add_user_device doesn't store entries for different users...
Juan Leyva [Fri, 25 Jul 2014 08:35:24 +0000 (10:35 +0200)]
MDL-45041 Web Service: add_user_device doesn't store entries for different users using the same push key

7 years agoMDL-46460 Web Services: Invalid check of grades visibility for missing grades
Juan Leyva [Wed, 23 Jul 2014 16:03:47 +0000 (18:03 +0200)]
MDL-46460 Web Services: Invalid check of grades visibility for missing grades

7 years agoMDL-46459 Web Services: Incorrect return parameters get_grades external function
Juan Leyva [Wed, 23 Jul 2014 15:33:20 +0000 (17:33 +0200)]
MDL-46459 Web Services: Incorrect return parameters get_grades external function

7 years agoMDL-46485 Assign: Fix when submitting to a group assignment from the default group
Damyon Wiese [Wed, 23 Jul 2014 05:32:11 +0000 (13:32 +0800)]
MDL-46485 Assign: Fix when submitting to a group assignment from the default group

7 years agoMDL-46485 Assign: New unit test to show error with group submission
Damyon Wiese [Wed, 23 Jul 2014 05:31:25 +0000 (13:31 +0800)]
MDL-46485 Assign: New unit test to show error with group submission

7 years agoMDL-46525 enrol_cohort: fix JS error
Marina Glancy [Fri, 25 Jul 2014 06:29:55 +0000 (14:29 +0800)]
MDL-46525 enrol_cohort: fix JS error

7 years agoMDL-46206 Accessibility: Add aria role to footer image
Jason Fowler [Mon, 21 Jul 2014 00:19:08 +0000 (08:19 +0800)]
MDL-46206 Accessibility: Add aria role to footer image

7 years agoMDL-46325 behat: Fixed issue where 'teacher1' didn't exist
Brian Barnes [Thu, 10 Jul 2014 23:28:54 +0000 (11:28 +1200)]
MDL-46325 behat: Fixed issue where 'teacher1' didn't exist

7 years agoMDL-8501 mod_forum: Behat test for neighbour discussions
Frederic Massart [Wed, 2 Jul 2014 09:40:33 +0000 (17:40 +0800)]
MDL-8501 mod_forum: Behat test for neighbour discussions

7 years agoMDL-8501 mod_forum: Adding links to navigate between discussions
Frederic Massart [Wed, 2 Jul 2014 08:06:49 +0000 (16:06 +0800)]
MDL-8501 mod_forum: Adding links to navigate between discussions

7 years agoMDL-8501 mod_forum: Test coverage of neighbour discussions
Frederic Massart [Wed, 2 Jul 2014 04:34:28 +0000 (12:34 +0800)]
MDL-8501 mod_forum: Test coverage of neighbour discussions

7 years agoMDL-8501 mod_forum: New function to retrieve discussion neighbours
Frederic Massart [Wed, 2 Jul 2014 04:33:56 +0000 (12:33 +0800)]
MDL-8501 mod_forum: New function to retrieve discussion neighbours

7 years agoMDL-46503 behat: cohort generator allows to create cohort in category
Marina Glancy [Thu, 24 Jul 2014 02:03:36 +0000 (10:03 +0800)]
MDL-46503 behat: cohort generator allows to create cohort in category

7 years agoMDL-46449 fix username prompt in login block when authloginviaemail enabled
Petr Skoda [Mon, 21 Jul 2014 06:21:54 +0000 (18:21 +1200)]
MDL-46449 fix username prompt in login block when authloginviaemail enabled

7 years agoMDL-45044 filter_tex: properly escape excutable pathnames for Windows
Daniel Thies [Thu, 24 Jul 2014 20:01:17 +0000 (15:01 -0500)]
MDL-45044 filter_tex: properly escape excutable pathnames for Windows

7 years agoMDL-43908 mod_assign: Order submissions by course id then cm id
Tony Butler [Fri, 11 Jul 2014 13:39:14 +0000 (14:39 +0100)]
MDL-43908 mod_assign: Order submissions by course id then cm id

Signed-off-by: Tony Butler <tonyjbutler@gmail.com>
7 years agoMDL-43908 mod_assign: Remove redundant code and improve SQL query
Tony Butler [Fri, 11 Jul 2014 11:10:50 +0000 (12:10 +0100)]
MDL-43908 mod_assign: Remove redundant code and improve SQL query

Signed-off-by: Tony Butler <tonyjbutler@gmail.com>
7 years agoMDL-43908 mod_assign: Prevent notifications for unavailable assignments
Tony Butler [Fri, 13 Jun 2014 09:36:09 +0000 (10:36 +0100)]
MDL-43908 mod_assign: Prevent notifications for unavailable assignments

Signed-off-by: Tony Butler <tonyjbutler@gmail.com>
7 years agoMDL-43908 mod_assign: Defer notifications for unavailable assignments
Tony Butler [Wed, 29 Jan 2014 12:01:53 +0000 (12:01 +0000)]
MDL-43908 mod_assign: Defer notifications for unavailable assignments

Signed-off-by: Tony Butler <tonyjbutler@gmail.com>
7 years agoweekly release 2.8dev
Dan Poltawski [Thu, 24 Jul 2014 08:50:52 +0000 (09:50 +0100)]
weekly release 2.8dev

7 years agoMerge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
Dan Poltawski [Thu, 24 Jul 2014 08:50:49 +0000 (09:50 +0100)]
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install

7 years agoMDL-46506 Assign: fix php warning on grant extension page
Damyon Wiese [Thu, 24 Jul 2014 03:25:22 +0000 (11:25 +0800)]
MDL-46506 Assign: fix php warning on grant extension page

This code was missed when the extensionduedate was moved to the userflags table.

7 years agoMDL-46504 libraries: Fixing typo
David Monllao [Thu, 24 Jul 2014 03:15:36 +0000 (11:15 +0800)]
MDL-46504 libraries: Fixing typo

7 years agoMDL-46017 Assign: Restore can't rely allocated marker fields existing in backup
Damyon Wiese [Thu, 24 Jul 2014 02:50:20 +0000 (10:50 +0800)]
MDL-46017 Assign: Restore can't rely allocated marker fields existing in backup

7 years agoMDL-43390 files: Only lock when locking is not prevented
David Monllao [Mon, 14 Jul 2014 04:13:41 +0000 (12:13 +0800)]
MDL-43390 files: Only lock when locking is not prevented

7 years agoMDL-45594 core_message: added unit tests
Mark Nelson [Fri, 20 Jun 2014 00:29:42 +0000 (17:29 -0700)]
MDL-45594 core_message: added unit tests

7 years agoMDL-45594 core_message: ordered recent notifications by timecreated
Mark Nelson [Sun, 29 Jun 2014 23:18:24 +0000 (16:18 -0700)]
MDL-45594 core_message: ordered recent notifications by timecreated

7 years agoMDL-45594 simplify message_get_recent_conversations SQL
Tim Hunt [Thu, 26 Jun 2014 15:45:05 +0000 (16:45 +0100)]
MDL-45594 simplify message_get_recent_conversations SQL

I am pretty sure that this new SQL is logically equivalent to
the original, and it passes Mark's unit tests. However, it is
hard to be 100% sure.

7 years agoAutomatically generated installer lang files
AMOS bot [Wed, 23 Jul 2014 22:46:06 +0000 (22:46 +0000)]
Automatically generated installer lang files

7 years agoMDL-46446 core_rating: fixed coding style problems
Andrew Davis [Sun, 20 Jul 2014 02:14:46 +0000 (10:14 +0800)]
MDL-46446 core_rating: fixed coding style problems

7 years agoMDL-46433 blog: fix error message when creating an external blog
Simey Lameze [Wed, 23 Jul 2014 06:54:10 +0000 (14:54 +0800)]
MDL-46433 blog: fix error message when creating an external blog

7 years agoRevert "Merge branch 'MDL-45594_master_alt' of git://github.com/markn86/moodle"
Dan Poltawski [Wed, 23 Jul 2014 08:00:54 +0000 (09:00 +0100)]
Revert "Merge branch 'MDL-45594_master_alt' of git://github.com/markn86/moodle"

This reverts commit fe43ab9b75a6f78f86525be8b309e66c162b2957, reversing
changes made to 3e2af223273fcd008a136c15a587475f5b04081b.

7 years agoMerge branch 'MDL-46017-master' of git://github.com/damyon/moodle
Dan Poltawski [Wed, 23 Jul 2014 07:24:24 +0000 (08:24 +0100)]
Merge branch 'MDL-46017-master' of git://github.com/damyon/moodle

7 years agoMDL-45715 assign: disable marking allocation if markingworkflow is not set.
Dan Marsden [Thu, 29 May 2014 07:12:00 +0000 (19:12 +1200)]
MDL-45715 assign: disable marking allocation if markingworkflow is not set.

7 years agoMDL-35864 Enrol plugins: Add missing capability strings
Damyon Wiese [Wed, 23 Jul 2014 05:53:55 +0000 (13:53 +0800)]
MDL-35864 Enrol plugins: Add missing capability strings

7 years agoMDL-45724 cache: fixed warning structure bug
Sam Hemelryk [Wed, 23 Jul 2014 03:16:20 +0000 (15:16 +1200)]
MDL-45724 cache: fixed warning structure bug

7 years agoMDL-46463 core_rss: coding style cleanup in /rss
Andrew Davis [Mon, 21 Jul 2014 13:30:17 +0000 (21:30 +0800)]
MDL-46463 core_rss: coding style cleanup in /rss

7 years agoAutomatically generated installer lang files
AMOS bot [Tue, 22 Jul 2014 22:49:02 +0000 (22:49 +0000)]
Automatically generated installer lang files

7 years agoMDL-45965 assign: bump version
Dan Poltawski [Tue, 22 Jul 2014 16:23:45 +0000 (17:23 +0100)]
MDL-45965 assign: bump version

7 years agoMerge branch 'MDL-45965_master' of https://github.com/Syxton/moodle
Dan Poltawski [Tue, 22 Jul 2014 16:09:48 +0000 (17:09 +0100)]
Merge branch 'MDL-45965_master' of https://github.com/Syxton/moodle

7 years agoMDL-44925 fixup default settings in TeX filter
Dan Poltawski [Tue, 22 Jul 2014 16:06:02 +0000 (17:06 +0100)]
MDL-44925 fixup default settings in TeX filter

7 years agoMDL-35864 enrol: misc fixups
Dan Poltawski [Tue, 22 Jul 2014 15:34:47 +0000 (16:34 +0100)]
MDL-35864 enrol: misc fixups

* Removed get_config_instance_capabilities() which was from
  older reviewed vrsions of the patch
* Added note to upgrade.txt
* Fixed deprecation note
* Bump versions

7 years agoMerge branch 'MDL-35864' of https://github.com/danielneis/moodle
Dan Poltawski [Tue, 22 Jul 2014 15:32:26 +0000 (16:32 +0100)]
Merge branch 'MDL-35864' of https://github.com/danielneis/moodle

7 years agoMerge branch 'MDL-37509-master' of git://github.com/damyon/moodle
Dan Poltawski [Tue, 22 Jul 2014 14:56:55 +0000 (15:56 +0100)]
Merge branch 'MDL-37509-master' of git://github.com/damyon/moodle

7 years agoMerge branch 'MDL-44925-master' of https://github.com/dthies/moodle
Dan Poltawski [Tue, 22 Jul 2014 13:33:33 +0000 (14:33 +0100)]
Merge branch 'MDL-44925-master' of https://github.com/dthies/moodle

7 years agoMerge branch 'MDL-34248_master' of https://github.com/markn86/moodle
Dan Poltawski [Tue, 22 Jul 2014 11:01:04 +0000 (12:01 +0100)]
Merge branch 'MDL-34248_master' of https://github.com/markn86/moodle

7 years agoMerge branch '45828-28' of git://github.com/samhemelryk/moodle
Dan Poltawski [Tue, 22 Jul 2014 08:33:01 +0000 (09:33 +0100)]
Merge branch '45828-28' of git://github.com/samhemelryk/moodle

7 years agoMerge branch '45724-28' of git://github.com/samhemelryk/moodle
Dan Poltawski [Tue, 22 Jul 2014 08:07:16 +0000 (09:07 +0100)]
Merge branch '45724-28' of git://github.com/samhemelryk/moodle

7 years agoMerge branch 'MDL-45594_master_alt' of git://github.com/markn86/moodle
Sam Hemelryk [Mon, 21 Jul 2014 23:12:09 +0000 (11:12 +1200)]
Merge branch 'MDL-45594_master_alt' of git://github.com/markn86/moodle

7 years agoMerge branch 'MDL-43063-master' of git://github.com/lameze/moodle
Sam Hemelryk [Mon, 21 Jul 2014 21:49:03 +0000 (09:49 +1200)]
Merge branch 'MDL-43063-master' of git://github.com/lameze/moodle

7 years agoMerge branch 'MDL-46386-master' of https://github.com/merrill-oakland/moodle
Dan Poltawski [Mon, 21 Jul 2014 13:11:39 +0000 (14:11 +0100)]
Merge branch 'MDL-46386-master' of https://github.com/merrill-oakland/moodle

7 years agoMDL-46386 question Whitelist the Atto editor from return blocking
Eric Merrill [Wed, 16 Jul 2014 21:32:32 +0000 (17:32 -0400)]
MDL-46386 question Whitelist the Atto editor from return blocking

Prevent the question engine from blocking return/enter key presses
from being sent to the Atto editor.

7 years agoMDL-46285 coding style fix
Dan Poltawski [Mon, 21 Jul 2014 13:07:39 +0000 (14:07 +0100)]
MDL-46285 coding style fix

(no double newlines)

7 years agoMerge branch 'MDL-46285-master' of git://github.com/jethac/moodle
Dan Poltawski [Mon, 21 Jul 2014 13:03:58 +0000 (14:03 +0100)]
Merge branch 'MDL-46285-master' of git://github.com/jethac/moodle

7 years agoMDL-46316 notes: coding style fixes
Dan Poltawski [Mon, 21 Jul 2014 11:39:18 +0000 (12:39 +0100)]
MDL-46316 notes: coding style fixes

Line length issues Andrew missed off.

7 years agoMerge branch 'MDL-46316_notes2' of https://github.com/andyjdavis/moodle
Dan Poltawski [Mon, 21 Jul 2014 11:31:51 +0000 (12:31 +0100)]
Merge branch 'MDL-46316_notes2' of https://github.com/andyjdavis/moodle

7 years agoMerge branch 'MDL-45847_master' of https://github.com/Syxton/moodle
Dan Poltawski [Mon, 21 Jul 2014 11:09:10 +0000 (12:09 +0100)]
Merge branch 'MDL-45847_master' of https://github.com/Syxton/moodle

7 years agoMerge branch 'MDL-43151-master' of git://github.com/damyon/moodle
Dan Poltawski [Mon, 21 Jul 2014 09:20:55 +0000 (10:20 +0100)]
Merge branch 'MDL-43151-master' of git://github.com/damyon/moodle

7 years agoMerge branch '46335-28' of git://github.com/samhemelryk/moodle
Dan Poltawski [Mon, 21 Jul 2014 08:59:04 +0000 (09:59 +0100)]
Merge branch '46335-28' of git://github.com/samhemelryk/moodle