Damyon Wiese [Tue, 7 May 2013 15:06:09 +0000 (23:06 +0800)]
Merge branch 'master_MDL-38102' of github.com:totara/moodle
Dan Poltawski [Tue, 7 May 2013 14:28:05 +0000 (15:28 +0100)]
Merge branch 'MDL-36223-master' of git://github.com/damyon/moodle
Dan Poltawski [Tue, 7 May 2013 14:12:58 +0000 (15:12 +0100)]
Merge branch 'wip-MDL-39436-master' of git://github.com/marinaglancy/moodle
Conflicts:
theme/bootstrapbase/style/moodle.css
Rajesh Taneja [Tue, 7 May 2013 04:02:26 +0000 (12:02 +0800)]
MDL-37245 Blog: Fixed comments.
Rajesh Taneja [Fri, 8 Mar 2013 01:37:21 +0000 (09:37 +0800)]
MDL-37245 Blog: Added permission check for blog comments
Eloy Lafuente (stronk7) [Tue, 7 May 2013 13:50:29 +0000 (15:50 +0200)]
Merge branch 'MDL-39437' of git://github.com/rwijaya/moodle
Dan Poltawski [Tue, 7 May 2013 13:42:44 +0000 (14:42 +0100)]
Merge branch 'MDL-39508_master' of git://github.com/lazydaisy/moodle
Dan Poltawski [Tue, 7 May 2013 11:15:38 +0000 (12:15 +0100)]
Merge branch 'MDL-39496-m' of git://github.com/andrewnicols/moodle
Dan Poltawski [Tue, 7 May 2013 10:54:15 +0000 (11:54 +0100)]
Merge branch 'MDL-38500-master' of git://github.com/FMCorz/moodle
Dan Poltawski [Tue, 7 May 2013 10:43:23 +0000 (11:43 +0100)]
Merge branch 'MDL-39448-master' of git://github.com/sammarshallou/moodle
Conflicts:
cache/stores/memcache/version.php
Dan Poltawski [Tue, 7 May 2013 10:41:30 +0000 (11:41 +0100)]
Merge branch 'master_MDL-35852' of git://github.com/danmarsden/moodle
Damyon Wiese [Tue, 7 May 2013 08:09:10 +0000 (16:09 +0800)]
Merge branch 'MDL-39187_master' of https://github.com/markn86/moodle
Damyon Wiese [Tue, 7 May 2013 07:28:17 +0000 (15:28 +0800)]
Merge branch 'MDL-31713_override' of git://github.com/andyjdavis/moodle
Damyon Wiese [Tue, 7 May 2013 06:04:52 +0000 (14:04 +0800)]
MDL-38596 coursecatlib performance
Version bump for cache definitions and added user delete check to sql
Damyon Wiese [Tue, 7 May 2013 06:09:56 +0000 (14:09 +0800)]
Merge branch 'wip-MDL-38596-master' of git://github.com/marinaglancy/moodle
Sam Hemelryk [Tue, 7 May 2013 05:11:28 +0000 (17:11 +1200)]
Merge branch 'wip-MDL-39499-master' of git://github.com/ds125v/moodle
Conflicts:
theme/bootstrapbase/style/moodle.css
Damyon Wiese [Tue, 7 May 2013 04:43:50 +0000 (12:43 +0800)]
Merge branch 'wip-MDL-39482-master' of git://github.com/marinaglancy/moodle
Andrew Davis [Sun, 21 Apr 2013 07:30:13 +0000 (15:30 +0800)]
MDL-31713 core_grade: added updating of grade min and max to update_final_grade()
Sam Hemelryk [Tue, 7 May 2013 04:13:06 +0000 (16:13 +1200)]
Merge branch 'MDL-39364_clean' of git://github.com/lazydaisy/moodle
Damyon Wiese [Tue, 7 May 2013 03:25:35 +0000 (11:25 +0800)]
Merge branch 'wip-MDL-39130-master' of git://github.com/ds125v/moodle
Conflicts:
theme/bootstrapbase/style/moodle.css
Andrew Davis [Fri, 19 Apr 2013 13:25:18 +0000 (21:25 +0800)]
MDL-31713 core_grade:added a unit test to replicate a raw grade max bug
David Monllao [Tue, 7 May 2013 02:36:40 +0000 (10:36 +0800)]
MDL-39437 mod_lesson: Expanding form fieldsets before clicking elements
Rossiani Wijaya [Thu, 2 May 2013 08:18:44 +0000 (16:18 +0800)]
MDL-39437 lesson mod: rename add a question page section name to avoid conflict in behat
Damyon Wiese [Tue, 7 May 2013 02:41:44 +0000 (10:41 +0800)]
Merge branch 'MDL-39162' of git://github.com/totara/openbadges
Conflicts:
theme/bootstrapbase/style/moodle.css
Eloy Lafuente (stronk7) [Tue, 7 May 2013 01:00:02 +0000 (03:00 +0200)]
Merge branch 'wip-MDL-37500-m25' of git://github.com/samhemelryk/moodle
Mary Evans [Tue, 7 May 2013 00:58:11 +0000 (01:58 +0100)]
MDL-39508 theme_canvas: Fixed dropdown navigation menu in SCORM player view.
Sam Hemelryk [Tue, 7 May 2013 00:18:42 +0000 (12:18 +1200)]
MDL-37500 cache: integration review touchups.
Issues:
1. Fix setType calls
2. Changing from default to all and editing again, default is still selected.
3. Uncheck all options causes error.
4. Doesn't seem to be restricting based upon option.
5. Picked all and got coding error with the database thing.
6. Bad title: https://github.com/samhemelryk/moodle/commit/wip-MDL-37500-m25#L1R157
7. Amend comments - should only be removed once 2.5 is the minimum version for an upgrade.
8. Document the defaultsharing option.
Outcomes:
1. Fixed - copy paste error.
2. Fixed - mforms was applying the default value despite a value being provided. A quirk of elements with array names.
3. Fixed - validation now requires at least one option to be selected.
4. Fixed - issue rose from definitions not being re-parsed. cache/admin.php now reparses the first time a user visits the page.
5. Fixed - better purging of definitions when working with them anonymously. Unit test added.
6. Fixed - new string added and used.
7. Fixed - comments amended.
New issue to address parsing of definitions during upgrade.
New issue to add debugging notice if definition sets only one possible sharing option and that option is user input.
Sam Hemelryk [Wed, 6 Feb 2013 21:59:52 +0000 (10:59 +1300)]
MDL-37500 cache: implemented sharing options and gui
Hugh Davenport [Thu, 28 Mar 2013 01:32:48 +0000 (14:32 +1300)]
MDL-35852 Add config option to prevent changes to configexecutable settings
Damyon Wiese [Mon, 6 May 2013 15:27:40 +0000 (23:27 +0800)]
MDL-38315 Fix unit tests for module completion
Dan Poltawski [Mon, 6 May 2013 15:12:28 +0000 (16:12 +0100)]
Merge branch 'MDL-39435-master-int' of git://github.com/FMCorz/moodle
Dan Poltawski [Mon, 6 May 2013 15:07:51 +0000 (16:07 +0100)]
MDL-38238 icons: convert to make ie9 compatible
Dan Poltawski [Mon, 6 May 2013 15:04:45 +0000 (16:04 +0100)]
Merge branch 'MDL-38238-master' of git://github.com/barbararamiro/moodle
Eloy Lafuente (stronk7) [Mon, 6 May 2013 14:50:30 +0000 (16:50 +0200)]
Merge branch 'MDL-38041_master-fix' of git://github.com/dmonllao/moodle
Maria Torres [Thu, 25 Apr 2013 02:02:46 +0000 (14:02 +1200)]
MDL-39169: Now the question's tags are added in backup/restore options
Damyon Wiese [Mon, 6 May 2013 14:27:41 +0000 (22:27 +0800)]
Merge branch 'MDL-38315-master' of git://github.com/sammarshallou/moodle
Damyon Wiese [Mon, 6 May 2013 13:57:19 +0000 (21:57 +0800)]
Merge branch 'MDL-38480_m' of git://github.com/andreabix/moodle
Dan Poltawski [Mon, 6 May 2013 13:47:58 +0000 (14:47 +0100)]
Merge branch 'MDL-39446' of git://github.com/timhunt/moodle
Dan Poltawski [Mon, 6 May 2013 13:32:33 +0000 (14:32 +0100)]
Merge branch 'MDL-39473-master' of git://github.com/sammarshallou/moodle
Dan Poltawski [Mon, 6 May 2013 12:25:51 +0000 (13:25 +0100)]
Merge branch 'wip-MDL-39065-master' of git://github.com/marinaglancy/moodle
Dan Poltawski [Mon, 6 May 2013 12:11:46 +0000 (13:11 +0100)]
Merge branch 'MDL-39491-workshop-media' of git://github.com/mudrd8mz/moodle
Dan Poltawski [Mon, 6 May 2013 11:39:53 +0000 (12:39 +0100)]
Merge branch 'MDL-39470_master' of https://github.com/markn86/moodle
Damyon Wiese [Wed, 13 Mar 2013 03:07:12 +0000 (11:07 +0800)]
MDL-38443 Assignment: Missing permissions check on downloadall submissions
Dan Poltawski [Mon, 6 May 2013 09:00:23 +0000 (10:00 +0100)]
Merge branch 'MDL-39442-copy-addon' of git://github.com/mudrd8mz/moodle
Conflicts:
admin/tool/installaddon/version.php
Damyon Wiese [Mon, 6 May 2013 07:38:24 +0000 (15:38 +0800)]
Merge branch 'MDL-39484-master-int' of git://github.com/FMCorz/moodle
Damyon Wiese [Mon, 6 May 2013 07:31:52 +0000 (15:31 +0800)]
MDL-39143: Version bump and svgfix for ie9
Damyon Wiese [Mon, 6 May 2013 07:31:05 +0000 (15:31 +0800)]
Merge branch 'MDL-39143-master' of git://github.com/barbararamiro/moodle
Damyon Wiese [Mon, 6 May 2013 07:15:02 +0000 (15:15 +0800)]
Merge branch 'MDL-39445' of git://github.com/timhunt/moodle
Marina Glancy [Mon, 6 May 2013 05:16:48 +0000 (15:16 +1000)]
MDL-38596 Added caching to the list of course contacts
Barbara Ramiro [Mon, 6 May 2013 06:37:04 +0000 (14:37 +0800)]
MDL-39143 usability: New badge icon - monochrome, bigger, clearer
David Monllao [Mon, 6 May 2013 06:12:15 +0000 (14:12 +0800)]
MDL-38041 behat: Respect error_reporting() values overwritten by moodle code
Mark Nelson [Mon, 6 May 2013 05:51:00 +0000 (13:51 +0800)]
MDL-39470 cache: added missing component to get_string call
Damyon Wiese [Mon, 6 May 2013 04:27:19 +0000 (12:27 +0800)]
Merge branch 'MDL-39412' of git://github.com/timhunt/moodle
Yuliya Bozhko [Mon, 6 May 2013 04:20:02 +0000 (16:20 +1200)]
MDL-39162: Add badges CSS to bootstrap theme
Damyon Wiese [Mon, 6 May 2013 04:17:44 +0000 (12:17 +0800)]
MDL-39399: Version bump for css
Marina Glancy [Mon, 6 May 2013 04:15:22 +0000 (14:15 +1000)]
MDL-38596 Optimise SQL in preloading course contacts for number of courses
Damyon Wiese [Mon, 6 May 2013 04:13:27 +0000 (12:13 +0800)]
Merge branch 'MDL-39399-master' of git://github.com/FMCorz/moodle
Conflicts:
theme/bootstrapbase/style/moodle.css
Marina Glancy [Fri, 3 May 2013 04:45:23 +0000 (14:45 +1000)]
MDL-39482 avoid using get_category_or_system_context() because file might not be included
Damyon Wiese [Mon, 6 May 2013 04:00:34 +0000 (12:00 +0800)]
Merge branch 'MDL-39480_badge' of git://github.com/andyjdavis/moodle
Damyon Wiese [Mon, 6 May 2013 03:43:37 +0000 (11:43 +0800)]
Merge branch 'wip-MDL-38594-master' of git://github.com/marinaglancy/moodle
Frederic Massart [Fri, 3 May 2013 06:29:07 +0000 (14:29 +0800)]
MDL-39484 core: Undefined ostype during installation process
Eloy Lafuente (stronk7) [Sun, 5 May 2013 23:49:51 +0000 (01:49 +0200)]
Merge branch 'MDL-39348_master' of git://github.com/dmonllao/moodle
Eloy Lafuente (stronk7) [Sun, 5 May 2013 23:23:49 +0000 (01:23 +0200)]
Merge branch 'MDL-38041_master' of git://github.com/dmonllao/moodle
Dan Poltawski [Sun, 5 May 2013 10:29:11 +0000 (11:29 +0100)]
Merge branch 'brokencalc' of git://github.com/andyjdavis/moodle
Andrew Davis [Sat, 4 May 2013 03:44:25 +0000 (11:44 +0800)]
MDL-39480 core_badge: prevented a php notice
Mary Evans [Sat, 4 May 2013 01:34:44 +0000 (02:34 +0100)]
MDL-39364 theme_clean: remove all references to the Simple theme from Clean theme.
David Scotson [Fri, 3 May 2013 15:28:07 +0000 (16:28 +0100)]
MDL-39499 bootstrapbase: Make two .singlebuttons line up
Dan Poltawski [Fri, 3 May 2013 15:05:41 +0000 (16:05 +0100)]
Merge branch 'MDL-39476-master' of git://github.com/damyon/moodle
David Scotson [Fri, 3 May 2013 14:47:15 +0000 (15:47 +0100)]
MDL-30130 bootstrapbase: Bring back Quiz answer feedback
Andrew Nicols [Fri, 3 May 2013 13:13:17 +0000 (14:13 +0100)]
MDL-39496 Admin: Reduce excessive is_array tests in admin_category
admin_category::category_cache is a protected value which is only ever
treated as an array. We shouldn't need to test that it's an array each time
we use it.
David Mudrák [Fri, 3 May 2013 09:43:03 +0000 (11:43 +0200)]
MDL-39491 Fix order of Workshop submission text processing
The order of format_text() and file_rewrite_pluginfile_urls() is
important to make filters work correctly.
Barbara Ramiro [Fri, 3 May 2013 09:11:36 +0000 (17:11 +0800)]
MDL-38238 usability: Revised t/lock and t/unlocked icons
Damyon Wiese [Fri, 3 May 2013 07:37:57 +0000 (15:37 +0800)]
Merge branch 'MDL-38714_tmp' of git://github.com/rwijaya/moodle
Damyon Wiese [Fri, 3 May 2013 03:16:15 +0000 (11:16 +0800)]
MDL-39476 Assign: Cleanup old bad data before adding new index
Mark Nelson [Thu, 2 May 2013 05:19:40 +0000 (13:19 +0800)]
MDL-39187 forms: fixed issue where calendar pop-up did not display when a date selector form element was added to a group
Marina Glancy [Fri, 3 May 2013 04:45:23 +0000 (14:45 +1000)]
MDL-39482 avoid using get_category_or_system_context() because file might not be included
David Monllao [Thu, 2 May 2013 07:35:23 +0000 (15:35 +0800)]
MDL-39348 behat: Compatibility with Safari and IE
Also changing from SeleniumDriver checking
to GoutteDriver as is less probably to change
goutte than to change selenium.
David Monllao [Thu, 25 Apr 2013 09:07:57 +0000 (17:07 +0800)]
MDL-39348 behat: Switching to wait which does not conflict with IE
Also solving bug with DOM ready, timeout
was set to self::TIMEOUT miliseconds not
seconds.
David Monllao [Thu, 25 Apr 2013 07:41:24 +0000 (15:41 +0800)]
MDL-39348 behat: Chaining strings instead of splitting strings in lines
David Monllao [Thu, 25 Apr 2013 06:55:45 +0000 (14:55 +0800)]
MDL-39348 behat: Changing to correct activity names
David Monllao [Thu, 25 Apr 2013 06:47:48 +0000 (14:47 +0800)]
MDL-39348 behat: Removing redundant step
This is causing some browsers to fail tests
as they uses the DOM of the current page to
search "You are logged in as".
David Monllao [Wed, 1 May 2013 07:58:55 +0000 (15:58 +0800)]
MDL-38041 behat: Also fail tests if there is any other backtrace
David Monllao [Mon, 29 Apr 2013 08:01:32 +0000 (16:01 +0800)]
MDL-38041 behat: Capturing also PHP debug messages
David Monllao [Fri, 22 Feb 2013 03:13:42 +0000 (11:13 +0800)]
MDL-38041 behat: Adding hook
Stops execution when the output contains
an exception, a debugging message or a PHP
debug message.
David Monllao [Fri, 22 Feb 2013 03:12:42 +0000 (11:12 +0800)]
MDL-38041 behat: Adding styles to debugging messages
Only when a simulated user session
is running.
Marina Glancy [Wed, 1 May 2013 03:16:00 +0000 (13:16 +1000)]
MDL-39436 fixing RTL in filemanager
Marina Glancy [Thu, 2 May 2013 07:27:30 +0000 (17:27 +1000)]
MDL-39065 fixed bug with quick jump to category
Marina Glancy [Thu, 2 May 2013 04:54:36 +0000 (14:54 +1000)]
MDL-38594 Core themes changed for the new course listings styles
Marina Glancy [Thu, 2 May 2013 01:16:21 +0000 (11:16 +1000)]
MDL-39318 CSS bug on mouse hover of paging bar in some themes
Tim Hunt [Mon, 29 Apr 2013 18:04:51 +0000 (19:04 +0100)]
MDL-39412 question behaviours: hide manual graded option
The ability to set all your quiz questions to require manual grading is
an interesting possibility, but practically almost useless.
If you set that accidentally, then you are badly stuck. There is no way
to fix it after the students have answered the quiz.
Therefore, we should set the config option to hide that option from the
UI. We do this for all Moodle sites as part of the upgrade, not just for
new installs.
If any admin wants to re-enable this, they can later.
Tim Hunt [Wed, 1 May 2013 14:50:09 +0000 (15:50 +0100)]
MDL-39450 course formats: add static cache to get_format_or_default
This function gets called hundreds of times on every page, often with
exactly the same input, so I added a static cache.
Tim Hunt [Wed, 1 May 2013 18:28:58 +0000 (19:28 +0100)]
MDL-39446 calculated qtype: make answer formula input bigger
This makes it easier for teachers editing questions.
Tim Hunt [Wed, 1 May 2013 10:35:14 +0000 (11:35 +0100)]
MDL-39445 get_plugin_list clean_param use is slow
get_plugin_list was calling clean_param($pluginname, PARAM_PLUGIN) a
lot (600+ times per page), and that is much slower than you would guess.
A specific function for this case, (which we then also use from
clean_param) is a performance win.
sam marshall [Thu, 2 May 2013 15:00:09 +0000 (16:00 +0100)]
MDL-39472 MUC: Improve parse_key performance
Dan Poltawski [Thu, 2 May 2013 13:34:48 +0000 (14:34 +0100)]
on demand release 2.5beta+
Dan Poltawski [Thu, 2 May 2013 13:32:03 +0000 (14:32 +0100)]
Merge branch 'install_master' of git://git.moodle.cz/moodle-install
David Mudrák [Thu, 2 May 2013 11:44:47 +0000 (13:44 +0200)]
MDL-39442 Do not use native rename() when moving folders
The native rename() function does not support moving folders
cross-device. See https://bugs.php.net/bug.php?id=54097 for details. So
instead of trying to move the whole tree, the new installer's method
moves files recursively one by one.
This is consistent with what mdeploy.php already does.
Damyon Wiese [Thu, 2 May 2013 08:20:30 +0000 (16:20 +0800)]
Merge branch 'MDL-30775-master' of git://github.com/mouneyrac/moodle
Conflicts:
course/externallib.php
Damyon Wiese [Thu, 2 May 2013 07:41:43 +0000 (15:41 +0800)]
MDL-36223 Assign: User outline report grade display
Use str_long_grade for user outline report because it handles scales and
no grade.
Thanks to Jean-Daniel Descoteaux for suggesting this fix.
Rossiani Wijaya [Thu, 2 May 2013 07:26:35 +0000 (15:26 +0800)]
MDL-38717: Lesson mod: fixed behat script to accomodate the fix of settype()