moodle.git
7 years agoMerge branch 'MDL-44834-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

7 years agoMerge branch 'MDL-32729-master' of git://github.com/andrewnicols/moodle
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

7 years agoMerge branch 'MDL-43284-master' of git://github.com/phalacee/moodle
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

7 years agoMerge branch 'wip-MDL-35305-master' of git://github.com/marinaglancy/moodle
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

7 years agoMerge branch 'w14_MDL-40910_m27_usergraded' of git://github.com/skodak/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

7 years agoMerge branch 'wip-MDL44021' of git://github.com/jennymgray/moodle
Marina Glancy [Tue, 1 Apr 2014 09:40:22 +0000 (17:40 +0800)]
Merge branch 'wip-MDL44021' of git://github.com/jennymgray/moodle

7 years agoMDL-42891 administration: Replace use of logtable in notify_login_failures() with...
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

7 years agoMDL-42891 administration: Re-implement incorrect login notification, without using...
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.

7 years agoMDL-44021 mod_glossary - fixed search multiple keywords sql duplicate parameter error
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

7 years agoMerge branch 'MDL-44745-master' of git://github.com/damyon/moodle
Sam Hemelryk [Tue, 1 Apr 2014 08:20:05 +0000 (21:20 +1300)]
Merge branch 'MDL-44745-master' of git://github.com/damyon/moodle

7 years agoMerge branch 'MDL-44770-master' of git://github.com/jethac/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

7 years agoMDL-44770 editor_atto: moved table context menu
Jetha Chan [Tue, 1 Apr 2014 07:45:12 +0000 (15:45 +0800)]
MDL-44770 editor_atto: moved table context menu

7 years agoMerge branch 'MDL-44759-master' of git://github.com/FMCorz/moodle
Marina Glancy [Tue, 1 Apr 2014 07:42:21 +0000 (15:42 +0800)]
Merge branch 'MDL-44759-master' of git://github.com/FMCorz/moodle

7 years agoMerge branch 'MDL-43999-master' of git://github.com/damyon/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

7 years agoMerge branch 'MDL-44777-master' of git://github.com/FMCorz/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

7 years agoMerge branch 'MDL-44717-master' of git://github.com/ankitagarwal/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

7 years agoMerge branch 'W14_MDL-44862_m27_pgsocket' of git://github.com/skodak/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

7 years agoMDL-43999 Atto : Make image dialogue open on double click of an image.
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.

7 years agoMDL-44777 atto_equation: More consistent width of buttons
Frederic Massart [Fri, 28 Mar 2014 08:17:18 +0000 (16:17 +0800)]
MDL-44777 atto_equation: More consistent width of buttons

7 years agoMDL-44717 events: Fix multiple issues in events
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

7 years agoMDL-44747 editor_atto: coding error fixed
Marina Glancy [Tue, 1 Apr 2014 06:55:39 +0000 (14:55 +0800)]
MDL-44747 editor_atto: coding error fixed

7 years agoMDL-44717 events: Event restore process must call the init() method
Ankit Agarwal [Tue, 1 Apr 2014 06:51:02 +0000 (14:51 +0800)]
MDL-44717 events: Event restore process must call the init() method

7 years agoMDL-44717 events: Fix for the name strings in various events.
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

7 years agoMDL-44717 events: Quick update to incorrect mod workshop class definition.
Adrian Greeve [Tue, 25 Mar 2014 03:39:00 +0000 (11:39 +0800)]
MDL-44717 events: Quick update to incorrect mod workshop class definition.

7 years agoMerge branch 'MDL-44234-master' of git://github.com/FMCorz/moodle
Marina Glancy [Tue, 1 Apr 2014 06:44:13 +0000 (14:44 +0800)]
Merge branch 'MDL-44234-master' of git://github.com/FMCorz/moodle

7 years agoMerge branch 'MDL-44741-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

7 years agoMDL-44234 atto_table: Reduce the size of the caption field
Frederic Massart [Tue, 25 Mar 2014 06:41:04 +0000 (14:41 +0800)]
MDL-44234 atto_table: Reduce the size of the caption field

7 years agoMDL-44741 theme_more: Updated description of the theme
Frederic Massart [Tue, 25 Mar 2014 08:47:54 +0000 (16:47 +0800)]
MDL-44741 theme_more: Updated description of the theme

7 years agoMerge branch 'MDL-44747-master' of git://github.com/FMCorz/moodle
Marina Glancy [Tue, 1 Apr 2014 06:26:08 +0000 (14:26 +0800)]
Merge branch 'MDL-44747-master' of git://github.com/FMCorz/moodle

7 years agoMerge branch 'MDL-44739-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

7 years agoMerge branch 'MDL-44746_master' of git://github.com/markn86/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

7 years agoMerge branch 'w14_MDL-44715_m27_eventval' of git://github.com/skodak/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

7 years agoMerge branch 'MDL-44755-master' of git://github.com/FMCorz/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

7 years agoMerge branch 'MDL-44811' of git://github.com/timhunt/moodle
Marina Glancy [Tue, 1 Apr 2014 05:24:09 +0000 (13:24 +0800)]
Merge branch 'MDL-44811' of git://github.com/timhunt/moodle

7 years agoMerge branch 'MDL-44763_preview_int' of https://github.com/andyjdavis/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

7 years agoMerge branch 'MDL-44754-master' of git://github.com/phalacee/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

7 years agoMDL-44752 atto: Correct spelling of color => colour in plugin languages
Andrew Nicols [Tue, 25 Mar 2014 05:09:03 +0000 (13:09 +0800)]
MDL-44752 atto: Correct spelling of color => colour in plugin languages

7 years agoMerge branch 'MDL-44701' of git://github.com/aolley/moodle
Marina Glancy [Tue, 1 Apr 2014 03:06:23 +0000 (11:06 +0800)]
Merge branch 'MDL-44701' of git://github.com/aolley/moodle

7 years agoMerge branch 'MDL-44670-master' of git://github.com/FMCorz/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

7 years agoMerge branch 'MDL-44590-master' of git://github.com/danpoltawski/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

7 years agoMDL-44763 editor_atto: removed unnecessary "preview" label
Andrew Davis [Thu, 27 Mar 2014 04:30:18 +0000 (12:30 +0800)]
MDL-44763 editor_atto: removed unnecessary "preview" label

7 years agoMerge branch 'MDL-44837-master' of git://github.com/sammarshallou/moodle
Marina Glancy [Tue, 1 Apr 2014 02:39:24 +0000 (10:39 +0800)]
Merge branch 'MDL-44837-master' of git://github.com/sammarshallou/moodle

7 years agoMerge branch 'wip_MDL-44854_master' of git://github.com/gjb2048/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

7 years agoMerge branch 'wip-MDL-44850_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

7 years agoMDL-44854 theme: 'svg' font type not served.
Gareth J Barnard [Fri, 28 Mar 2014 14:45:52 +0000 (14:45 +0000)]
MDL-44854 theme: 'svg' font type not served.

7 years agoMDL-44850 theme: 'eot' 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.

7 years agoMDL-44808 atto_table: Removing unused language string for JS
Frederic Massart [Mon, 31 Mar 2014 09:16:41 +0000 (17:16 +0800)]
MDL-44808 atto_table: Removing unused language string for JS

7 years agoMerge branch 'w14_MDL-44733_m27_taskdisabled' of git://github.com/skodak/moodle
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

7 years agoMerge branch 'MDL-44808-master' of git://github.com/FMCorz/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

7 years agoMerge branch 'MDL-44764-master' of git://github.com/FMCorz/moodle
Marina Glancy [Mon, 31 Mar 2014 07:55:29 +0000 (15:55 +0800)]
Merge branch 'MDL-44764-master' of git://github.com/FMCorz/moodle

7 years agoMDL-44733 add disabled class rows with disabled scheduled tasks
Petr Škoda [Mon, 31 Mar 2014 07:48:19 +0000 (15:48 +0800)]
MDL-44733 add disabled class rows with disabled scheduled tasks

7 years agoMDL-44583 Assign: performance fixes
Damyon Wiese [Thu, 13 Mar 2014 03:04:33 +0000 (11:04 +0800)]
MDL-44583 Assign: performance fixes

7 years agoMerge branch 'MDL-44822' of git://github.com/aolley/moodle
Marina Glancy [Mon, 31 Mar 2014 04:46:21 +0000 (12:46 +0800)]
Merge branch 'MDL-44822' of git://github.com/aolley/moodle

7 years agoMDL-44757 atto_equation: Use Moodle Docs URL for TeX doc
Frederic Massart [Tue, 25 Mar 2014 09:42:26 +0000 (17:42 +0800)]
MDL-44757 atto_equation: Use Moodle Docs URL for TeX doc

7 years agoMDL-44747 editor_atto: Renamed subplugin setting class
Frederic Massart [Fri, 28 Mar 2014 03:08:17 +0000 (11:08 +0800)]
MDL-44747 editor_atto: Renamed subplugin setting class

7 years agoMDL-44747 editor_atto: Improved validation of toolbar config
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.

7 years agoMDL-44755 atto_editor: Remove hardcoded icons from settings
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.

7 years agoMDL-44764 atto_image: Reword the alt related labels
Frederic Massart [Thu, 27 Mar 2014 04:40:01 +0000 (12:40 +0800)]
MDL-44764 atto_image: Reword the alt related labels

7 years agoMDL-44767 atto_editor: Browser hangs when making a selection
Frederic Massart [Tue, 25 Mar 2014 07:32:47 +0000 (15:32 +0800)]
MDL-44767 atto_editor: Browser hangs when making a selection

7 years agoMerge branch 'MDL-44804-master' of git://github.com/FMCorz/moodle
Marina Glancy [Mon, 31 Mar 2014 03:03:31 +0000 (11:03 +0800)]
Merge branch 'MDL-44804-master' of git://github.com/FMCorz/moodle

7 years agoMDL-44770 editor-atto: table context menu opens from button
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.

7 years agoMDL-44759 atto_undo: Buttons are only enabled when needed
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.

7 years agoMDL-44862 postgres: tests to support socket & port
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).

7 years agoMDL-44862 always add dbport to dbsocket in pg driver
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.

7 years agoMDL-44746 core_events: minor changes to the user_deleted event
Mark Nelson [Sat, 29 Mar 2014 00:00:33 +0000 (17:00 -0700)]
MDL-44746 core_events: minor changes to the user_deleted event

7 years agoMDL-44746 core_events: removed incorrect uses of snapshots
Mark Nelson [Fri, 28 Mar 2014 23:11:48 +0000 (16:11 -0700)]
MDL-44746 core_events: removed incorrect uses of snapshots

7 years agoMDL-40910 add new core event user_graded
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.

7 years agoMDL-44811 quiz settings form title: change for consistency.
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.

7 years agoMDL-44808 atto_table: Remove accessibility information from dialogue
Frederic Massart [Thu, 27 Mar 2014 07:49:45 +0000 (15:49 +0800)]
MDL-44808 atto_table: Remove accessibility information from dialogue

7 years agoMDL-44754 Atto: Explaining what group names are used for in toolbars
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

7 years agoMDL-44715 use parent::validate_data() consistently in all events
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.

7 years agoMDL-35305 wiki: backup and restore files
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

7 years agoMDL-44733 add support for disabling of scheduled tasks
Petr Škoda [Mon, 24 Mar 2014 03:34:31 +0000 (11:34 +0800)]
MDL-44733 add support for disabling of scheduled tasks

7 years agoMDL-44837 Behat: 'dialogue' selector only works for confirm dialogues
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.

7 years agoMDL-44834 editor_atto: Delegate change event to one editor
Frederic Massart [Thu, 27 Mar 2014 11:48:37 +0000 (19:48 +0800)]
MDL-44834 editor_atto: Delegate change event to one editor

7 years agoweekly release 2.7dev
Marina Glancy [Thu, 27 Mar 2014 08:52:07 +0000 (16:52 +0800)]
weekly release 2.7dev

7 years agoNOBUG: Fixed file access permissions
Marina Glancy [Thu, 27 Mar 2014 08:52:07 +0000 (16:52 +0800)]
NOBUG: Fixed file access permissions

7 years agoNOBUG: Fixed SVG browser compatibility
Marina Glancy [Thu, 27 Mar 2014 08:52:06 +0000 (16:52 +0800)]
NOBUG: Fixed SVG browser compatibility

7 years agoMerge branch 'install_master' of git://git.moodle.org/moodle-install
Marina Glancy [Thu, 27 Mar 2014 08:52:05 +0000 (16:52 +0800)]
Merge branch 'install_master' of git://git.moodle.org/moodle-install

7 years agoMDL-43883 Fix wiki behat tests to work with Atto
Damyon Wiese [Thu, 27 Mar 2014 04:26:51 +0000 (12:26 +0800)]
MDL-43883 Fix wiki behat tests to work with Atto

7 years agoMDL-43883 Behat: Fix deprecation and move custom matches to the editor field only.
Damyon Wiese [Thu, 13 Mar 2014 09:04:19 +0000 (17:04 +0800)]
MDL-43883 Behat: Fix deprecation and move custom matches to the editor field only.

7 years agoMDL-44084 behat: Fixed setting value for form editor
Rajesh Taneja [Thu, 27 Mar 2014 03:44:13 +0000 (11:44 +0800)]
MDL-44084 behat: Fixed setting value for form editor

7 years agoMDL-43284 Theme: Clean theme errors with padding in Question Bank fixed
Jason Fowler [Mon, 24 Mar 2014 07:00:10 +0000 (15:00 +0800)]
MDL-43284 Theme: Clean theme errors with padding in Question Bank fixed

7 years agoAutomatically generated installer lang files
AMOS bot [Thu, 27 Mar 2014 00:48:26 +0000 (00:48 +0000)]
Automatically generated installer lang files

7 years agoMDL-44701 gradereport_grader: Display warning on navigation if unsaved grades are...
Adam Olley [Thu, 20 Mar 2014 02:25:59 +0000 (12:55 +1030)]
MDL-44701 gradereport_grader: Display warning on navigation if unsaved grades are present

7 years agoMDL-44822 assignfeedback_editpdf: Stop test generation in is_enabled()
Adam Olley [Wed, 26 Mar 2014 23:37:41 +0000 (10:07 +1030)]
MDL-44822 assignfeedback_editpdf: Stop test generation in is_enabled()

This change also moves one of the checks in test_gs_path. If
generateimage is false, there's no need to stat for the fixture file.

7 years agoMDL-32729 Question: Convert remaining Questionbank code to YUI3
Andrew Nicols [Wed, 26 Mar 2014 15:59:21 +0000 (23:59 +0800)]
MDL-32729 Question: Convert remaining Questionbank code to YUI3

7 years agoMDL-32729 Question: Switch to the YUI3 chooser dialogue
Andrew Robert Nicols [Wed, 2 May 2012 11:33:06 +0000 (12:33 +0100)]
MDL-32729 Question: Switch to the YUI3 chooser dialogue

This uses the core chooserdialogue and associated style changes to make an
easily generated chooser with question descriptions.

7 years agoMDL-44804 editor_atto: JS error when filepicker is disabled
Frederic Massart [Wed, 26 Mar 2014 09:19:39 +0000 (17:19 +0800)]
MDL-44804 editor_atto: JS error when filepicker is disabled

7 years agoMerge branch 'MDL-43784-master-fixup' of git://github.com/FMCorz/moodle
Dan Poltawski [Wed, 26 Mar 2014 08:25:39 +0000 (16:25 +0800)]
Merge branch 'MDL-43784-master-fixup' of git://github.com/FMCorz/moodle

7 years agoMDL-43784 behat: Removed usage of Afterburner in a feature
Frederic Massart [Wed, 26 Mar 2014 08:18:13 +0000 (16:18 +0800)]
MDL-43784 behat: Removed usage of Afterburner in a feature

7 years agoMDL-44084 behat: Fixed behat set_value for atto editor
Rajesh Taneja [Wed, 26 Mar 2014 07:56:21 +0000 (15:56 +0800)]
MDL-44084 behat: Fixed behat set_value for atto editor

7 years agoMDL-44316 move the tag context upgrade to the end and fix issues
Petr Škoda [Wed, 26 Mar 2014 07:16:37 +0000 (15:16 +0800)]
MDL-44316 move the tag context upgrade to the end and fix issues

7 years agoMDL-42588 mod_scorm: option for displaying activity name
Jetha Chan [Wed, 26 Mar 2014 07:12:57 +0000 (15:12 +0800)]
MDL-42588 mod_scorm: option for displaying activity name

Added option to display or hide activity name on SCORM player.

7 years agoMDL-44557 behat: Resize window only possible with javascript
Rajesh Taneja [Wed, 26 Mar 2014 06:45:30 +0000 (14:45 +0800)]
MDL-44557 behat: Resize window only possible with javascript

7 years agoMerge branch 'wip-mdl-44557' of git://github.com/rajeshtaneja/moodle
Marina Glancy [Wed, 26 Mar 2014 06:10:53 +0000 (14:10 +0800)]
Merge branch 'wip-mdl-44557' of git://github.com/rajeshtaneja/moodle

7 years agoMDL-44557 behat: Allow nehat to resize window
Rajesh Taneja [Wed, 26 Mar 2014 04:13:46 +0000 (12:13 +0800)]
MDL-44557 behat: Allow nehat to resize window

Run all behat with medium (1024x768) screen size to
avoid failures with small screen size. Also, added
feature to let scenario chnage screen size if need be.

7 years agoMDL-44316 upgrade: fix to ensure upgraded and new installations have matching 'tag_in...
Mark Nelson [Wed, 26 Mar 2014 03:43:13 +0000 (20:43 -0700)]
MDL-44316 upgrade: fix to ensure upgraded and new installations have matching 'tag_instance' tables

7 years agoMerge branch 'w13_MDL-44510_m27_phpunit4' of https://github.com/skodak/moodle
Sam Hemelryk [Wed, 26 Mar 2014 03:35:47 +0000 (16:35 +1300)]
Merge branch 'w13_MDL-44510_m27_phpunit4' of https://github.com/skodak/moodle

7 years agoMDL-44510 fix class guessing in phpunit 4
Petr Škoda [Wed, 26 Mar 2014 03:32:09 +0000 (11:32 +0800)]
MDL-44510 fix class guessing in phpunit 4