Dan Poltawski [Thu, 17 May 2012 13:04:30 +0000 (21:04 +0800)]
Merge branch 'MDL-33073-master-1' of git://git.luns.net.uk/moodle
Dan Poltawski [Thu, 17 May 2012 12:46:21 +0000 (20:46 +0800)]
Merge branch 'MDL-24419' of git://github.com/danpoltawski/moodle
Dan Poltawski [Thu, 17 May 2012 12:45:37 +0000 (20:45 +0800)]
Merge branch 'MDL-24419-master' of git://github.com/sammarshallou/moodle
sam marshall [Thu, 17 May 2012 12:37:33 +0000 (13:37 +0100)]
MDL-24419 Fix bug with section creation for new courses
Andrew Robert Nicols [Thu, 17 May 2012 10:49:53 +0000 (11:49 +0100)]
MDL-33073 Fix application of toolbox JS for drag/dropped content
Aparup Banerjee [Thu, 17 May 2012 09:17:37 +0000 (17:17 +0800)]
Merge branch 'MDL-32087' of git://github.com/timhunt/moodle
Aparup Banerjee [Thu, 17 May 2012 08:57:01 +0000 (16:57 +0800)]
Merge branch 'w20_MDL-33016_m23_hubperf' of git://github.com/skodak/moodle
Aparup Banerjee [Thu, 17 May 2012 08:48:07 +0000 (16:48 +0800)]
Merge branch 'wip-mdl-32866' of git://github.com/rajeshtaneja/moodle
Aparup Banerjee [Thu, 17 May 2012 06:47:44 +0000 (14:47 +0800)]
Merge branch 'w20_MDL-32907_m23_like' of git://github.com/skodak/moodle
Dan Poltawski [Thu, 17 May 2012 06:33:42 +0000 (14:33 +0800)]
Merge branch 'w20_MDL-29054_m23_sqlsrvdbt' of git://github.com/skodak/moodle
Dan Poltawski [Thu, 17 May 2012 06:30:30 +0000 (14:30 +0800)]
Merge branch 'w20_MDL-32967_m23_sqlsrvstrings' of git://github.com/skodak/moodle
Dan Poltawski [Thu, 17 May 2012 06:11:14 +0000 (14:11 +0800)]
Merge branch 'MDL-31814' of git://github.com/timhunt/moodle
Dan Poltawski [Thu, 17 May 2012 04:35:45 +0000 (12:35 +0800)]
Merge branch 'w20_MDL-32961_m23_phpunitperf' of git://github.com/skodak/moodle
Dan Poltawski [Thu, 17 May 2012 03:57:12 +0000 (11:57 +0800)]
MDL-24419: redirect_if_major_upgrade_required version update
The conditional topics changes need users to go to /admin/index.php
Dan Poltawski [Thu, 17 May 2012 03:29:04 +0000 (11:29 +0800)]
Merge branch 'w20_MDL-32961_m23_phpunitperf' of git://github.com/skodak/moodle
Dan Poltawski [Thu, 17 May 2012 03:19:02 +0000 (11:19 +0800)]
Merge branch 'MDL-24419' of git://github.com/stronk7/moodle
Sam Hemelryk [Thu, 17 May 2012 02:55:21 +0000 (14:55 +1200)]
Merge branch 'MDL-32337-uptodate' of git://github.com/mudrd8mz/moodle
Sam Hemelryk [Thu, 17 May 2012 02:49:03 +0000 (14:49 +1200)]
Merge branch 'MDL-31850-master' of https://github.com/mackensen/moodle
Sam Hemelryk [Thu, 17 May 2012 02:24:40 +0000 (14:24 +1200)]
Merge branch 'MDL-32903' of git://github.com/netspotau/moodle-mod_assign
Eloy Lafuente (stronk7) [Thu, 17 May 2012 00:57:56 +0000 (02:57 +0200)]
MDL-24419 (6): Backup and restore fixes and improvements
- annotate used grouping
- reorganize restore methods
- roll availability dates
- observe $CFG->enableavailability
- observe $CFG->enablegroupmembersonly
- TODO: 2 TODOs
Damyon Wiese [Thu, 10 May 2012 07:44:32 +0000 (15:44 +0800)]
MDL-32903: Remove unused variable $tempsettings from mod_assign
This was left over from when I removed all the pass by reference calls.
Sam Hemelryk [Thu, 17 May 2012 00:30:44 +0000 (12:30 +1200)]
Merge branch 'MDL-32610-hide-updates' of git://github.com/mudrd8mz/moodle
Sam Hemelryk [Thu, 17 May 2012 00:27:50 +0000 (12:27 +1200)]
Merge branch 'master_MDL-32794' of git://github.com/danmarsden/moodle
Sam Hemelryk [Wed, 16 May 2012 23:54:07 +0000 (11:54 +1200)]
Merge branch 'MDL-32904' of git://github.com/netspotau/moodle-mod_assign
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
Eloy Lafuente (stronk7) [Wed, 16 May 2012 22:51:50 +0000 (00:51 +0200)]
MDL-24419 (5): Coding style cleanup
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 21:48:50 +0000 (23:48 +0200)]
Merge branch 'MDL-24419-master' of git://github.com/sammarshallou/moodle
Conflicts:
lib/db/upgrade.php
lib/phpunit/lib.php
version.php
Fixed:
lib/db/upgrade.php - duplicate course->sectioncache add code
lib/db/install.xml - cleanup needed because xmldb editor was not used
lib/phpunit/classes/util.php - cleanup $GROUPLIB_CACHE on test reset
Eloy Lafuente (stronk7) [Wed, 16 May 2012 14:28:59 +0000 (16:28 +0200)]
NOBUG: Minibump to get latest WS installed
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.
Juho Viitasalo [Fri, 2 Mar 2012 13:16:07 +0000 (15:16 +0200)]
MDL-31850 wiki: extra whitespace removed from form
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
David Mudrak [Tue, 15 May 2012 14:59:45 +0000 (16:59 +0200)]
MDL-32337 admin notifications page checks for the recent updates fetch timestamp
Now the message 'Your Moodle code is up-to-date!' is displayed only if
the fetch was done within the last hour. Otherwise, just the button
'Check for available updates' is displayed.
Petr Skoda [Tue, 15 May 2012 13:40:22 +0000 (15:40 +0200)]
MDL-33016 eliminate unnecessary DB query on /index.php
David Mudrak [Tue, 15 May 2012 12:32:55 +0000 (14:32 +0200)]
MDL-32610 cron based fetch of available updates can be disabled from config.php
David Mudrak [Tue, 15 May 2012 12:30:47 +0000 (14:30 +0200)]
MDL-32610 available updates info at the admin Notifications page can be hidden
David Mudrak [Tue, 15 May 2012 12:23:48 +0000 (14:23 +0200)]
MDL-32610 available updates info at the Plugins check upgrade page can be hidden
David Mudrak [Tue, 15 May 2012 11:42:32 +0000 (13:42 +0200)]
MDL-32610 available updates info at the Plugins overview admin page can be hidden
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
David Mudrak [Tue, 15 May 2012 09:39:04 +0000 (11:39 +0200)]
MDL-32610 site administration > server > update notifications section can be hidden
David Mudrak [Tue, 15 May 2012 09:37:59 +0000 (11:37 +0200)]
MDL-32610 config-dist.php has info about $CFG->disableupdatenotifications flag
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
Dan Marsden [Fri, 11 May 2012 00:51:39 +0000 (12:51 +1200)]
MDL-32794 SCORM prevent items in tree that have no navigation from triggering a navigation change.
Tim Hunt [Mon, 14 May 2012 18:24:35 +0000 (19:24 +0100)]
MDL-32087 question preview: add a help icon to the technical info.
Tim Hunt [Mon, 14 May 2012 18:07:37 +0000 (19:07 +0100)]
MDL-32087 question preview: update the code to use html_writer.
Tim Hunt [Mon, 14 May 2012 17:54:37 +0000 (18:54 +0100)]
MDL-32087 question preview: add a Save button.
Without this, there are some interactions with the question that could
only be tested by adding the question to a quiz, which was a pain.
Tim Hunt [Mon, 14 May 2012 17:53:30 +0000 (18:53 +0100)]
MDL-32087 question preview: make more technical info available.
... but hide it in a collapsible region.
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
sam marshall [Mon, 2 Apr 2012 11:16:13 +0000 (12:16 +0100)]
MDL-24419 (4): Add conditional availability support to sections; section cache
Credit: original version done by Kirill Astashov of NetSpot (netspot.com.au),
finished and tweaked by sam.
This change adds conditional availability support for sections analagous to
that already available for activities. (Backend, UI, backup/restore.)
In order that this feature does not reduce performance, section cacheing has
also been added using a new course 'sectioncache' field analagous to modinfo.
The new feature integrates with activity availability so that activities
inside sections which are not available are automatically not available
themselves (meaning it works to restrict access).
sam marshall [Thu, 26 Apr 2012 14:32:45 +0000 (15:32 +0100)]
MDL-24419 (3): Add new parameter to format_float for shorter display
sam marshall [Mon, 2 Apr 2012 11:08:30 +0000 (12:08 +0100)]
MDL-24419 (2): Moved groupings cache to get_all_groupings function
There was a static cache inside course/lib.php. I need to access this
information in other places, so to avoid making two queries, I am
moving the cache into the groups_get_all_groupings function instead.
sam marshall [Mon, 2 Apr 2012 11:04:33 +0000 (12:04 +0100)]
MDL-24419 (1): Core restore steps should have after_restore function
At present core restore steps cannot have an after_restore function,
even though plugin restore steps can. Technically it would be possible
to just override the launch_after_restore_methods function but this
is not very neat. Instead, I added code to call after_restore function
(exactly the same way after_execute works).
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