Sam Hemelryk [Wed, 16 May 2012 23:53:08 +0000 (11:53 +1200)]
Merge branch 'MDL-23016c' of git://github.com/srynot4sale/moodle
Sam Hemelryk [Wed, 16 May 2012 23:29:38 +0000 (11:29 +1200)]
MDL-22504 course-dndupload: Fixed up a couple of minor bugs
Sam Hemelryk [Wed, 16 May 2012 22:55:35 +0000 (10:55 +1200)]
Merge branch 'MDL-22504_drag_and_drop_upload_final' of https://github.com/davosmith/moodle
Conflicts:
course/lib.php
theme/base/style/course.css
Sam Hemelryk [Wed, 16 May 2012 22:09:27 +0000 (10:09 +1200)]
MDL-32881 Prevent course/view.php from being cached
This should prevent browser caching which will ensure that changes made
using the course javascript (e.g. drag/drop, show/hide) will not be 'lost'
by using the browser back button.
This reverts commit
3aaa1843999eeb1832331ec5c8b30865fdba9710.
Eloy Lafuente (stronk7) [Wed, 16 May 2012 14:23:00 +0000 (16:23 +0200)]
Merge branch 'MDL-32233-core_course_duplicate_course-usersdata' of git://github.com/jleyva/moodle
Juan Leyva [Wed, 16 May 2012 14:10:47 +0000 (16:10 +0200)]
MDL-32233 core_course_duplicate_course: Forcing backup and restore in MODE_SAMESITE always as suggested by Eloy.
Juan Leyva [Wed, 16 May 2012 10:10:09 +0000 (12:10 +0200)]
MDL-32233 core_course_duplicate_course: Fixed integrator review details described here tracker.moodle.org/browse/MDL-32233?focusedCommentId=157707&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-157707
Eloy Lafuente (stronk7) [Wed, 16 May 2012 09:41:48 +0000 (11:41 +0200)]
Merge branch 'MDL-32662-core_course_groups_xxx_groupings' of git://github.com/jleyva/moodle
Juan Leyva [Wed, 16 May 2012 08:45:40 +0000 (10:45 +0200)]
MDL-32662 core_group_xxx_groupings: Fixed integrator review potential problem detected in update_groupings. More info: tracker.moodle.org/browse/MDL-32662?focusedCommentId=157706&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-157706
Aparup Banerjee [Wed, 16 May 2012 07:59:07 +0000 (15:59 +0800)]
Merge branch 'MDL-32633' of git://github.com/timhunt/moodle
Davo Smith [Wed, 16 May 2012 07:25:22 +0000 (08:25 +0100)]
MDL-22504 Course drag and drop upload - moved file locations
Aparup Banerjee [Wed, 16 May 2012 06:32:51 +0000 (14:32 +0800)]
Merge branch 'MDL-31657' of git://github.com/scriby/moodle
Aparup Banerjee [Wed, 16 May 2012 06:03:56 +0000 (14:03 +0800)]
Merge branch 'MDL-32988-master' of git://github.com/sammarshallou/moodle
Aparup Banerjee [Wed, 16 May 2012 05:49:32 +0000 (13:49 +0800)]
MDL-32921 lti : reused a moodle_url.
Aparup Banerjee [Wed, 16 May 2012 05:48:42 +0000 (13:48 +0800)]
Merge branch 'MDL-32921' of git://github.com/scriby/moodle
Aparup Banerjee [Wed, 16 May 2012 02:39:48 +0000 (10:39 +0800)]
Merge branch 'MDL-32005-master-10' of git://git.luns.net.uk/moodle
- fixed up comments (was phpdoc blocks)
Sam Hemelryk [Wed, 16 May 2012 01:14:59 +0000 (13:14 +1200)]
Merge branch 'MDL-32641-master-1' of git://git.luns.net.uk/moodle
Sam Hemelryk [Wed, 16 May 2012 01:09:32 +0000 (13:09 +1200)]
Merge branch 'MDL-32889-master' of https://github.com/mackensen/moodle
Aaron Barnes [Mon, 12 Mar 2012 23:53:52 +0000 (12:53 +1300)]
MDL-32016 unit tests: Remove hard coded file hash and calculate dynamically
Sam Hemelryk [Tue, 15 May 2012 21:59:07 +0000 (09:59 +1200)]
Merge branch 'MDL-31215-master-11' of git://git.luns.net.uk/moodle
Conflicts:
course/lib.php
Sam Hemelryk [Tue, 15 May 2012 21:51:48 +0000 (09:51 +1200)]
Merge branch 'MDL-30434_debug_exception' of git://github.com/andyjdavis/moodle
Sam Hemelryk [Tue, 15 May 2012 21:12:17 +0000 (09:12 +1200)]
Merge branch 'MDL-31458' of git://github.com/danpoltawski/moodle
Eloy Lafuente (stronk7) [Tue, 15 May 2012 11:14:13 +0000 (13:14 +0200)]
Merge branch 'MDL-32998' of git://github.com/mouneyrac/moodle
Eloy Lafuente (stronk7) [Tue, 15 May 2012 11:10:50 +0000 (13:10 +0200)]
MDL-32949 ws: minor comments cleanup
sam marshall [Tue, 15 May 2012 10:38:03 +0000 (11:38 +0100)]
MDL-32988 Lib: Course delete does availability/completion in wrong order
When deleting modules that failed to delete using normal method, it deleted
the course-modules table first and then the availability/completion,
which depend on the entries in course-modules table. This commit switches
the order.
Eloy Lafuente (stronk7) [Tue, 15 May 2012 10:59:18 +0000 (12:59 +0200)]
Merge branch 'MDL-32949' of git://github.com/mouneyrac/moodle
Jerome Mouneyrac [Tue, 15 May 2012 10:40:06 +0000 (18:40 +0800)]
MDL-32998 add warnings structure
Jerome Mouneyrac [Tue, 15 May 2012 10:23:43 +0000 (18:23 +0800)]
MDL-32949 return exception errorcode from the REST/SOAP/XMLRPC servers
Aparup Banerjee [Tue, 15 May 2012 08:41:54 +0000 (16:41 +0800)]
Merge branch 'wip-mdl-32770' of git://github.com/rajeshtaneja/moodle
Andrew Robert Nicols [Mon, 12 Mar 2012 16:34:45 +0000 (16:34 +0000)]
MDL-32005 Add idnumber field to groups and groupings
Dan Poltawski [Tue, 15 May 2012 07:41:46 +0000 (15:41 +0800)]
Merge branch 'w20_MDL-25197_m23_innodb' of git://github.com/skodak/moodle
Dan Poltawski [Tue, 15 May 2012 07:32:03 +0000 (15:32 +0800)]
Merge branch 'MDL-32869_master' of git://github.com/kordan/moodle
Dan Poltawski [Tue, 15 May 2012 07:30:28 +0000 (15:30 +0800)]
Merge branch 'MDL-32321_master' of git://github.com/kordan/moodle
Dan Poltawski [Tue, 15 May 2012 06:43:31 +0000 (14:43 +0800)]
Merge branch 'MDL-32978-master-integration' of git://github.com/FMCorz/moodle
Yang [Tue, 15 May 2012 05:40:58 +0000 (13:40 +0800)]
MDL-32998 add warnings structure
Aparup Banerjee [Tue, 15 May 2012 03:03:07 +0000 (11:03 +0800)]
Merge branch 'MDL-25695-master' of https://github.com/mackensen/moodle
Andrew Robert Nicols [Tue, 8 May 2012 11:13:19 +0000 (12:13 +0100)]
MDL-31215 Add the ability to change activity titles using AJAX calls
Dan Poltawski [Mon, 14 May 2012 12:57:14 +0000 (20:57 +0800)]
Merge branch 'MDL-32930' of git://github.com/tmuras/moodle
Dan Poltawski [Mon, 14 May 2012 12:49:05 +0000 (20:49 +0800)]
Merge branch 'MDL-32863' of git://github.com/jonof/moodle
Dan Poltawski [Mon, 14 May 2012 12:42:12 +0000 (20:42 +0800)]
Merge branch 'MDL-32375' of git://github.com/timhunt/moodle
Dan Poltawski [Mon, 14 May 2012 10:08:30 +0000 (18:08 +0800)]
Merge branch 'MDL-30291' of git://github.com/rwijaya/moodle
Dan Poltawski [Mon, 14 May 2012 09:38:58 +0000 (17:38 +0800)]
MDL-32923 phpunit: make copy/paste easier
Davo Smith [Mon, 14 May 2012 08:48:04 +0000 (09:48 +0100)]
MDL-22504 Course drag and drop upload - now correctly ignores disabled modules and allows upload to orphaned sections
Dan Poltawski [Mon, 14 May 2012 07:53:19 +0000 (15:53 +0800)]
Merge branch 'MDL-31719_master' of git://github.com/lazydaisy/moodle
Dan Poltawski [Mon, 14 May 2012 07:48:26 +0000 (15:48 +0800)]
MDL-32923 phpunit: be a bit more verbose about re-run cmmand
Dan Poltawski [Mon, 14 May 2012 07:46:23 +0000 (15:46 +0800)]
Merge branch 'w20_MDL-32923_m23_phpunithint' of git://github.com/skodak/moodle
Dan Poltawski [Mon, 14 May 2012 06:44:04 +0000 (14:44 +0800)]
Merge branch 'w20_MDL-26901_m23_tinymceoptions' of git://github.com/skodak/moodle
Dan Poltawski [Mon, 14 May 2012 06:26:29 +0000 (14:26 +0800)]
Merge branch 'wip-mdl-31941' of git://github.com/rajeshtaneja/moodle
Dan Poltawski [Mon, 14 May 2012 06:23:41 +0000 (14:23 +0800)]
Merge branch 'MDL-31951' of git://github.com/rwijaya/moodle
Dan Poltawski [Mon, 14 May 2012 06:21:57 +0000 (14:21 +0800)]
Merge branch 'MDL-32742-master-1' of git://git.luns.net.uk/moodle
Dan Poltawski [Mon, 14 May 2012 06:20:05 +0000 (14:20 +0800)]
Merge branch 'MDL-31804_ambiguous_sql' of git://github.com/andyjdavis/moodle
Dan Poltawski [Mon, 14 May 2012 06:12:30 +0000 (14:12 +0800)]
Merge branch 'MDL-24401' of git://github.com/rwijaya/moodle
Dan Poltawski [Mon, 14 May 2012 06:08:27 +0000 (14:08 +0800)]
Merge branch 'MDL-32902' of git://github.com/netspotau/moodle-mod_assign
Dan Poltawski [Mon, 14 May 2012 06:06:37 +0000 (14:06 +0800)]
Merge branch 'w20_MDL-32915_m23_chatdiv' of git://github.com/skodak/moodle
Dan Poltawski [Mon, 14 May 2012 06:00:51 +0000 (14:00 +0800)]
Merge branch 'wip-MDL-32872-m23' of git://github.com/samhemelryk/moodle
Dan Poltawski [Mon, 14 May 2012 05:36:11 +0000 (13:36 +0800)]
Merge branch 'w20_MDL-32926_m23_phpunitevil' of git://github.com/skodak/moodle
Dan Poltawski [Mon, 14 May 2012 05:32:18 +0000 (13:32 +0800)]
Merge branch 'w20_MDL-32960_m23_phpunitref' of git://github.com/skodak/moodle
Frederic Massart [Mon, 14 May 2012 05:27:06 +0000 (13:27 +0800)]
MDL-32978 Gradebook: Fix strict standards notices
Dan Poltawski [Mon, 14 May 2012 05:12:53 +0000 (13:12 +0800)]
Merge branch 'wip-MDL-32611-m23' of git://github.com/samhemelryk/moodle
Dan Poltawski [Mon, 14 May 2012 05:08:40 +0000 (13:08 +0800)]
Merge branch 'MDL-32875-master-1' of git://git.luns.net.uk/moodle
Jonathon Fowler [Tue, 28 Feb 2012 04:53:47 +0000 (14:53 +1000)]
MDL-31804 duplicated columns cause Oracle error in grader report
Damyon Wiese [Thu, 10 May 2012 07:10:30 +0000 (15:10 +0800)]
MDL-32902: Remove 70% width stylesheet rule for tables on the mod_assign submission screen.
Sam Hemelryk [Mon, 14 May 2012 03:36:55 +0000 (15:36 +1200)]
Merge branch 'MDL-31134-master' of git://github.com/ankitagarwal/moodle
Jonathon Fowler [Wed, 9 May 2012 01:51:18 +0000 (11:51 +1000)]
MDL-32863 question: fix for Oracle ambiguous column error
Sam Hemelryk [Mon, 14 May 2012 02:52:10 +0000 (14:52 +1200)]
Merge branch 'MDL-31944' of git://github.com/ankitagarwal/moodle
Dan Poltawski [Mon, 14 May 2012 02:49:52 +0000 (10:49 +0800)]
Merge branch 'w20_MDL-26553_m23_sqlsrvconfig' of git://github.com/skodak/moodle
Sam Hemelryk [Mon, 14 May 2012 02:48:31 +0000 (14:48 +1200)]
Merge branch 'MDL-30305-master-1' of git://git.luns.net.uk/moodle
Dan Poltawski [Mon, 14 May 2012 02:41:46 +0000 (10:41 +0800)]
Merge branch 'MDL-32714-rubric' of git://github.com/mudrd8mz/moodle
Sam Hemelryk [Mon, 14 May 2012 02:37:51 +0000 (14:37 +1200)]
Merge branch 'w20_MDL-32659_m23_navcourses' of git://github.com/skodak/moodle
Dan Poltawski [Mon, 14 May 2012 02:28:05 +0000 (10:28 +0800)]
Merge branch 'MDL-31902-master' of git://github.com/ankitagarwal/moodle
Rossiani Wijaya [Mon, 14 May 2012 02:25:05 +0000 (10:25 +0800)]
MDL-30291 outputrenderers: fixed typo for
Dan Poltawski [Mon, 14 May 2012 02:22:21 +0000 (10:22 +0800)]
Merge branch 'MDL-27322_export' of git://github.com/andyjdavis/moodle
Dan Poltawski [Mon, 14 May 2012 02:10:03 +0000 (10:10 +0800)]
Merge branch 'MDL-32910' of git://github.com/timhunt/moodle
Sam Hemelryk [Mon, 14 May 2012 02:04:21 +0000 (14:04 +1200)]
Merge branch 'MDL-32340-master-2' of git://git.luns.net.uk/moodle
Sam Hemelryk [Mon, 14 May 2012 01:41:15 +0000 (13:41 +1200)]
MDL-32873 course: Fixed up unused global + phpdocs
Sam Hemelryk [Mon, 14 May 2012 01:39:55 +0000 (13:39 +1200)]
Merge branch 'MDL-32873-master-1' of git://git.luns.net.uk/moodle
Conflicts:
course/lib.php
Sam Hemelryk [Mon, 14 May 2012 01:30:16 +0000 (13:30 +1200)]
Merge branch 'MDL-32881-master-2' of git://git.luns.net.uk/moodle
Sam Hemelryk [Mon, 14 May 2012 01:20:07 +0000 (13:20 +1200)]
Merge branch 'wip-MDL-32126-master' of git://github.com/abgreeve/moodle
Adrian Greeve [Tue, 8 May 2012 01:21:24 +0000 (09:21 +0800)]
MDL-32126 - data - Fix of an error when sorting by other criteria.
Sam Hemelryk [Sun, 13 May 2012 21:16:43 +0000 (09:16 +1200)]
MDL-32611 editcategory: Fixed up navigation error.
Sam Hemelryk [Wed, 9 May 2012 23:44:18 +0000 (11:44 +1200)]
MDL-32872 tool_roles: Fixed up navigation on user roles page
Mary Evans [Sun, 13 May 2012 13:40:30 +0000 (14:40 +0100)]
MDL-31719 lang/en/admin.php: changed text in $string['configallowthemechangeonurl'] to make less ambiguous
Petr Skoda [Sun, 13 May 2012 12:28:25 +0000 (14:28 +0200)]
MDL-26553 add sqlsrv to list of available db types in config-dist.php
Petr Skoda [Sun, 13 May 2012 11:54:35 +0000 (13:54 +0200)]
MDL-25197 add existing InnoDB engine detection in conversion tool
Petr Skoda [Sun, 13 May 2012 08:24:43 +0000 (10:24 +0200)]
MDL-32915 fix bogus open div in basic chat ui
Petr Skoda [Sun, 13 May 2012 07:56:57 +0000 (09:56 +0200)]
MDL-32923 on failure print hint how to execute the failed test case
Petr Skoda [Sat, 12 May 2012 19:06:24 +0000 (21:06 +0200)]
MDL-32926 exorcise setUser(2) evil from phpunit
Petr Skoda [Sat, 12 May 2012 19:11:53 +0000 (21:11 +0200)]
MDL-32960 put phpunit integration tests to one test suite and execute them first
Petr Skoda [Sat, 12 May 2012 18:53:48 +0000 (20:53 +0200)]
MDL-32960 refactor phpunit integration to one class per file structure
Petr Skoda [Sat, 12 May 2012 15:06:45 +0000 (17:06 +0200)]
MDL-32830 add new hidden yuidebug setting for module backtraces
Petr Skoda [Sat, 12 May 2012 11:19:22 +0000 (13:19 +0200)]
MDL-32659 potential navigation course loading improvements
The idea is to not use inequalities in SQL queries for loading of courses in navigation because ti seems some SQL query optimiser have problems with that.
David Mudrak [Tue, 8 May 2012 22:57:57 +0000 (00:57 +0200)]
MDL-32714 workshop: fixed SQL to load assessment form fields
Obvious problems emerged once there were some records in the
workshopform_rubric table with no workshopform_rubric_levels. As l.id
(empty in that case) was used as the key of the returned array, they all
were collapsed into a single one.
Petr Skoda [Tue, 8 May 2012 14:24:41 +0000 (16:24 +0200)]
MDL-26901 add new option to specify list of available fonts in TinyMCE
Also modified the list of languages appearance, textarea is more suitable for entry of long texts. It is now also possible to specify empty list of languages and fonts which removes the button from the editor toolbar. Includes release name fix.
Tim Hunt [Thu, 3 May 2012 21:33:36 +0000 (22:33 +0100)]
MDL-32633 quiz editing: recreate grade item when max changed from 0
Tim Hunt [Fri, 11 May 2012 13:57:09 +0000 (14:57 +0100)]
MDL-32375 question unit tests: fix breakage from phpunit coversion.
Three things:
1. Fixes to select expectation.
2. Fixes to match walkthrough tests (No idea how these managed to pass
under Simpletest!)
3. Fix expected values for multianswer upgrade tests.
Eloy Lafuente (stronk7) [Fri, 11 May 2012 10:18:06 +0000 (12:18 +0200)]
weekly release 2.3dev
Eloy Lafuente (stronk7) [Fri, 11 May 2012 10:10:16 +0000 (12:10 +0200)]
Merge branch 'install_master' of git://github.com/amosbot/moodle
Dan Poltawski [Fri, 11 May 2012 07:25:26 +0000 (15:25 +0800)]
MDL-31458 forum: email subjects containing ampersand are sent as &
Tomasz Muras [Fri, 11 May 2012 06:56:01 +0000 (08:56 +0200)]
MDL-32930 Add escaping for '_' character
Andrew Davis [Tue, 6 Mar 2012 05:46:23 +0000 (12:46 +0700)]
MDL-30434 core: modified get_exception_info() to provide more debug information