Sam Hemelryk [Fri, 13 Dec 2013 03:59:10 +0000 (16:59 +1300)]
weekly release 2.7dev
Sam Hemelryk [Fri, 13 Dec 2013 03:59:08 +0000 (16:59 +1300)]
Merge branch 'install_master' of git://git.moodle.org/moodle-install
AMOS bot [Fri, 13 Dec 2013 00:42:11 +0000 (00:42 +0000)]
Automatically generated installer lang files
Tim Lock [Wed, 4 Dec 2013 04:12:49 +0000 (14:42 +1030)]
MDL-33925: auth_imap: add self-signed cert support
David Monllao [Thu, 12 Dec 2013 08:38:25 +0000 (16:38 +0800)]
MDL-42625 behat: Wrapping select an option extra actions in a try & catch
To select an option is specially painful, every browser
behaves differently and phantomjs just joined the party
throwing "Element does not exist in cache" random
exceptions that we need to catch.
Marina Glancy [Thu, 12 Dec 2013 05:49:56 +0000 (16:49 +1100)]
Merge branch 'MDL-42625_master-failures-fix' of git://github.com/dmonllao/moodle
David Monllao [Thu, 12 Dec 2013 04:18:01 +0000 (12:18 +0800)]
MDL-42625 behat: Fixing failures
* Expanding fieldsets before setting the course format
* Ensure editors are loaded moved to expand_all_fieldsets
* Return true rather than false when JS is disabled and
non-allowed steps should continue without throwing an
exception.
* Submit create user form after editing it
Marina Glancy [Thu, 12 Dec 2013 04:39:14 +0000 (15:39 +1100)]
Merge branch 'mucupdates27' of https://github.com/skodak/moodle
Petr Škoda [Thu, 12 Dec 2013 03:36:36 +0000 (11:36 +0800)]
MDL-42973 fix MUC caching issue when fetching available updates
Rajesh Taneja [Thu, 12 Dec 2013 01:36:24 +0000 (09:36 +0800)]
MDL-40058 mod_wiki: trigger event on page map view
Eloy Lafuente (stronk7) [Thu, 12 Dec 2013 01:03:41 +0000 (02:03 +0100)]
MDL-31410 paypal: fix problem on notifications
This commit fixes a PHP warning about using a
unititialised variable and also the problems when
notifications are enabled and there is not yet a
teacher in the course, defaulting to admin for student
notifications and preventing teacher notifications to happen.
Eloy Lafuente (stronk7) [Thu, 12 Dec 2013 00:09:02 +0000 (01:09 +0100)]
Merge branch 'w50_MDL-31410_m27_paypalipn' of https://github.com/skodak/moodle
Sam Hemelryk [Wed, 11 Dec 2013 20:13:42 +0000 (09:13 +1300)]
Merge branch 'MDL-43232-master-1' of git://github.com/andrewnicols/moodle
David Monllao [Wed, 11 Dec 2013 09:02:46 +0000 (17:02 +0800)]
MDL-42625 behat: Fixing ExpectationException::__construct() call
Also adding an extra checking to the selector to
ensure it is no updating the list of files.
Andrew Nicols [Wed, 11 Dec 2013 05:29:39 +0000 (13:29 +0800)]
MDL-43232 JavaScript: Correct typo when cancelling the confirmcancel
Rajesh Taneja [Tue, 3 Dec 2013 06:42:49 +0000 (14:42 +0800)]
MDL-40058 mod_wiki: modified wiki_restore_page api to accept version and context
Rajesh Taneja [Mon, 2 Dec 2013 08:50:03 +0000 (16:50 +0800)]
MDL-40058 Events: added unit test
Rajesh Taneja [Mon, 2 Dec 2013 02:59:30 +0000 (10:59 +0800)]
MDL-40058 Events: Replaced add_to_log for page comments to event
Rajesh Taneja [Fri, 29 Nov 2013 08:23:06 +0000 (16:23 +0800)]
MDL-40058 mod_wiki: Replaced add_to_log for page version viewed to event
Rajesh Taneja [Fri, 29 Nov 2013 07:53:53 +0000 (15:53 +0800)]
MDL-40058 mod_wiki: Replaced add_to_log for page created to event
Rajesh Taneja [Fri, 29 Nov 2013 07:33:58 +0000 (15:33 +0800)]
MDL-40058 mod_wiki: Replaced add_to_log for page map viewed to event
Rajesh Taneja [Fri, 29 Nov 2013 07:19:53 +0000 (15:19 +0800)]
MDL-40058 mod_wiki: Replaced add_to_log for admin to event
Rajesh Taneja [Fri, 29 Nov 2013 06:51:42 +0000 (14:51 +0800)]
MDL-40058 mod_wiki: Replaced add_to_log for override locks with event
Rajesh Taneja [Fri, 29 Nov 2013 06:19:12 +0000 (14:19 +0800)]
MDL-40058 mod_wiki: Replaced add_to_log for page diff view with event
Rajesh Taneja [Fri, 29 Nov 2013 06:18:10 +0000 (14:18 +0800)]
MDL-40058 mod_wiki: Replaced add_to_log for page edit with event
Rajesh Taneja [Fri, 29 Nov 2013 06:16:19 +0000 (14:16 +0800)]
MDL-40058 mod_wiki: Replaced add_to_log for version restored with event
Rajesh Taneja [Fri, 29 Nov 2013 06:15:04 +0000 (14:15 +0800)]
MDL-40058 mod_wiki: Replaced add_to_log for history viewed with event
Rajesh Taneja [Fri, 29 Nov 2013 06:13:14 +0000 (14:13 +0800)]
MDL-40058 mod_wiki: Replaced add_to_log on index.php with event
Rajesh Taneja [Fri, 29 Nov 2013 06:11:26 +0000 (14:11 +0800)]
MDL-40058 mod_wiki: Replaced add_to_log for course_module_viewed with event
Rajesh Taneja [Mon, 18 Nov 2013 08:17:52 +0000 (16:17 +0800)]
MDL-40058 mod_wiki: Replaced add_to_log for page_viewed with event
Sam Hemelryk [Wed, 11 Dec 2013 02:32:29 +0000 (15:32 +1300)]
Merge branch 'wip-MDL-43218-master' of git://github.com/marinaglancy/moodle
Marina Glancy [Wed, 11 Dec 2013 02:27:38 +0000 (13:27 +1100)]
MDL-43218 blog: prepare the blog navigation only when needed
Simon Coggins [Thu, 5 Dec 2013 07:20:38 +0000 (20:20 +1300)]
MDL-43218 navigation: Remove link to blogs when they are disabled
Marina Glancy [Wed, 11 Dec 2013 01:46:14 +0000 (12:46 +1100)]
Merge branch 'MDL-43071-master' of https://github.com/lucisgit/moodle
Sam Hemelryk [Tue, 10 Dec 2013 23:30:26 +0000 (12:30 +1300)]
Merge branch 'MDL-42932_master' of https://github.com/markn86/moodle
Sam Hemelryk [Tue, 10 Dec 2013 23:26:47 +0000 (12:26 +1300)]
NOBUG: shifter rebuild
Sam Hemelryk [Tue, 10 Dec 2013 23:25:16 +0000 (12:25 +1300)]
Merge branch 'MDL-38775-master' of git://github.com/andrewnicols/moodle
Sam Hemelryk [Tue, 10 Dec 2013 23:25:14 +0000 (12:25 +1300)]
Merge branch 'MDL-38776-master' of git://github.com/andrewnicols/moodle
Sam Hemelryk [Tue, 10 Dec 2013 23:25:12 +0000 (12:25 +1300)]
Merge branch 'MDL-43202-master' of git://github.com/andrewnicols/moodle
Eloy Lafuente (stronk7) [Tue, 10 Dec 2013 22:29:06 +0000 (23:29 +0100)]
Merge branch 'MDL-42625_master' of git://github.com/dmonllao/moodle
Eloy Lafuente (stronk7) [Tue, 10 Dec 2013 22:24:56 +0000 (23:24 +0100)]
Merge branch 'MDL-42815-master' of git://github.com/sammarshallou/moodle
Sam Hemelryk [Tue, 10 Dec 2013 22:13:32 +0000 (11:13 +1300)]
Merge branch 'MDL-42796-master' of git://github.com/andrewnicols/moodle
Sam Hemelryk [Tue, 10 Dec 2013 22:03:39 +0000 (11:03 +1300)]
Merge branch 'MDL-43252-master' of git://github.com/sammarshallou/moodle
Sam Hemelryk [Tue, 10 Dec 2013 21:59:21 +0000 (10:59 +1300)]
Merge branch 'wip-MDL-43279-master' of git://github.com/marinaglancy/moodle
Sam Hemelryk [Tue, 10 Dec 2013 21:50:07 +0000 (10:50 +1300)]
Merge branch 'w50_MDL-31625_m27_replace' of https://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Tue, 10 Dec 2013 21:47:15 +0000 (22:47 +0100)]
Merge branch 'wip-MDL-43150-master' of git://github.com/marinaglancy/moodle
Sam Hemelryk [Tue, 10 Dec 2013 21:34:17 +0000 (10:34 +1300)]
Merge branch 'MDL-42959-master' of git://github.com/andrewnicols/moodle
Sam Hemelryk [Tue, 10 Dec 2013 21:32:06 +0000 (10:32 +1300)]
Merge branch 'MDL-40517-master' of git://github.com/danpoltawski/moodle
Eloy Lafuente (stronk7) [Tue, 10 Dec 2013 21:06:39 +0000 (22:06 +0100)]
Merge branch 'wip-MDL-42174-master' of git://github.com/marinaglancy/moodle
Eloy Lafuente (stronk7) [Tue, 10 Dec 2013 18:43:33 +0000 (19:43 +0100)]
Merge branch 'wip-MDL-43135' of https://github.com/jennymgray/moodle
Jenny Gray [Tue, 3 Dec 2013 09:46:03 +0000 (09:46 +0000)]
MDL-43135 Lang: removed redundant opentoguests
Jenny Gray [Tue, 3 Dec 2013 09:45:14 +0000 (09:45 +0000)]
MDL-43135 Guest Enrol: new language string for with key icon
AMOS BEGIN
CPY [pluginname,enrol_guest], [guestaccess_withpassword,enrol_guest]
CPY [pluginname,enrol_guest], [guestaccess_withoutpassword,enrol_guest]
AMOS END
Marina Glancy [Tue, 10 Dec 2013 04:20:22 +0000 (15:20 +1100)]
Merge branch 'MDL-37380-master' of git://github.com/danpoltawski/moodle
Marina Glancy [Tue, 10 Dec 2013 04:15:27 +0000 (15:15 +1100)]
Merge branch 'MDL-43199-master' of git://github.com/damyon/moodle
Marina Glancy [Tue, 10 Dec 2013 03:47:08 +0000 (14:47 +1100)]
Merge branch 'm27_MDL-43082_IE9_Compat_View_SVG_Say_No' of https://github.com/scara/moodle
Marina Glancy [Tue, 10 Dec 2013 03:29:22 +0000 (14:29 +1100)]
Merge branch 'MDL-37517-master' of git://github.com/danpoltawski/moodle
Marina Glancy [Tue, 10 Dec 2013 03:25:24 +0000 (14:25 +1100)]
Merge branch 'MDL-43215_master' of https://github.com/markn86/moodle
Marina Glancy [Tue, 10 Dec 2013 03:10:04 +0000 (14:10 +1100)]
Merge branch 'MDL-43131' of git://github.com/timhunt/moodle
Marina Glancy [Tue, 10 Dec 2013 02:56:49 +0000 (13:56 +1100)]
Merge branch 'mdl42487-master' of https://github.com/tlock/moodle
Mark Nelson [Sat, 16 Nov 2013 21:12:06 +0000 (13:12 -0800)]
MDL-42932 core_calendar: introduced calendar type system setting
Marina Glancy [Tue, 10 Dec 2013 00:52:42 +0000 (11:52 +1100)]
MDL-43044 fix trailing whitespace
Marina Glancy [Tue, 10 Dec 2013 00:40:54 +0000 (11:40 +1100)]
Merge branch 'MDL-43044-master' of git://github.com/ankitagarwal/moodle
Marina Glancy [Mon, 9 Dec 2013 22:28:05 +0000 (09:28 +1100)]
MDL-43279 block_blog_recent: fixed undefined property notice
Sam Hemelryk [Mon, 9 Dec 2013 21:27:45 +0000 (10:27 +1300)]
Merge branch 'MDL-43104-master' of git://github.com/andrewnicols/moodle
Sam Hemelryk [Mon, 9 Dec 2013 20:52:08 +0000 (09:52 +1300)]
Merge branch 'MDL-43164-master' of git://github.com/andrewnicols/moodle
Sam Hemelryk [Mon, 9 Dec 2013 20:25:51 +0000 (09:25 +1300)]
Merge branch 'MDL-38774-master' of git://github.com/andrewnicols/moodle
Sam Hemelryk [Mon, 9 Dec 2013 20:21:10 +0000 (09:21 +1300)]
Merge branch 'm27_MDL-43159_Wrong_Naming_Convention_For_Variable' of https://github.com/scara/moodle
Sam Hemelryk [Mon, 9 Dec 2013 20:18:16 +0000 (09:18 +1300)]
NOBUG: rebuilt shifted files
Sam Hemelryk [Mon, 9 Dec 2013 20:09:06 +0000 (09:09 +1300)]
Merge branch 'MDL-43253-master' of git://github.com/andrewnicols/moodle
Sam Hemelryk [Mon, 9 Dec 2013 20:07:11 +0000 (09:07 +1300)]
Merge branch 'MDL-43212-master' of git://github.com/andrewnicols/moodle
Sam Hemelryk [Mon, 9 Dec 2013 20:06:54 +0000 (09:06 +1300)]
Merge branch 'MDL-43232-master' of git://github.com/andrewnicols/moodle
Sam Hemelryk [Mon, 9 Dec 2013 19:48:33 +0000 (08:48 +1300)]
Merge branch 'MDL-43194-master' of git://github.com/andrewnicols/moodle
Sam Hemelryk [Mon, 9 Dec 2013 19:43:50 +0000 (08:43 +1300)]
Merge branch 'MDL-43152-master' of git://github.com/andrewnicols/moodle
Sam Hemelryk [Mon, 9 Dec 2013 19:36:39 +0000 (08:36 +1300)]
Merge branch 'MDL-43087a' of https://github.com/srynot4sale/moodle
Conflicts:
config-dist.php
Eloy Lafuente (stronk7) [Mon, 9 Dec 2013 15:24:26 +0000 (16:24 +0100)]
Merge branch 'MDL-40003-master' of git://github.com/FMCorz/moodle
sam marshall [Fri, 6 Dec 2013 18:15:09 +0000 (18:15 +0000)]
MDL-43252 Group menu in wrong order when groupings used
Sam Chaffee [Mon, 3 Jun 2013 21:49:01 +0000 (17:49 -0400)]
MDL-40003 mod_assign: Fixed submission comments not being restored
Marina Glancy [Mon, 9 Dec 2013 07:54:53 +0000 (18:54 +1100)]
Merge branch 'wip-MDL-43175-master' of git://github.com/abgreeve/moodle
Marina Glancy [Mon, 9 Dec 2013 07:45:27 +0000 (18:45 +1100)]
Merge branch 'wip-mdl-43224' of https://github.com/rajeshtaneja/moodle
Marina Glancy [Mon, 9 Dec 2013 07:26:39 +0000 (18:26 +1100)]
Merge branch 'w50_MDL-42973_m27_addonupd' of https://github.com/skodak/moodle
Marina Glancy [Mon, 9 Dec 2013 06:50:27 +0000 (17:50 +1100)]
Merge branch 'MDL-43092_master' of git://github.com/lazydaisy/moodle
Marina Glancy [Mon, 9 Dec 2013 05:15:21 +0000 (16:15 +1100)]
Merge branch 'w50_MDL-43137_m27_openbasedir' of https://github.com/skodak/moodle
Andrew Nicols [Wed, 4 Dec 2013 06:13:41 +0000 (14:13 +0800)]
MDL-38774 JavaScript: Migrate moodle-core-dragdrop to Shifter
David Monllao [Fri, 29 Nov 2013 02:36:33 +0000 (10:36 +0800)]
MDL-42625 behat: Make behat pacient
* When looking for texts inside the page or inside
other containers we should wait until the elements
are visible.
* Same when expanding tree nodes.
* Normalizing loops to spin() function using
behat_base::TIMEOUT and behat_base::EXTENDED_TIMEOUT,
leaving TIMEOUT for DOM load processes and
EXTENDED_TIMEOUT for long processes that involves JS
too.
* Add page load waits between actions that involves
reloading the page.
Adrian Greeve [Wed, 4 Dec 2013 07:39:14 +0000 (15:39 +0800)]
MDL-43175 events: Base event unit tests for JSON encoding / decoding comparison.
Adrian Greeve [Wed, 4 Dec 2013 07:27:35 +0000 (15:27 +0800)]
MDL-43175 events: Changed JSON encoding decoding comparison to be less strict.
Debugging messages would be sent when other contained a float that is a whole number.
When encoding and decoding using JSON the number is changed to an integer and the
comparison fails.
Andrew Nicols [Wed, 27 Nov 2013 01:46:58 +0000 (09:46 +0800)]
MDL-43104 JavaScript: Combine mcore JS into simplemoodle
I was wrong about why this didn't work before - this was caused by the
missing semi-colon.
Joining these scripts into a single combo-load has the benefit of further
reducing the number of HTTP transactions to load a page, and a minor
reduction on transferred size due to a reduced header count.
Marina Glancy [Mon, 9 Dec 2013 00:28:03 +0000 (11:28 +1100)]
Merge branch 'master_MDL-43192' of https://github.com/danmarsden/moodle
Marina Glancy [Mon, 9 Dec 2013 00:13:16 +0000 (11:13 +1100)]
Merge branch 'wip-MDL-40213_master' of git://github.com/gjb2048/moodle
Andrew Nicols [Sat, 7 Dec 2013 15:44:12 +0000 (23:44 +0800)]
MDL-43253 JavaScript: Migrate moodle-backup-backupselectall to use Shifter
Dan Poltawski [Thu, 5 Dec 2013 04:19:43 +0000 (12:19 +0800)]
MDL-37380 mod_data: remove unused JS functions
Andrew Nicols [Fri, 8 Nov 2013 04:25:09 +0000 (12:25 +0800)]
MDL-42796 ActionMenu: Add additional keyboard event handling
Add additional handling for up/down/escape key presses and consolidate them
with the existing tab/shift+tab handling.
Andrew Nicols [Fri, 8 Nov 2013 04:20:30 +0000 (12:20 +0800)]
MDL-42796 ActionMenu: Move event handlers to showMenu
Andrew Nicols [Fri, 6 Dec 2013 06:02:28 +0000 (14:02 +0800)]
MDL-42959 JavaScript: Backport fix from https://github.com/yui/yui3/pull/1465
Ankit Agarwal [Wed, 4 Dec 2013 08:48:37 +0000 (16:48 +0800)]
MDL-43044 events: Add unit tests
Ankit Agarwal [Wed, 4 Dec 2013 08:25:19 +0000 (16:25 +0800)]
MDL-43044 events: Deprecate and remove code duplication from instances_list_viewed events
Ankit Agarwal [Wed, 4 Dec 2013 08:17:28 +0000 (16:17 +0800)]
MDL-43044 events: Deprecate course_module_instances_list_viewed abstract class
Ankit Agarwal [Wed, 4 Dec 2013 08:13:07 +0000 (16:13 +0800)]
MDL-43044 events: Add a course_module_instance_list_viewed abstract class
Ankit Agarwal [Fri, 6 Dec 2013 05:13:09 +0000 (13:13 +0800)]
MDL-43044 events: Move component declartion to construct
Damyon Wiese [Fri, 22 Nov 2013 05:42:55 +0000 (13:42 +0800)]
MDL-42625 TinyMCE: Hook into API to track the progress of the init script
