Eloy Lafuente (stronk7) [Fri, 5 Apr 2013 00:51:48 +0000 (02:51 +0200)]
Merge branch 'MDL-38852-master' of git://github.com/danpoltawski/moodle
Eloy Lafuente (stronk7) [Fri, 5 Apr 2013 00:48:37 +0000 (02:48 +0200)]
Merge branch 'MDL-38883-master' of git://github.com/danpoltawski/moodle
Eloy Lafuente (stronk7) [Fri, 5 Apr 2013 00:46:15 +0000 (02:46 +0200)]
Merge branch 'MDL-38886-master' of git://github.com/danpoltawski/moodle
Andrew Robert Nicols [Thu, 4 Apr 2013 09:07:40 +0000 (10:07 +0100)]
MDL-38667 JavaScript: Don't use -min files for YUI CSS
Eloy Lafuente (stronk7) [Thu, 4 Apr 2013 14:59:34 +0000 (16:59 +0200)]
Merge branch 'MDL-36570' of git://github.com/colchambers/moodle
Tim Hunt [Thu, 4 Apr 2013 14:32:32 +0000 (15:32 +0100)]
MDL-38538 question autosave: fix sequencecheck handling.
Colin Chambers [Thu, 4 Apr 2013 13:15:32 +0000 (14:15 +0100)]
MDL-36570 Grouped question type answer fields now display errors
Tim Hunt [Thu, 4 Apr 2013 10:38:58 +0000 (11:38 +0100)]
MDL-38538 quiz autosave: fix JavaScript errors.
1. Make cancelling the delay more robust.
2. Ignore changes in flag state. They are already saved using AJAX.
3. Typo that caused an error when there was no TinyMCE on the page.
Tim Hunt [Thu, 4 Apr 2013 10:17:39 +0000 (11:17 +0100)]
MDL-38209 quiz css: fix minor regression.
Colin Chambers [Thu, 4 Apr 2013 10:17:33 +0000 (11:17 +0100)]
MDL-36570 Added missing calculatedmulti fields
Dan Poltawski [Thu, 4 Apr 2013 09:22:28 +0000 (17:22 +0800)]
MDL-38886 course: missing setType calls when adding a new category
Dan Poltawski [Thu, 4 Apr 2013 09:17:37 +0000 (17:17 +0800)]
MDL-38883 calendar: fix missing setType
Also remove duplicate sesskey definition (this is done by formslib
internally)
Aparup Banerjee [Thu, 4 Apr 2013 07:07:01 +0000 (15:07 +0800)]
Merge branch 'wip-MDL-38708-master' of git://github.com/marinaglancy/moodle
Conflicts:
version.php
Damyon Wiese [Thu, 4 Apr 2013 06:26:15 +0000 (14:26 +0800)]
Merge branch 'MDL-38633' of git://github.com/stronk7/moodle
Dan Poltawski [Thu, 4 Apr 2013 06:05:17 +0000 (14:05 +0800)]
Merge branch 'MDL-38590_master-fix-behat' of git://github.com/dmonllao/moodle
David Monllao [Thu, 4 Apr 2013 05:54:40 +0000 (13:54 +0800)]
MDL-38590 behat: Fixing broken behat test
David Monllao [Thu, 4 Apr 2013 05:52:24 +0000 (13:52 +0800)]
MDL-38691 behat: Fixing behat tests
Damyon Wiese [Thu, 4 Apr 2013 03:23:28 +0000 (11:23 +0800)]
MDL-37009 Course - Fix typo in new lang string.
Damyon Wiese [Thu, 4 Apr 2013 03:22:20 +0000 (11:22 +0800)]
Merge branch 'wip-MDL-37009-master' of git://github.com/marinaglancy/moodle
Dan Poltawski [Thu, 4 Apr 2013 03:00:01 +0000 (11:00 +0800)]
Merge branch 'MDL-38861' of git://github.com/stronk7/moodle
Damyon Wiese [Thu, 4 Apr 2013 02:39:51 +0000 (10:39 +0800)]
MDL-35073 Open badges - close session before making curl request to check backpack server.
Damyon Wiese [Thu, 4 Apr 2013 02:34:50 +0000 (10:34 +0800)]
Merge branch 'MDL-38823_master-fix' of git://github.com/dmonllao/moodle
Eloy Lafuente (stronk7) [Wed, 3 Apr 2013 23:15:34 +0000 (01:15 +0200)]
Merge branch 'MDL-38612-master-int' of git://github.com/FMCorz/moodle
Eloy Lafuente (stronk7) [Wed, 3 Apr 2013 23:14:36 +0000 (01:14 +0200)]
Merge branch 'MDL-38590-master-int' of git://github.com/FMCorz/moodle
Eloy Lafuente (stronk7) [Wed, 3 Apr 2013 23:07:23 +0000 (01:07 +0200)]
Merge branch 'MDL-38751-master' of git://github.com/FMCorz/moodle
Eloy Lafuente (stronk7) [Wed, 3 Apr 2013 23:04:00 +0000 (01:04 +0200)]
Merge branch 'MDL-38666-m' of git://github.com/andrewnicols/moodle
Eloy Lafuente (stronk7) [Wed, 3 Apr 2013 23:02:20 +0000 (01:02 +0200)]
Merge branch 'MDL-38667-m' of git://github.com/andrewnicols/moodle
Eloy Lafuente (stronk7) [Wed, 3 Apr 2013 22:53:05 +0000 (00:53 +0200)]
Merge branch 'MDL-38611-master-int' of git://github.com/FMCorz/moodle
Eloy Lafuente (stronk7) [Wed, 3 Apr 2013 22:51:47 +0000 (00:51 +0200)]
Merge branch 'MDL-38599-master-int' of git://github.com/FMCorz/moodle
Conflicts:
mod/glossary/mod_form.php
Eloy Lafuente (stronk7) [Wed, 3 Apr 2013 22:34:24 +0000 (00:34 +0200)]
Merge branch 'MDL-38645-master' of git://github.com/FMCorz/moodle
Eloy Lafuente (stronk7) [Wed, 3 Apr 2013 21:45:40 +0000 (23:45 +0200)]
Merge branch 'wip-mdl-38494' of git://github.com/rajeshtaneja/moodle
Eloy Lafuente (stronk7) [Wed, 3 Apr 2013 21:09:19 +0000 (23:09 +0200)]
Merge branch 'MDL-36570' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Wed, 3 Apr 2013 19:59:18 +0000 (21:59 +0200)]
Merge branch 'MDL-38756-m' of git://github.com/andrewnicols/moodle
Eloy Lafuente (stronk7) [Wed, 3 Apr 2013 18:06:49 +0000 (20:06 +0200)]
Merge branch 'MDL-38733-workshop-rubric-css' of git://github.com/mudrd8mz/moodle
Eloy Lafuente (stronk7) [Wed, 3 Apr 2013 17:48:02 +0000 (19:48 +0200)]
Merge branch 'MDL-38815_master' of git://github.com/dmonllao/moodle
Eloy Lafuente (stronk7) [Wed, 3 Apr 2013 15:12:04 +0000 (17:12 +0200)]
Merge branch 'MDL-38615_master' of git://github.com/dmonllao/moodle
Eloy Lafuente (stronk7) [Wed, 3 Apr 2013 14:48:42 +0000 (16:48 +0200)]
Merge branch 'MDL-38482_master' of git://github.com/dmonllao/moodle
Eloy Lafuente (stronk7) [Wed, 3 Apr 2013 14:18:38 +0000 (16:18 +0200)]
MDL-38861 upload users: add missing setType() calls.
Dan Poltawski [Wed, 3 Apr 2013 12:22:03 +0000 (20:22 +0800)]
Merge branch 'MDL-38538_clean' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Wed, 3 Apr 2013 11:33:16 +0000 (13:33 +0200)]
Merge branch 'MDL-38619_master' of git://github.com/dmonllao/moodle
Eloy Lafuente (stronk7) [Wed, 3 Apr 2013 11:20:23 +0000 (13:20 +0200)]
Merge branch 'MDL-26956' of git://github.com/timhunt/moodle
Tim Hunt [Wed, 3 Apr 2013 10:44:23 +0000 (11:44 +0100)]
MDL-26956 user selector: fix regressions sam caused.
Tim Hunt [Wed, 3 Apr 2013 10:23:41 +0000 (11:23 +0100)]
MDL-38538 quiz autosave: fix language string.
This feature does not actually provide spiritual salvation.
Dan Poltawski [Wed, 3 Apr 2013 09:32:15 +0000 (17:32 +0800)]
Merge branch 'MDL-36804-master' of git://github.com/damyon/moodle
Damyon Wiese [Wed, 3 Apr 2013 09:31:12 +0000 (17:31 +0800)]
MDL-36804 Assign attempt history: Fix course unit tests
Handle missing attemptreopenmethod in add/update instance.
Dan Poltawski [Wed, 3 Apr 2013 09:22:38 +0000 (17:22 +0800)]
Merge branch 'm25_MDL-38678_SCORM_RTE_not_required_for_SCO_Assets' of https://github.com/scara/moodle
Dan Poltawski [Wed, 3 Apr 2013 08:50:43 +0000 (16:50 +0800)]
Merge branch 'MDL-38657_master' of git://github.com/lazydaisy/moodle
Aparup Banerjee [Wed, 3 Apr 2013 08:48:53 +0000 (16:48 +0800)]
Merge branch 'm25_MDL-38745_SCORM_API_Debugging_trivial_issue' of git://github.com/scara/moodle
Dan Poltawski [Wed, 3 Apr 2013 08:47:15 +0000 (16:47 +0800)]
Merge branch 'MDL-36804-master' of git://github.com/damyon/moodle
Damyon Wiese [Wed, 3 Apr 2013 08:44:31 +0000 (16:44 +0800)]
MDL-36804 Assign attempt history - Add missing index to upgrade step.
Aparup Banerjee [Wed, 3 Apr 2013 08:32:42 +0000 (16:32 +0800)]
Merge branch 'MDL-38809' of git://github.com/timhunt/moodle
Dan Poltawski [Wed, 3 Apr 2013 08:27:16 +0000 (16:27 +0800)]
Merge branch 'MDL-38691-master-int' of git://github.com/FMCorz/moodle
Dan Poltawski [Wed, 3 Apr 2013 08:18:50 +0000 (16:18 +0800)]
Merge branch 'MDL-36804-master' of git://github.com/damyon/moodle
Damyon Wiese [Wed, 3 Apr 2013 08:16:21 +0000 (16:16 +0800)]
MDL-36804: Assign attempt history - add upgrade.txt
Damyon Wiese [Wed, 3 Apr 2013 07:48:35 +0000 (15:48 +0800)]
Merge branch 'w13_MDL-38627_m25_byteservingstop' of git://github.com/skodak/moodle
Dan Poltawski [Wed, 3 Apr 2013 07:39:48 +0000 (15:39 +0800)]
Merge branch 'MDL-37602-workshop-overall-feedback' of git://github.com/mudrd8mz/moodle
Damyon Wiese [Wed, 3 Apr 2013 07:30:49 +0000 (15:30 +0800)]
MDL-26644 Course - Remove completion tracking begins on enrolment setting from behat.
David Mudrák [Wed, 3 Apr 2013 07:28:11 +0000 (09:28 +0200)]
MDL-37602 Fix broken workshop unit tests
Damyon Wiese [Wed, 3 Apr 2013 06:48:06 +0000 (14:48 +0800)]
Merge branch 'MDL-38610-master-int' of git://github.com/FMCorz/moodle
Dan Poltawski [Wed, 3 Apr 2013 06:46:58 +0000 (14:46 +0800)]
Merge branch 'MDL-38808' of git://github.com/jmvedrine/moodle
Damyon Wiese [Wed, 3 Apr 2013 06:35:12 +0000 (14:35 +0800)]
Merge branch 'MDL-38705' of git://github.com/jonof/moodle
Damyon Wiese [Wed, 3 Apr 2013 06:27:26 +0000 (14:27 +0800)]
MDL-26644 Course - Version bump for upgrade script.
Damyon Wiese [Wed, 3 Apr 2013 06:32:11 +0000 (14:32 +0800)]
Merge branch 'MDL-26644-master' of git://github.com/FMCorz/moodle
Conflicts:
lib/db/install.xml
lib/db/upgrade.php
Dan Poltawski [Wed, 3 Apr 2013 06:27:08 +0000 (14:27 +0800)]
Merge branch 'MDL-38681-master-int' of git://github.com/FMCorz/moodle
Damyon Wiese [Wed, 3 Apr 2013 06:17:00 +0000 (14:17 +0800)]
MDL-36804: Assign resubmission history - remove locked/mailed
Remove locked/mailed flags from the grade record in the unit tests.
It just would not have done anything because the columns dont exist.
Dan Poltawski [Wed, 3 Apr 2013 05:57:02 +0000 (13:57 +0800)]
Merge branch 'MDL-34640' of git://github.com/timhunt/moodle
David Monllao [Wed, 3 Apr 2013 05:54:25 +0000 (13:54 +0800)]
MDL-38823 behat: Fixing related scenarios
David Monllao [Wed, 3 Apr 2013 05:51:40 +0000 (13:51 +0800)]
MDL-38823 behat: New behat_form_radio
To deal with radio inputs after allowing
behat_form_field to delegate in specific
fields managers. It also fixes a BIG issue
when calling a no required class.
Dan Poltawski [Wed, 3 Apr 2013 04:44:05 +0000 (12:44 +0800)]
Merge branch 'MDL-38855_master' of git://github.com/dmonllao/moodle
Dan Poltawski [Wed, 3 Apr 2013 04:30:12 +0000 (12:30 +0800)]
Merge branch 'MDL-37602-workshop-overall-feedback' of git://github.com/mudrd8mz/moodle
Damyon Wiese [Wed, 3 Apr 2013 04:21:04 +0000 (12:21 +0800)]
MDL-10516 Question Type - Fix upgrade code so new install matches upgrade.
Damyon Wiese [Wed, 3 Apr 2013 03:21:36 +0000 (11:21 +0800)]
MDL-10516 Question Type - Essay - Whitespace fix
Jean-Michel Vedrine [Sun, 10 Feb 2013 09:36:22 +0000 (10:36 +0100)]
MDL-10516 Pre-populated answer (template) in essay questions
Dan Poltawski [Wed, 3 Apr 2013 03:29:56 +0000 (11:29 +0800)]
MDL-38509 Version bump for plugins installation
Dan Poltawski [Wed, 3 Apr 2013 03:28:49 +0000 (11:28 +0800)]
Merge branch 'MDL-38509-tool-installaddon' of git://github.com/mudrd8mz/moodle
Dan Poltawski [Wed, 3 Apr 2013 03:00:57 +0000 (11:00 +0800)]
MDL-38852 repository_webdav: missing setType calls
Dan Poltawski [Wed, 3 Apr 2013 02:51:50 +0000 (10:51 +0800)]
MDL-38852 repository_s3: fix missing setType calls
Dan Poltawski [Wed, 3 Apr 2013 02:50:44 +0000 (10:50 +0800)]
MDL-38852 repository_merloy: fix missing setType calls
Dan Poltawski [Wed, 3 Apr 2013 02:46:42 +0000 (10:46 +0800)]
MDL-38852 flickr_public: fix missing setType calls
Dan Poltawski [Wed, 3 Apr 2013 02:43:49 +0000 (10:43 +0800)]
MDL-38852 repository_flickr: fix missing setType calls
Dan Poltawski [Wed, 3 Apr 2013 02:41:22 +0000 (10:41 +0800)]
MDL-38852 repository_boxnet: fix missing setType calls
Dan Poltawski [Wed, 3 Apr 2013 02:38:48 +0000 (10:38 +0800)]
MDL-38852 repository_alfresco: fix missing setType calls
Dan Poltawski [Wed, 3 Apr 2013 02:36:40 +0000 (10:36 +0800)]
MDL-38852 repository_filesystem: missing setType calls
Dan Poltawski [Wed, 3 Apr 2013 02:24:22 +0000 (10:24 +0800)]
MDL-38852 repository_dropbox: fix missing setType calls
David Monllao [Wed, 3 Apr 2013 02:48:32 +0000 (10:48 +0800)]
MDL-38855 blocks: Fix missing setType calls
Damyon Wiese [Wed, 3 Apr 2013 02:58:23 +0000 (10:58 +0800)]
MDL-38016 Theme Bootstrap: Fix for unit tests undefined variable
David Monllao [Thu, 21 Mar 2013 09:25:00 +0000 (17:25 +0800)]
MDL-38615 behat: New test
According to MDLQA-1160, a manager
can configure a block to display
throughout the site.
Damyon Wiese [Wed, 3 Apr 2013 02:26:12 +0000 (10:26 +0800)]
MDL-38016 Theme Bootstrap - Add bootstrap to standard themes list.
David Monllao [Wed, 3 Apr 2013 02:07:13 +0000 (10:07 +0800)]
MDL-38482 behat: Data generator for system assigns
Chaning also the adapt_ prefix for non-direct
data generator uses to process_ because not all
of behat's data generators would have a lib/testing
data generator to share with phpunit tests.
David Monllao [Thu, 14 Mar 2013 07:59:55 +0000 (15:59 +0800)]
MDL-38482 behat: New test
According to MDLQA-1756 the maximum
number of weeks/topics for course can be
configured and not restricted to 52.
Damyon Wiese [Wed, 3 Apr 2013 02:02:28 +0000 (10:02 +0800)]
MDL-38016 Theme Bootstrap - Whitespace in Moodle .less files
Dan Poltawski [Wed, 3 Apr 2013 01:59:01 +0000 (09:59 +0800)]
Merge branch 'MDL-38735' of git://github.com/stronk7/moodle
Dan Poltawski [Wed, 3 Apr 2013 01:55:21 +0000 (09:55 +0800)]
Merge branch 'MDL-38538_clean' of git://github.com/timhunt/moodle
David Monllao [Thu, 14 Mar 2013 07:58:16 +0000 (15:58 +0800)]
MDL-38482 behat: Steps definitions for course management
- To access the course management page
- To create a course based in a table
Damyon Wiese [Wed, 3 Apr 2013 01:41:33 +0000 (09:41 +0800)]
MDL-38016 Theme Bootstrap - Add license information to lib/thirdpartylibs.xml
Also minor formatting cleanup.
Bas Brands [Wed, 3 Apr 2013 00:53:27 +0000 (08:53 +0800)]
MDL-38016 Themes - Add a bootstrap theme to core
This theme has been contributed by:
Bas Brands <bmbrands@gmail.com>
David Scotson <david.scotson@glasgow.ac.uk>
Michael Aherne <michael.aherne@strath.ac.uk>
Stuart Lamour <thisismyrice@gmail.com>
Thanks for your hard work.
David Monllao [Thu, 14 Mar 2013 07:57:18 +0000 (15:57 +0800)]
MDL-38482 behat: Allow frontpage course role assigns
There are no enrolment plugins at frontpage
course level.
Eloy Lafuente (stronk7) [Wed, 3 Apr 2013 01:17:08 +0000 (03:17 +0200)]
Merge branch 'MDL-38738-master' of git://github.com/danpoltawski/moodle
Eloy Lafuente (stronk7) [Wed, 3 Apr 2013 00:17:40 +0000 (02:17 +0200)]
MDL-38735 backup: add missing setType() to forms
David Mudrák [Tue, 2 Apr 2013 21:11:01 +0000 (23:11 +0200)]
MDL-38509 Unify curl class usage in the add-on installer tool
Both classes using cURL features now access it via the core curl wrapper
class. Credit goes to Dan Poltawski for spotting the previous discrepancy
during the integration review.
