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
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
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.
Frederic Massart [Thu, 27 Mar 2014 04:40:01 +0000 (12:40 +0800)]
MDL-44764 atto_image: Reword the alt related labels
Frederic Massart [Tue, 25 Mar 2014 07:32:47 +0000 (15:32 +0800)]
MDL-44767 atto_editor: Browser hangs when making a selection
Marina Glancy [Mon, 31 Mar 2014 03:03:31 +0000 (11:03 +0800)]
Merge branch 'MDL-44804-master' of git://github.com/FMCorz/moodle
Jetha Chan [Fri, 28 Mar 2014 09:00:36 +0000 (17:00 +0800)]
MDL-44770 editor-atto: table context menu opens from button
Context menu now opens from button, rather than table cell. Modified wording of table strings.
Frederic Massart [Thu, 27 Mar 2014 11:14:16 +0000 (19:14 +0800)]
MDL-44759 atto_undo: Buttons are only enabled when needed
Before the patch it was happening that the undo or redo buttons
were enabled even though clicking on them didn't produce anything.
This is partly because we were not storing the initial value, we
allowed for the stack to be empty, and we were using not clean
HTML.
Andrew Davis [Mon, 31 Mar 2014 02:25:39 +0000 (10:25 +0800)]
MDL-44756 editor_atto: changed a string
Eloy Lafuente (stronk7) [Sun, 30 Mar 2014 20:32:25 +0000 (22:32 +0200)]
MDL-44862 postgres: tests to support socket & port
Both the database auth and enrol plugins use ADOdb
to perform connections. Socket and port are allowed
there if passed as "socket:port", so, when both are
configured in CFG, we pass them that way. Else
ADOdb defaults to standard port (5432).
Petr Škoda [Sun, 30 Mar 2014 02:06:39 +0000 (10:06 +0800)]
MDL-44862 always add dbport to dbsocket in pg driver
This should hopefully resolve problems when using sockets connection
to pg servers running on non-standard ports.
Mark Nelson [Sat, 29 Mar 2014 00:00:33 +0000 (17:00 -0700)]
MDL-44746 core_events: minor changes to the user_deleted event
Mark Nelson [Fri, 28 Mar 2014 23:11:48 +0000 (16:11 -0700)]
MDL-44746 core_events: removed incorrect uses of snapshots
Petr Škoda [Fri, 21 Mar 2014 06:36:19 +0000 (14:36 +0800)]
MDL-40910 add new core event user_graded
This event is triggered when teacher manually edits the grade in gradebook.
Tim Hunt [Fri, 28 Mar 2014 17:58:48 +0000 (17:58 +0000)]
MDL-44811 quiz settings form title: change for consistency.
Thanks to Fred for poining out that most other activities use the work
Appearance for these sorts of settings.
Frederic Massart [Thu, 27 Mar 2014 07:49:45 +0000 (15:49 +0800)]
MDL-44808 atto_table: Remove accessibility information from dialogue
Marina Glancy [Fri, 28 Mar 2014 08:39:55 +0000 (16:39 +0800)]
MDL-41102 report_performance: correctly check state of automated backups
Thanks to Renaat Debleu for the patch
Marina Glancy [Fri, 28 Mar 2014 07:21:08 +0000 (15:21 +0800)]
MDL-34012 chat: removing repetetive db query (performance)
Jason Fowler [Fri, 28 Mar 2014 06:18:02 +0000 (14:18 +0800)]
MDL-44754 Atto: Explaining what group names are used for in toolbars
Petr Škoda [Fri, 28 Mar 2014 05:52:01 +0000 (13:52 +0800)]
MDL-44715 use parent::validate_data() consistently in all events
Includes some minor PHPDocs typo fixes.
Damyon Wiese [Fri, 28 Mar 2014 01:18:01 +0000 (09:18 +0800)]
MDL-44832 Assign: Convert grading menu to a moodle action-menu
This is required because YUI broke something.
Petr Škoda [Tue, 25 Mar 2014 02:36:55 +0000 (10:36 +0800)]
MDL-44843 try to hack around strict locale names in OSX
Marina Glancy [Fri, 28 Mar 2014 02:26:01 +0000 (10:26 +0800)]
MDL-35305 wiki: backup and restore files
Thanks to Tatsuya Shirai for the patch
Petr Škoda [Mon, 24 Mar 2014 03:34:31 +0000 (11:34 +0800)]
MDL-44733 add support for disabling of scheduled tasks
sam marshall [Thu, 27 Mar 2014 16:42:29 +0000 (16:42 +0000)]
MDL-44837 Behat: 'dialogue' selector only works for confirm dialogues
The dialogue selector in Behat (used only in one place) didn't work for
other types of standard Moodle notification dialogue.
Gilles-Philippe Leblanc [Mon, 2 Dec 2013 21:32:57 +0000 (16:32 -0500)]
MDL-42816 auth_manual: Add password expiry for manual auth method
Frederic Massart [Thu, 27 Mar 2014 11:48:37 +0000 (19:48 +0800)]
MDL-44834 editor_atto: Delegate change event to one editor
Marina Glancy [Thu, 27 Mar 2014 08:52:07 +0000 (16:52 +0800)]
weekly release 2.7dev
Marina Glancy [Thu, 27 Mar 2014 08:52:07 +0000 (16:52 +0800)]
NOBUG: Fixed file access permissions
Marina Glancy [Thu, 27 Mar 2014 08:52:06 +0000 (16:52 +0800)]
NOBUG: Fixed SVG browser compatibility
Marina Glancy [Thu, 27 Mar 2014 08:52:05 +0000 (16:52 +0800)]
Merge branch 'install_master' of git://git.moodle.org/moodle-install
Frederic Massart [Thu, 27 Mar 2014 07:00:48 +0000 (15:00 +0800)]
MDL-44772 editor_atto: Initial height of editor matches textarea's
We set a min-height and a height in JavaScript to force the editor
to start at a certain height, but then it can be expanded thanks
to the CSS property resize. Though as IE does not support the resize
property we ignore we do not set a height so that the editor expands
as we type.