Eloy Lafuente (stronk7) [Tue, 31 Jan 2012 23:48:47 +0000 (00:48 +0100)]
Merge branch 'wip-MDL-31197-m23' of git://github.com/samhemelryk/moodle
Eloy Lafuente (stronk7) [Tue, 31 Jan 2012 23:41:25 +0000 (00:41 +0100)]
Merge branch 'master_MDL-31039' of git://github.com/danmarsden/moodle
Eloy Lafuente (stronk7) [Tue, 31 Jan 2012 23:25:05 +0000 (00:25 +0100)]
Merge branch 'MDL-31000-master-3' of git://git.luns.net.uk/moodle
Eloy Lafuente (stronk7) [Tue, 31 Jan 2012 22:57:32 +0000 (23:57 +0100)]
Merge branch 'MDL-31448_incorrect-comment' of https://github.com/ncsu-delta/moodle
Eloy Lafuente (stronk7) [Tue, 31 Jan 2012 22:36:35 +0000 (23:36 +0100)]
MDL-30714 theme_afterburner: better, output the information, LOL
Mary Evans [Wed, 25 Jan 2012 01:20:46 +0000 (01:20 +0000)]
MDL-30714 theme_afterburner: logo link to home page
Glenn Ansley [Tue, 31 Jan 2012 19:39:23 +0000 (14:39 -0500)]
MDL-31448 Replaced incorrect PHP comment
Eloy Lafuente (stronk7) [Tue, 31 Jan 2012 18:44:21 +0000 (19:44 +0100)]
Merge branch 'MDL-31015-master' of git://github.com/sammarshallou/moodle
Eloy Lafuente (stronk7) [Tue, 31 Jan 2012 18:30:58 +0000 (19:30 +0100)]
Merge branch 'MDL-30854' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Tue, 31 Jan 2012 16:16:04 +0000 (17:16 +0100)]
Merge branch 'MDL-30484' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Tue, 31 Jan 2012 16:06:01 +0000 (17:06 +0100)]
Merge branch 'MDL-31314' of git://github.com/timhunt/moodle
Aparup Banerjee [Tue, 31 Jan 2012 08:48:59 +0000 (16:48 +0800)]
Merge branch 'MDL-30828_feedback_sort' of git://github.com/andyjdavis/moodle
Aparup Banerjee [Tue, 31 Jan 2012 08:43:28 +0000 (16:43 +0800)]
Merge branch 'MDL-30707_forum_log' of git://github.com/andyjdavis/moodle
Aparup Banerjee [Tue, 31 Jan 2012 06:21:14 +0000 (14:21 +0800)]
Merge branch 'MDL-29097_mod_update_create' of git://github.com/andyjdavis/moodle
Aparup Banerjee [Tue, 31 Jan 2012 03:51:14 +0000 (11:51 +0800)]
Merge branch 'MDL-31426' of git://github.com/stronk7/moodle
Aparup Banerjee [Tue, 31 Jan 2012 03:15:26 +0000 (11:15 +0800)]
Merge branch 'MDL-31428' of git://github.com/stronk7/moodle
Andrew Davis [Thu, 29 Dec 2011 09:20:39 +0000 (16:20 +0700)]
MDL-30707 mod_forum: fixed a add_to_log() call that was causing invalid URLs to be added to the log
Andrew Davis [Wed, 28 Dec 2011 08:28:17 +0000 (15:28 +0700)]
MDL-30828 mod_feedback: fixed sorting when viewing responses
Andrew Davis [Fri, 30 Dec 2011 03:56:22 +0000 (10:56 +0700)]
MDL-29097 course: refactored to avoid having two seperate calls to events_trigger()
Eloy Lafuente (stronk7) [Mon, 30 Jan 2012 23:22:32 +0000 (00:22 +0100)]
MDL-31428 forum: prevent some warnings with debug enabled
Eloy Lafuente (stronk7) [Mon, 30 Jan 2012 22:20:03 +0000 (23:20 +0100)]
MDL-31426 forum: don't show/allow any subscription to not enrolled users
Tim Hunt [Mon, 16 Jan 2012 18:29:52 +0000 (18:29 +0000)]
MDL-30484 question engine: don't lose response files when regrading.
The problem was mostly that, in the past, we did not worry if
question_attempt_step.id changed during regrade (because we deleted the
old step row and inserted a new one). However, now that steps can have
associated files, we can't be that slack, becuase the step id is used as
the file itemid.
So, now, we have to update the existing rows during a regrade. We do
this by having the question engine tell the question_engine_unit_of_work
that the step has first been deleted, and then added back. Then we make
the unit-of-work spot that delete + add = update.
This also means that during regrading, we have to pass around some extra
ids so that new steps know the id of the step they are replacing.
Naturally, this requires some quite trickly logic, so I finally got
around to writing unit tests for question_engine_unit_of_work, which is
a good thing.
Along the way I also got around to renaming
question_attempt->set_number_in_usage, which got missed out when
everthing else was renamed to slot ages ago.
Finally, while working on this code, I noticed and fixed some PHPdoc
comments.
Tim Hunt [Wed, 18 Jan 2012 16:47:45 +0000 (16:47 +0000)]
MDL-30854 quiz/question editing: fix create calc question & add on page.
This was one of those innocent seeming issues where, once you start
digging, you find a mess. In this case, the code that is now in
question_wizard_form::add_hidden_fields used to exist in four different
places, in four inconsistent versions. This is now all nicely
re-factored, and that solves the problem.
Along the way, I found and fixed some wrong string references in
qtype_random, and stripped out some unnecessary &s in function
declarations.
Tim Hunt [Fri, 20 Jan 2012 15:53:05 +0000 (15:53 +0000)]
MDL-31314 gradebook restore: fix category.depth on restore.
Without this, restoring backups made with the OU's custom 'restore from
1.9' feature, and possibly other people's custom converstion code, does
not work properly.
Also, fix poor recordset code.
Aparup Banerjee [Mon, 30 Jan 2012 08:23:54 +0000 (16:23 +0800)]
Merge branch 'MDL-26260' of git://github.com/timhunt/moodle
Aparup Banerjee [Mon, 30 Jan 2012 07:52:50 +0000 (15:52 +0800)]
Merge branch 'MDL-31311-Fix_iframe_titles' of git://github.com/ncsu-delta/moodle
Aparup Banerjee [Mon, 30 Jan 2012 07:01:53 +0000 (15:01 +0800)]
Merge branch 'MDL-31319' of git://github.com/mackensen/moodle
Aparup Banerjee [Mon, 30 Jan 2012 06:24:31 +0000 (14:24 +0800)]
Merge branch 'MDL-31392' of git://github.com/timhunt/moodle
sam marshall [Wed, 4 Jan 2012 11:44:18 +0000 (11:44 +0000)]
MDL-31015 File/URL resource 'Open' and 'Force download' options should work consistently
Glenn Ansley [Fri, 27 Jan 2012 15:22:59 +0000 (10:22 -0500)]
MDL-31311 Enhance unhelpful iframe title attributes
David Mudrak [Thu, 26 Jan 2012 13:09:04 +0000 (14:09 +0100)]
MDL-31317 original_site_identifier_hash falls back to null during the backup conversion
Even if the site identifier is not defined in the source 1.9 backup then the
converted 2.0 version should still contain the element to prevent PHP
notices on direct assignment.
Dan Marsden [Thu, 26 Jan 2012 08:42:06 +0000 (21:42 +1300)]
SCORM AICC MDL-31039 update external AICC url correctly - thanks to Albert Rhemrev for report/fix
Eloy Lafuente (stronk7) [Fri, 27 Jan 2012 01:27:25 +0000 (02:27 +0100)]
weekly release 2.3dev (blame stronk7 for 0202 mistake)
On
20120102 version was incorrectly bumped to 2012-02-02. So,
until then (< 1mo) we are going to be incrementing decimal digits
only and not date ones (first 8).
Eloy Lafuente (stronk7) [Fri, 27 Jan 2012 01:19:54 +0000 (02:19 +0100)]
fix permissions
Eloy Lafuente (stronk7) [Fri, 27 Jan 2012 01:19:05 +0000 (02:19 +0100)]
Merge branch 'install_master' of git://github.com/amosbot/moodle
AMOS bot [Fri, 27 Jan 2012 00:31:13 +0000 (00:31 +0000)]
Automatically generated installer lang files
Tim Hunt [Thu, 26 Jan 2012 16:31:44 +0000 (16:31 +0000)]
MDL-31392 qeupgradehelper partial upgrade support broken since 2.2
Sam Hemelryk [Wed, 25 Jan 2012 05:53:56 +0000 (13:53 +0800)]
Merge branch 'wip-mdl-30993' of git://github.com/rajeshtaneja/moodle
Rajesh Taneja [Thu, 12 Jan 2012 02:14:17 +0000 (10:14 +0800)]
MDL-30993 time api: Php document updated for time api
Eloy Lafuente (stronk7) [Wed, 25 Jan 2012 00:52:25 +0000 (01:52 +0100)]
Merge branch 'MDL-31122-master' of git://github.com/sammarshallou/moodle
Eloy Lafuente (stronk7) [Wed, 25 Jan 2012 00:40:20 +0000 (01:40 +0100)]
Merge branch 'MDL-31121-master' of git://github.com/sammarshallou/moodle
Eloy Lafuente (stronk7) [Wed, 25 Jan 2012 00:16:49 +0000 (01:16 +0100)]
Merge branch 'MDL-29896-master' of git://github.com/sammarshallou/moodle
Eloy Lafuente (stronk7) [Wed, 25 Jan 2012 00:06:00 +0000 (01:06 +0100)]
Merge branch 'MDL-31113_multiple_files_file_manager' of https://github.com/davosmith/moodle
Eloy Lafuente (stronk7) [Wed, 25 Jan 2012 00:02:30 +0000 (01:02 +0100)]
Merge branch 'MDL-31110_loading_animation' of git://github.com/davosmith/moodle
Eloy Lafuente (stronk7) [Tue, 24 Jan 2012 23:57:25 +0000 (00:57 +0100)]
Merge branch 'MDL-31153-master' of git://github.com/sammarshallou/moodle
Eloy Lafuente (stronk7) [Tue, 24 Jan 2012 23:47:10 +0000 (00:47 +0100)]
Merge branch 'MDL-30120' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Tue, 24 Jan 2012 22:54:44 +0000 (23:54 +0100)]
Merge branch 'w04_MDL-31238_m23_php54' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Tue, 24 Jan 2012 17:45:29 +0000 (18:45 +0100)]
Merge branch 'MDL-31245-master-1' of git://git.luns.net.uk/moodle
Aparup Banerjee [Tue, 24 Jan 2012 14:57:24 +0000 (22:57 +0800)]
Merge branch 'wip-MDL-31224-m23' of git://github.com/samhemelryk/moodle
Aparup Banerjee [Tue, 24 Jan 2012 12:23:05 +0000 (20:23 +0800)]
Merge branch 'wip-MDL-29941-master' of git://github.com/samhemelryk/moodle
Eloy Lafuente (stronk7) [Tue, 24 Jan 2012 12:12:25 +0000 (13:12 +0100)]
MDL-31189 whitespace fixes
Eloy Lafuente (stronk7) [Tue, 24 Jan 2012 11:55:23 +0000 (12:55 +0100)]
MDL-29614 whitespace fixes
Eloy Lafuente (stronk7) [Tue, 24 Jan 2012 11:24:46 +0000 (12:24 +0100)]
Merge branch 'w04_MDL-31183_m23_gloscounts' of git://github.com/skodak/moodle
M Kassaei [Fri, 20 Jan 2012 11:59:14 +0000 (11:59 +0000)]
MDL-31306 question preview: disable 'Fill correct' for qtypes that can't
Kordan [Thu, 19 Jan 2012 08:15:04 +0000 (09:15 +0100)]
MDL-29614 theme_formal_white: Change the way Formal White theme shrinks pages
Sam Hemelryk [Tue, 24 Jan 2012 03:29:08 +0000 (11:29 +0800)]
Merge branch 'MDL-31205' of git://github.com/timhunt/moodle
Sam Hemelryk [Tue, 24 Jan 2012 03:07:22 +0000 (11:07 +0800)]
Merge branch 'MDL-31189' of git://github.com/lazydaisy/moodle
Sam Hemelryk [Tue, 24 Jan 2012 03:03:22 +0000 (11:03 +0800)]
Merge branch 'MDL-31231' of git://github.com/lazydaisy/moodle
Eloy Lafuente (stronk7) [Tue, 24 Jan 2012 00:28:56 +0000 (01:28 +0100)]
Merge branch 'w04_MDL-31176_m23_groupcontext' of git://github.com/skodak/moodle
Aparup Banerjee [Mon, 23 Jan 2012 23:15:15 +0000 (07:15 +0800)]
Merge branch 'wip-MDL-28352-master' of git://github.com/marinaglancy/moodle
Eloy Lafuente (stronk7) [Mon, 23 Jan 2012 23:09:12 +0000 (00:09 +0100)]
Merge branch 'MDL-30033' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Mon, 23 Jan 2012 23:07:18 +0000 (00:07 +0100)]
Merge branch 'MDL-31065' of git://github.com/timhunt/moodle
Aparup Banerjee [Mon, 23 Jan 2012 22:57:57 +0000 (06:57 +0800)]
Merge branch 'w04_MDL-31184_m23_glosreset' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Mon, 23 Jan 2012 20:17:54 +0000 (21:17 +0100)]
Merge branch 'w04_MDL-31081_m23_forumindex' of git://github.com/skodak/moodle
Charles Fulton [Sat, 21 Jan 2012 01:11:47 +0000 (17:11 -0800)]
MDL-31319 quiz attempts: include currentpage in backup
Sam Hemelryk [Mon, 23 Jan 2012 08:09:41 +0000 (16:09 +0800)]
Merge branch 'w04_MDL-31172_m23_fullpath' of git://github.com/skodak/moodle
Sam Hemelryk [Mon, 23 Jan 2012 08:06:47 +0000 (16:06 +0800)]
Merge branch 'w04_MDL-31173_m23_restore' of git://github.com/skodak/moodle
Sam Hemelryk [Mon, 23 Jan 2012 07:38:06 +0000 (15:38 +0800)]
Merge branch 'w04_MDL-31177_m23_odsexport' of git://github.com/skodak/moodle
Sam Hemelryk [Mon, 23 Jan 2012 07:27:43 +0000 (15:27 +0800)]
Merge branch 'w04_MDL-31178_m23_enrolledws' of git://github.com/skodak/moodle
Sam Hemelryk [Mon, 23 Jan 2012 06:46:05 +0000 (14:46 +0800)]
Merge branch 'w04_MDL-31182_m23_messprefs' of git://github.com/skodak/moodle
Sam Hemelryk [Mon, 23 Jan 2012 06:35:26 +0000 (14:35 +0800)]
Merge branch 'w04_MDL-31186_m23_extprofiles' of git://github.com/skodak/moodle
Sam Hemelryk [Mon, 23 Jan 2012 06:23:25 +0000 (14:23 +0800)]
Merge branch 'w04_MDL-31202_m23_emailvalidation' of git://github.com/skodak/moodle
Mary Evans [Sat, 21 Jan 2012 00:50:46 +0000 (00:50 +0000)]
MDL-31269 theme_magazine: fixes login pagelayout in theme_magazine
Sam Hemelryk [Mon, 23 Jan 2012 05:13:10 +0000 (13:13 +0800)]
Merge branch 'MDL-31324' of git://github.com/lazydaisy/moodle
Sam Hemelryk [Mon, 23 Jan 2012 03:48:59 +0000 (11:48 +0800)]
Merge branch 'MDL-31077' of git://github.com/mouneyrac/moodle
Sam Hemelryk [Mon, 23 Jan 2012 03:28:17 +0000 (11:28 +0800)]
Merge branch 'MDL-31329' of git://github.com/stronk7/moodle
Sam Hemelryk [Mon, 23 Jan 2012 03:22:08 +0000 (11:22 +0800)]
Merge branch 'MDL-31333' of git://github.com/stronk7/moodle
Sam Hemelryk [Mon, 23 Jan 2012 03:08:22 +0000 (11:08 +0800)]
Merge branch 'MDL-31013-master-1' of git://git.luns.net.uk/moodle
Eloy Lafuente (stronk7) [Mon, 23 Jan 2012 00:56:43 +0000 (01:56 +0100)]
MDL-31333 backup: reintroduce missing function lost by MDL-30610
Mary Evans [Mon, 23 Jan 2012 00:55:59 +0000 (00:55 +0000)]
MDL-31189 fixes performance info in theme_sky_high footer
Eloy Lafuente (stronk7) [Mon, 23 Jan 2012 00:19:18 +0000 (01:19 +0100)]
Merge branch 'wip-MDL-31179-master' of github.com:marinaglancy/moodle
Eloy Lafuente (stronk7) [Mon, 23 Jan 2012 00:10:38 +0000 (01:10 +0100)]
Merge branch 'w04_MDL-31180_m23_closedproperty' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Mon, 23 Jan 2012 00:04:00 +0000 (01:04 +0100)]
Merge branch 'w04_MDL-31181_m23_fitlertestcfg' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Sun, 22 Jan 2012 23:56:08 +0000 (00:56 +0100)]
Merge branch 'MDL-31058' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Sun, 22 Jan 2012 23:28:08 +0000 (00:28 +0100)]
Merge branch 'w04_MDL-31185_m23_postscfg' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Sun, 22 Jan 2012 20:30:06 +0000 (21:30 +0100)]
MDL-31329 timezones: updated to 2011n
Petr Skoda [Sun, 22 Jan 2012 13:54:43 +0000 (14:54 +0100)]
MDL-31081 limit query to one course in forum_get_subscribed_forums()
This improves performance on the forum index page. Credit goes to Mark Nielsen.
Mary Evans [Sun, 22 Jan 2012 01:43:24 +0000 (01:43 +0000)]
MDL-31324 fixes custom css settings in theme_afterburner
Mary Evans [Sun, 22 Jan 2012 00:44:38 +0000 (00:44 +0000)]
MDL-31231 fixes docked navigation menu in theme_afterburner
Petr Skoda [Sat, 21 Jan 2012 19:19:34 +0000 (20:19 +0100)]
MDL-31172 fix variable name typo in backup file logger
Petr Skoda [Sat, 21 Jan 2012 19:14:58 +0000 (20:14 +0100)]
MDL-31173 fix variable name typo when throwing invalid $rule param exception in restore decode processor
Petr Skoda [Sat, 21 Jan 2012 18:57:01 +0000 (19:57 +0100)]
MDL-31176 add missing global $DB when looking for group related context in calendar
Petr Skoda [Sat, 21 Jan 2012 18:51:28 +0000 (19:51 +0100)]
MDL-31177 fix notices when exporting logs to ods
Petr Skoda [Sat, 21 Jan 2012 16:58:47 +0000 (17:58 +0100)]
MDL-31178 fix broken core_enrol_external::get_enrolled_users()
Petr Skoda [Sat, 21 Jan 2012 16:13:39 +0000 (17:13 +0100)]
MDL-31180 fix coding error in fake_recordset iterator
Petr Skoda [Sat, 21 Jan 2012 16:07:59 +0000 (17:07 +0100)]
MDL-31181 fix missing global $CFG that was breaking unit test teardown
Petr Skoda [Sat, 21 Jan 2012 15:59:16 +0000 (16:59 +0100)]
MDL-31182 fix fatal error when problem detected in finding messaging defaults
Petr Skoda [Sat, 21 Jan 2012 15:47:03 +0000 (16:47 +0100)]
MDL-31183 fix non-functional glossary_count_unrated_entries()
Petr Skoda [Sat, 21 Jan 2012 15:31:04 +0000 (16:31 +0100)]
MDL-31184 fix multiple problems when reseting individual glossary types
Petr Skoda [Sat, 21 Jan 2012 15:17:06 +0000 (16:17 +0100)]
MDL-31185 fix missing CFG in forum_get_posts_by_user()
