Sam Hemelryk [Sun, 30 Mar 2014 22:46:18 +0000 (11:46 +1300)]
MDL-41551 blocks: added tracking and recognition of custom block regions
Sam Hemelryk [Sun, 23 Feb 2014 21:38:17 +0000 (10:38 +1300)]
MDL-41511 blocks: improved how custom block regions were being rendered.
There is a new theme property 'blockrendermethod' that can be set by the
theme in its config.php and tells Moodle what method it is using to render
blocks in the layout files.
Either blocks, or blocks_for_region.
Then when adding custom block regions to a page content we ensure we use
the same method the theme is using elsewhere.
This is really a hack becuase we (I) didn't properly deprecate
blocks_for_region when I added the blocks method.
Marina Glancy [Thu, 3 Apr 2014 04:39:44 +0000 (12:39 +0800)]
weekly release 2.7dev
Frederic Massart [Thu, 3 Apr 2014 03:20:49 +0000 (11:20 +0800)]
MDL-44747 editor_atto: Improved configuration error messages
Rajesh Taneja [Thu, 3 Apr 2014 02:54:51 +0000 (10:54 +0800)]
MDL-44832 behat: Fixed behat test
Eloy Lafuente (stronk7) [Wed, 2 Apr 2014 21:17:10 +0000 (23:17 +0200)]
MDL-44720 modinfo: whitespace fix
Eloy Lafuente (stronk7) [Wed, 2 Apr 2014 19:32:42 +0000 (21:32 +0200)]
Merge branch 'wip-MDL-44720-master' of git://github.com/marinaglancy/moodle
Damyon Wiese [Wed, 2 Apr 2014 08:33:06 +0000 (16:33 +0800)]
Merge branch 'master_MDL-44753' of https://github.com/danmarsden/moodle
Dan Poltawski [Wed, 2 Apr 2014 07:57:48 +0000 (15:57 +0800)]
MDL-44590 course: fix deprecated behat step use
Dan Marsden [Wed, 2 Apr 2014 07:50:21 +0000 (20:50 +1300)]
MDL-44753 SCORM: make correct selection of first sco - also fixes MDL-44896
Marina Glancy [Wed, 2 Apr 2014 06:57:40 +0000 (14:57 +0800)]
Merge branch 'MDL-44739-master-fixup' of git://github.com/FMCorz/moodle
Frederic Massart [Wed, 2 Apr 2014 06:41:58 +0000 (14:41 +0800)]
MDL-44739 theme_more: Force default settings to be set
Marina Glancy [Wed, 2 Apr 2014 06:54:59 +0000 (14:54 +0800)]
Merge branch 'MDL-42891-master' of git://github.com/ankitagarwal/moodle
Ankit Agarwal [Wed, 2 Apr 2014 06:18:25 +0000 (14:18 +0800)]
MDL-42891 adminstration: update strings and display for login fails
Sam Hemelryk [Wed, 2 Apr 2014 03:37:19 +0000 (16:37 +1300)]
Merge branch 'MDL-32729-im' of git://github.com/andrewnicols/moodle
Andrew Nicols [Wed, 2 Apr 2014 02:52:02 +0000 (10:52 +0800)]
MDL-32729 Question: Load all hidden fields from the source form
Eloy Lafuente (stronk7) [Wed, 2 Apr 2014 02:05:19 +0000 (04:05 +0200)]
Merge branch 'MDL-30085_grade_ws' of git://github.com/jleyva/moodle
Marina Glancy [Wed, 2 Apr 2014 01:56:46 +0000 (09:56 +0800)]
Merge branch 'MDL-44749-master' of git://github.com/andrewnicols/moodle
Andrew Nicols [Wed, 2 Apr 2014 01:41:31 +0000 (09:41 +0800)]
MDL-32729 Question: Correct button selection when openin qbank chooser
Some browsers do not bubble form submission events to the window, and we
had more than one form on the page in certain conditions. We need to select
all of the forms on a page and then test the action.
Andrew Nicols [Tue, 25 Mar 2014 04:25:16 +0000 (12:25 +0800)]
MDL-44749 atto_collapse: Skip button inclusion if it will impact UX
Do not show the collapse button if:
* it's specified after the cut-off and would therefore be unusable; or
* the total number of groups matches the number of groups to display anyway.
Marina Glancy [Wed, 2 Apr 2014 01:46:35 +0000 (09:46 +0800)]
Merge branch 'MDL-41063' of git://github.com/jmvedrine/moodle
Eloy Lafuente (stronk7) [Wed, 2 Apr 2014 01:18:05 +0000 (03:18 +0200)]
Merge branch 'MDL-31262' of git://github.com/timhunt/moodle
Marina Glancy [Wed, 2 Apr 2014 01:15:33 +0000 (09:15 +0800)]
Merge branch 'master_MDL-44753' of git://github.com/danmarsden/moodle
Eloy Lafuente (stronk7) [Wed, 2 Apr 2014 01:14:36 +0000 (03:14 +0200)]
MDL-24408 Whitespace fix.
Eloy Lafuente (stronk7) [Wed, 2 Apr 2014 01:14:06 +0000 (03:14 +0200)]
Merge branch 'MDL-24408_2' of https://github.com/oasychev/moodle
Eloy Lafuente (stronk7) [Wed, 2 Apr 2014 00:57:15 +0000 (02:57 +0200)]
Merge branch 'wip-MDL-34012-master' of git://github.com/marinaglancy/moodle
Eloy Lafuente (stronk7) [Wed, 2 Apr 2014 00:47:59 +0000 (02:47 +0200)]
Merge branch 'wip-MDL-43398-master' of git://github.com/marinaglancy/moodle
Eloy Lafuente (stronk7) [Wed, 2 Apr 2014 00:22:51 +0000 (02:22 +0200)]
Merge branch 'w14_MDL-44843_m27_localedash' of https://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Wed, 2 Apr 2014 00:18:54 +0000 (02:18 +0200)]
Merge branch 'wip-MDL-41102-master' of git://github.com/marinaglancy/moodle
Sam Hemelryk [Wed, 2 Apr 2014 00:04:46 +0000 (13:04 +1300)]
Merge branch 'w14_MDL-44824_m27_subplugins' of https://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Tue, 1 Apr 2014 23:52:41 +0000 (01:52 +0200)]
Merge branch 'MDL-42816-master' of https://github.com/StudiUM/moodle
Eloy Lafuente (stronk7) [Tue, 1 Apr 2014 23:12:52 +0000 (01:12 +0200)]
Merge branch 'MDL-28261-master' of git://github.com/andrewnicols/moodle
Eloy Lafuente (stronk7) [Tue, 1 Apr 2014 22:27:30 +0000 (00:27 +0200)]
Merge branch 'MDL-44000-master' of git://github.com/damyon/moodle
Conflicts:
lib/editor/atto/plugins/image/yui/build/moodle-atto_image-button/moodle-atto_image-button-min.js
Dan Marsden [Wed, 26 Mar 2014 08:35:18 +0000 (21:35 +1300)]
MDL-44753 SCORM: add check during SCORM restore to make sure valid launch sco is set
Sam Hemelryk [Tue, 1 Apr 2014 20:54:33 +0000 (09:54 +1300)]
Merge branch 'MDL-44832-master' of git://github.com/damyon/moodle
Sam Hemelryk [Tue, 1 Apr 2014 20:54:13 +0000 (09:54 +1300)]
Merge branch 'MDL-44719-master' of git://github.com/FMCorz/moodle
Conflicts:
lib/deprecatedlib.php
Sam Hemelryk [Tue, 1 Apr 2014 20:51:47 +0000 (09:51 +1300)]
Merge branch 'MDL-44756_help' of https://github.com/andyjdavis/moodle
Sam Hemelryk [Tue, 1 Apr 2014 20:43:25 +0000 (09:43 +1300)]
Merge branch 'MDL-44772-master' of git://github.com/FMCorz/moodle
Conflicts:
lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-min.js
Sam Hemelryk [Tue, 1 Apr 2014 20:29:11 +0000 (09:29 +1300)]
Merge branch 'MDL-44762-master' of git://github.com/FMCorz/moodle
Sam Hemelryk [Tue, 1 Apr 2014 20:28:49 +0000 (09:28 +1300)]
Merge branch 'MDL-44834-master' of git://github.com/FMCorz/moodle
Conflicts:
lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-min.js
Sam Hemelryk [Tue, 1 Apr 2014 20:27:23 +0000 (09:27 +1300)]
Merge branch 'MDL-32729-master' of git://github.com/andrewnicols/moodle
Conflicts:
theme/bootstrapbase/style/moodle.css
Sam Hemelryk [Tue, 1 Apr 2014 20:27:03 +0000 (09:27 +1300)]
Merge branch 'MDL-43284-master' of git://github.com/phalacee/moodle
Conflicts:
theme/bootstrapbase/style/moodle.css
Eloy Lafuente (stronk7) [Tue, 1 Apr 2014 19:50:09 +0000 (21:50 +0200)]
Merge branch 'wip-MDL-35305-master' of git://github.com/marinaglancy/moodle
Marina Glancy [Tue, 1 Apr 2014 09:40:35 +0000 (17:40 +0800)]
Merge branch 'w14_MDL-40910_m27_usergraded' of git://github.com/skodak/moodle
Marina Glancy [Tue, 1 Apr 2014 09:40:22 +0000 (17:40 +0800)]
Merge branch 'wip-MDL44021' of git://github.com/jennymgray/moodle
Ankit Agarwal [Fri, 21 Feb 2014 05:15:46 +0000 (13:15 +0800)]
MDL-42891 administration: Replace use of logtable in notify_login_failures() with new logging apis
Ankit Agarwal [Fri, 21 Feb 2014 08:25:09 +0000 (16:25 +0800)]
MDL-42891 administration: Re-implement incorrect login notification, without using the logtable.
Jenny Gray [Tue, 1 Apr 2014 08:34:06 +0000 (09:34 +0100)]
MDL-44021 mod_glossary - fixed search multiple keywords sql duplicate parameter error
Sam Hemelryk [Tue, 1 Apr 2014 08:20:05 +0000 (21:20 +1300)]
Merge branch 'MDL-44745-master' of git://github.com/damyon/moodle
Marina Glancy [Tue, 1 Apr 2014 07:50:14 +0000 (15:50 +0800)]
Merge branch 'MDL-44770-master' of git://github.com/jethac/moodle
Jetha Chan [Tue, 1 Apr 2014 07:45:12 +0000 (15:45 +0800)]
MDL-44770 editor_atto: moved table context menu
Marina Glancy [Tue, 1 Apr 2014 07:42:21 +0000 (15:42 +0800)]
Merge branch 'MDL-44759-master' of git://github.com/FMCorz/moodle
Marina Glancy [Tue, 1 Apr 2014 07:35:05 +0000 (15:35 +0800)]
Merge branch 'MDL-43999-master' of git://github.com/damyon/moodle
Marina Glancy [Tue, 1 Apr 2014 07:34:44 +0000 (15:34 +0800)]
Merge branch 'MDL-44777-master' of git://github.com/FMCorz/moodle
Marina Glancy [Tue, 1 Apr 2014 07:34:28 +0000 (15:34 +0800)]
Merge branch 'MDL-44717-master' of git://github.com/ankitagarwal/moodle
Marina Glancy [Tue, 1 Apr 2014 07:33:38 +0000 (15:33 +0800)]
Merge branch 'W14_MDL-44862_m27_pgsocket' of git://github.com/skodak/moodle
Damyon Wiese [Mon, 24 Mar 2014 13:48:38 +0000 (21:48 +0800)]
MDL-43999 Atto : Make image dialogue open on double click of an image.
Frederic Massart [Fri, 28 Mar 2014 08:17:18 +0000 (16:17 +0800)]
MDL-44777 atto_equation: More consistent width of buttons
Ankit Agarwal [Tue, 1 Apr 2014 06:51:05 +0000 (14:51 +0800)]
MDL-44717 events: Fix multiple issues in events
Fix various incorrect urls
Fix incorrect phpdocs and other minor code style issues
Fix missing/incorrect strings
AMOS BEGIN
MOV [eventblogassociationcreated, core_blog],[eventblogassociationadded, core_blog]
AMOS END
Marina Glancy [Tue, 1 Apr 2014 06:55:39 +0000 (14:55 +0800)]
MDL-44747 editor_atto: coding error fixed
Ankit Agarwal [Tue, 1 Apr 2014 06:51:02 +0000 (14:51 +0800)]
MDL-44717 events: Event restore process must call the init() method
Adrian Greeve [Tue, 25 Mar 2014 05:49:20 +0000 (13:49 +0800)]
MDL-44717 events: Fix for the name strings in various events.
AMOS BEGIN
MOV [eventnoteupdate, core_notes],[eventnoteupdated, core_notes]
AMOS END
Adrian Greeve [Tue, 25 Mar 2014 03:39:00 +0000 (11:39 +0800)]
MDL-44717 events: Quick update to incorrect mod workshop class definition.
Marina Glancy [Tue, 1 Apr 2014 06:44:13 +0000 (14:44 +0800)]
Merge branch 'MDL-44234-master' of git://github.com/FMCorz/moodle
Marina Glancy [Tue, 1 Apr 2014 06:43:49 +0000 (14:43 +0800)]
Merge branch 'MDL-44741-master' of git://github.com/FMCorz/moodle
Frederic Massart [Tue, 25 Mar 2014 06:41:04 +0000 (14:41 +0800)]
MDL-44234 atto_table: Reduce the size of the caption field
Frederic Massart [Tue, 25 Mar 2014 08:47:54 +0000 (16:47 +0800)]
MDL-44741 theme_more: Updated description of the theme
Marina Glancy [Tue, 1 Apr 2014 06:26:08 +0000 (14:26 +0800)]
Merge branch 'MDL-44747-master' of git://github.com/FMCorz/moodle
Marina Glancy [Tue, 1 Apr 2014 06:24:54 +0000 (14:24 +0800)]
Merge branch 'MDL-44739-master' of git://github.com/FMCorz/moodle
Marina Glancy [Tue, 1 Apr 2014 05:51:09 +0000 (13:51 +0800)]
Merge branch 'MDL-44746_master' of git://github.com/markn86/moodle
Marina Glancy [Tue, 1 Apr 2014 05:45:59 +0000 (13:45 +0800)]
Merge branch 'w14_MDL-44715_m27_eventval' of git://github.com/skodak/moodle
Marina Glancy [Tue, 1 Apr 2014 05:32:03 +0000 (13:32 +0800)]
Merge branch 'MDL-44755-master' of git://github.com/FMCorz/moodle
Marina Glancy [Tue, 1 Apr 2014 05:24:09 +0000 (13:24 +0800)]
Merge branch 'MDL-44811' of git://github.com/timhunt/moodle
Marina Glancy [Tue, 1 Apr 2014 03:19:26 +0000 (11:19 +0800)]
Merge branch 'MDL-44763_preview_int' of https://github.com/andyjdavis/moodle
Marina Glancy [Tue, 1 Apr 2014 03:08:40 +0000 (11:08 +0800)]
Merge branch 'MDL-44754-master' of git://github.com/phalacee/moodle
Andrew Nicols [Tue, 25 Mar 2014 05:09:03 +0000 (13:09 +0800)]
MDL-44752 atto: Correct spelling of color => colour in plugin languages
Marina Glancy [Tue, 1 Apr 2014 03:06:23 +0000 (11:06 +0800)]
Merge branch 'MDL-44701' of git://github.com/aolley/moodle
Marina Glancy [Tue, 1 Apr 2014 03:05:31 +0000 (11:05 +0800)]
Merge branch 'MDL-44670-master' of git://github.com/FMCorz/moodle
Marina Glancy [Tue, 1 Apr 2014 03:04:52 +0000 (11:04 +0800)]
Merge branch 'MDL-44590-master' of git://github.com/danpoltawski/moodle
Andrew Davis [Thu, 27 Mar 2014 04:30:18 +0000 (12:30 +0800)]
MDL-44763 editor_atto: removed unnecessary "preview" label
Marina Glancy [Tue, 1 Apr 2014 02:39:24 +0000 (10:39 +0800)]
Merge branch 'MDL-44837-master' of git://github.com/sammarshallou/moodle
Marina Glancy [Tue, 1 Apr 2014 02:37:22 +0000 (10:37 +0800)]
Merge branch 'wip_MDL-44854_master' of git://github.com/gjb2048/moodle
Marina Glancy [Tue, 1 Apr 2014 02:36:00 +0000 (10:36 +0800)]
Merge branch 'wip-MDL-44850_master' of git://github.com/gjb2048/moodle
Juan Leyva [Mon, 24 Mar 2014 08:39:32 +0000 (09:39 +0100)]
MDL-30085 Moved to lib/classes for support autoloading
Juan Leyva [Fri, 21 Feb 2014 15:09:00 +0000 (16:09 +0100)]
MDL-30085 core_grades functions moved to correct location
Andrew Davis [Mon, 17 Dec 2012 03:13:10 +0000 (11:13 +0800)]
MDL-30085 core_grade: added a grade web service
Gareth J Barnard [Fri, 28 Mar 2014 14:45:52 +0000 (14:45 +0000)]
MDL-44854 theme: 'svg' font type not served.
Gareth J Barnard [Fri, 28 Mar 2014 13:32:31 +0000 (13:32 +0000)]
MDL-44850 theme: 'eot' font type not served.
Frederic Massart [Mon, 31 Mar 2014 09:16:41 +0000 (17:16 +0800)]
MDL-44808 atto_table: Removing unused language string for JS
Marina Glancy [Mon, 31 Mar 2014 08:36:27 +0000 (16:36 +0800)]
Merge branch 'w14_MDL-44733_m27_taskdisabled' of git://github.com/skodak/moodle
Marina Glancy [Mon, 31 Mar 2014 08:36:12 +0000 (16:36 +0800)]
Merge branch 'MDL-44808-master' of git://github.com/FMCorz/moodle
Damyon Wiese [Tue, 25 Mar 2014 03:34:47 +0000 (11:34 +0800)]
MDL-44000 Atto: Add option to constrain image size
(Keep aspect ratio)
Also some small improvements to the edit image dialogue.
Marina Glancy [Mon, 31 Mar 2014 07:55:29 +0000 (15:55 +0800)]
Merge branch 'MDL-44764-master' of git://github.com/FMCorz/moodle
Petr Škoda [Mon, 31 Mar 2014 07:48:19 +0000 (15:48 +0800)]
MDL-44733 add disabled class rows with disabled scheduled tasks
Damyon Wiese [Thu, 13 Mar 2014 03:04:33 +0000 (11:04 +0800)]
MDL-44583 Assign: performance fixes
Marina Glancy [Mon, 31 Mar 2014 04:46:21 +0000 (12:46 +0800)]
Merge branch 'MDL-44822' of git://github.com/aolley/moodle
Frederic Massart [Tue, 25 Mar 2014 09:42:26 +0000 (17:42 +0800)]
MDL-44757 atto_equation: Use Moodle Docs URL for TeX doc
Frederic Massart [Fri, 28 Mar 2014 03:08:17 +0000 (11:08 +0800)]
MDL-44747 editor_atto: Renamed subplugin setting class
Frederic Massart [Fri, 28 Mar 2014 03:04:46 +0000 (11:04 +0800)]
MDL-44747 editor_atto: Improved validation of toolbar config
This ensures that:
- Plugins are only used once,
- Group names are unique,
- Lines match: group = plugin[, plugin[, plugin ...]],
- There are some groups and plugins defined,
- The plugins used are installed.
Frederic Massart [Tue, 25 Mar 2014 08:22:35 +0000 (16:22 +0800)]
MDL-44755 atto_editor: Remove hardcoded icons from settings
Previously, we hardcoded a list of icons for Atto plugins. This is not
a good idea as it would be very quickly outdated, or incomplete. Now,
we proceed as we often do: if the image pix/icon exists in the plugin
it is displayed, else nothing is displayed.
