Damyon Wiese [Tue, 21 Jan 2014 02:41:40 +0000 (10:41 +0800)]
Merge branch 'wip-mdl-40917' of https://github.com/rajeshtaneja/moodle
Dan Poltawski [Tue, 21 Jan 2014 02:37:01 +0000 (10:37 +0800)]
Merge branch 'MDL-42955_b' of git://github.com/rwijaya/moodle
Damyon Wiese [Tue, 21 Jan 2014 01:35:21 +0000 (09:35 +0800)]
Merge branch 'MDL-41688-master' of git://github.com/FMCorz/moodle
Damyon Wiese [Tue, 21 Jan 2014 01:28:54 +0000 (09:28 +0800)]
Merge branch 'MDL-43732' of github.com:merrill-oakland/moodle
Eloy Lafuente (stronk7) [Tue, 21 Jan 2014 00:59:50 +0000 (01:59 +0100)]
Merge branch 'wip-MDL-43333-master' of git://github.com/marinaglancy/moodle
Eric Merrill [Wed, 15 Jan 2014 23:15:05 +0000 (18:15 -0500)]
MDL-43732 quiz Fix styles so that question div doesn't overlap controls.
Eloy Lafuente (stronk7) [Tue, 21 Jan 2014 00:54:00 +0000 (01:54 +0100)]
Merge branch 'wip-MDL-43211-master' of git://github.com/marinaglancy/moodle
Eloy Lafuente (stronk7) [Tue, 21 Jan 2014 00:46:16 +0000 (01:46 +0100)]
Merge branch 'MDL-43401-master' of git://github.com/FMCorz/moodle
Eloy Lafuente (stronk7) [Tue, 21 Jan 2014 00:43:13 +0000 (01:43 +0100)]
Merge branch 'MDL-43480_master' of git://github.com/dmonllao/moodle
Eloy Lafuente (stronk7) [Tue, 21 Jan 2014 00:13:04 +0000 (01:13 +0100)]
Merge branch 'MDL-41693-master' of git://github.com/FMCorz/moodle
Eloy Lafuente (stronk7) [Mon, 20 Jan 2014 23:20:28 +0000 (00:20 +0100)]
Merge branch 'MDL-39684-master' of git://github.com/FMCorz/moodle
Conflicts:
theme/bootstrapbase/style/moodle.css
Eloy Lafuente (stronk7) [Mon, 20 Jan 2014 23:17:31 +0000 (00:17 +0100)]
Merge branch 'MDL-40533-master' of git://github.com/FMCorz/moodle
Eloy Lafuente (stronk7) [Mon, 20 Jan 2014 23:05:03 +0000 (00:05 +0100)]
Merge branch 'MDL-43743_master' of git://github.com/dmonllao/moodle
Eloy Lafuente (stronk7) [Mon, 20 Jan 2014 22:59:27 +0000 (23:59 +0100)]
Merge branch 'MDL-41362-master' of git://github.com/FMCorz/moodle
Conflicts:
theme/bootstrapbase/style/moodle.css
Frederic Massart [Tue, 14 Jan 2014 14:24:13 +0000 (15:24 +0100)]
MDL-41688 gradebook: Improved grading layout on bootstrapbase themes
Damyon Wiese [Mon, 20 Jan 2014 09:24:04 +0000 (17:24 +0800)]
MDL-39756 qtype_essay : Make defaults match upgrade (and php) for responserequired field
Damyon Wiese [Mon, 20 Jan 2014 09:10:38 +0000 (17:10 +0800)]
Merge branch 'MDL-43632-master' of https://github.com/lucisgit/moodle
Damyon Wiese [Mon, 20 Jan 2014 08:20:15 +0000 (16:20 +0800)]
Merge branch 'MDL-39756-essay' of https://github.com/ktemkin/moodle
Damyon Wiese [Mon, 20 Jan 2014 08:02:54 +0000 (16:02 +0800)]
Merge branch 'MDL-32523' of git://github.com/timhunt/moodle
Dan Poltawski [Mon, 20 Jan 2014 07:29:15 +0000 (15:29 +0800)]
Merge branch 'wip-MDL-41062-master' of git://github.com/marinaglancy/moodle
Dan Poltawski [Mon, 20 Jan 2014 07:25:46 +0000 (15:25 +0800)]
Merge branch '42682-27' of git://github.com/samhemelryk/moodle
Dan Poltawski [Mon, 20 Jan 2014 06:24:38 +0000 (14:24 +0800)]
Merge branch 'MDL-43690' of git://github.com/timhunt/moodle
Rossiani Wijaya [Mon, 20 Jan 2014 06:00:29 +0000 (14:00 +0800)]
MDL-42955: Removed scrollbar from block's action menu
Damyon Wiese [Mon, 20 Jan 2014 05:21:58 +0000 (13:21 +0800)]
Merge branch 'MDL-42495-m' of git://github.com/micaherne/moodle
Dan Poltawski [Mon, 20 Jan 2014 04:56:17 +0000 (12:56 +0800)]
Merge branch 'MDL-42980' of git://github.com/rwijaya/moodle
Conflicts:
theme/bootstrapbase/style/moodle.css
Marina Glancy [Tue, 14 Jan 2014 06:54:00 +0000 (14:54 +0800)]
MDL-41062 gradebook: corrections to grade_item upgrade script, more tests
Damyon Wiese [Mon, 20 Jan 2014 03:27:07 +0000 (11:27 +0800)]
Merge branch 'MDL-39683-master' of git://github.com/FMCorz/moodle
Conflicts:
theme/bootstrapbase/style/moodle.css
Damyon Wiese [Mon, 20 Jan 2014 03:22:27 +0000 (11:22 +0800)]
MDL-40051 Add mnet test folder to phpunit.xml.dist
Damyon Wiese [Mon, 20 Jan 2014 02:57:30 +0000 (10:57 +0800)]
Merge branch '43675-27' of git://github.com/samhemelryk/moodle
Dan Poltawski [Mon, 20 Jan 2014 02:53:50 +0000 (10:53 +0800)]
Merge branch 'MDL-43671_message' of https://github.com/andyjdavis/moodle
Damyon Wiese [Mon, 20 Jan 2014 02:41:36 +0000 (10:41 +0800)]
Merge branch 'MDL-40051_master' of https://github.com/markn86/moodle
Dan Poltawski [Mon, 20 Jan 2014 02:33:36 +0000 (10:33 +0800)]
Merge branch 'MDL-40139-master' of git://github.com/FMCorz/moodle
Mark Nelson [Sun, 1 Dec 2013 00:16:42 +0000 (16:16 -0800)]
MDL-40051 core_lib: replaced add_to_log call when failing to send email with an event
Mark Nelson [Fri, 29 Nov 2013 20:58:40 +0000 (12:58 -0800)]
MDL-40051 core_mnet: replaced add_to_log calls with events
Damyon Wiese [Mon, 20 Jan 2014 02:02:40 +0000 (10:02 +0800)]
Merge branch 'MDL-43733' of git://github.com/timhunt/moodle
Dan Poltawski [Mon, 20 Jan 2014 01:45:43 +0000 (09:45 +0800)]
Merge branch 'wip-mdl-43306-m' of git://github.com/rajeshtaneja/moodle
David Monllao [Mon, 20 Jan 2014 01:29:37 +0000 (09:29 +0800)]
MDL-43743 mod_scorm: Adding package disclaimer
As the package is licensed under CC 3.0 we should
be compliant with attribution.
Dan Poltawski [Mon, 20 Jan 2014 01:24:53 +0000 (09:24 +0800)]
Merge branch 'MDL-40752-master' of git://github.com/phalacee/moodle
Conflicts:
theme/bootstrapbase/style/moodle.css
Tim Hunt [Fri, 17 Jan 2014 16:58:13 +0000 (16:58 +0000)]
MDL-43733 use any auto-saved responses when questions are finished.
Before this, autosave was only working to save data when a student went
back in to continue an attempt. If the student, having crashed out,
never went back in and continued the attempt, their auto-saved responses
were not used when the attempt was automatically finished. That was a
rather bad oversight, which should now be fixed.
Tim Hunt [Tue, 14 Jan 2014 13:40:11 +0000 (13:40 +0000)]
MDL-43690 quiz_question_tostring missing s().
This meant that the edit quiz page sometimes had invalid HTML.
Tim Hunt [Wed, 15 Jan 2014 14:20:27 +0000 (14:20 +0000)]
MDL-32523 question behat tests: distinctive question names
This means that, if you are watching the tests run, it is easier to see
which test is currently being executed.
M Kassaei [Mon, 4 Nov 2013 16:35:27 +0000 (16:35 +0000)]
MDL-32523 Duplicate questions in question bank
David Monllao [Fri, 17 Jan 2014 09:39:25 +0000 (17:39 +0800)]
MDL-43743 behat: Lightweight scorm package
The previous used package were adding a second iframe
inside the scorm iframe and was slow loading it;
this patch replaces it for a simple one without any
extra iframe.
Dan Poltawski [Tue, 14 Jan 2014 06:53:03 +0000 (14:53 +0800)]
MDL-41062 gradebook: remove sortorder duplicates
* Upgrade function to remove duplicates from the grade item duplicates
column. Duplicates were causing sorting to fail in some cases.
* Add some unit tests which simulate sort order duplicate data and
verify that they have been removed.
Marina Glancy [Fri, 10 Jan 2014 03:59:43 +0000 (11:59 +0800)]
MDL-43333 blocks: move activity icon in social and main menu
Marina Glancy [Thu, 9 Jan 2014 09:02:36 +0000 (17:02 +0800)]
MDL-43211 blocks: style edit icons in main menu and social activities
Marina Glancy [Thu, 9 Jan 2014 09:01:58 +0000 (17:01 +0800)]
MDL-43211 course: do not return indent icon if not needed
rwijaya [Thu, 16 Jan 2014 09:57:42 +0000 (17:57 +0800)]
MDL-42980 clean theme: fixed add/cancel buttons position for safari on iPhone with ios7.
David Monllao [Mon, 13 Jan 2014 06:30:53 +0000 (14:30 +0800)]
MDL-43480 behat: Switching @_only_local and @_alerts to @_file_upload and @_alert
David Monllao [Thu, 9 Jan 2014 07:23:28 +0000 (15:23 +0800)]
MDL-43480 behat: Removing @_only_local tags from steps where it is not necessary
Andrew Davis [Thu, 16 Jan 2014 23:32:12 +0000 (07:32 +0800)]
MDL-43671 message: removed an overly cautious check
Sam Hemelryk [Mon, 13 Jan 2014 23:29:36 +0000 (12:29 +1300)]
MDL-43675 navigation: courses branch is now recognised as expandable
Sam Hemelryk [Thu, 9 Jan 2014 01:58:28 +0000 (14:58 +1300)]
MDL-42682 theme_bootstrapbase: fixed styling of discussion selector
Sam Hemelryk [Thu, 9 Jan 2014 00:50:55 +0000 (13:50 +1300)]
MDL-42682 theme_bootstrapbase: fixed forum search alignment
Eloy Lafuente (stronk7) [Thu, 16 Jan 2014 17:50:54 +0000 (18:50 +0100)]
weekly release 2.7dev
Eloy Lafuente (stronk7) [Thu, 16 Jan 2014 17:50:54 +0000 (18:50 +0100)]
NOBUG: Fixed file access permissions
Eloy Lafuente (stronk7) [Thu, 16 Jan 2014 17:50:44 +0000 (18:50 +0100)]
Merge branch 'install_master' of git://git.moodle.org/moodle-install
Damyon Wiese [Thu, 16 Jan 2014 08:35:22 +0000 (16:35 +0800)]
Merge branch 'MDL-40056-master' of git://github.com/ankitagarwal/moodle
Ankit Agarwal [Thu, 16 Jan 2014 08:31:06 +0000 (16:31 +0800)]
MDL-40056 events: Use correct course module id while fetching context
Dan Poltawski [Thu, 16 Jan 2014 01:40:58 +0000 (09:40 +0800)]
Merge branch 'MDL-33952-master-fix2' of git://github.com/damyon/moodle
AMOS bot [Thu, 16 Jan 2014 00:43:15 +0000 (00:43 +0000)]
Automatically generated installer lang files
Eloy Lafuente (stronk7) [Wed, 15 Jan 2014 21:02:12 +0000 (22:02 +0100)]
Merge branch 'master_MDL-43222' of git://github.com/danmarsden/moodle
Dan Marsden [Wed, 15 Jan 2014 20:48:04 +0000 (09:48 +1300)]
MDL-43222 SCORM: Fix invalid sql
Kyle Temkin [Thu, 20 Jun 2013 03:31:01 +0000 (23:31 -0400)]
MDL-39756 add advanced attachment options to essay question type
Adds a set of options to the essay question type which implement
the following new features:
-Adds an input format which accepts only file uploads, and no
inline text.
-Adds an option to make the inline text response optional when
attachments are enabled, so students can choose to upload
an essay file.
-Adds an option to make attachments required, so essays without
attachments will be marked incomplete.
Damyon Wiese [Wed, 15 Jan 2014 08:47:30 +0000 (16:47 +0800)]
MDL-33952: mod_assignment Don't hide the modules on upgrade.
Damyon Wiese [Wed, 15 Jan 2014 05:17:31 +0000 (13:17 +0800)]
Merge branch 'MDL-43621_master' of https://github.com/totara/openbadges
Damyon Wiese [Wed, 11 Dec 2013 08:59:23 +0000 (16:59 +0800)]
MDL-28448 Assign: Add a new capability that lets teachers mess with student submissions.
Dan Poltawski [Wed, 15 Jan 2014 03:41:05 +0000 (11:41 +0800)]
Merge branch 'MDL-40912_master' of https://github.com/markn86/moodle
Yuliya Bozhko [Wed, 15 Jan 2014 03:24:37 +0000 (16:24 +1300)]
MDL-43621 badges: Fix has_awards() result when deleted users are the only recipients of a badge
Mark Nelson [Tue, 31 Dec 2013 22:53:34 +0000 (14:53 -0800)]
MDL-40912 coursecat: replaced 'hide' and 'show' add_to_log calls with an event
Mark Nelson [Tue, 31 Dec 2013 02:04:40 +0000 (18:04 -0800)]
MDL-40912 coursecat: replaced 'move' add_to_log calls with an event
Mark Nelson [Tue, 31 Dec 2013 00:47:57 +0000 (16:47 -0800)]
MDL-40912 coursecat: replaced 'update' add_to_log call with an event
Mark Nelson [Tue, 31 Dec 2013 00:03:21 +0000 (16:03 -0800)]
MDL-40912 coursecat: replaced 'add' add_to_log call with an event
Eloy Lafuente (stronk7) [Wed, 15 Jan 2014 02:59:51 +0000 (03:59 +0100)]
Merge branch 'MDL-43439_master-dateformat' of git://github.com/dmonllao/moodle
Rajesh Taneja [Wed, 15 Jan 2014 01:49:34 +0000 (09:49 +0800)]
MDL-43306 restore: Fix grade_item sortorder after restoring course
While restoring course/activity, restore will blindly insert grade_item
sortorder. Which cause dulicate sortorder and lead to unpredicatble sorting
results.
Now we will call grade_item::fix_duplicate_sortorder() after restore is finished
to fix duplicate sortorder and order grade items to the closest order possible
Damyon Wiese [Wed, 15 Jan 2014 01:39:03 +0000 (09:39 +0800)]
Merge branch 'MDL-43461_master' of git://github.com/dmonllao/moodle
David Monllao [Wed, 15 Jan 2014 01:17:44 +0000 (09:17 +0800)]
MDL-43439 behat: Dir date without - separators
Dan Poltawski [Wed, 15 Jan 2014 00:19:49 +0000 (08:19 +0800)]
Merge branch 'MDL-43619-master' of git://github.com/sammarshallou/moodle
Eloy Lafuente (stronk7) [Tue, 14 Jan 2014 23:03:34 +0000 (00:03 +0100)]
Merge branch 'MDL-43439_master' of git://github.com/dmonllao/moodle
Eloy Lafuente (stronk7) [Tue, 14 Jan 2014 21:08:46 +0000 (22:08 +0100)]
Merge branch 'w02_MDL-43524_m27_textcaching' of https://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Tue, 14 Jan 2014 21:03:02 +0000 (22:03 +0100)]
Merge branch 'wip-MDL-31597-master' of git://github.com/abgreeve/moodle
Conflicts:
grade/tests/behat/behat_grade.php
grade/tests/behat/grade_view.feature
Yuliya Bozhko [Thu, 9 Jan 2014 20:00:01 +0000 (09:00 +1300)]
MDL-43621 badges: Don't display deleted users in badge recipients list
Frederic Massart [Tue, 14 Jan 2014 18:00:31 +0000 (19:00 +0100)]
MDL-40533 block_html: Remove styles specific to the block
Eloy Lafuente (stronk7) [Tue, 14 Jan 2014 15:48:22 +0000 (16:48 +0100)]
Merge branch 'MDL-43332_master' of https://github.com/markn86/moodle
Eloy Lafuente (stronk7) [Tue, 14 Jan 2014 15:44:11 +0000 (16:44 +0100)]
Merge branch 'master_MDL-43222' of git://github.com/danmarsden/moodle
Eloy Lafuente (stronk7) [Tue, 14 Jan 2014 15:39:00 +0000 (16:39 +0100)]
Merge branch '35597-27' of git://github.com/samhemelryk/moodle
Eloy Lafuente (stronk7) [Tue, 14 Jan 2014 15:01:27 +0000 (16:01 +0100)]
Merge branch 'w02_MDL-43537_m27_env' of https://github.com/skodak/moodle
sam marshall [Tue, 14 Jan 2014 13:44:17 +0000 (13:44 +0000)]
MDL-43619 Roles: reset_role_capabilities unit test, cache fix
sam marshall [Wed, 8 Jan 2014 17:11:10 +0000 (17:11 +0000)]
MDL-43619 Roles: reset_role_capabilities function destroys overrides
Dan Poltawski [Tue, 14 Jan 2014 08:50:07 +0000 (16:50 +0800)]
Merge branch 'MDL-43664-master' of git://github.com/andrewnicols/moodle
Damyon Wiese [Tue, 14 Jan 2014 08:21:21 +0000 (16:21 +0800)]
Merge branch 'MDL-43584_master' of git://github.com/dmonllao/moodle
Dan Poltawski [Tue, 14 Jan 2014 07:57:05 +0000 (15:57 +0800)]
Merge branch 'm27_MDL-43577_Incorrect_Variable_Expansion' of https://github.com/scara/moodle
Dan Poltawski [Tue, 14 Jan 2014 07:48:49 +0000 (15:48 +0800)]
Merge branch 'MDL-43642_master' of git://github.com/dmonllao/moodle
Dan Poltawski [Tue, 14 Jan 2014 07:36:58 +0000 (15:36 +0800)]
Merge branch 'm27_MDL-43575_Typo_In_The_Overridden_setOption' of https://github.com/scara/moodle
Dan Poltawski [Tue, 14 Jan 2014 07:26:52 +0000 (15:26 +0800)]
Merge branch 'MDL-43178_forum' of https://github.com/andyjdavis/moodle
Damyon Wiese [Tue, 14 Jan 2014 07:18:37 +0000 (15:18 +0800)]
Merge branch 'MDL-43531-master' of git://github.com/andrewnicols/moodle
David Monllao [Mon, 6 Jan 2014 08:33:11 +0000 (16:33 +0800)]
MDL-43439 behat: Save the screenshots to the specified location
Dan Poltawski [Tue, 14 Jan 2014 07:00:11 +0000 (15:00 +0800)]
Merge branch 'master_MDL-41577' of git://github.com/danmarsden/moodle
Dan Poltawski [Tue, 14 Jan 2014 06:46:55 +0000 (14:46 +0800)]
Merge branch 'w02_MDL-43529_m27_globals' of https://github.com/skodak/moodle
Dan Poltawski [Tue, 14 Jan 2014 06:43:45 +0000 (14:43 +0800)]
Merge branch 'MDL-40918_master' of https://github.com/markn86/moodle
