Commit graph

53292 commits

Author SHA1 Message Date
Ankit Agarwal
ecb6b25b0d MDL-31946 forum: Removing deprecated function folder_get_participants 2012-05-08 14:50:22 +08:00
Ankit Agarwal
c1413e22e2 MDL-31945 folder: Removing deprecated function folder_get_participants 2012-05-08 14:44:47 +08:00
Jason Fowler
dd6ae1784c MDL-31952 - Resource - Removing the deprecated page_get_participants function 2012-05-08 14:40:53 +08:00
Jason Fowler
c72c01b184 MDL-31953 - Resource - Removing the deprecated resource_get_participants function 2012-05-08 14:37:43 +08:00
Jason Fowler
58cc51ee15 MDL-31947 - Glossary - Removing the deprecated glossary_get_participants function 2012-05-08 14:33:42 +08:00
Sam Hemelryk
bbb0a6eb02 Merge branch 'MDL-32509' of git://github.com/danpoltawski/moodle 2012-05-08 18:12:28 +12:00
Sam Hemelryk
cd6b62c849 Merge branch 'MDL-32670' of git://github.com/rlorenzo/moodle 2012-05-08 18:07:07 +12:00
Sam Hemelryk
d7013dba20 Merge branch 'MDL-32777' of git://github.com/danpoltawski/moodle 2012-05-08 17:49:44 +12:00
Sam Hemelryk
301cf946a6 Merge branch 'MDL-31671-master2' of git://github.com/ankitagarwal/moodle 2012-05-08 17:42:03 +12:00
Dan Poltawski
4022860ea8 Merge branch 'w19_MDL-31691_m23_cohortidnumber' of git://github.com/skodak/moodle 2012-05-08 12:40:33 +08:00
Dan Poltawski
1fb26160f2 Merge branch 'MDL-32718-sql-typo' of git://github.com/mudrd8mz/moodle 2012-05-08 12:35:49 +08:00
Dan Poltawski
92e1ae5447 Merge branch 'MDL-31854' of git://github.com/timhunt/moodle 2012-05-08 12:33:45 +08:00
Dan Poltawski
35c5e46d88 Merge branch 'master-MDL-30598' of git://github.com/danmarsden/moodle 2012-05-08 12:22:30 +08:00
Dan Poltawski
8243bc686b Merge branch 'MDL-32768-CLEAN' of git://github.com/netspotau/moodle-mod_assign 2012-05-08 11:24:43 +08:00
Damyon Wiese
3ec209133d MDL-32768: Remove unused function count_files from mod_assign
This is implemented in the plugins and is not used in the base assign class.
This was also using a constant from the assignsubmission_file plugin which is
bad form.
2012-05-08 11:02:25 +08:00
Sam Hemelryk
4ecbd65d32 Merge branch 'MDL-32681-master-2' of git://git.luns.net.uk/moodle 2012-05-08 11:14:12 +12:00
Sam Hemelryk
42708cbeb1 Merge branch 'MDL-32743-master-2' of git://git.luns.net.uk/moodle 2012-05-08 11:05:53 +12:00
Petr Skoda
979d320722 MDL-32825 try to improve atomicity of cache file operations in themes and javascript 2012-05-07 18:45:13 +02:00
Dan Poltawski
4dd63b6d70 Merge branch 'w19_MDL-32683_m23_publiccache' of git://github.com/skodak/moodle 2012-05-07 19:17:40 +08:00
Petr Skoda
3db67789a1 MDL-32683 assert $CFG->slasharguments is enabled in new installs
Thanks Dan Poltawski for spotting it.
2012-05-07 13:05:42 +02:00
Petr Skoda
fcc4f23d0d MDL-32683 fix outdated tests 2012-05-07 12:49:26 +02:00
Dan Poltawski
a84b57e603 Merge branch 'w19_MDL-32683_m23_publiccache' of git://github.com/skodak/moodle 2012-05-07 17:55:31 +08:00
Dan Marsden
3cc7515843 MDL-30598 SCORM fix a few coding guideline issues, tidy up phpdocs 2012-05-07 21:08:53 +12:00
David Mudrak
6c09cb4a64 MDL-32718 fixing an SQL typo in workshop_get_recent_mod_activity() 2012-05-07 10:02:41 +02:00
Dan Poltawski
96a241736e Merge branch 'MDL-18335' of git://github.com/rwijaya/moodle 2012-05-07 15:32:24 +08:00
Dan Poltawski
63313eca72 Merge branch 'w19_MDL-32762_m23_forumstrict' of git://github.com/skodak/moodle 2012-05-07 15:27:51 +08:00
Dan Poltawski
c3c70f09d6 Merge branch 'w19_MDL-32735_m23_feedbackstrict' of git://github.com/skodak/moodle 2012-05-07 15:08:21 +08:00
Ankit Agarwal
5ff114adae MDL-31671 calendar: update_event hook should be triggered when updating event 2012-05-07 15:01:50 +08:00
Ankit Agarwal
ff284fac9e MDL-31671 calendar: Fixing error when trying to delete parent of a repeated event series 2012-05-07 15:01:49 +08:00
Dan Poltawski
5c46aee8fd Revert "MDL-32379: Fix memory leak in session_set_user"
This reverts commit 22dc32042a.

This integrator didn't properly read the diff, sorry.
2012-05-07 14:39:43 +08:00
Dan Poltawski
74bf5cb999 Merge branch 'MDL-32781' of git://github.com/netspotau/moodle-mod_assign 2012-05-07 13:17:07 +08:00
Dan Poltawski
57417ab1ec Merge branch 'MDL-32684' of git://github.com/lazydaisy/moodle 2012-05-07 13:03:50 +08:00
Dan Poltawski
007fe3f775 Merge branch 'w19_MDL-32719_m23_enrolstrict' of git://github.com/skodak/moodle 2012-05-07 12:58:40 +08:00
Dan Poltawski
73c670423d Merge branch 'w19_MDL-31617_m23_coursesortorder' of git://github.com/skodak/moodle 2012-05-07 12:51:20 +08:00
Dan Poltawski
efff2ab77f Merge branch 'MDL-32430' of git://github.com/timhunt/moodle 2012-05-07 12:48:18 +08:00
Dan Poltawski
9af52f493a Merge branch 'MDL-32786' of git://github.com/stronk7/moodle 2012-05-07 12:44:19 +08:00
Dan Poltawski
deda57ae1a Merge branch 'MDL-32768-CLEAN' of git://github.com/netspotau/moodle-mod_assign 2012-05-07 12:37:09 +08:00
Dan Poltawski
defbe24610 Merge branch 'MDL-32772-CLEAN' of git://github.com/netspotau/moodle-mod_assign 2012-05-07 12:34:06 +08:00
Dan Poltawski
7e6d3880b4 Merge branch 'MDL-32774-CLEAN' of git://github.com/netspotau/moodle-mod_assign 2012-05-07 12:28:34 +08:00
Damyon Wiese
9f91316495 MDL-32781: assignfeedback_comments plugin not loading previous comments
Was setting the wrong field names in the form.
2012-05-07 12:15:08 +08:00
Dan Poltawski
33e71140bb Merge branch 'MDL-32698_questionengine_typos' of git://github.com/davosmith/moodle 2012-05-07 12:05:43 +08:00
Damyon Wiese
cfc81f03c5 MDL-32813: Change mod_assign settings to use plugin settings table.
Also move the 'default' setting for each plugin into it's own settings file
so that it is handled properly on new installs.
(ensure the plugin is available at setting time)
Also make the file submission plugin on by default
2012-05-07 11:49:15 +08:00
Dan Poltawski
35be447cda Merge branch 'wip-MDL-32267-m23' of git://github.com/samhemelryk/moodle 2012-05-07 11:35:26 +08:00
Dan Poltawski
11a4313109 Merge branch 'mdl32379_23' of git://github.com/tlevi/moodle 2012-05-07 11:29:01 +08:00
Dan Poltawski
11c33d32be Merge branch 'MDL-32788' of git://github.com/timhunt/moodle 2012-05-07 11:16:22 +08:00
Dan Poltawski
b2344ab366 Merge branch 'MDL-32009-master-3' of git://git.luns.net.uk/moodle 2012-05-07 11:07:28 +08:00
Damyon Wiese
8ab7bb9f56 MDL-32768: mod_assign - Change plugin constants to use correct prefix for component 2012-05-07 10:59:07 +08:00
Damyon Wiese
ee225061dc MDL-32774: Require sesskey for all actions in the assignment upgrade tool 2012-05-07 10:51:05 +08:00
Damyon Wiese
a3dbdc2c03 MDL-32772: Change SQL for mod_assign gradingtable to use named query parameters
This makes it consistent with the built in filtering in flexible_table.

Fix additional issue with SQL for grading table when there are no enrolled users

Change SQL for mod_assign grading table to use get_in_or_equal
As Suggested by Andrew Nicols in tracker
2012-05-07 10:45:23 +08:00
Christopher Tombleson
1273dde9f7 MDL-30598 SCORM api.php moved to loaddatamodel.php
Merged api.php into loaddatamodel.php. Changed all references to api.php
to point at loaddatamodel.php
2012-05-07 14:41:57 +12:00