Eloy Lafuente (stronk7) [Tue, 9 Apr 2013 00:25:12 +0000 (02:25 +0200)]
Merge branch 'w14_MDL-38753_m25_ocicount' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Tue, 9 Apr 2013 00:23:36 +0000 (02:23 +0200)]
Merge branch 'w14_MDL-39038_m25_oracleconcat' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Tue, 9 Apr 2013 00:19:41 +0000 (02:19 +0200)]
Merge branch 'w14_MDL-39027_m25_sqlsrvdatatype' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Tue, 9 Apr 2013 00:17:56 +0000 (02:17 +0200)]
Merge branch 'w14_MDL-39028_m25_sqlsrconcat' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Tue, 9 Apr 2013 00:01:04 +0000 (02:01 +0200)]
Merge branch 'w14_MDL-39019_m25_mssqldatatype' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Mon, 8 Apr 2013 23:58:20 +0000 (01:58 +0200)]
Merge branch 'w14_MDL-39024_m25_mssqlseek' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Mon, 8 Apr 2013 23:53:57 +0000 (01:53 +0200)]
Merge branch 'w14_MDL-39022_m25_mssqlconcat' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Mon, 8 Apr 2013 23:44:58 +0000 (01:44 +0200)]
Merge branch 'MDL-38618_master' of git://github.com/dmonllao/moodle
Eloy Lafuente (stronk7) [Mon, 8 Apr 2013 23:36:20 +0000 (01:36 +0200)]
Merge branch 'MDL-38912' of git://github.com/timhunt/moodle
Eloy Lafuente (stronk7) [Mon, 8 Apr 2013 23:32:35 +0000 (01:32 +0200)]
Merge branch 'w14_MDL-38786_m25_yui391' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Mon, 8 Apr 2013 23:28:06 +0000 (01:28 +0200)]
MDL-34222 simplepie: fix permissions.
Eloy Lafuente (stronk7) [Mon, 8 Apr 2013 23:24:08 +0000 (01:24 +0200)]
Merge branch 'w14_MDL-34222_m25_simplepie131' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Mon, 8 Apr 2013 23:13:57 +0000 (01:13 +0200)]
Merge branch 'MDL-38744-master' of git://github.com/danpoltawski/moodle
Eloy Lafuente (stronk7) [Mon, 8 Apr 2013 22:58:02 +0000 (00:58 +0200)]
Merge branch 'MDL-38907-master' of git://github.com/damyon/moodle
Eloy Lafuente (stronk7) [Mon, 8 Apr 2013 22:52:27 +0000 (00:52 +0200)]
Merge branch 'MDL-38849' of git://github.com/timhunt/moodle
Petr Škoda [Mon, 8 Apr 2013 10:43:50 +0000 (12:43 +0200)]
MDL-39027 make sure sqlsrv does not return non-string data types
Petr Škoda [Mon, 8 Apr 2013 21:16:55 +0000 (23:16 +0200)]
MDL-39038 nasty workaround for Oracle NULL concats
Eloy Lafuente (stronk7) [Mon, 8 Apr 2013 14:57:38 +0000 (16:57 +0200)]
Merge branch 'MDL-39023-parentlang' of git://github.com/mudrd8mz/moodle
David Mudrák [Mon, 8 Apr 2013 12:26:23 +0000 (14:26 +0200)]
MDL-39023 Make get_language_dependencies() aware of circular dependency risk
The patch reimplements the core_string_manager::get_language_dependencies()
so that potentially mis-configured language packs with circular
dependencies or self dependency do not make the site unavailable.
Unit tests for the expected behaviour are added.
Petr Škoda [Mon, 8 Apr 2013 11:17:56 +0000 (13:17 +0200)]
MDL-39028 fix sqlsrv concat type conversion
Petr Škoda [Mon, 8 Apr 2013 07:23:45 +0000 (09:23 +0200)]
MDL-38753 tweak count SQL to make stupid Oracle happy
Tim Hunt [Mon, 8 Apr 2013 09:44:51 +0000 (10:44 +0100)]
MDL-38849 editor collapsing: cope with verbose languages
We can't fix the width of the tab, because the length of the string
'Show editing tools' varies a LOT between langauges.
Tim Hunt [Mon, 8 Apr 2013 09:37:22 +0000 (10:37 +0100)]
MDL-38849 editor CSS: re-format to match coding style.
Damyon Wiese [Mon, 8 Apr 2013 08:40:26 +0000 (16:40 +0800)]
MDL-38907 Course: Remove unused CSS causing jump menu to be center aligned.
Petr Škoda [Mon, 8 Apr 2013 08:36:37 +0000 (10:36 +0200)]
MDL-39024 fix MSSQL seek past the end of recordset
Petr Škoda [Mon, 8 Apr 2013 08:19:51 +0000 (10:19 +0200)]
MDL-39022 fix MSSQL concat type conversion
Petr Škoda [Mon, 8 Apr 2013 08:06:55 +0000 (10:06 +0200)]
MDL-39019 make sure MSSQL does not return non-string data types
Damyon Wiese [Mon, 8 Apr 2013 07:42:36 +0000 (15:42 +0800)]
Merge branch 'MDL-37562-master' of git://github.com/ankitagarwal/moodle
Dan Poltawski [Mon, 8 Apr 2013 07:36:07 +0000 (15:36 +0800)]
Merge branch 'MDL-38179_master' of git://github.com/dmonllao/moodle
Ankit Agarwal [Mon, 8 Apr 2013 05:48:10 +0000 (13:48 +0800)]
MDL-37562 calendar: Updating upgrade.txt to mention calendar_update_subscription()
Ankit Agarwal [Thu, 21 Mar 2013 07:19:15 +0000 (15:19 +0800)]
MDL-37562 calendar: Remove all hardcoded updating of calendar subscriptions, use calendar_update_subscription() instead
Ankit Agarwal [Thu, 21 Mar 2013 06:38:04 +0000 (14:38 +0800)]
MDL-37562 calendar: Adding unit tests for calendar_update_subscription()
Dan Poltawski [Mon, 8 Apr 2013 06:05:21 +0000 (14:05 +0800)]
Merge branch 'MDL-37676' of git://github.com/appalachianstate/moodle
Ankit Agarwal [Thu, 21 Mar 2013 06:09:30 +0000 (14:09 +0800)]
MDL-37562 calendar: Adding a api calendar_update_subscription() to update calendar events
Damyon Wiese [Mon, 8 Apr 2013 05:02:38 +0000 (13:02 +0800)]
Merge branch 'MDL-38878_master' of git://github.com/dmonllao/moodle
Damyon Wiese [Mon, 8 Apr 2013 04:32:56 +0000 (12:32 +0800)]
Merge branch 'MDL-39015-master' of git://github.com/danpoltawski/moodle
Dan Poltawski [Mon, 8 Apr 2013 04:23:52 +0000 (12:23 +0800)]
MDL-39015 navigation: remove course reports from navigation
Regression from the commit in
278065528aed2e6d712292b09ecdedf3d5b26bfe
Damyon Wiese [Mon, 8 Apr 2013 04:00:52 +0000 (12:00 +0800)]
Merge branch 'MDL-38741-master' of git://github.com/danpoltawski/moodle
Dan Poltawski [Mon, 8 Apr 2013 03:55:55 +0000 (11:55 +0800)]
Merge branch 'MDL-38634' of git://github.com/rlorenzo/moodle
Dan Poltawski [Mon, 8 Apr 2013 03:14:03 +0000 (11:14 +0800)]
Merge branch 'MDL-39006' of git://github.com/stronk7/moodle
Tim Lock [Thu, 28 Mar 2013 00:45:23 +0000 (11:15 +1030)]
MDL-35868: quiz: Use correct attemptnumber when a last attempt exists.
Dan Poltawski [Mon, 8 Apr 2013 02:22:59 +0000 (10:22 +0800)]
Merge branch 'wip-MDL-38701-m25' of git://github.com/marinaglancy/moodle
David Monllao [Thu, 28 Mar 2013 02:40:55 +0000 (10:40 +0800)]
MDL-38179 behat: Step definition to click on a table row element
Marina Glancy [Mon, 8 Apr 2013 01:34:05 +0000 (11:34 +1000)]
MDL-38701 Added missing require_once() before calling course_get_format
David Monllao [Mon, 8 Apr 2013 01:01:07 +0000 (09:01 +0800)]
MDL-38878 behat: Also update composer dependencies after site install/reinstall
Rex Lorenzo [Mon, 8 Apr 2013 00:22:21 +0000 (17:22 -0700)]
MDL-38634 folder: Problems displaying multiple folder resources inline in the course page
Eloy Lafuente (stronk7) [Sun, 7 Apr 2013 16:32:15 +0000 (18:32 +0200)]
MDL-39006 environment: raise all uses of 5.3.2 to 5.3.3
Petr Škoda [Sat, 6 Apr 2013 17:57:28 +0000 (19:57 +0200)]
MDL-34222 import simplepie 1.3.1
Petr Škoda [Sat, 6 Apr 2013 17:06:55 +0000 (19:06 +0200)]
MDL-38786 import YUI 3.9.1
Tim Hunt [Thu, 4 Apr 2013 13:51:25 +0000 (14:51 +0100)]
MDL-38912 prevent time-outs during unit tests.
Eloy Lafuente (stronk7) [Fri, 5 Apr 2013 12:29:54 +0000 (14:29 +0200)]
NOBUG: Bump to 2.5beta+
we don't package tagged commits in master, so let's
bump to beta+ and get the packaging done.
Dan Poltawski [Fri, 5 Apr 2013 10:03:30 +0000 (18:03 +0800)]
Moodle release 2.5beta
Dan Poltawski [Fri, 5 Apr 2013 09:56:05 +0000 (17:56 +0800)]
fix permissions
Dan Poltawski [Fri, 5 Apr 2013 09:55:06 +0000 (17:55 +0800)]
ie9 svg compatibility fixes
Dan Poltawski [Fri, 5 Apr 2013 09:52:13 +0000 (17:52 +0800)]
Merge branch 'install_master' of git://git.moodle.cz/moodle-install
Damyon Wiese [Fri, 5 Apr 2013 09:39:13 +0000 (17:39 +0800)]
Merge branch 'MDL-35073_master' of https://github.com/markn86/moodle
Mark Nelson [Fri, 5 Apr 2013 09:10:43 +0000 (17:10 +0800)]
MDL-35073 badges: passed the session key in the enable access URL
Damyon Wiese [Fri, 5 Apr 2013 09:10:14 +0000 (17:10 +0800)]
Merge branch 'openbadges-fixes' of https://github.com/danpoltawski/moodle
Dan Poltawski [Fri, 5 Apr 2013 08:43:43 +0000 (16:43 +0800)]
Merge branch 'MDL-36804-fix3' of git://github.com/damyon/moodle
Damyon Wiese [Fri, 5 Apr 2013 08:40:16 +0000 (16:40 +0800)]
MDL-36804 Assign attempt history: Submit button missing
Dan Poltawski [Fri, 5 Apr 2013 08:00:35 +0000 (16:00 +0800)]
Merge branch 'MDL-36804-master-fix2' of git://github.com/damyon/moodle
Damyon Wiese [Fri, 5 Apr 2013 07:53:38 +0000 (15:53 +0800)]
MDL-36804 Assign history: Fix automatic coding error when using auto-reopen method
This fix should call the gradebook function is_passed - but the gradebook is returning a record with
not enough information to create an instance of grade_grade.
Dan Poltawski [Fri, 5 Apr 2013 07:44:28 +0000 (03:44 -0400)]
MDL-35073 badges: fix incorrect fk name
Good spotting Damyon!
Dan Poltawski [Fri, 5 Apr 2013 07:14:44 +0000 (15:14 +0800)]
MDL-35073 badges: fix duplicate indexes
Dan Poltawski [Fri, 5 Apr 2013 06:34:07 +0000 (14:34 +0800)]
Revert "MDL-38678 SCORM: Runtime Environment (RTE) checks not required in case of SCO Assets"
This reverts commit
fe104762c9acb0e178ae1d5ffe514c8109f48f0a.
Dan Poltawski [Fri, 5 Apr 2013 06:06:52 +0000 (14:06 +0800)]
MDL-38744 completion: add missing setType and properly allow float
Now can use correct decimal seperator
Damyon Wiese [Fri, 5 Apr 2013 02:03:00 +0000 (10:03 +0800)]
MDL-36804 Assignment attempt history: Fix warning on saving a new grade.
This is a fix for the case when there is a submission but no grade.
Eloy Lafuente (stronk7) [Fri, 5 Apr 2013 01:21:52 +0000 (03:21 +0200)]
Merge branch 'MDL-38897-master' of git://github.com/danpoltawski/moodle
Damyon Wiese [Fri, 5 Apr 2013 01:19:09 +0000 (09:19 +0800)]
Merge branch 'wip-MDL-38708-master' of git://github.com/marinaglancy/moodle
Eloy Lafuente (stronk7) [Fri, 5 Apr 2013 01:06:15 +0000 (03:06 +0200)]
MDL-38852 repository_recent: add missing type.
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
Marina Glancy [Thu, 4 Apr 2013 23:52:09 +0000 (10:52 +1100)]
MDL-38708 Changed test to be more accurate
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)
Dan Poltawski [Thu, 4 Apr 2013 03:59:35 +0000 (11:59 +0800)]
MDL-38741 qtype_truefalse: fix missing setType call
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
Dan Poltawski [Thu, 4 Apr 2013 06:57:33 +0000 (14:57 +0800)]
MDL-38897 formslib: add unit tests for setType debugging
Dan Poltawski [Thu, 4 Apr 2013 04:50:42 +0000 (12:50 +0800)]
MDL-38885 - don't test for setType in display() itself
Doing it in _process_submission is enough.
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
Dan Poltawski [Thu, 4 Apr 2013 03:57:46 +0000 (11:57 +0800)]
MDL-38741 qtype_calculatesimple: missing setType call
Dan Poltawski [Thu, 4 Apr 2013 03:49:05 +0000 (11:49 +0800)]
MDL-38741 qtype_calculatedmulti: fix missing setType
Dan Poltawski [Thu, 4 Apr 2013 03:45:11 +0000 (11:45 +0800)]
MDL-38741 qtype_calculate: fix missing setType
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
AMOS bot [Thu, 4 Apr 2013 00:36:08 +0000 (00:36 +0000)]
Automatically generated installer lang files
