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
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
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 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
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, 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
Pavel Sokolov [Thu, 5 Dec 2013 07:56:14 +0000 (11:56 +0400)]
MDL-43199 assign: fix js error when expanding comments for non editing teachers in assign grading table
Rajesh Taneja [Fri, 6 Dec 2013 02:17:08 +0000 (10:17 +0800)]
MDL-43224 navigation: Load local plugin navigation in site admin via ajax
Local plugin can add navigation nodes to site admin and while loading
site admin via ajax this should be considered.
Petr Škoda [Sun, 24 Nov 2013 07:08:27 +0000 (15:08 +0800)]
MDL-42973 fix multiple addon update issues
Petr Škoda [Tue, 3 Dec 2013 01:34:42 +0000 (09:34 +0800)]
MDL-43137 fix open_basedir regression in classloader
Andrew Nicols [Wed, 4 Dec 2013 08:55:26 +0000 (16:55 +0800)]
MDL-43152 JavaScript: Add update instructions for gallery-bootstrap
Andrew Nicols [Wed, 4 Dec 2013 08:16:38 +0000 (16:16 +0800)]
MDL-43152 JavaScript: Fix linting issues with moodle-theme_bootstrapbase
Andrew Nicols [Wed, 4 Dec 2013 08:16:11 +0000 (16:16 +0800)]
MDL-43152 JavaScript: Fix linting issues with moodle-core-blocks
Andrew Nicols [Mon, 2 Dec 2013 06:20:09 +0000 (14:20 +0800)]
MDL-43152 JavaScript: Fix linting issue with navigation JS
Andrew Nicols [Fri, 6 Dec 2013 00:16:33 +0000 (08:16 +0800)]
MDL-43232 JavaSript: Migrate moodle-backup-confirmcancel to use Shifter
Matteo Scaramuccia [Mon, 2 Dec 2013 18:12:46 +0000 (19:12 +0100)]
MDL-43159 Libraries Wrong naming convention in $compat_view.
Matteo Scaramuccia [Wed, 27 Nov 2013 22:33:15 +0000 (23:33 +0100)]
MDL-43082 Themes IE 9 Compatibility View doesn't support SVG.
Tim Hunt [Mon, 2 Dec 2013 17:42:59 +0000 (17:42 +0000)]
MDL-43131 qbank: Fix show question text when first viewing.
When you followed the link to the question bank, the checkbox for the
"Show question text in the question list" option correctly reflected the
user's preference, but what was actually shown in the question bank did
not.
Marina Glancy [Thu, 5 Dec 2013 03:26:22 +0000 (14:26 +1100)]
MDL-42174 behat: change word filepicker to filemanager in step definitions
Marina Glancy [Thu, 5 Dec 2013 02:49:18 +0000 (13:49 +1100)]
MDL-42174 behat: deprecate upload file to filepicker step in favour of filemanager
Marina Glancy [Fri, 1 Nov 2013 06:09:47 +0000 (17:09 +1100)]
MDL-42174 More behat tests for filepicker
Dan Poltawski [Thu, 5 Dec 2013 07:09:50 +0000 (15:09 +0800)]
weekly release 2.7dev
Dan Poltawski [Thu, 5 Dec 2013 07:09:47 +0000 (15:09 +0800)]
Merge branch 'install_master' of git://git.moodle.org/moodle-install
Mark Nelson [Thu, 5 Dec 2013 04:46:06 +0000 (20:46 -0800)]
MDL-43215 core_webservice: retrieve all user name fields when adding a token
David Monllao [Wed, 4 Dec 2013 03:58:32 +0000 (11:58 +0800)]
MDL-41592 behat: Setting a default value for CFG->behat_wwwroot in case it is empty
Dan Poltawski [Thu, 5 Dec 2013 04:03:38 +0000 (12:03 +0800)]
MDL-37517 testing: remove deprecated classes
Dan Poltawski [Thu, 5 Dec 2013 03:39:57 +0000 (11:39 +0800)]
MDL-40517 deprecatedlib: remove functions
* Removed functions which were throwing fatal errors
* Fixup navmenu comment, as it hasn't been throwing a fatal error, it
shouldn't be removed as part of this issue yet. (Although if you are
still using this function, you are crazy and should thank me ;-)).
Ankit Agarwal [Thu, 5 Dec 2013 02:47:43 +0000 (10:47 +0800)]
MDL-42097 auth: Webservice auth uses tokens only not passwords
Petr Škoda [Wed, 4 Dec 2013 10:00:23 +0000 (18:00 +0800)]
MDL-42097 fix handling of passwords when creating new users
Andrew Nicols [Thu, 5 Dec 2013 01:42:31 +0000 (09:42 +0800)]
MDL-43212 JavaScript: Remove deprecated moodle-enrol-notification
Sam Hemelryk [Wed, 4 Dec 2013 19:25:35 +0000 (08:25 +1300)]
Merge branch 'MDL-42084-master' of git://github.com/sammarshallou/moodle
Sam Hemelryk [Wed, 4 Dec 2013 19:07:59 +0000 (08:07 +1300)]
Merge branch 'MDL-43185-master' of git://github.com/FMCorz/moodle
sam marshall [Wed, 4 Dec 2013 16:59:03 +0000 (16:59 +0000)]
MDL-42084 Fix breakage in grader preferences page
Gareth J Barnard [Wed, 4 Dec 2013 11:23:32 +0000 (11:23 +0000)]
MDL-40213 theme_clean: Layout "secure.php" missing settings.
Andrew Nicols [Wed, 4 Dec 2013 08:39:48 +0000 (16:39 +0800)]
MDL-43194 JavaScript: Correct maxlen jshint configuration
Dan Marsden [Wed, 4 Dec 2013 07:54:57 +0000 (20:54 +1300)]
MDL-43192 Repository: param doesn't exist - should use function
Dan Poltawski [Wed, 4 Dec 2013 07:44:03 +0000 (15:44 +0800)]
Merge branch 'wip-MDL-40191-2-master' of git://github.com/marinaglancy/moodle
Marina Glancy [Wed, 4 Dec 2013 07:27:55 +0000 (18:27 +1100)]
MDL-40191 folder: Do not check capability in renderer
Capability to access the module is already checked before calling the renderer. Extra check works bad together with switching roles
Dan Poltawski [Wed, 4 Dec 2013 06:57:24 +0000 (14:57 +0800)]
Merge branch 'wip-mdl-43028' of https://github.com/rajeshtaneja/moodle
Rajesh Taneja [Wed, 4 Dec 2013 06:48:30 +0000 (14:48 +0800)]
MDL-43028 navigation: fixed section for profilepage
section for profile page is profilepage and not mypage
Dan Poltawski [Wed, 4 Dec 2013 03:30:09 +0000 (11:30 +0800)]
Merge branch 'MDL-42563_filter_algebra_thirdpartylibs.xml' of https://github.com/tmuras/moodle
Frederic Massart [Wed, 4 Dec 2013 02:59:49 +0000 (10:59 +0800)]
MDL-43185 behat: Use realpath on existing paths
Sam Hemelryk [Wed, 4 Dec 2013 02:29:00 +0000 (15:29 +1300)]
Merge branch 'MDL-43084-master' of git://github.com/phalacee/moodle
Damyon Wiese [Wed, 4 Dec 2013 01:52:51 +0000 (09:52 +0800)]
Merge branch 'MDL-43083-master' of git://github.com/phalacee/moodle
Dan Poltawski [Wed, 4 Dec 2013 01:08:54 +0000 (09:08 +0800)]
MDL-42597 yui: remove stale built files
Dan Poltawski [Wed, 4 Dec 2013 00:53:25 +0000 (08:53 +0800)]
Merge branch 'wip-mdl-42597' of https://github.com/rajeshtaneja/moodle
Conflicts:
theme/bootstrapbase/style/moodle.css
Jason Fowler [Thu, 28 Nov 2013 01:20:23 +0000 (09:20 +0800)]
MDL-43084 Themes: fixing dialog header in standard theme
AMOS bot [Wed, 4 Dec 2013 00:43:12 +0000 (00:43 +0000)]
Automatically generated installer lang files
Dan Poltawski [Wed, 4 Dec 2013 00:36:05 +0000 (08:36 +0800)]
Merge branch 'master_MDL-43049' of git://github.com/totara/moodle
Rajesh Taneja [Wed, 20 Nov 2013 01:05:01 +0000 (09:05 +0800)]
MDL-42597 Administration: Modified maintenance mode countdown to display nicely
Added Style and JS to display maintenance mode timer similar
to what is done on moodle demo site for rest.
Eloy Lafuente (stronk7) [Tue, 3 Dec 2013 22:55:42 +0000 (23:55 +0100)]
Merge branch 'MDL-41446-master' of git://github.com/sammarshallou/moodle
Sam Hemelryk [Tue, 3 Dec 2013 22:52:12 +0000 (11:52 +1300)]
Merge branch 'MDL-41592_master' of https://github.com/dmonllao/moodle
Eloy Lafuente (stronk7) [Tue, 3 Dec 2013 22:45:54 +0000 (23:45 +0100)]
Merge branch 'w49_MDL-43117_m27_releaseinfo' of https://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Tue, 3 Dec 2013 22:40:19 +0000 (23:40 +0100)]
Merge branch 'MDL-43142_master' of https://github.com/markn86/moodle
Eloy Lafuente (stronk7) [Tue, 3 Dec 2013 22:24:22 +0000 (23:24 +0100)]
Merge branch 'MDL-43140_master' of https://github.com/markn86/moodle
Sam Hemelryk [Tue, 3 Dec 2013 21:12:12 +0000 (10:12 +1300)]
Merge branch 'MDL-43093' of git://github.com/timhunt/moodle
Sam Hemelryk [Tue, 3 Dec 2013 20:49:29 +0000 (09:49 +1300)]
Merge branch 'wip-mdl-40079' of git://github.com/rajeshtaneja/moodle
Sam Hemelryk [Tue, 3 Dec 2013 20:44:25 +0000 (09:44 +1300)]
Merge branch 'MDL-43065-master' of git://github.com/damyon/moodle
Conflicts:
backup/util/ui/base_moodleform.class.php
Sam Hemelryk [Tue, 3 Dec 2013 20:43:43 +0000 (09:43 +1300)]
Merge branch 'MDL-42919-master' of git://github.com/damyon/moodle
